marko 5.37.49 → 5.37.51

package/dist/runtime/helpers/tags-compat/runtime-dom.js

@@ -50,7 +50,7 @@ exports.p = function (domCompat) {
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
       const input = Array.isArray(_.i) ? _.i : [_.i];
-      const tagsRenderer = domCompat.resolveRegistered(_.r, global);
+      const tagsRenderer = domCompat.resolveRegistered(_.r, out.global);
       const newNode = domCompat.render(out, component, tagsRenderer, input);
 
       out.bf("1", component, !newNode);

package/dist/runtime/helpers/tags-compat/runtime-html.js

@@ -34,6 +34,11 @@ exports.p = function (htmlCompat) {
 
     if (componentDefs) {
       scripts = _g_($global, componentDefs);
+      htmlCompat.ensureState($global).walkOnNextFlush = true;
+
+      if (!tagsAPI.length) {
+        scripts = concatScripts(htmlCompat.flushScript($global), scripts);
+      }
     }
 
     if (tagsAPI.length) {
@@ -70,17 +75,19 @@ exports.p = function (htmlCompat) {
       return tagsRenderer;
     }
 
-    if (!tagsRenderer && renderBody) {
-      renderBody.toJSON = htmlCompat.toJSON;
-    }
-
-    return (input, out) =>
-    TagsCompat(
-      args ?
-      { i: args, r: (args) => (tagsRenderer || renderBody)(...args) } :
-      { i: input, r: tagsRenderer || renderBody },
-      out
-    );
+    return (input, out) => {
+      if (!tagsRenderer && renderBody) {
+        renderBody.toJSON = htmlCompat.toJSON(
+          htmlCompat.ensureState(out.global)
+        );
+      }
+      TagsCompat(
+        args ?
+        { i: args, r: (args) => (tagsRenderer || renderBody)(...args) } :
+        { i: input, r: tagsRenderer || renderBody },
+        out
+      );
+    };
   };
 
   const TagsCompatId = "tags-compat";
@@ -147,7 +154,7 @@ exports.p = function (htmlCompat) {
     return (input, ...args) => {
       // tags to class
       const $global = htmlCompat.$global();
-      htmlCompat.ensureState($global);
+      const state = htmlCompat.ensureState($global);
       let writers = writersByGlobal.get($global);
       if (!writers) {
         writersByGlobal.set($global, writers = { classAPI: [], tagsAPI: [] });
@@ -169,7 +176,7 @@ exports.p = function (htmlCompat) {
               key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase(),
               value]
               );
-              value.toJSON = htmlCompat.toJSON;
+              value.toJSON = htmlCompat.toJSON(state);
             }
           } else {
             input[key === "content" ? "renderBody" : key] = value;

package/dist/translator/index.js

@@ -428,32 +428,44 @@ const translate = exports.translate = {
         );
       }
 
-      path.pushContainer(
-        "body",
-        _compiler.types.expressionStatement(
-          _compiler.types.assignmentExpression(
-            "=",
-            templateRendererMember,
-            _compiler.types.callExpression(rendererIdentifier, [
-            _compiler.types.functionExpression(
-              null,
-              [
-              _compiler.types.identifier("input"),
-              _compiler.types.identifier("out"),
-              file._componentDefIdentifier,
-              file._componentInstanceIdentifier,
-              _compiler.types.identifier("state"),
-              _compiler.types.identifier("$global")],
-
-              renderBlock.node
-            ),
-            _compiler.types.objectExpression(templateRenderOptionsProps),
-            componentIdentifier]
-            )
-          )
+      let rendererAssignment = _compiler.types.assignmentExpression(
+        "=",
+        templateRendererMember,
+        _compiler.types.callExpression(rendererIdentifier, [
+        _compiler.types.functionExpression(
+          null,
+          [
+          _compiler.types.identifier("input"),
+          _compiler.types.identifier("out"),
+          file._componentDefIdentifier,
+          file._componentInstanceIdentifier,
+          _compiler.types.identifier("state"),
+          _compiler.types.identifier("$global")],
+
+          renderBlock.node
+        ),
+        _compiler.types.objectExpression(templateRenderOptionsProps),
+        componentIdentifier]
         )
       );
 
+      if (!isHTML && componentBrowserFile && !meta.implicitSplitComponent) {
+        rendererAssignment = _compiler.types.assignmentExpression(
+          "=",
+          _compiler.types.memberExpression(
+            (0, _babelUtils.importDefault)(
+              file,
+              (0, _babelUtils.resolveRelativePath)(file, componentBrowserFile),
+              "marko_split_component"
+            ),
+            _compiler.types.identifier("renderer")
+          ),
+          rendererAssignment
+        );
+      }
+
+      path.pushContainer("body", _compiler.types.expressionStatement(rendererAssignment));
+
       if (meta.implicitSplitComponent && isHTML) {
         renderBlock.unshiftContainer(
           "body",

package/dist/translator/util/add-dependencies.js

@@ -43,7 +43,7 @@ const lassoDepPrefix = "package: ";var _default =
 };exports.default = _default;
 
 const entryBuilder = exports.entryBuilder = {
-  build(entryFile) {
+  build(entryFile, exportInit) {
     const state = entryFile[kEntryState];
     if (!state) {
       throw entryFile.path.buildCodeFrameError(
@@ -53,6 +53,7 @@ const entryBuilder = exports.entryBuilder = {
     const { markoOpts } = entryFile;
     const entryMarkoMeta = entryFile.metadata.marko;
     const { body } = state;
+    let didExportInit = false;
     entryMarkoMeta.watchFiles = [...state.watchFiles];
     entryMarkoMeta.deps = [...state.lassoDeps];
 
@@ -69,19 +70,29 @@ const entryBuilder = exports.entryBuilder = {
 
       body.unshift(markoComponentsImport);
 
-      if (markoOpts.hydrateInit) {
+      if (markoOpts.hydrateInit || exportInit) {
+        const initExpression = _compiler.types.callExpression(
+          initId,
+          markoOpts.runtimeId ? [_compiler.types.stringLiteral(markoOpts.runtimeId)] : []
+        );
         markoComponentsImport.specifiers.push(
           _compiler.types.importSpecifier(initId, initId)
         );
+
         body.push(
-          _compiler.types.expressionStatement(
-            _compiler.types.callExpression(
-              initId,
-              markoOpts.runtimeId ? [_compiler.types.stringLiteral(markoOpts.runtimeId)] : []
-            )
-          )
+          exportInit ?
+          _compiler.types.exportDefaultDeclaration(
+            _compiler.types.arrowFunctionExpression([], initExpression)
+          ) :
+          _compiler.types.expressionStatement(initExpression)
         );
       }
+    } else if (exportInit) {
+      body.push(
+        _compiler.types.exportDefaultDeclaration(
+          _compiler.types.arrowFunctionExpression([], _compiler.types.blockStatement([]))
+        )
+      );
     }
 
     return body;

package/package.json

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

package/src/runtime/helpers/tags-compat/runtime-dom.js

@@ -50,7 +50,7 @@ exports.p = function (domCompat) {
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
       const input = Array.isArray(_.i) ? _.i : [_.i];
-      const tagsRenderer = domCompat.resolveRegistered(_.r, global);
+      const tagsRenderer = domCompat.resolveRegistered(_.r, out.global);
       const newNode = domCompat.render(out, component, tagsRenderer, input);
 
       out.bf("1", component, !newNode);

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -34,6 +34,11 @@ exports.p = function (htmlCompat) {
 
     if (componentDefs) {
       scripts = ___getInitComponentsCodeForDefs($global, componentDefs);
+      htmlCompat.ensureState($global).walkOnNextFlush = true;
+
+      if (!tagsAPI.length) {
+        scripts = concatScripts(htmlCompat.flushScript($global), scripts);
+      }
     }
 
     if (tagsAPI.length) {
@@ -70,17 +75,19 @@ exports.p = function (htmlCompat) {
       return tagsRenderer;
     }
 
-    if (!tagsRenderer && renderBody) {
-      renderBody.toJSON = htmlCompat.toJSON;
-    }
-
-    return (input, out) =>
+    return (input, out) => {
+      if (!tagsRenderer && renderBody) {
+        renderBody.toJSON = htmlCompat.toJSON(
+          htmlCompat.ensureState(out.global),
+        );
+      }
       TagsCompat(
         args
           ? { i: args, r: (args) => (tagsRenderer || renderBody)(...args) }
           : { i: input, r: tagsRenderer || renderBody },
         out,
       );
+    };
   };
 
   const TagsCompatId = "tags-compat";
@@ -147,7 +154,7 @@ exports.p = function (htmlCompat) {
     return (input, ...args) => {
       // tags to class
       const $global = htmlCompat.$global();
-      htmlCompat.ensureState($global);
+      const state = htmlCompat.ensureState($global);
       let writers = writersByGlobal.get($global);
       if (!writers) {
         writersByGlobal.set($global, (writers = { classAPI: [], tagsAPI: [] }));
@@ -169,7 +176,7 @@ exports.p = function (htmlCompat) {
                 key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase(),
                 value,
               ]);
-              value.toJSON = htmlCompat.toJSON;
+              value.toJSON = htmlCompat.toJSON(state);
             }
           } else {
             input[key === "content" ? "renderBody" : key] = value;

package/src/translator/index.js

@@ -428,32 +428,44 @@ export const translate = {
         );
       }
 
-      path.pushContainer(
-        "body",
-        t.expressionStatement(
-          t.assignmentExpression(
-            "=",
-            templateRendererMember,
-            t.callExpression(rendererIdentifier, [
-              t.functionExpression(
-                null,
-                [
-                  t.identifier("input"),
-                  t.identifier("out"),
-                  file._componentDefIdentifier,
-                  file._componentInstanceIdentifier,
-                  t.identifier("state"),
-                  t.identifier("$global"),
-                ],
-                renderBlock.node,
-              ),
-              t.objectExpression(templateRenderOptionsProps),
-              componentIdentifier,
-            ]),
+      let rendererAssignment = t.assignmentExpression(
+        "=",
+        templateRendererMember,
+        t.callExpression(rendererIdentifier, [
+          t.functionExpression(
+            null,
+            [
+              t.identifier("input"),
+              t.identifier("out"),
+              file._componentDefIdentifier,
+              file._componentInstanceIdentifier,
+              t.identifier("state"),
+              t.identifier("$global"),
+            ],
+            renderBlock.node,
           ),
-        ),
+          t.objectExpression(templateRenderOptionsProps),
+          componentIdentifier,
+        ]),
       );
 
+      if (!isHTML && componentBrowserFile && !meta.implicitSplitComponent) {
+        rendererAssignment = t.assignmentExpression(
+          "=",
+          t.memberExpression(
+            importDefault(
+              file,
+              resolveRelativePath(file, componentBrowserFile),
+              "marko_split_component",
+            ),
+            t.identifier("renderer"),
+          ),
+          rendererAssignment,
+        );
+      }
+
+      path.pushContainer("body", t.expressionStatement(rendererAssignment));
+
       if (meta.implicitSplitComponent && isHTML) {
         renderBlock.unshiftContainer(
           "body",

package/src/translator/util/add-dependencies.js

@@ -43,7 +43,7 @@ export default (entryFile, isHydrate) => {
 };
 
 export const entryBuilder = {
-  build(entryFile) {
+  build(entryFile, exportInit) {
     const state = entryFile[kEntryState];
     if (!state) {
       throw entryFile.path.buildCodeFrameError(
@@ -53,6 +53,7 @@ export const entryBuilder = {
     const { markoOpts } = entryFile;
     const entryMarkoMeta = entryFile.metadata.marko;
     const { body } = state;
+    let didExportInit = false;
     entryMarkoMeta.watchFiles = [...state.watchFiles];
     entryMarkoMeta.deps = [...state.lassoDeps];
 
@@ -69,19 +70,29 @@ export const entryBuilder = {
 
       body.unshift(markoComponentsImport);
 
-      if (markoOpts.hydrateInit) {
+      if (markoOpts.hydrateInit || exportInit) {
+        const initExpression = t.callExpression(
+          initId,
+          markoOpts.runtimeId ? [t.stringLiteral(markoOpts.runtimeId)] : [],
+        );
         markoComponentsImport.specifiers.push(
           t.importSpecifier(initId, initId),
         );
+
         body.push(
-          t.expressionStatement(
-            t.callExpression(
-              initId,
-              markoOpts.runtimeId ? [t.stringLiteral(markoOpts.runtimeId)] : [],
-            ),
-          ),
+          exportInit
+            ? t.exportDefaultDeclaration(
+                t.arrowFunctionExpression([], initExpression),
+              )
+            : t.expressionStatement(initExpression),
         );
       }
+    } else if (exportInit) {
+      body.push(
+        t.exportDefaultDeclaration(
+          t.arrowFunctionExpression([], t.blockStatement([])),
+        ),
+      );
     }
 
     return body;