marko 4.26.5 → 4.28.0

package/docs/rendering.md

@@ -70,7 +70,7 @@ The `render` method returns an async `out` which is used to generate HTML on the
 var view = require("./view"); // Import `./view.marko`
 var resultPromise = view.render({});
 
-resultPromise.then(result => {
+resultPromise.then((result) => {
   result.appendTo(document.body);
 });
 ```
@@ -212,8 +212,8 @@ If you need to make data available globally to all views that are rendered as th
 ```js
 view.render({
   $global: {
-    flags: ["mobile"]
-  }
+    flags: ["mobile"],
+  },
 });
 ```
 
@@ -235,9 +235,9 @@ app.get("/", (req, res) => {
 
         serializedGlobals: {
           isIos: true, // Tell marko to serialize isIos above
-          isAndroid: true // Tell marko to serialize isAndroid above
-        }
-      }
+          isAndroid: true, // Tell marko to serialize isAndroid above
+        },
+      },
     },
     res
   );

package/docs/server-side-rendering.md

@@ -138,9 +138,9 @@ template.render(
     $global: {
       serializedGlobals: {
         apiKey: true,
-        locale: true
-      }
-    }
+        locale: true,
+      },
+    },
   },
   res
 );

package/docs/webpack.md

@@ -40,19 +40,19 @@ module.exports = {
   entry: "./client.js",
   output: {
     path: __dirname,
-    filename: "static/bundle.js"
+    filename: "static/bundle.js",
   },
   resolve: {
-    extensions: [".js", ".marko"]
+    extensions: [".js", ".marko"],
   },
   module: {
     rules: [
       {
         test: /\.marko$/,
-        loader: "@marko/webpack/loader"
-      }
-    ]
-  }
+        loader: "@marko/webpack/loader",
+      },
+    ],
+  },
 };
 ```
 
@@ -96,8 +96,8 @@ module: {
     //...
     {
       test: /\.less$/, // matches style.less { ... } from our template
-      use: ["style-loader", "css-loader", "less-loader"]
-    }
+      use: ["style-loader", "css-loader", "less-loader"],
+    },
     //...
   ];
 }
@@ -120,25 +120,25 @@ const CSSExtractPlugin = require("mini-css-extract-plugin");
 module.exports = {
   entry: "./client.js",
   resolve: {
-    extensions: [".js", ".marko"]
+    extensions: [".js", ".marko"],
   },
   module: {
     rules: [
       {
         test: /\.marko$/,
-        loader: "@marko/webpack/loader"
+        loader: "@marko/webpack/loader",
       },
       {
         test: /\.(less|css)$/,
-        use: [CSSExtractPlugin.loader, "css-loader", "less-loader"]
-      }
-    ]
+        use: [CSSExtractPlugin.loader, "css-loader", "less-loader"],
+      },
+    ],
   },
   plugins: [
     // Write out CSS bundle to its own file:
     new CSSExtractPlugin({
-      filename: "[name].css"
-    })
-  ]
+      filename: "[name].css",
+    }),
+  ],
 };
 ```

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

@@ -104,8 +104,8 @@ function render(input, out) {
     "DIV",
     {
       style: marko_styleAttr({
-        backgroundColor: color
-      })
+        backgroundColor: color,
+      }),
     },
     0,
     4
@@ -176,7 +176,7 @@ Marko will produce the following compiled output:
 
 ```js
 var marko_attrs0 = {
-  class: "hello"
+  class: "hello",
 };
 
 function render(input, out) {

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "marko",
-    "version": "4.26.5",
+    "version": "4.28.0",
     "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/Builder.js

@@ -65,7 +65,7 @@ function makeNode(arg) {
   } else if (arg == null) {
     return undefined;
   } else if (Array.isArray(arg)) {
-    return arg.map(arg => {
+    return arg.map((arg) => {
       return makeNode(arg);
     });
   } else {
@@ -209,7 +209,7 @@ class Builder {
         : {
             params: makeNode(params),
             of: makeNode(ofExpression),
-            body
+            body,
           }
     );
   }
@@ -221,7 +221,7 @@ class Builder {
         : {
             params: makeNode(params),
             in: makeNode(inExpression),
-            body
+            body,
           }
     );
   }
@@ -235,7 +235,7 @@ class Builder {
             from: makeNode(from),
             to: makeNode(to),
             step: makeNode(step),
-            body
+            body,
           }
     );
   }
@@ -299,7 +299,7 @@ class Builder {
         body,
         argument,
         openTagOnly,
-        selfClosed
+        selfClosed,
       });
     }
   }
@@ -377,7 +377,7 @@ class Builder {
       return new Assignment({
         left: moduleExports,
         right: value,
-        operator: "="
+        operator: "=",
       });
     } else {
       return moduleExports;
@@ -432,7 +432,7 @@ class Builder {
         }
       } else {
         let propertiesObject = properties;
-        properties = Object.keys(propertiesObject).map(key => {
+        properties = Object.keys(propertiesObject).map((key) => {
           let value = propertiesObject[key];
           if (!(value instanceof Node)) {
             value = value = new Literal({ value });
@@ -509,7 +509,7 @@ class Builder {
 
     let callee = new MemberExpression({
       object: new Identifier({ name: "require" }),
-      property: new Identifier({ name: "resolve" })
+      property: new Identifier({ name: "resolve" }),
     });
 
     let args = [path];
@@ -526,7 +526,7 @@ class Builder {
     return new Scriptlet({
       code: scriptlet.value,
       tag: scriptlet.tag,
-      block: scriptlet.block
+      block: scriptlet.block,
     });
   }
 
@@ -615,11 +615,11 @@ class Builder {
           }
           if (typeof declaration === "string") {
             declarations[i] = new VariableDeclarator({
-              id: new Identifier({ name: declaration })
+              id: new Identifier({ name: declaration }),
             });
           } else if (declaration instanceof Identifier) {
             declarations[i] = new VariableDeclarator({
-              id: declaration
+              id: declaration,
             });
           } else if (typeof declaration === "object") {
             if (!(declaration instanceof VariableDeclarator)) {
@@ -640,14 +640,14 @@ class Builder {
 
               declarations[i] = new VariableDeclarator({
                 id,
-                init
+                init,
               });
             }
           }
         }
       } else if (typeof declarations === "object") {
         // Convert the object into an array of variables
-        declarations = Object.keys(declarations).map(key => {
+        declarations = Object.keys(declarations).map((key) => {
           let id = new Identifier({ name: key });
           let init = makeNode(declarations[key]);
           return new VariableDeclarator({ id, init });

package/src/compiler/CodeGenerator.js

@@ -135,12 +135,12 @@ class CodeGenerator {
 
   _generateCode(node, finalNodes) {
     if (isArray(node)) {
-      node.forEach(child => {
+      node.forEach((child) => {
         this._generateCode(child, finalNodes);
       });
       return;
     } else if (node instanceof Container) {
-      node.forEach(child => {
+      node.forEach((child) => {
         if (child.container === node) {
           this._generateCode(child, finalNodes);
         }

package/src/compiler/CodeWriter.js

@@ -60,7 +60,7 @@ class CodeWriter {
     ok(nodes, '"nodes" expected');
     let firstStatement = true;
 
-    var writeNode = node => {
+    var writeNode = (node) => {
       if (Array.isArray(node) || node instanceof Container) {
         node.forEach(writeNode);
         return;

package/src/compiler/CompileContext.js

@@ -61,11 +61,11 @@ const helpers = {
   merge: "marko/runtime/helpers/merge",
   attr: {
     html: "marko/runtime/html/helpers/attr",
-    vdom: "marko/runtime/vdom/helpers/attr"
+    vdom: "marko/runtime/vdom/helpers/attr",
   },
   attrs: {
     html: "marko/runtime/html/helpers/attrs",
-    vdom: "marko/runtime/vdom/helpers/attrs"
+    vdom: "marko/runtime/vdom/helpers/attrs",
   },
   mergeAttrs: { html: "marko/runtime/html/helpers/merge-attrs" },
   classAttr: { html: "marko/runtime/html/helpers/class-attr" },
@@ -76,36 +76,37 @@ const helpers = {
   dataMarko: { html: "marko/runtime/html/helpers/data-marko" },
   bindComponent: "marko/runtime/helpers/bind-component",
   defineComponent: {
-    vdom: "marko/runtime/components/defineComponent"
+    vdom: "marko/runtime/components/defineComponent",
   },
   "defineComponent-legacy": {
     vdom: "marko/runtime/components/legacy/defineComponent-legacy",
-    html: "marko/runtime/helpers/noop"
+    html: "marko/runtime/helpers/noop",
   },
   "defineWidget-legacy": "marko/runtime/components/legacy/defineWidget-legacy",
   dynamicTag: "marko/runtime/helpers/dynamic-tag",
   escapeXml: {
     html: {
       module: "marko/runtime/html/helpers/escape-xml",
-      method: "x"
-    }
+      method: "x",
+    },
   },
   escapeDoubleQuoteAttrValue: {
     html: {
       module: "marko/runtime/html/helpers/escape-quotes",
-      method: "d"
-    }
+      method: "d",
+    },
   },
   escapeScript: {
-    html: "marko/runtime/html/helpers/escape-script-placeholder"
+    html: "marko/runtime/html/helpers/escape-script-placeholder",
   },
   escapeStyle: {
-    html: "marko/runtime/html/helpers/escape-style-placeholder"
+    html: "marko/runtime/html/helpers/escape-style-placeholder",
   },
   forOf: "marko/runtime/helpers/for-of",
   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",
@@ -115,13 +116,13 @@ const helpers = {
   rendererLegacy: "marko/runtime/components/legacy/renderer-legacy",
   registerComponent: {
     module: "marko/runtime/components/registry",
-    method: "r"
+    method: "r",
   },
   str: "marko/runtime/helpers/to-string",
   styleValue: "marko/runtime/helpers/style-value",
   styleAttr: {
-    html: "marko/runtime/html/helpers/style-attr"
-  }
+    html: "marko/runtime/html/helpers/style-attr",
+  },
 };
 
 class CompileContext extends EventEmitter {
@@ -268,7 +269,7 @@ class CompileContext extends EventEmitter {
     return {
       pop: () => {
         this.popData(key);
-      }
+      },
     };
   }
 
@@ -337,7 +338,7 @@ class CompileContext extends EventEmitter {
         node,
         message,
         code,
-        pos
+        pos,
       };
     } else if (typeof errorInfo === "string") {
       let message = arguments[0];
@@ -347,7 +348,7 @@ class CompileContext extends EventEmitter {
       errorInfo = {
         message,
         code,
-        pos
+        pos,
       };
     }
 
@@ -489,7 +490,7 @@ class CompileContext extends EventEmitter {
       message:
         "Unrecognized tag: " +
         tagName +
-        " - More details: https://github.com/marko-js/marko/wiki/Error:-Unrecognized-Tag"
+        " - More details: https://github.com/marko-js/marko/wiki/Error:-Unrecognized-Tag",
     });
   }
 
@@ -510,9 +511,9 @@ class CompileContext extends EventEmitter {
     } else if (typeof attributes === "object") {
       if (!Array.isArray(attributes)) {
         attributes = elDef.attributes = Object.keys(attributes).map(
-          attrName => {
+          (attrName) => {
             var attrDef = {
-              name: attrName
+              name: attrName,
             };
 
             var val = attributes[attrName];
@@ -576,7 +577,7 @@ class CompileContext extends EventEmitter {
               // may be a macro that gets registered later
               this.unrecognizedTags.push({
                 node: elNode,
-                tagName: tagName
+                tagName: tagName,
               });
             }
           }
@@ -620,7 +621,7 @@ class CompileContext extends EventEmitter {
     var foundAttrs = {};
 
     // Validate the attributes
-    attributes.forEach(attr => {
+    attributes.forEach((attr) => {
       let attrName = attr.name;
       if (!attrName) {
         // Attribute will be name for placeholder attributes. For example: <div ${data.myAttrs}>
@@ -644,7 +645,7 @@ class CompileContext extends EventEmitter {
               getTaglibPath(tagDef.taglibId) +
               '" does not support attribute "' +
               attrName +
-              '"'
+              '"',
           });
         }
         return;
@@ -665,7 +666,7 @@ class CompileContext extends EventEmitter {
       // Add default values for any attributes. If an attribute has a declared
       // default value and the attribute was not found on the element
       // then add the attribute with the specified default value
-      tagDef.forEachAttribute(attrDef => {
+      tagDef.forEachAttribute((attrDef) => {
         var attrName = attrDef.name;
 
         if (
@@ -674,7 +675,7 @@ class CompileContext extends EventEmitter {
         ) {
           attributes.push({
             name: attrName,
-            value: builder.literal(attrDef.defaultValue)
+            value: builder.literal(attrDef.defaultValue),
           });
         } else if (attrDef.required === true) {
           // TODO Only throw an error if there is no data argument provided (just HTML attributes)
@@ -688,7 +689,7 @@ class CompileContext extends EventEmitter {
                 tagName +
                 '" in taglib "' +
                 getTaglibPath(tagDef.taglibId) +
-                '".'
+                '".',
             });
           }
         }
@@ -744,7 +745,7 @@ class CompileContext extends EventEmitter {
         builder.literal(relativePath)
       );
       let loadFunctionCall = builder.functionCall(this.helper("loadTemplate"), [
-        loadTemplateArg
+        loadTemplateArg,
       ]);
       templateVar = this.addStaticVar(varName, loadFunctionCall);
     }
@@ -773,7 +774,7 @@ class CompileContext extends EventEmitter {
       this.meta[key] = [value];
     } else if (
       !unique ||
-      !property.some(e => JSON.stringify(e) === JSON.stringify(value))
+      !property.some((e) => JSON.stringify(e) === JSON.stringify(value))
     ) {
       property.push(value);
     }
@@ -852,7 +853,7 @@ class CompileContext extends EventEmitter {
     let staticNodes = [];
     let staticVars = this.getStaticVars();
 
-    let staticVarNodes = Object.keys(staticVars).map(varName => {
+    let staticVarNodes = Object.keys(staticVars).map((varName) => {
       var varInit = staticVars[varName];
       return builder.variableDeclarator(varName, varInit);
     });
@@ -953,7 +954,7 @@ class CompileContext extends EventEmitter {
 
   optimize(rootNode) {
     if (this._optimizers) {
-      this._optimizers.forEach(optimizer => {
+      this._optimizers.forEach((optimizer) => {
         optimizer.optimize(rootNode, this);
       });
     }
@@ -978,7 +979,7 @@ class CompileContext extends EventEmitter {
 
 CompileContext.prototype.util = {
   isValidJavaScriptIdentifier: require("./util/isValidJavaScriptIdentifier"),
-  isJavaScriptReservedWord: require("./util/isJavaScriptReservedWord")
+  isJavaScriptReservedWord: require("./util/isJavaScriptReservedWord"),
 };
 
 module.exports = CompileContext;

package/src/compiler/Compiler.js

@@ -58,7 +58,7 @@ function transformTreeHelper(node, context) {
 }
 
 function transformTree(rootNode, context) {
-  context.taglibLookup.forEachTemplateTransformer(transformer => {
+  context.taglibLookup.forEachTemplateTransformer((transformer) => {
     var transformFunc = transformer.getFunc();
     rootNode = transformFunc(rootNode, context) || rootNode;
   });
@@ -111,7 +111,7 @@ class CompiledTemplate {
     var meta = this.context.meta;
     if (meta) {
       var root = path.dirname(this.filename);
-      return (meta.deps || []).map(dep => resolveDep(dep, root));
+      return (meta.deps || []).map((dep) => resolveDep(dep, root));
     } else {
       return [];
     }
@@ -151,7 +151,7 @@ class Compiler {
 
     // STAGE 1: Parse the template to produce the initial AST
     var ast = this.parser.parse(src, context, {
-      migrate: true && !process.env.MARKO_NO_MIGRATE
+      migrate: true && !process.env.MARKO_NO_MIGRATE,
     });
     // console.log('ROOT', JSON.stringify(ast, null, 2));
 

package/src/compiler/HtmlJsParser.js

@@ -23,11 +23,11 @@ class HtmlJsParser {
       onString(event) {
         if (!event.isStringLiteral) {
           let value = "";
-          event.stringParts.forEach(part => {
+          event.stringParts.forEach((part) => {
             if (part.type === "placeholder") {
               value += "${" + part.value + "}";
             } else {
-              value += part.replace(/`|\${/g, match => "\\" + match);
+              value += part.replace(/`|\${/g, (match) => "\\" + match);
             }
           });
           event.value = "$nonstandard`" + value + "`";
@@ -90,7 +90,7 @@ class HtmlJsParser {
 
       onError(event) {
         handlers.handleError(event);
-      }
+      },
     };
 
     var mergedOptions = Object.assign({}, this.defaultOptions, options);
@@ -98,7 +98,7 @@ class HtmlJsParser {
       ignorePlaceholders: mergedOptions.ignorePlaceholders,
       isOpenTagOnly: function (tagName) {
         return handlers.isOpenTagOnly(tagName);
-      }
+      },
     }));
     parser.parse(src, filename);
   }

package/src/compiler/Migrator.js

@@ -13,7 +13,7 @@ function migrateNode(node, context) {
     return;
   }
 
-  context.taglibLookup.forEachTagMigrator(node, migration => {
+  context.taglibLookup.forEachTagMigrator(node, (migration) => {
     // Check to make sure a migration of a certain type is only applied once to a node
     if (node.isTransformerApplied(migration)) {
       return;
@@ -61,7 +61,7 @@ function migrateTreeHelper(node, context) {
 function migrateTree(ast, context) {
   // TODO: Consider moving this into the loop below so that root level migrations
   // are also run on new nodes.
-  context.taglibLookup.forEachTemplateMigrator(migration => {
+  context.taglibLookup.forEachTemplateMigrator((migration) => {
     migration(ast, context);
   });
 

package/src/compiler/Normalizer.js

@@ -10,7 +10,7 @@ function isIEConditionalComment(comment) {
 
 function mergeShorthandClassNames(el, shorthandClassNames, context) {
   var builder = context.builder;
-  let classNames = shorthandClassNames.map(className => {
+  let classNames = shorthandClassNames.map((className) => {
     return typeof className == "string"
       ? builder.literal(className)
       : className;
@@ -45,7 +45,7 @@ function mergeShorthandClassNames(el, shorthandClassNames, context) {
     el.setAttributeValue(
       "class",
       builder.functionCall(context.helper("classValue"), [
-        builder.literal(finalClassNames)
+        builder.literal(finalClassNames),
       ])
     );
   }
@@ -93,7 +93,7 @@ class Normalizer {
           if (newNode !== node) {
             return newNode;
           }
-        }
+        },
       })
       .walk(rootNode);
 
@@ -110,7 +110,7 @@ class Normalizer {
     }
 
     if (elNode.tagName === "marko-migration-flags") {
-      elNode.attributes.forEach(attr => {
+      elNode.attributes.forEach((attr) => {
         context.setFlag(attr.name);
       });
       elNode.detach();
@@ -147,7 +147,7 @@ class Normalizer {
       openTagOnly: elNode.openTagOnly,
       selfClosed: elNode.selfClosed,
       pos: elNode.pos,
-      attributes: elNode.attributes
+      attributes: elNode.attributes,
     });
 
     newNode.pos = elNode.pos;