marko 5.38.22 → 5.38.23

package/dist/runtime/helpers/skip-serialize.js

@@ -7,7 +7,11 @@
   }
 };
 module.exports = function (input) {
-  if (!input.toJSON) {
-    Object.defineProperty(input, "toJSON", toJSONDescriptor);
+  if (input.toJSON) {
+    return input;
+  } else {
+    const newInput = { ...input };
+    Object.defineProperty(newInput, "toJSON", toJSONDescriptor);
+    return newInput;
   }
 };

package/dist/translator/index.js

@@ -426,6 +426,28 @@ const translate = exports.translate = {
         );
       }
 
+      let inputName = "input";
+
+      if (meta.implicitSplitComponent && isHTML) {
+        inputName = path.scope.generateUid(inputName);
+        renderBlock.unshiftContainer(
+          "body",
+          _compiler.types.variableDeclaration("const", [
+          _compiler.types.variableDeclarator(
+            _compiler.types.identifier("input"),
+            _compiler.types.callExpression(
+              (0, _babelUtils.importDefault)(
+                file,
+                "marko/src/runtime/helpers/skip-serialize.js",
+                "marko_skip_serialize"
+              ),
+              [_compiler.types.identifier(inputName)]
+            )
+          )]
+          )
+        );
+      }
+
       let rendererAssignment = _compiler.types.assignmentExpression(
         "=",
         templateRendererMember,
@@ -433,7 +455,7 @@ const translate = exports.translate = {
         _compiler.types.functionExpression(
           null,
           [
-          _compiler.types.identifier("input"),
+          _compiler.types.identifier(inputName),
           _compiler.types.identifier("out"),
           file._componentDefIdentifier,
           file._componentInstanceIdentifier,
@@ -464,22 +486,6 @@ const translate = exports.translate = {
 
       path.pushContainer("body", _compiler.types.expressionStatement(rendererAssignment));
 
-      if (meta.implicitSplitComponent && isHTML) {
-        renderBlock.unshiftContainer(
-          "body",
-          _compiler.types.expressionStatement(
-            _compiler.types.callExpression(
-              (0, _babelUtils.importDefault)(
-                file,
-                "marko/src/runtime/helpers/skip-serialize.js",
-                "marko_skip_serialize"
-              ),
-              [_compiler.types.identifier("input")]
-            )
-          )
-        );
-      }
-
       renderBlock.remove();
 
       if (!isHTML) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.38.22",
+  "version": "5.38.23",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",

package/src/runtime/helpers/skip-serialize.js

@@ -7,7 +7,11 @@ var toJSONDescriptor = {
   },
 };
 module.exports = function (input) {
-  if (!input.toJSON) {
-    Object.defineProperty(input, "toJSON", toJSONDescriptor);
+  if (input.toJSON) {
+    return input;
+  } else {
+    const newInput = { ...input };
+    Object.defineProperty(newInput, "toJSON", toJSONDescriptor);
+    return newInput;
   }
 };

package/src/translator/index.js

@@ -426,6 +426,28 @@ export const translate = {
         );
       }
 
+      let inputName = "input";
+
+      if (meta.implicitSplitComponent && isHTML) {
+        inputName = path.scope.generateUid(inputName);
+        renderBlock.unshiftContainer(
+          "body",
+          t.variableDeclaration("const", [
+            t.variableDeclarator(
+              t.identifier("input"),
+              t.callExpression(
+                importDefault(
+                  file,
+                  "marko/src/runtime/helpers/skip-serialize.js",
+                  "marko_skip_serialize",
+                ),
+                [t.identifier(inputName)],
+              ),
+            ),
+          ]),
+        );
+      }
+
       let rendererAssignment = t.assignmentExpression(
         "=",
         templateRendererMember,
@@ -433,7 +455,7 @@ export const translate = {
           t.functionExpression(
             null,
             [
-              t.identifier("input"),
+              t.identifier(inputName),
               t.identifier("out"),
               file._componentDefIdentifier,
               file._componentInstanceIdentifier,
@@ -464,22 +486,6 @@ export const translate = {
 
       path.pushContainer("body", t.expressionStatement(rendererAssignment));
 
-      if (meta.implicitSplitComponent && isHTML) {
-        renderBlock.unshiftContainer(
-          "body",
-          t.expressionStatement(
-            t.callExpression(
-              importDefault(
-                file,
-                "marko/src/runtime/helpers/skip-serialize.js",
-                "marko_skip_serialize",
-              ),
-              [t.identifier("input")],
-            ),
-          ),
-        );
-      }
-
       renderBlock.remove();
 
       if (!isHTML) {