marko 4.27.0 → 4.28.1

package/dist/compiler/CompileContext.js

@@ -103,6 +103,7 @@ const helpers = {
   forIn: "marko/runtime/helpers/for-in",
   forRange: "marko/runtime/helpers/for-range",
   getWidgetFromOut: "marko/runtime/components/legacy/helper-getWidgetFromOut",
+  interopRequireDefault: "marko/runtime/helpers/interop-require",
   loadNestedTag: "marko/runtime/helpers/load-nested-tag",
   loadTag: "marko/runtime/helpers/load-tag",
   loadTemplate: "marko/runtime/helpers/load-template",

package/dist/compiler/ast/CustomTag.js

@@ -480,6 +480,7 @@ class CustomTag extends HtmlElement {
       let tagVar = codegen.addStaticVar(tagVarName, loadTag);
 
       renderTagNode = this.generateRenderTagCode(codegen, tagVar, [inputProps, builder.identifierOut()]);
+      renderTagNode._isTagCall = true;
     } else {
       if (rendererRequirePath) {
         codegen.pushMeta("tags", rendererRequirePath, true);
@@ -516,8 +517,10 @@ class CustomTag extends HtmlElement {
 
       if (isNestedTag) {
         renderTagNode = builder.functionCall(tagVar, tagArgs);
+        renderTagNode._isNestedTagCall = true;
       } else {
         renderTagNode = this.generateRenderTagCode(codegen, tagVar, tagArgs);
+        renderTagNode._isTagCall = true;
       }
     }
 
@@ -533,10 +536,22 @@ class CustomTag extends HtmlElement {
     let renderBodyFunction;
 
     if (hasBody) {
-      if (this._mergedRenderBodyStart !== undefined) {
-        const mergedRenderBody = builder.renderBodyFunction(body.slice(this._mergedRenderBodyStart));
-        body = body.slice(0, this._mergedRenderBodyStart);
-        body.push(builder.returnStatement(mergedRenderBody));
+      if (this._hasDynamicNestedTags) {
+        const renderBody = [];
+        const newBody = [];
+
+        for (const child of body) {
+          if (hasHTML(child, context)) {
+            renderBody.push(child);
+          } else {
+            newBody.push(child);
+          }
+        }
+
+        if (renderBody.length) {
+          newBody.push(builder.returnStatement(builder.renderBodyFunction(renderBody)));
+          body = newBody;
+        }
       }
 
       if (tagDef.bodyFunction) {
@@ -625,27 +640,7 @@ class CustomTag extends HtmlElement {
         return null;
       } else {
         this._isDirectlyNestedTag = false;
-
-        if (!parentCustomTag._hasDynamicNestedTags) {
-          parentCustomTag._hasDynamicNestedTags = true;
-
-          let nextBodyContent = parentCustomTag.firstChild;
-          let i = 0;
-
-          do {
-            if (nextBodyContent.type === "Text" || nextBodyContent.type === "Scriptlet" || (nextBodyContent.type === "HtmlElement" || nextBodyContent.type === "CustomTag") && !(nextBodyContent.tagDef && (nextBodyContent.tagDef.isNestedTag || nextBodyContent.tagDef.codeGeneratorModulePath))) {
-              parentCustomTag._mergedRenderBodyStart = i;
-              break;
-            }
-
-            nextBodyContent = nextBodyContent.nextSibling;
-            i++;
-          } while (nextBodyContent);
-
-          if (!i) {
-            context.addError(parentCustomTag, "Render body content must come after any dynamic nested attribute tags.");
-          }
-        }
+        parentCustomTag._hasDynamicNestedTags = true;
       }
     }
 
@@ -660,4 +655,21 @@ class CustomTag extends HtmlElement {
   }
 }
 
+function hasHTML(node, context) {
+  let hasHTML = false;
+  const walker = context.createWalker({
+    enter(node) {
+      if (node.type === "Html" || node.type === "TextVDOM" || node._isTagCall) {
+        hasHTML = true;
+        walker.stop();
+      } else if (node._isNestedTagCall) {
+        walker.skip();
+      }
+    }
+  });
+
+  walker.walk(node);
+  return hasHTML;
+}
+
 module.exports = CustomTag;

package/dist/core-tags/components/TransformHelper/convertToComponent.js

@@ -94,7 +94,7 @@ module.exports = function handleComponentBind(options) {
     if (rendererModule.inlineId) {
       markoComponentVar = rendererModule.inlineId;
     } else if (!isImplicitComponent) {
-      markoComponentVar = context.addStaticVar("marko_component", builder.require(builder.literal(rendererModule.requirePath)));
+      markoComponentVar = context.addStaticVar("marko_component", builder.functionCall(context.helper("interopRequireDefault"), [builder.require(builder.literal(rendererModule.requirePath))]));
     }
   }
 

package/dist/node_modules/@internal/components-registry/index-browser.js

@@ -27,6 +27,8 @@ var deferredDefs;
 var pendingDefs;
 
 function register(type, def) {
+  if (def.default) def = def.default;
+
   var pendingForType;
   if (pendingDefs) {
     pendingForType = pendingDefs[type];

package/dist/runtime/helpers/dynamic-tag.js

@@ -5,6 +5,7 @@ var changeCase = require("./_change-case");
 var ComponentsContext = require("../components/ComponentsContext");
 var getComponentsContext = ComponentsContext.U_;
 var ComponentDef = require("../components/ComponentDef");
+var interopRequire = require("./interop-require");
 var w10NOOP = require("warp10/constants").NOOP;
 var RENDER_BODY_TO_JSON = function () {
   return w10NOOP;
@@ -44,6 +45,8 @@ module.exports = function dynamicTag(out, tag, getAttrs, renderBody, args, props
         }
       }
 
+      tag = interopRequire(tag);
+
       var renderer = tag._ || (tag.renderer ? tag.renderer.renderer || tag.renderer : tag.render);
 
       // eslint-disable-next-line no-constant-condition

package/dist/runtime/helpers/interop-require.js

@@ -0,0 +1,3 @@
+module.exports = function interopRequireDefault(mod) {
+  return mod.default || mod;
+};

package/dist/runtime/vdom/morphdom/index.js

@@ -219,8 +219,12 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           if (!curToNodeChild.ae_) {
             // We just skip over the fromNode if it is preserved
 
-            if (compareNodeNames(curToNodeChild, curVFromNodeChild)) {
-              morphEl(curFromNodeChild, curVFromNodeChild, curToNodeChild, parentComponent);
+            if (curVFromNodeChild && curToNodeType === curVFromNodeChild.bX_ && (curToNodeType !== ELEMENT_NODE || compareNodeNames(curToNodeChild, curVFromNodeChild))) {
+              if (curToNodeType === ELEMENT_NODE) {
+                morphEl(curFromNodeChild, curVFromNodeChild, curToNodeChild, parentComponent);
+              } else {
+                morphChildren(curFromNodeChild, curToNodeChild, parentComponent);
+              }
             } else {
               // Remove the old node
               detachNode(curFromNodeChild, fromNode, ownerComponent);
@@ -300,7 +304,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             if (!curToNodeChild.ae_) {
               curVFromNodeChild = vElementByDOMNode.get(matchingFromEl);
 
-              if (compareNodeNames(curVFromNodeChild, curToNodeChild)) {
+              if (curVFromNodeChild && curToNodeType === curVFromNodeChild.bX_ && (curToNodeType !== ELEMENT_NODE || compareNodeNames(curVFromNodeChild, curToNodeChild))) {
                 if (fromNextSibling === matchingFromEl) {
                   // Single element removal:
                   // A <-> A
@@ -348,7 +352,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   }
                 }
 
-                morphEl(matchingFromEl, curVFromNodeChild, curToNodeChild, parentComponent);
+                if (curToNodeType === ELEMENT_NODE) {
+                  morphEl(matchingFromEl, curVFromNodeChild, curToNodeChild, parentComponent);
+                } else {
+                  morphChildren(matchingFromEl, curToNodeChild, parentComponent);
+                }
               } else {
                 insertVirtualNodeBefore(curToNodeChild, curToNodeKey, curFromNodeChild, fromNode, ownerComponent, parentComponent);
                 detachNode(matchingFromEl, fromNode, ownerComponent);

package/dist/taglib/taglib-finder/index.js

@@ -124,7 +124,7 @@ function find(dirname, registeredTaglibs) {
       if (!excludedPackages[name]) {
         let taglibPath = resolveFrom(rootPkg.__dirname, name + "/marko.json");
         if (taglibPath) {
-          var taglib = taglibLoader.loadTaglibFromFile(taglibPath);
+          var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);
           helper.addTaglib(taglib);
         }
       }

package/dist/taglib/taglib-loader/Taglib.js

@@ -28,9 +28,10 @@ function handleImport(taglib, importedTaglib) {
 }
 
 class Taglib {
-  constructor(filePath) {
+  constructor(filePath, isFromPackageJson) {
     ok(filePath, '"filePath" expected');
     this.filePath = this.path /* deprecated */ = this.id = filePath;
+    this.isFromPackageJson = isFromPackageJson === true;
     this.dirname = path.dirname(this.filePath);
     this.tags = {};
     this.textTransformers = [];

package/dist/taglib/taglib-loader/index.js

@@ -8,8 +8,8 @@ function loadTaglibFromProps(taglib, taglibProps) {
   return loaders.loadTaglibFromProps(taglib, taglibProps);
 }
 
-function loadTaglibFromFile(filePath) {
-  return loaders.loadTaglibFromFile(filePath);
+function loadTaglibFromFile(filePath, isFromPackageJson) {
+  return loaders.loadTaglibFromFile(filePath, isFromPackageJson);
 }
 
 function loadTaglibFromDir(filePath) {

package/dist/taglib/taglib-loader/loadTaglibFromFile.js

@@ -5,7 +5,7 @@ var loaders = require("./loaders");
 
 var ok = require("assert").ok;
 
-function loadFromFile(filePath) {
+function loadFromFile(filePath, isFromPackageJson) {
   ok(filePath, '"filePath" is required');
 
   var taglib = cache.get(filePath);
@@ -13,7 +13,7 @@ function loadFromFile(filePath) {
   // Only load a taglib once by caching the loaded taglibs using the file
   // system file path as the key
   if (!taglib) {
-    taglib = new types.Taglib(filePath);
+    taglib = new types.Taglib(filePath, isFromPackageJson);
     cache.put(filePath, taglib);
 
     var taglibProps = jsonFileReader.readFileSync(filePath);

package/dist/taglib/taglib-loader/loadTaglibFromProps.js

@@ -221,6 +221,18 @@ class TaglibLoader {
     }
   }
 
+  exports(dir) {
+    var taglib = this.taglib;
+    var path = this.filePath;
+    var dirname = this.dirname;
+
+    if (taglib.isFromPackageJson) {
+      taglib.tagsDir = false;
+
+      scanTagsDir(path, dirname, dir, taglib, this.dependencyChain.append(`exports`));
+    }
+  }
+
   taglibImports(imports) {
     if (!resolveFrom) {
       return;

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "marko",
-    "version": "4.27.0",
+    "version": "4.28.1",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {
-        "acorn": "^7.4.0",
         "app-module-path": "^2.2.0",
         "argly": "^1.0.0",
         "browser-refresh-client": "^1.0.0",

package/src/compiler/CompileContext.js

@@ -106,6 +106,7 @@ const helpers = {
   forIn: "marko/runtime/helpers/for-in",
   forRange: "marko/runtime/helpers/for-range",
   getWidgetFromOut: "marko/runtime/components/legacy/helper-getWidgetFromOut",
+  interopRequireDefault: "marko/runtime/helpers/interop-require",
   loadNestedTag: "marko/runtime/helpers/load-nested-tag",
   loadTag: "marko/runtime/helpers/load-tag",
   loadTemplate: "marko/runtime/helpers/load-template",

package/src/compiler/ast/CustomTag.js

@@ -560,6 +560,7 @@ class CustomTag extends HtmlElement {
         inputProps,
         builder.identifierOut(),
       ]);
+      renderTagNode._isTagCall = true;
     } else {
       if (rendererRequirePath) {
         codegen.pushMeta("tags", rendererRequirePath, true);
@@ -623,8 +624,10 @@ class CustomTag extends HtmlElement {
 
       if (isNestedTag) {
         renderTagNode = builder.functionCall(tagVar, tagArgs);
+        renderTagNode._isNestedTagCall = true
       } else {
         renderTagNode = this.generateRenderTagCode(codegen, tagVar, tagArgs);
+        renderTagNode._isTagCall = true;
       }
     }
 
@@ -640,12 +643,22 @@ class CustomTag extends HtmlElement {
     let renderBodyFunction;
 
     if (hasBody) {
-      if (this._mergedRenderBodyStart !== undefined) {
-        const mergedRenderBody = builder.renderBodyFunction(
-          body.slice(this._mergedRenderBodyStart)
-        );
-        body = body.slice(0, this._mergedRenderBodyStart);
-        body.push(builder.returnStatement(mergedRenderBody));
+      if (this._hasDynamicNestedTags) {
+        const renderBody = [];
+        const newBody = [];
+
+        for (const child of body) {
+          if (hasHTML(child, context)) {
+            renderBody.push(child);
+          } else {
+            newBody.push(child);
+          }
+        }
+
+        if (renderBody.length) {
+          newBody.push(builder.returnStatement(builder.renderBodyFunction(renderBody)));
+          body = newBody;
+        }
       }
 
       if (tagDef.bodyFunction) {
@@ -756,40 +769,7 @@ class CustomTag extends HtmlElement {
         return null;
       } else {
         this._isDirectlyNestedTag = false;
-
-        if (!parentCustomTag._hasDynamicNestedTags) {
-          parentCustomTag._hasDynamicNestedTags = true;
-
-          let nextBodyContent = parentCustomTag.firstChild;
-          let i = 0;
-
-          do {
-            if (
-              nextBodyContent.type === "Text" ||
-              nextBodyContent.type === "Scriptlet" ||
-              ((nextBodyContent.type === "HtmlElement" ||
-                nextBodyContent.type === "CustomTag") &&
-                !(
-                  nextBodyContent.tagDef &&
-                  (nextBodyContent.tagDef.isNestedTag ||
-                    nextBodyContent.tagDef.codeGeneratorModulePath)
-                ))
-            ) {
-              parentCustomTag._mergedRenderBodyStart = i;
-              break;
-            }
-
-            nextBodyContent = nextBodyContent.nextSibling;
-            i++;
-          } while (nextBodyContent);
-
-          if (!i) {
-            context.addError(
-              parentCustomTag,
-              "Render body content must come after any dynamic nested attribute tags."
-            );
-          }
-        }
+        parentCustomTag._hasDynamicNestedTags = true;
       }
     }
 
@@ -812,4 +792,21 @@ class CustomTag extends HtmlElement {
   }
 }
 
+function hasHTML(node, context) {
+  let hasHTML = false;
+  const walker = context.createWalker({
+    enter(node) {
+      if (node.type === "Html" || node.type === "TextVDOM" || node._isTagCall) {
+        hasHTML = true;
+        walker.stop();
+      } else if (node._isNestedTagCall) {
+        walker.skip();
+      }
+    },
+  });
+
+  walker.walk(node);
+  return hasHTML;
+}
+
 module.exports = CustomTag;

package/src/core-tags/components/TransformHelper/convertToComponent.js

@@ -115,7 +115,9 @@ module.exports = function handleComponentBind(options) {
     } else if (!isImplicitComponent) {
       markoComponentVar = context.addStaticVar(
         "marko_component",
-        builder.require(builder.literal(rendererModule.requirePath))
+        builder.functionCall(context.helper("interopRequireDefault"), [
+          builder.require(builder.literal(rendererModule.requirePath))
+        ])
       );
     }
   }

package/src/node_modules/@internal/components-define-widget-legacy/index-browser.js

@@ -14,7 +14,7 @@ var stateToJSONDef = {
     return this;
   }
 };
-function noop() { }
+function noop() {}
 
 module.exports = function defineWidget(def, renderer) {
   def = def.Widget || def;
@@ -23,7 +23,7 @@ module.exports = function defineWidget(def, renderer) {
     return def;
   }
 
-  var ComponentClass = function () { };
+  var ComponentClass = function () {};
   var proto;
   var legacyInit;
 

package/src/node_modules/@internal/components-registry/index-browser.js

@@ -29,6 +29,8 @@ var deferredDefs;
 var pendingDefs;
 
 function register(type, def) {
+  if (def.default) def = def.default;
+
   var pendingForType;
   if (pendingDefs) {
     pendingForType = pendingDefs[type];

package/src/runtime/helpers/dynamic-tag.js

@@ -5,6 +5,7 @@ var changeCase = require("./_change-case");
 var ComponentsContext = require("../components/ComponentsContext");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
 var ComponentDef = require("../components/ComponentDef");
+var interopRequire = require("./interop-require");
 var w10NOOP = require("warp10/constants").NOOP;
 var RENDER_BODY_TO_JSON = function () {
   return w10NOOP;
@@ -66,6 +67,8 @@ module.exports = function dynamicTag(
         }
       }
 
+      tag = interopRequire(tag);
+
       var renderer =
         tag._ ||
         (tag.renderer ? tag.renderer.renderer || tag.renderer : tag.render);

package/src/runtime/helpers/interop-require.js

@@ -0,0 +1,3 @@
+module.exports = function interopRequireDefault(mod) {
+  return mod.default || mod;
+}

package/src/runtime/vdom/morphdom/index.js

@@ -281,13 +281,26 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           if (!curToNodeChild.___preserve) {
             // We just skip over the fromNode if it is preserved
 
-            if (compareNodeNames(curToNodeChild, curVFromNodeChild)) {
-              morphEl(
-                curFromNodeChild,
-                curVFromNodeChild,
-                curToNodeChild,
-                parentComponent
-              );
+            if (
+              curVFromNodeChild &&
+              curToNodeType === curVFromNodeChild.___nodeType &&
+              (curToNodeType !== ELEMENT_NODE ||
+                compareNodeNames(curToNodeChild, curVFromNodeChild))
+            ) {
+              if (curToNodeType === ELEMENT_NODE) {
+                morphEl(
+                  curFromNodeChild,
+                  curVFromNodeChild,
+                  curToNodeChild,
+                  parentComponent,
+                );
+              } else {
+                morphChildren(
+                  curFromNodeChild,
+                  curToNodeChild,
+                  parentComponent,
+                );
+              }
             } else {
               // Remove the old node
               detachNode(curFromNodeChild, fromNode, ownerComponent);
@@ -404,7 +417,12 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             if (!curToNodeChild.___preserve) {
               curVFromNodeChild = vElementByDOMNode.get(matchingFromEl);
 
-              if (compareNodeNames(curVFromNodeChild, curToNodeChild)) {
+              if (
+                curVFromNodeChild &&
+                curToNodeType === curVFromNodeChild.___nodeType &&
+                (curToNodeType !== ELEMENT_NODE ||
+                  compareNodeNames(curVFromNodeChild, curToNodeChild))
+              ) {
                 if (fromNextSibling === matchingFromEl) {
                   // Single element removal:
                   // A <-> A
@@ -455,12 +473,21 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   }
                 }
 
-                morphEl(
-                  matchingFromEl,
-                  curVFromNodeChild,
-                  curToNodeChild,
-                  parentComponent
-                );
+                if (curToNodeType === ELEMENT_NODE) {
+                  morphEl(
+                    matchingFromEl,
+                    curVFromNodeChild,
+                    curToNodeChild,
+                    parentComponent
+                  );
+                } else {
+                  morphChildren(
+                    matchingFromEl,
+                    curToNodeChild,
+                    parentComponent,
+                  );
+                }
+
               } else {
                 insertVirtualNodeBefore(
                   curToNodeChild,

package/src/taglib/taglib-finder/index.js

@@ -123,7 +123,7 @@ function find(dirname, registeredTaglibs) {
       if (!excludedPackages[name]) {
         let taglibPath = resolveFrom(rootPkg.__dirname, name + "/marko.json");
         if (taglibPath) {
-          var taglib = taglibLoader.loadTaglibFromFile(taglibPath);
+          var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);
           helper.addTaglib(taglib);
         }
       }

package/src/taglib/taglib-loader/Taglib.js

@@ -27,9 +27,10 @@ function handleImport(taglib, importedTaglib) {
 }
 
 class Taglib {
-  constructor(filePath) {
+  constructor(filePath, isFromPackageJson) {
     ok(filePath, '"filePath" expected');
     this.filePath = this.path /* deprecated */ = this.id = filePath;
+    this.isFromPackageJson = isFromPackageJson === true;
     this.dirname = path.dirname(this.filePath);
     this.tags = {};
     this.textTransformers = [];

package/src/taglib/taglib-loader/index.js

@@ -8,8 +8,8 @@ function loadTaglibFromProps(taglib, taglibProps) {
   return loaders.loadTaglibFromProps(taglib, taglibProps);
 }
 
-function loadTaglibFromFile(filePath) {
-  return loaders.loadTaglibFromFile(filePath);
+function loadTaglibFromFile(filePath, isFromPackageJson) {
+  return loaders.loadTaglibFromFile(filePath, isFromPackageJson);
 }
 
 function loadTaglibFromDir(filePath) {

package/src/taglib/taglib-loader/loadTaglibFromFile.js

@@ -5,7 +5,7 @@ var loaders = require("./loaders");
 
 var ok = require("assert").ok;
 
-function loadFromFile(filePath) {
+function loadFromFile(filePath, isFromPackageJson) {
   ok(filePath, '"filePath" is required');
 
   var taglib = cache.get(filePath);
@@ -13,7 +13,7 @@ function loadFromFile(filePath) {
   // Only load a taglib once by caching the loaded taglibs using the file
   // system file path as the key
   if (!taglib) {
-    taglib = new types.Taglib(filePath);
+    taglib = new types.Taglib(filePath, isFromPackageJson);
     cache.put(filePath, taglib);
 
     var taglibProps = jsonFileReader.readFileSync(filePath);

package/src/taglib/taglib-loader/loadTaglibFromProps.js

@@ -258,6 +258,24 @@ class TaglibLoader {
     }
   }
 
+  exports(dir) {
+    var taglib = this.taglib;
+    var path = this.filePath;
+    var dirname = this.dirname;
+
+    if (taglib.isFromPackageJson) {
+      taglib.tagsDir = false;
+
+      scanTagsDir(
+        path,
+        dirname,
+        dir,
+        taglib,
+        this.dependencyChain.append(`exports`)
+      );
+    }
+  }
+
   taglibImports(imports) {
     if (!resolveFrom) {
       return;