fix: optimize param serialization, optimize define tag

Author: rturnq

.changeset/few-pianos-shop.md

@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Guard param serialize reasons and avoid registering body content for stateless attribute tags

.sizes.json

@@ -7,8 +7,8 @@
     {
       "name": "*",
       "total": {
-        "min": 19254,
-        "brotli": 7298
+        "min": 19308,
+        "brotli": 7346
       }
     },
     {
@@ -44,16 +44,16 @@
     {
       "name": "comments",
       "user": {
-        "min": 890,
-        "brotli": 457
+        "min": 809,
+        "brotli": 431
       },
       "runtime": {
         "min": 6990,
         "brotli": 2989
       },
       "total": {
-        "min": 7880,
-        "brotli": 3446
+        "min": 7799,
+        "brotli": 3420
       }
     },
     {

.sizes/comments.csr/entry.js

@@ -1,26 +1,17 @@
-// size: 890 (min) 457 (brotli)
+// size: 809 (min) 431 (brotli)
 const $if_content__setup = ($scope) => {
     ($scope[0],
       $if_content__comment_comments._($scope),
       $if_content__id._($scope));
   },
-  $if_content__comment_comments__OR__id = _or(1, ($scope) => {
-    let {
-      _: { 8: comment_comments, 11: id },
-    } = $scope;
-    $input$1($scope[0], { comments: comment_comments, path: id });
-  }),
   $if_content__comment_comments = _if_closure(
     8,
     4,
     0,
-    $if_content__comment_comments__OR__id,
+    ($scope, comment_comments) => $input_comments($scope[0], comment_comments),
   ),
-  $if_content__id = _if_closure(
-    11,
-    4,
-    0,
-    $if_content__comment_comments__OR__id,
+  $if_content__id = _if_closure(11, 4, 0, ($scope, id) =>
+    $input_path($scope[0], id),
   ),
   $if_content = _content_branch("<ul></ul>", "/ b&", $if_content__setup),
   $for_content__id = _const(11, ($scope, id) => {
@@ -80,9 +71,6 @@ const $if_content__setup = ($scope) => {
   $input_comments = _const(3, ($scope, input_comments) =>
     $for($scope, [input_comments]),
   ),
-  $input$1 = _const(2, ($scope, input) => {
-    ($input_comments($scope, input.comments), $input_path($scope, input.path));
-  }),
   $input_path = _const(4, $for_content__input_path);
 function $setup($scope) {
   $scope[0];

.sizes/dom.js

@@ -1,4 +1,4 @@
-// size: 19254 (min) 7298 (brotli)
+// size: 19308 (min) 7346 (brotli)
 var empty = [],
   rest = Symbol();
 function attrTag(attrs) {
@@ -732,6 +732,14 @@ function closure(valueAccessor, fn, getOwnerScope) {
     fn(scope, (getOwnerScope ? getOwnerScope(scope) : scope._)[valueAccessor]);
   };
 }
+function _child_setup(setup) {
+  return (
+    (setup._ = (scope, owner) => {
+      ((scope._ = owner), queueRender(scope, setup, -1));
+    }),
+    setup
+  );
+}
 function _var(scope, childAccessor, signal) {
   scope[childAccessor].e = (value) => signal(scope, value);
 }

.sizes/name-cache.json

@@ -1 +1 @@
-{"vars":{"props":{"$empty":"e","$rest":"t","$attrTag":"n","$attrTags":"r","$attrTagIterator":"l","$forIn":"o","$forOf":"i","$forTo":"u","$stringifyClassObject":"f","$stringifyStyleObject":"a","$toDelimitedString":"c","$isEventHandler":"s","$getEventHandlerName":"d","$normalizeDynamicRenderer":"h","$defaultDelegator":"g","$_on":"p","$createDelegator":"v","$handleDelegated":"b","$stripSpacesAndPunctuation":"m","$createScope":"y","$skipScope":"k","$findBranchWithKey":"C","$destroyBranch":"N","$destroyNestedBranches":"w","$removeAndDestroyBranch":"_","$insertBranchBefore":"A","$tempDetachBranch":"S","$walker":"x","$walk":"M","$walkInternal":"I","$branchesEnabled":"$","$isResuming":"j","$registeredValues":"E","$enableBranches":"T","$init":"L","$_resume":"O","$_var_resume":"R","$_el":"q","$_attr_input_checked":"B","$_attr_input_checked_script":"D","$_attr_input_checkedValue":"V","$_attr_input_checkedValue_script":"F","$_attr_input_value":"U","$_attr_input_value_script":"W","$_attr_select_value":"z","$_attr_select_value_script":"G","$setSelectOptions":"P","$_attr_details_or_dialog_open":"H","$_attr_details_or_dialog_open_script":"J","$inputType":"K","$setValueAndUpdateSelection":"X","$setCheckboxValue":"Z","$controllableDelegate":"Q","$syncControllable":"Y","$handleChange":"ee","$handleFormReset":"te","$hasValueChanged":"ne","$hasCheckboxChanged":"re","$hasSelectChanged":"le","$hasFormElementChanged":"oe","$normalizeStrProp":"ie","$normalizeBoolProp":"ue","$toValueProp":"fe","$isScheduled":"ae","$channel":"ce","$parsers":"se","$parseHTML":"de","$schedule":"he","$flushAndWaitFrame":"ge","$triggerMacroTask":"pe","$_let":"ve","$_const":"be","$_or":"me","$_for_closure":"ye","$_if_closure":"ke","$subscribeToScopeSet":"Ce","$_closure":"Ne","$_closure_get":"we","$closure":"_e","$_var":"Ae","$_return":"Se","$_return_change":"xe","$_var_change":"Me","$tagIdsByGlobal":"Ie","$_id":"$e","$_script":"je","$traverseAllHoisted":"Ee","$_hoist":"Te","$createBranch":"Le","$createAndSetupBranch":"Oe","$setupBranch":"Re","$_content":"qe","$_content_resume":"Be","$_content_closures":"De","$_content_branch":"Ve","$cloneCache":"Fe","$_attr":"Ue","$setAttribute":"We","$_attr_class":"ze","$_attr_class_items":"Ge","$_attr_class_item":"Pe","$_attr_style":"He","$_attr_style_items":"Je","$_attr_style_item":"Ke","$_text":"Xe","$_text_content":"Ze","$_attrs":"Qe","$_attrs_content":"Ye","$hasAttrAlias":"et","$_attrs_partial":"tt","$_attrs_partial_content":"nt","$attrsInternal":"rt","$_attr_content":"lt","$_attrs_script":"ot","$_html":"it","$normalizeAttrValue":"ut","$normalizeString":"ft","$_lifecycle":"at","$removeChildNodes":"ct","$insertChildNodes":"st","$toInsertNode":"dt","$_await":"ht","$_try":"gt","$renderCatch":"pt","$_if":"vt","$_dynamic_tag":"bt","$setConditionalRenderer":"mt","$_for_of":"yt","$_for_in":"kt","$_for_to":"Ct","$loop":"Nt","$createBranchWithTagNameOrRenderer":"wt","$bySecondArg":"_t","$byFirstArg":"At","$rendering":"St","$pendingRenders":"xt","$pendingRendersLookup":"Mt","$caughtError":"It","$placeholderShown":"$t","$pendingEffects":"jt","$pendingScopes":"Et","$scopeKeyOffset":"Tt","$queueRender":"Lt","$queueEffect":"Ot","$run":"Rt","$prepareEffects":"qt","$runEffects":"Bt","$runRenders":"Dt","$runRender":"Vt","$_enable_catch":"Ft","$$signalReset":"Ut","$$signal":"Wt","$abort":"zt","$classIdToBranch":"Gt","$compat":"Pt","$_template":"Ht","$mount":"Jt","$$clickCount__script":"Xt","$$clickCount":"Kt","$$setup":"Qt","$$if_content__setup":"ss","$$if_content__comment_comments__OR__id":"ts","$$if_content__comment_comments":"as","$$if_content__id":"ns","$$if_content":"ls","$$for_content__id":"os","$$for_content__input_path__OR__i":"cs","$$for_content__input_path":"ms","$$for_content__i":"is","$$for_content__open__script":"es","$$for_content__open":"us","$$for_content__setup":"bs","$$for_content__comment_text":"hs","$$for_content__if":"ps","$$for_content__comment_comments":"_s","$$for_content__$params":"ds","$$for_content__comment":"fs","$$for":"rs","$$input_comments":"gs","$$input$1":"js","$$input_path":"ks","$forUntil":"Zt","$_for_until":"Yt"}}}
+{"vars":{"props":{"$empty":"e","$rest":"t","$attrTag":"n","$attrTags":"r","$attrTagIterator":"l","$forIn":"o","$forOf":"i","$forTo":"u","$stringifyClassObject":"f","$stringifyStyleObject":"a","$toDelimitedString":"c","$isEventHandler":"s","$getEventHandlerName":"d","$normalizeDynamicRenderer":"h","$defaultDelegator":"g","$_on":"p","$createDelegator":"v","$handleDelegated":"b","$stripSpacesAndPunctuation":"m","$createScope":"y","$skipScope":"k","$findBranchWithKey":"C","$destroyBranch":"N","$destroyNestedBranches":"w","$removeAndDestroyBranch":"_","$insertBranchBefore":"A","$tempDetachBranch":"S","$walker":"x","$walk":"M","$walkInternal":"I","$branchesEnabled":"$","$isResuming":"j","$registeredValues":"E","$enableBranches":"T","$init":"L","$_resume":"O","$_var_resume":"R","$_el":"q","$_attr_input_checked":"B","$_attr_input_checked_script":"D","$_attr_input_checkedValue":"V","$_attr_input_checkedValue_script":"F","$_attr_input_value":"U","$_attr_input_value_script":"W","$_attr_select_value":"z","$_attr_select_value_script":"G","$setSelectOptions":"P","$_attr_details_or_dialog_open":"H","$_attr_details_or_dialog_open_script":"J","$inputType":"K","$setValueAndUpdateSelection":"X","$setCheckboxValue":"Z","$controllableDelegate":"Q","$syncControllable":"Y","$handleChange":"ee","$handleFormReset":"te","$hasValueChanged":"ne","$hasCheckboxChanged":"re","$hasSelectChanged":"le","$hasFormElementChanged":"oe","$normalizeStrProp":"ie","$normalizeBoolProp":"ue","$toValueProp":"fe","$isScheduled":"ae","$channel":"ce","$parsers":"se","$parseHTML":"de","$schedule":"he","$flushAndWaitFrame":"ge","$triggerMacroTask":"pe","$_let":"ve","$_const":"be","$_or":"me","$_for_closure":"ye","$_if_closure":"ke","$subscribeToScopeSet":"Ce","$_closure":"Ne","$_closure_get":"we","$closure":"_e","$_var":"Ae","$_return":"Se","$_return_change":"xe","$_var_change":"Me","$tagIdsByGlobal":"Ie","$_id":"$e","$_script":"je","$traverseAllHoisted":"Ee","$_hoist":"Te","$createBranch":"Le","$createAndSetupBranch":"Oe","$setupBranch":"Re","$_content":"qe","$_content_resume":"Be","$_content_closures":"De","$_content_branch":"Ve","$cloneCache":"Fe","$_attr":"Ue","$setAttribute":"We","$_attr_class":"ze","$_attr_class_items":"Ge","$_attr_class_item":"Pe","$_attr_style":"He","$_attr_style_items":"Je","$_attr_style_item":"Ke","$_text":"Xe","$_text_content":"Ze","$_attrs":"Qe","$_attrs_content":"Ye","$hasAttrAlias":"et","$_attrs_partial":"tt","$_attrs_partial_content":"nt","$attrsInternal":"rt","$_attr_content":"lt","$_attrs_script":"ot","$_html":"it","$normalizeAttrValue":"ut","$normalizeString":"ft","$_lifecycle":"at","$removeChildNodes":"ct","$insertChildNodes":"st","$toInsertNode":"dt","$_await":"ht","$_try":"gt","$renderCatch":"pt","$_if":"vt","$_dynamic_tag":"bt","$setConditionalRenderer":"mt","$_for_of":"yt","$_for_in":"kt","$_for_to":"Ct","$loop":"Nt","$createBranchWithTagNameOrRenderer":"wt","$bySecondArg":"_t","$byFirstArg":"At","$rendering":"St","$pendingRenders":"xt","$pendingRendersLookup":"Mt","$caughtError":"It","$placeholderShown":"$t","$pendingEffects":"jt","$pendingScopes":"Et","$scopeKeyOffset":"Tt","$queueRender":"Lt","$queueEffect":"Ot","$run":"Rt","$prepareEffects":"qt","$runEffects":"Bt","$runRenders":"Dt","$runRender":"Vt","$_enable_catch":"Ft","$$signalReset":"Ut","$$signal":"Wt","$abort":"zt","$classIdToBranch":"Gt","$compat":"Pt","$_template":"Ht","$mount":"Jt","$$clickCount__script":"Xt","$$clickCount":"Kt","$$setup":"Qt","$$if_content__setup":"ss","$$if_content__comment_comments__OR__id":"ts","$$if_content__comment_comments":"as","$$if_content__id":"ns","$$if_content":"ls","$$for_content__id":"os","$$for_content__input_path__OR__i":"cs","$$for_content__input_path":"ms","$$for_content__i":"is","$$for_content__open__script":"es","$$for_content__open":"us","$$for_content__setup":"bs","$$for_content__comment_text":"hs","$$for_content__if":"ps","$$for_content__comment_comments":"_s","$$for_content__$params":"ds","$$for_content__comment":"fs","$$for":"rs","$$input_comments":"gs","$$input$1":"js","$$input_path":"ks","$forUntil":"Zt","$_for_until":"Yt","$_child_setup":"en"}}}

packages/compiler/src/babel-utils/imports.js

@@ -127,6 +127,9 @@ export function importStar(file, request, nameHint) {
 }
 
 function getImports(file) {
+  if (file.___compileStage !== "translate") {
+    throw new Error("Unable to add an import outside of translate");
+  }
   let imports = file.metadata.marko[IMPORTS_KEY];
 
   if (!imports) {

packages/runtime-tags/src/__tests__/fixtures/async-deep-recursive/__snapshots__/dom.expected/tags/recurse.js

@@ -2,17 +2,14 @@ export const $template = "<!><!><!>";
 export const $walks = /* over(1), replace, over(2) */"b%c";
 export const $setup = () => {};
 import * as _ from "@marko/runtime-tags/debug/dom";
-import { $template as _recurse_template, $walks as _recurse_walks } from "./recurse.marko";
 _._enable_catch();
 const $placeholder_content = _._content_resume("__tests__/tags/recurse.marko_4_content", "LOADING...", /* over(1) */"b");
 const $await_content__setup = $scope => {
   $setup($scope["#childScope/0"]);
   $await_content__input_level($scope);
 };
-const $await_content__input_level = /* @__PURE__ */_._closure_get("input_level", ($scope, input_level) => $input($scope["#childScope/0"], {
-  level: input_level - 1
-}), $scope => $scope._._._);
-const $await_content = /* @__PURE__ */_._content_branch(`<!>${_recurse_template}<!>`, /* over(1), beginChild, _recurse_walks, endChild, over(1) */`b/${_recurse_walks}&b`, $await_content__setup);
+const $await_content__input_level = /* @__PURE__ */_._closure_get("input_level", ($scope, input_level) => $input_level($scope["#childScope/0"], input_level - 1), $scope => $scope._._._);
+const $await_content = /* @__PURE__ */_._content_branch(`<!>${$template}<!>`, /* over(1), beginChild, $walks, endChild, over(1) */`b/${$walks}&b`, $await_content__setup);
 const $try_content__await = /* @__PURE__ */_._await("#text/0", $await_content);
 const $try_content__setup = $scope => {
   $try_content__await($scope, new Promise(setImmediate));

packages/runtime-tags/src/__tests__/fixtures/async-deep-recursive/__snapshots__/html.expected/tags/recurse.js

@@ -1,5 +1,6 @@
 import * as _ from "@marko/runtime-tags/debug/html";
-const $content = (input, $serialize) => {
+const $content = input => {
+  const $serialize = _._get_serialize_reason();
   const $scope0_id = _._scope_id();
   const $input_level__closures = new Set();
   _._if(() => {
@@ -8,9 +9,11 @@ const $content = (input, $serialize) => {
       _._html(`<div${_._attr("data-level", input.level)}>`);
       _._try($scope1_id, "#text/1", _._content_resume("__tests__/tags/recurse.marko_2_content", () => {
         const $scope2_id = _._scope_id();
+        const $serialize2 = _._get_serialize_reason();
         _._await($scope2_id, "#text/0", new Promise(setImmediate), () => {
           const $scope3_id = _._scope_id();
           const $childScope = _._peek_scope_id();
+          _._set_serialize_reason(_._serialize_guard($serialize, /* input.level */0));
           $content({
             level: input.level - 1
           });

packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js

@@ -1,5 +1,6 @@
 import * as _ from "@marko/runtime-tags/debug/html";
-export default _._template("__tests__/tags/custom-tag/index.marko", (input, $serialize) => {
+export default _._template("__tests__/tags/custom-tag/index.marko", input => {
+  const $serialize = _._get_serialize_reason();
   const $scope0_id = _._scope_id();
   const {
     thing: {

packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js

@@ -1,6 +1,7 @@
 import * as _ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag/index.marko";
-export default _._template("__tests__/template.marko", (input, $serialize) => {
+export default _._template("__tests__/template.marko", input => {
+  const $serialize = _._get_serialize_reason();
   const $scope0_id = _._scope_id();
   const {
     x
@@ -24,14 +25,15 @@ export default _._template("__tests__/template.marko", (input, $serialize) => {
       }, $scope0_id)
     });
   }
-  _customTag({
-    thing: $thing
-  }, {
+  _._set_serialize_reason({
     /* input.thing.x, input.thing.content */0: _._serialize_guard($serialize, /* x */0),
     /* input.thing.x */1: _._serialize_guard($serialize, /* x */0),
     /* input.thing.content */2: _._serialize_guard($serialize, /* x */0)
   });
+  _customTag({
+    thing: $thing
+  });
   _._serialize_guard($serialize, /* x */0) && _._scope($scope0_id, {
-    "#childScope/0": _._serialize_if($serialize, /* input.x */0) && _._existing_scope($childScope)
+    "#childScope/0": _._serialize_if($serialize, /* x */0) && _._existing_scope($childScope)
   }, "__tests__/template.marko", 0);
 });