marko 4.25.0 → 4.26.0

package/docs/why-is-marko-fast.md

@@ -72,11 +72,7 @@ function render(input, out) {
 var marko_template = require("marko/vdom").t(__filename);
 
 function render(input, out) {
-  out
-    .e("DIV", null, 3)
-    .t("Hello ")
-    .t(input.name)
-    .t("!");
+  out.e("DIV", null, 3).t("Hello ").t(input.name).t("!");
 }
 ```
 
@@ -184,11 +180,7 @@ var marko_attrs0 = {
 };
 
 function render(input, out) {
-  out
-    .e("DIV", marko_attrs0, 3)
-    .t("Hello ")
-    .t(input.name)
-    .t("!");
+  out.e("DIV", marko_attrs0, 3).t("Hello ").t(input.name).t("!");
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "4.25.0",
+    "version": "4.26.0",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {

package/src/browser-refresh.js

@@ -1,7 +1,7 @@
 var enabled = false;
 var browserRefreshClient = require("browser-refresh-client");
 
-exports.enable = function(options) {
+exports.enable = function (options) {
   if (!browserRefreshClient.isBrowserRefreshEnabled()) {
     return;
   }
@@ -23,7 +23,7 @@ exports.enable = function(options) {
 
   browserRefreshClient
     .enableSpecialReload("*.marko marko.json marko-tag.json")
-    .onFileModified(function(path) {
+    .onFileModified(function (path) {
       hotReload.handleFileModified(path, options);
     });
 };

package/src/compiler/CodeWriter.js

@@ -49,9 +49,7 @@ class CodeWriter {
 
     this.writeStatements(body);
 
-    this.decIndent()
-      .writeLineIndent()
-      .write("}");
+    this.decIndent().writeLineIndent().write("}");
   }
 
   writeStatements(nodes) {

package/src/compiler/CompileContext.js

@@ -82,10 +82,7 @@ const helpers = {
     vdom: "marko/runtime/components/legacy/defineComponent-legacy",
     html: "marko/runtime/helpers/noop"
   },
-  "defineWidget-legacy": {
-    html: "marko/runtime/components/legacy/defineWidget-legacy",
-    vdom: "marko/runtime/components/legacy/defineWidget-legacy-browser"
-  },
+  "defineWidget-legacy": "marko/runtime/components/legacy/defineWidget-legacy",
   dynamicTag: "marko/runtime/helpers/dynamic-tag",
   escapeXml: {
     html: {
@@ -117,10 +114,8 @@ const helpers = {
   renderer: "marko/runtime/components/renderer",
   rendererLegacy: "marko/runtime/components/legacy/renderer-legacy",
   registerComponent: {
-    vdom: {
-      module: "marko/runtime/components/registry-browser",
-      method: "r"
-    }
+    module: "marko/runtime/components/registry",
+    method: "r"
   },
   str: "marko/runtime/helpers/to-string",
   styleValue: "marko/runtime/helpers/style-value",

package/src/compiler/Compiler.js

@@ -4,14 +4,14 @@ var path = require("path");
 var CodeGenerator = require("./CodeGenerator");
 var CodeWriter = require("./CodeWriter");
 var createError = require("raptor-util/createError");
-var resolveDep = require("../runtime/components/legacy/dependencies")
-  .resolveDep;
+var resolveDep =
+  require("../runtime/components/legacy/dependencies").resolveDep;
 
 const FLAG_TRANSFORMER_APPLIED = "transformerApply";
 
 function transformNode(node, context) {
   try {
-    context.taglibLookup.forEachNodeTransformer(node, function(transformer) {
+    context.taglibLookup.forEachNodeTransformer(node, function (transformer) {
       if (node.isDetached()) {
         return; //The node might have been removed from the tree
       }
@@ -52,7 +52,7 @@ function transformTreeHelper(node, context) {
    *       The checks to prevent transformers from being applied multiple times makes
    *       sure that this is not a problem.
    */
-  node.forEachChild(function(childNode) {
+  node.forEachChild(function (childNode) {
     transformTreeHelper(childNode, context);
   });
 }

package/src/compiler/HtmlJsParser.js

@@ -96,7 +96,7 @@ class HtmlJsParser {
     var mergedOptions = Object.assign({}, this.defaultOptions, options);
     var parser = (this.parser = htmljs.createParser(listeners, {
       ignorePlaceholders: mergedOptions.ignorePlaceholders,
-      isOpenTagOnly: function(tagName) {
+      isOpenTagOnly: function (tagName) {
         return handlers.isOpenTagOnly(tagName);
       }
     }));

package/src/compiler/Migrator.js

@@ -53,7 +53,7 @@ function migrateTreeHelper(node, context) {
    *       sure that this is not a problem.
    */
 
-  node.forEachChild(function(childNode) {
+  node.forEachChild(function (childNode) {
     migrateTreeHelper(childNode, context);
   });
 }

package/src/compiler/Parser.js

@@ -5,10 +5,10 @@ var Normalizer = require("./Normalizer");
 var Migrator = require("./Migrator");
 
 var COMPILER_ATTRIBUTE_HANDLERS = {
-  "preserve-whitespace": function(attr, context) {
+  "preserve-whitespace": function (attr, context) {
     context.setPreserveWhitespace(true);
   },
-  "preserve-comments": function(attr, context) {
+  "preserve-comments": function (attr, context) {
     context.setPreserveComments(true);
   }
 };
@@ -164,7 +164,7 @@ class Parser {
 
       this.parentNode.setTrimStartEnd(true);
 
-      attributes.forEach(function(attr) {
+      attributes.forEach(function (attr) {
         let attrName = attr.name;
         let handler = COMPILER_ATTRIBUTE_HANDLERS[attrName];
 

package/src/compiler/ast/CustomTag.js

@@ -14,9 +14,8 @@ function getNestedVariables(elNode, tagDef, codegen) {
     tagDef.forEachVariable(nestedVar => {
       let varName;
       if (nestedVar.nameFromAttribute) {
-        let possibleNameAttributes = nestedVar.nameFromAttribute.split(
-          /\s+or\s+|\s*,\s*/i
-        );
+        let possibleNameAttributes =
+          nestedVar.nameFromAttribute.split(/\s+or\s+|\s*,\s*/i);
         for (let i = 0, len = possibleNameAttributes.length; i < len; i++) {
           let attrName = possibleNameAttributes[i];
           let keep = false;
@@ -275,7 +274,7 @@ class CustomTag extends HtmlElement {
     if (tagDef.forEachAttribute) {
       // Add default values for any attributes from the tag definition. These added properties may get overridden
       // by get overridden from the attributes found on the actual HTML element.
-      tagDef.forEachAttribute(function(attrDef) {
+      tagDef.forEachAttribute(function (attrDef) {
         if (attrDef.hasOwnProperty("defaultValue")) {
           handleAttr(
             attrDef.name,
@@ -351,7 +350,7 @@ class CustomTag extends HtmlElement {
     if (tagDef.forEachImportedVariable) {
       // Imported variables are used to add input properties to a custom tag based on data/variables
       // found in the compiled template
-      tagDef.forEachImportedVariable(function(importedVariable) {
+      tagDef.forEachImportedVariable(function (importedVariable) {
         let propName = importedVariable.targetProperty;
         let propExpression = importedVariable.expression;
 
@@ -651,7 +650,7 @@ class CustomTag extends HtmlElement {
 
       if (tagDef.bodyFunction) {
         let bodyFunction = tagDef.bodyFunction;
-        let bodyFunctionParams = bodyFunction.params.map(function(param) {
+        let bodyFunctionParams = bodyFunction.params.map(function (param) {
           return builder.identifier(param);
         });
 
@@ -662,9 +661,8 @@ class CustomTag extends HtmlElement {
           renderBodyFunction.params.push(this._nestedTagVar);
         } else {
           if (nestedVariableNames && nestedVariableNames.length) {
-            renderBodyFunction.params = renderBodyFunction.params.concat(
-              nestedVariableNames
-            );
+            renderBodyFunction.params =
+              renderBodyFunction.params.concat(nestedVariableNames);
           }
         }
       }
@@ -798,8 +796,8 @@ class CustomTag extends HtmlElement {
     let renderBody = this.generateRenderBodyCode(codegen, body);
     let additionalAttrs = renderBody &&
       !isDynamicTag && {
-        [(tagDef.bodyFunction && tagDef.bodyFunction.name) ||
-        "renderBody"]: renderBody
+        [(tagDef.bodyFunction && tagDef.bodyFunction.name) || "renderBody"]:
+          renderBody
       };
     let inputProps = this.buildInputProps(codegen, additionalAttrs);
     let renderTagNode = this.generateRenderNode(

package/src/compiler/ast/HtmlAttribute/html/generateCode.js

@@ -1,8 +1,8 @@
 "use strict";
 
 var attr = require("../../../../runtime/html/helpers/attr");
-var escapeDoubleQuoteAttrValue = require("../../../../runtime/html/helpers/escape-quotes")
-  .d;
+var escapeDoubleQuoteAttrValue =
+  require("../../../../runtime/html/helpers/escape-quotes").d;
 
 function isStringLiteral(node) {
   return node.type === "Literal" && typeof node.value === "string";

package/src/compiler/ast/HtmlAttribute/index.js

@@ -79,7 +79,7 @@ class HtmlAttribute extends Node {
   }
 }
 
-HtmlAttribute.isHtmlAttribute = function(attr) {
+HtmlAttribute.isHtmlAttribute = function (attr) {
   return attr instanceof HtmlAttribute;
 };
 

package/src/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js

@@ -124,7 +124,7 @@ class HtmlElementVDOM extends Node {
     if (attributes != null && attributes.length !== 0) {
       let explicitAttrs = null;
       let attrs = [];
-      let addAttr = function(name, value) {
+      let addAttr = function (name, value) {
         hasNamedAttributes = true;
 
         if (!SIMPLE_ATTRS[name]) {

package/src/compiler/ast/HtmlElement/vdom/generateCode.js

@@ -33,7 +33,7 @@ function checkPropertiesStatic(properties) {
   return true;
 }
 
-module.exports = function(node, codegen) {
+module.exports = function (node, codegen) {
   var builder = codegen.builder;
   var context = codegen.context;
   var body = codegen.generateCode(node.body);

package/src/compiler/ast/TemplateRoot.js

@@ -2,7 +2,7 @@
 var Node = require("./Node");
 
 function createVarsArray(vars) {
-  return Object.keys(vars).map(function(varName) {
+  return Object.keys(vars).map(function (varName) {
     var varInit = vars[varName];
     return {
       id: varName,

package/src/compiler/ast/Text/html/generateCode.js

@@ -1,10 +1,10 @@
 "use strict";
 
-var escapeXmlOrNullish = require("../../../../runtime/html/helpers/escape-xml")
-  .x;
+var escapeXmlOrNullish =
+  require("../../../../runtime/html/helpers/escape-xml").x;
 var Literal = require("../../Literal");
 
-module.exports = function(node, codegen) {
+module.exports = function (node, codegen) {
   var context = codegen.context;
   var argument = codegen.generateCode(node.argument);
   var escape = node.escape !== false;

package/src/compiler/ast/Text/vdom/generateCode.js

@@ -4,7 +4,7 @@ var TextVDOM = require("./TextVDOM");
 var Literal = require("../../Literal");
 var he = require("he"); // Used for dealing with HTML entities
 
-module.exports = function(node, codegen, vdomUtil) {
+module.exports = function (node, codegen, vdomUtil) {
   var argument = codegen.generateCode(node.argument);
   var escape = node.escape !== false;
   var isStatic = null;

package/src/compiler/index.js

@@ -14,7 +14,7 @@ var taglib = require("../taglib");
 var defaults = extend({}, globalConfig);
 
 Object.defineProperty(exports, "defaultOptions", {
-  get: function() {
+  get: function () {
     return globalConfig;
   },
   enumerable: true,
@@ -22,7 +22,7 @@ Object.defineProperty(exports, "defaultOptions", {
 });
 
 Object.defineProperty(exports, "config", {
-  get: function() {
+  get: function () {
     return globalConfig;
   },
   enumerable: true,
@@ -141,7 +141,7 @@ function compileFile(filename, options, callback) {
   options.sourceOnly = options.sourceOnly !== false;
 
   if (callback) {
-    fs.readFile(filename, { encoding: "utf8" }, function(err, templateSrc) {
+    fs.readFile(filename, { encoding: "utf8" }, function (err, templateSrc) {
       if (err) {
         return callback(err);
       }
@@ -292,7 +292,7 @@ function buildTaglibLookup(dirname) {
 
 exports.buildTaglibLookup = buildTaglibLookup;
 
-exports.registerTaglib = function(filePath) {
+exports.registerTaglib = function (filePath) {
   registerCoreTaglibs();
 
   ok(typeof filePath === "string", '"filePath" should be a string');

package/src/compiler/modules.js

@@ -14,19 +14,19 @@ const deresolveOptions = {
 // We only need this to make Try Online work :/
 
 var helpers = {
-  require: function(path) {
+  require: function (path) {
     return nativeRequire(path);
   },
 
-  resolve: function(path) {
+  resolve: function (path) {
     return nativeRequire.resolve(path);
   },
 
-  resolveFrom: function(from, target) {
+  resolveFrom: function (from, target) {
     return resolveFrom(from, target);
   },
 
-  deresolve: function(targetFilename, from) {
+  deresolve: function (targetFilename, from) {
     return deresolve(targetFilename, from, deresolveOptions);
   }
 };

package/src/compiler/util/finger-print.js

@@ -1,5 +1,5 @@
 var sha1 = require("simple-sha1");
 
-module.exports = function(str) {
+module.exports = function (str) {
   return sha1.sync(str);
 };

package/src/compiler/util/parseExpression.js

@@ -1,5 +1,5 @@
 var parseJavaScript = require("./parseJavaScript");
 
-module.exports = function(src, builder) {
+module.exports = function (src, builder) {
   return parseJavaScript(src, builder, true /* isExpression */);
 };

package/src/compiler/util/parseStatement.js

@@ -1,5 +1,5 @@
 var parseJavaScript = require("./parseJavaScript");
 
-module.exports = function(src, builder) {
+module.exports = function (src, builder) {
   return parseJavaScript(src, builder, false /* isExpression */);
 };

package/src/compiler/util/removeDashes.js

@@ -1,5 +1,5 @@
 module.exports = function removeDashes(str) {
-  return str.replace(/-([a-z])/g, function(match, lower) {
+  return str.replace(/-([a-z])/g, function (match, lower) {
     return lower.toUpperCase();
   });
 };

package/src/compiler/util/safeVarName.js

@@ -8,7 +8,7 @@ function safeVarName(varName) {
 
   return varName
     .replace(/[^A-Za-z0-9_]/g, "_")
-    .replace(/^[0-9]+/, function(match) {
+    .replace(/^[0-9]+/, function (match) {
       var str = "";
       for (var i = 0; i < match.length; i++) {
         str += "_";

package/src/compiler/util/tokenizer.js

@@ -26,7 +26,7 @@ function create(tokens) {
   );
 
   return {
-    forEachToken: function(value, callback) {
+    forEachToken: function (value, callback) {
       tokensRegExp.lastIndex = 0; // Start searching from the beginning again
       var matches;
       while ((matches = tokensRegExp.exec(value))) {

package/src/core-tags/cache/cached-fragment-tag-transformer.js

@@ -1,6 +1,6 @@
 var defaultCacheManagerPath = require.resolve("./default-cache-manager");
 
-module.exports = function(el, context) {
+module.exports = function (el, context) {
   context.deprecate("The <cached-fragment> tag is deprecated.");
   if (!el.hasAttribute("cache-manager")) {
     var requirePath = context.getRequirePath(defaultCacheManagerPath);

package/src/core-tags/cache/cached-fragment-tag.js

@@ -1,6 +1,6 @@
 "use strict";
 module.exports = {
-  render: function(input, out) {
+  render: function (input, out) {
     var cacheKey = input.cacheKey;
     if (!cacheKey) {
       throw new Error("cache-key is required for <cached-fragment>");
@@ -17,21 +17,21 @@ module.exports = {
     cache.get(
       cacheKey,
       {
-        builder: function(callback) {
+        builder: function (callback) {
           var nestedOut = out.createOut();
 
           if (input.renderBody) {
             input.renderBody(nestedOut);
           }
 
-          nestedOut.on("error", callback).on("finish", function(result) {
+          nestedOut.on("error", callback).on("finish", function (result) {
             callback(null, result.getOutput());
           });
 
           nestedOut.end();
         }
       },
-      function(err, result) {
+      function (err, result) {
         if (err) {
           return asyncOut.error(err);
         }

package/src/core-tags/cache/default-cache-manager.js

@@ -4,14 +4,14 @@ function createCache() {
   var cache = {};
 
   return {
-    get: function(cacheKey, options, callback) {
+    get: function (cacheKey, options, callback) {
       var value = cache[cacheKey];
       if (value !== undefined) {
         return callback(null, value);
       }
 
       var builder = options.builder;
-      builder(function(err, value) {
+      builder(function (err, value) {
         if (err) {
           return callback(err);
         }
@@ -29,7 +29,7 @@ function createCache() {
 }
 
 var defaultCacheManager = {
-  getCache: function(cacheName) {
+  getCache: function (cacheName) {
     return caches[cacheName] || (caches[cacheName] = createCache());
   }
 };

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

@@ -61,7 +61,7 @@ class ComponentArgs {
     args = finalizeArgs(args, builder);
 
     if (el.type === "CustomTag") {
-      el.generateRenderTagCode = function(codegen, tagVar, tagArgs) {
+      el.generateRenderTagCode = function (codegen, tagVar, tagArgs) {
         tagArgs = tagArgs.concat(args);
         return codegen.builder.functionCall(tagVar, tagArgs);
       };

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

@@ -135,7 +135,7 @@ module.exports = function handleComponentBind(options) {
     defineComponentHelper = this.context.helper("defineComponent");
   }
 
-  this.context.on("beforeGenerateCode:TemplateRoot", function(eventArgs) {
+  this.context.on("beforeGenerateCode:TemplateRoot", function (eventArgs) {
     eventArgs.node.addRenderFunctionParam(builder.identifier("__component"));
 
     if (isLegacyComponent) {

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

@@ -11,7 +11,7 @@ module.exports = function handleComponentPreserveAttrs() {
 
   var noUpdateAttrs = [];
 
-  el.forEachAttribute(function(attr) {
+  el.forEachAttribute(function (attr) {
     var attrName = attr.name;
 
     if (attrName && attrName.endsWith(NO_UPDATE_ATTR_SUFFIX)) {

package/src/core-tags/components/init-components-tag.js

@@ -1,54 +1 @@
-"use strict";
-
-const INIT_COMPONENTS_KEY = Symbol();
-
-const addComponentsFromContext = require("../../runtime/components")
-  .___addComponentsFromContext;
-const getInitComponentsCode = require("../../runtime/components")
-  .___getInitComponentsCode;
-
-function addComponentsFromOut(source, target) {
-  const sourceOut = source.out || source;
-  const targetOut = target || sourceOut;
-  const componentsContext = sourceOut.___components;
-  const componentDefs = targetOut.writer.get("componentDefs");
-  addComponentsFromContext(componentsContext, componentDefs);
-}
-
-function addInitScript(writer) {
-  const out = writer.state.root;
-  const componentDefs = writer.get("componentDefs");
-  writer.script(getInitComponentsCode(out, componentDefs));
-}
-
-module.exports = function render(input, out) {
-  const $global = out.global;
-  if ($global[INIT_COMPONENTS_KEY] === undefined) {
-    $global[INIT_COMPONENTS_KEY] = true;
-
-    out.on("await:finish", addComponentsFromOut);
-    out.on("___toString", addInitScript);
-
-    if (out.isSync() === true) {
-      // Generate initialization code for any of the UI components that were
-      // rendered synchronously
-      addComponentsFromOut(out);
-    } else {
-      // Generate initialization code for any of the UI components that were
-      // rendered asynchronously, but were outside an `<await>` tag
-      // (each `<await>` tag will have its own component initialization block)
-      const asyncOut = out.beginAsync({ last: true, timeout: -1 });
-      out.onLast(function(next) {
-        // Ensure we're getting init code starting from the root
-        let rootOut = out;
-        while (rootOut._parentOut) {
-          rootOut = rootOut._parentOut;
-        }
-        // Write out all of the component init code from the main out
-        addComponentsFromOut(rootOut, asyncOut);
-        asyncOut.end();
-        next();
-      });
-    }
-  }
-};
+module.exports = require("@internal/init-components-tag");

package/src/core-tags/components/package.json

@@ -1,7 +1,5 @@
 {
     "browser": {
-        "./getRequirePath.js": "./getRequirePath-browser.js",
-        "./init-components-tag.js": "./init-components-tag-browser.js",
-        "./preserve-tag.js": "./preserve-tag-browser.js"
+        "./getRequirePath.js": "./getRequirePath-browser.js"
     }
 }

package/src/core-tags/components/preferred-script-location-tag.js

@@ -16,7 +16,7 @@ module.exports = function render(input, out) {
     forceScriptTagAtThisPoint(out);
   } else {
     const asyncOut = out.beginAsync({ last: true, timeout: -1 });
-    out.onLast(function(next) {
+    out.onLast(function (next) {
       forceScriptTagAtThisPoint(asyncOut);
       asyncOut.end();
       next();

package/src/core-tags/components/preserve-tag.js

@@ -1,27 +1 @@
-var ComponentsContext = require("../../runtime/components/ComponentsContext");
-var getComponentsContext = ComponentsContext.___getComponentsContext;
-
-module.exports = function render(input, out) {
-  var shouldPreserve = Boolean(!("i" in input) || input.i);
-  var isComponent = !input.n;
-
-  if (isComponent) {
-    out.bf(out.___assignedKey, out.___assignedComponentDef.___component, true);
-  }
-
-  if (input.renderBody) {
-    if (shouldPreserve) {
-      var componentsContext = getComponentsContext(out);
-      var parentPreserved = componentsContext.___isPreserved;
-      componentsContext.___isPreserved = true;
-      input.renderBody(out);
-      componentsContext.___isPreserved = parentPreserved;
-    } else {
-      input.renderBody(out);
-    }
-  }
-
-  if (isComponent) {
-    out.ef();
-  }
-};
+module.exports = require("@internal/preserve-tag");

package/src/core-tags/components/util/getTransformHelper.js

@@ -1,5 +1,5 @@
 var TransformHelper = require("../TransformHelper");
 
-module.exports = function(el, context) {
+module.exports = function (el, context) {
   return new TransformHelper(el, context);
 };

package/src/core-tags/core/await/AsyncValue.js

@@ -46,7 +46,7 @@ AsyncValue.prototype = {
    * The given callback will be invoked when there is an error or resolved data
    * available.
    */
-  ___done: function(callback) {
+  ___done: function (callback) {
     // Do we already have data or error?
     if (this.___settled) {
       // invoke the callback immediately
@@ -63,7 +63,7 @@ AsyncValue.prototype = {
    * its initial state so that any future requests to load data will trigger a
    * new load call.
    */
-  ___reject: function(err) {
+  ___reject: function (err) {
     if (this.___settled) {
       return;
     }
@@ -84,7 +84,7 @@ AsyncValue.prototype = {
   /**
    * This method will trigger any callbacks to be notified of data.
    */
-  ___resolve: function(value) {
+  ___resolve: function (value) {
     if (this.___settled) {
       return;
     }