marko 4.26.5 → 4.28.0

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

@@ -45,7 +45,7 @@ class Text extends Node {
   toJSON() {
     return {
       type: this.type,
-      argument: this.argument
+      argument: this.argument,
     };
   }
 }

package/src/compiler/ast/UnaryExpression.js

@@ -55,7 +55,7 @@ class UnaryExpression extends Node {
       type: "UnaryExpression",
       argument: this.argument,
       operator: this.operator,
-      prefix: this.prefix
+      prefix: this.prefix,
     };
   }
 

package/src/compiler/ast/UpdateExpression.js

@@ -51,7 +51,7 @@ class UpdateExpression extends Node {
       type: "UpdateExpression",
       argument: this.argument,
       operator: this.operator,
-      prefix: this.prefix
+      prefix: this.prefix,
     };
   }
 

package/src/compiler/config.js

@@ -66,7 +66,7 @@ if (g.__MARKO_CONFIG) {
      * Controls whether or not a key should be assigned to all HTML
      * and custom tags at compile-time. The default is `true`
      */
-    autoKeyEnabled: true
+    autoKeyEnabled: true,
   };
 
   if (process.env.MARKO_CONFIG) {

package/src/compiler/index.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "defaultOptions", {
     return globalConfig;
   },
   enumerable: true,
-  configurable: false
+  configurable: false,
 });
 
 Object.defineProperty(exports, "config", {
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "config", {
     return globalConfig;
   },
   enumerable: true,
-  configurable: false
+  configurable: false,
 });
 
 var defaultParser = new Parser(new HtmlJsParser());
@@ -42,7 +42,7 @@ function configure(newConfig) {
 
 var defaultCompiler = new Compiler({
   parser: defaultParser,
-  builder: Builder.DEFAULT_BUILDER
+  builder: Builder.DEFAULT_BUILDER,
 });
 
 function createBuilder(options) {
@@ -123,7 +123,7 @@ function compileForBrowser(src, filename, options, callback) {
       output: "vdom",
       meta: false,
       browser: true,
-      sourceOnly: false
+      sourceOnly: false,
     },
     options
   );
@@ -191,7 +191,7 @@ function parseRaw(templateSrc, filename, options) {
     Object.assign(
       {
         raw: true,
-        ignorePlaceholders: true
+        ignorePlaceholders: true,
       },
       options
     )

package/src/compiler/modules.js

@@ -7,7 +7,7 @@ var deresolve = require("./util/deresolve");
 const deresolveOptions = {
   shouldRemoveExt(ext) {
     return ext === ".js" || ext === ".json" || ext === ".es6";
-  }
+  },
 };
 
 // This allows us to swap out a different implementation in the browser...
@@ -28,7 +28,7 @@ var helpers = {
 
   deresolve: function (targetFilename, from) {
     return deresolve(targetFilename, from, deresolveOptions);
-  }
+  },
 };
 
 module.exports = helpers;

package/src/compiler/util/UniqueVars.js

@@ -29,7 +29,7 @@ class UniqueVars {
 
       let newEntry = {
         name: name + ++entry.counter,
-        value: value
+        value: value,
       };
 
       entry.vars.push(newEntry);
@@ -39,10 +39,10 @@ class UniqueVars {
         vars: [
           {
             name: name,
-            value: value
-          }
+            value: value,
+          },
         ],
-        counter: 1
+        counter: 1,
       };
 
       this.vars[name] = entry;

package/src/compiler/util/convertRawJavaScriptAst.js

@@ -140,7 +140,7 @@ module.exports = function convertRawJavaScriptAst(ast, builder) {
         return null;
       }
       case "TemplateLiteral": {
-        const quasis = node.quasis.map(q => q.value.cooked);
+        const quasis = node.quasis.map((q) => q.value.cooked);
         const expressions = convert(node.expressions);
         if (expressions) {
           return builder.templateLiteral(quasis, expressions);

package/src/compiler/util/javaScriptReservedWords.js

@@ -62,5 +62,5 @@ module.exports = {
   volatile: true,
   while: true,
   with: true,
-  yield: true
+  yield: true,
 };

package/src/compiler/util/macros.js

@@ -30,7 +30,7 @@ class MacrosContext {
     var functionName = "macro_" + safeVarName(name);
     var macroDef = {
       name: name,
-      functionName: functionName
+      functionName: functionName,
     };
 
     this._byName[name] = macroDef;

package/src/compiler/util/mergeProps.js

@@ -24,7 +24,7 @@ module.exports = function merge(props1, props2, context) {
       let mergeVar = context.helper("merge");
       argProp.value = context.builder.functionCall(mergeVar, [
         props2, // Input props from the attributes take precedence
-        argProp.value
+        argProp.value,
       ]);
 
       return props1;
@@ -38,14 +38,14 @@ module.exports = function merge(props1, props2, context) {
 
       return context.builder.functionCall(mergeVar, [
         props2, // Input props from the attributes take precedence
-        props1
+        props1,
       ]);
     }
   } else {
     let mergeVar = context.helper("merge");
     return context.builder.functionCall(mergeVar, [
       props2, // Input props from the attributes take precedence
-      props1
+      props1,
     ]);
   }
 };

package/src/compiler/util/parseJavaScriptArgs.js

@@ -11,7 +11,7 @@ function parseJavaScriptArgs(args, builder) {
   const ast = parseRawJavaScriptAst`_(${args})`;
 
   return ast.body[0].expression.arguments.map(
-    node =>
+    (node) =>
       convertRawJavaScriptAst(node, builder) ||
       builder.expression(ast.source.slice(node.range[0], node.range[1]), ast)
   );

package/src/compiler/util/parseJavaScriptParams.js

@@ -9,7 +9,7 @@ function parseJavaScriptParams(params, builder) {
 
   const ast = parseRawJavaScriptAst`(${params}) => {}`;
 
-  return ast.body[0].expression.params.map(node => {
+  return ast.body[0].expression.params.map((node) => {
     const paramSrc = ast.source.slice(node.range[0], node.range[1]);
     return node.type === "Identifier"
       ? builder.identifier(paramSrc)

package/src/compiler/util/parseRawJavaScriptAst.js

@@ -5,7 +5,7 @@ const espree = require("espree");
 const espreeOptions = {
   range: true,
   sourceType: "script",
-  ecmaVersion: espree.latestEcmaVersion
+  ecmaVersion: espree.latestEcmaVersion,
 };
 
 module.exports = function parseRawJavaScriptAst(parts, src) {

package/src/compiler/util/removeComments.js

@@ -2,26 +2,26 @@
 var tokenizer = require("./tokenizer").create([
   {
     name: "stringDouble",
-    pattern: /"(?:[^"]|\\")*"/
+    pattern: /"(?:[^"]|\\")*"/,
   },
   {
     name: "stringSingle",
-    pattern: /'(?:[^']|\\')*'/
+    pattern: /'(?:[^']|\\')*'/,
   },
   {
     name: "singleLineComment",
-    pattern: /\/\/.*/
+    pattern: /\/\/.*/,
   },
   {
     name: "multiLineComment",
-    pattern: /\/\*(?:[\s\S]*?)\*\//
-  }
+    pattern: /\/\*(?:[\s\S]*?)\*\//,
+  },
 ]);
 
 module.exports = function removeComments(str) {
   var comments = [];
 
-  tokenizer.forEachToken(str, token => {
+  tokenizer.forEachToken(str, (token) => {
     switch (token.name) {
       case "singleLineComment":
       case "multiLineComment":

package/src/compiler/util/tokenizer.js

@@ -10,7 +10,7 @@ function create(tokens) {
           start: matches.index,
           end: matches.index + matches[0].length,
           name: tokenDef.name,
-          value: tokenValue
+          value: tokenValue,
         };
       }
     }
@@ -18,7 +18,7 @@ function create(tokens) {
 
   var tokensRegExp = new RegExp(
     tokens
-      .map(token => {
+      .map((token) => {
         return "(" + token.pattern.source + ")";
       })
       .join("|"),
@@ -33,7 +33,7 @@ function create(tokens) {
         let token = getToken(matches);
         callback(token);
       }
-    }
+    },
   };
 }
 

package/src/compiler/util/vdom/VDOMOptimizer.js

@@ -27,7 +27,7 @@ const OPTIMIZER_CONTEXT_KEY = Symbol();
 const OPTIONS_DEFAULT = { optimizeTextNodes: true, optimizeStaticNodes: true };
 const OPTIONS_OPTIMIZE_TEXT_NODES = {
   optimizeTextNodes: true,
-  optimizeStaticNodes: false
+  optimizeStaticNodes: false,
 };
 
 class OptimizerContext {
@@ -159,7 +159,7 @@ function doOptimizeNode(node, context, options) {
   let walker = context.createWalker({
     enterArray(nodes) {
       return generateNodesForArray(nodes, context, options);
-    }
+    },
   });
 
   return walker.walk(node);

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

@@ -29,7 +29,7 @@ module.exports = {
           });
 
           nestedOut.end();
-        }
+        },
       },
       function (err, result) {
         if (err) {
@@ -48,5 +48,5 @@ module.exports = {
         }
       }
     );
-  }
+  },
 };

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

@@ -24,14 +24,14 @@ function createCache() {
 
         callback(null, value);
       });
-    }
+    },
   };
 }
 
 var defaultCacheManager = {
   getCache: function (cacheName) {
     return caches[cacheName] || (caches[cacheName] = createCache());
-  }
+  },
 };
 
 module.exports = defaultCacheManager;

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

@@ -37,7 +37,7 @@ class ComponentArgs {
       options.eventType,
       options.targetMethod,
       options.isOnce,
-      options.extraArgs
+      options.extraArgs,
     ]);
   }
 
@@ -66,7 +66,7 @@ class ComponentArgs {
         return codegen.builder.functionCall(tagVar, tagArgs);
       };
     } else {
-      el.onBeforeGenerateCode(event => {
+      el.onBeforeGenerateCode((event) => {
         let funcTarget = builder.memberExpression(
           builder.identifierOut(),
           builder.identifier("c")
@@ -76,7 +76,7 @@ class ComponentArgs {
         event.insertCode(builder.functionCall(funcTarget, funcArgs));
       });
 
-      el.onAfterGenerateCode(event => {
+      el.onAfterGenerateCode((event) => {
         let funcTarget = builder.memberExpression(
           builder.identifierOut(),
           builder.identifier("c")

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

@@ -99,7 +99,7 @@ module.exports = function assignComponentId(isRepeated) {
 
   this.componentIdInfo = {
     idExpression: idExpression,
-    nestedIdExpression: nestedIdExpression
+    nestedIdExpression: nestedIdExpression,
   };
 
   return this.componentIdInfo;
@@ -188,7 +188,7 @@ const createIndexKey = (forNode, transformHelper) => {
 
 const forASTNodes = ["ForEach", "ForEachProp", "ForRange", "ForStatement"];
 
-const getParentFor = el => {
+const getParentFor = (el) => {
   let current = el;
   while ((current = current.parentNode) && current.type !== "Macro") {
     if (current.tagName === "for" || forASTNodes.includes(current.type)) {
@@ -197,7 +197,7 @@ const getParentFor = el => {
   }
 };
 
-const getFirstElementChild = el => {
+const getFirstElementChild = (el) => {
   let current = el.firstChild;
   while (
     current &&

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

@@ -101,7 +101,7 @@ module.exports = function handleComponentBind(options) {
 
     // TODO Deprecation warning for inner binds
     let componentNode = context.createNodeForEl("_component", {
-      props: builder.literal(componentProps)
+      props: builder.literal(componentProps),
     });
     el.wrapWith(componentNode);
     return;
@@ -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))
+        ])
       );
     }
   }
@@ -146,7 +148,7 @@ module.exports = function handleComponentBind(options) {
       eventArgs.node.addRenderFunctionParam(builder.identifier("state"));
     }
 
-    eventArgs.node.generateAssignRenderCode = eventArgs => {
+    eventArgs.node.generateAssignRenderCode = (eventArgs) => {
       const nodes = [];
       const templateVar = eventArgs.templateVar;
       const templateRendererMember = eventArgs.templateRendererMember;
@@ -154,7 +156,7 @@ module.exports = function handleComponentBind(options) {
 
       const createRendererArgs = [
         renderFunctionVar,
-        builder.literal(componentProps)
+        builder.literal(componentProps),
       ];
 
       if (markoComponentVar) {
@@ -177,7 +179,7 @@ module.exports = function handleComponentBind(options) {
             ),
             builder.functionCall(defineComponentHelper, [
               markoComponentVar || builder.literal({}),
-              templateRendererMember
+              templateRendererMember,
             ])
           )
         );

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

@@ -24,7 +24,7 @@ function getComponentFiles(filename) {
     styles: [],
     file: null,
     browserFile: null,
-    package: null
+    package: null,
   };
 
   let dirFiles = fs.readdirSync(dirname);

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

@@ -83,7 +83,7 @@ module.exports = function handleComponentEvents() {
   if (hasComponentEvents) {
     var attrs = el.getAttributes().concat([]);
 
-    attrs.forEach(attr => {
+    attrs.forEach((attr) => {
       var eventType;
       var targetMethod;
       var attrName = attr.name;
@@ -150,7 +150,7 @@ module.exports = function handleComponentEvents() {
           eventType,
           targetMethod,
           extraArgs,
-          isOnce
+          isOnce,
         });
       } else {
         // We are adding an event listener for a DOM event (not a custom event)
@@ -171,7 +171,7 @@ module.exports = function handleComponentEvents() {
           eventType,
           targetMethod,
           extraArgs,
-          isOnce
+          isOnce,
         });
       }
     });

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

@@ -7,7 +7,7 @@ function addPreserve(transformHelper, bodyOnly, condition) {
   var isCustomTag = el.type !== "HtmlElement";
 
   if (bodyOnly) {
-    el.forEachChild(child => {
+    el.forEachChild((child) => {
       child._canBePreserved = true;
     });
   } else {
@@ -15,7 +15,7 @@ function addPreserve(transformHelper, bodyOnly, condition) {
   }
 
   var preserveAttrs = {
-    key: transformHelper.assignComponentId().nestedIdExpression
+    key: transformHelper.assignComponentId().nestedIdExpression,
   };
 
   if (isCustomTag) {
@@ -100,20 +100,20 @@ const preserveTypes = [
   // The new preserve types
   {
     attribute: "no-update",
-    handler: preserveHandler
+    handler: preserveHandler,
   },
   {
     attribute: "no-update-if",
-    handler: preserveIfHandler
+    handler: preserveIfHandler,
   },
   {
     attribute: "no-update-body",
-    handler: preserveBodyHandler
+    handler: preserveBodyHandler,
   },
   {
     attribute: "no-update-body-if",
-    handler: preserveBodyIfHandler
-  }
+    handler: preserveBodyIfHandler,
+  },
 ];
 
 module.exports = function handleComponentPreserve() {

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

@@ -35,12 +35,6 @@ module.exports = function handleLegacyBind() {
 
   const hasWidgetTypes = context.isFlagSet("hasWidgetTypes");
 
-  if (hasWidgetTypes) {
-    context.deprecate(
-      "The <widget-types> tag is deprecated. Please remove it. See: https://github.com/marko-js/marko/issues/514"
-    );
-  }
-
   if (bindAttrValue != null && !bindAttr.isLiteralValue()) {
     // This is a dynamic expression. The <widget-types> should have been found.
     if (!hasWidgetTypes) {
@@ -61,7 +55,7 @@ module.exports = function handleLegacyBind() {
             builder.identifier("marko_componentTypes"),
             bindAttrValue,
             true /* computed */
-          )
+          ),
         ]
       )
     );
@@ -84,6 +78,6 @@ module.exports = function handleLegacyBind() {
     componentModule,
     rendererModule,
     isLegacyComponent: true,
-    rootNodes: [el]
+    rootNodes: [el],
   });
 };

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

@@ -8,7 +8,7 @@ const escodegen = require("escodegen");
 const FLAG_COMPONENT_STYLE = Symbol("COMPONENT_STYLE");
 const espreeOptions = {
   sourceType: "script",
-  ecmaVersion: espree.latestEcmaVersion
+  ecmaVersion: espree.latestEcmaVersion,
 };
 
 function handleStyleElement(styleEl, transformHelper) {
@@ -62,7 +62,7 @@ function handleStyleElement(styleEl, transformHelper) {
       type: lang,
       code: styleCode,
       virtualPath: "./" + path.basename(context.filename) + "." + lang,
-      path: "./" + path.basename(context.filename)
+      path: "./" + path.basename(context.filename),
     });
   }
 
@@ -77,14 +77,14 @@ function methodToProperty(method) {
     value: method.value,
     kind: "init",
     method: false,
-    shorthand: false
+    shorthand: false,
   };
 }
 
 function classToObject(cls, el, transformHelper) {
   return {
     type: "ObjectExpression",
-    properties: cls.body.body.map(method => {
+    properties: cls.body.body.map((method) => {
       if (method.type != "MethodDefinition") {
         throw Error(
           "Only methods are allowed on single file component class definitions."
@@ -104,7 +104,7 @@ function classToObject(cls, el, transformHelper) {
       } else {
         return method;
       }
-    })
+    }),
   };
 }
 
@@ -123,7 +123,7 @@ function handleClassDeclaration(classEl, transformHelper) {
       if (errorIndex != null && errorIndex >= 0) {
         transformHelper.context.addError({
           pos: classEl.pos + errorIndex,
-          message: message
+          message: message,
         });
         return;
       }
@@ -151,7 +151,7 @@ function handleClassDeclaration(classEl, transformHelper) {
   let moduleInfo = {
     inlineId: componentVar,
     filename: transformHelper.filename,
-    requirePath: "./" + path.basename(transformHelper.filename)
+    requirePath: "./" + path.basename(transformHelper.filename),
   };
 
   classEl.detach();
@@ -179,7 +179,7 @@ module.exports = function handleRootNodes() {
     context.addDependency("package: ./" + componentFiles.package);
   }
 
-  componentFiles.styles.forEach(styleFile => {
+  componentFiles.styles.forEach((styleFile) => {
     context.addDependency("./" + styleFile);
   });
 
@@ -188,7 +188,7 @@ module.exports = function handleRootNodes() {
 
     let moduleInfo = {
       filename: path.join(dirname, file),
-      requirePath: "./" + file.slice(0, file.lastIndexOf("."))
+      requirePath: "./" + file.slice(0, file.lastIndexOf(".")),
     };
 
     componentModule = rendererModule = moduleInfo;
@@ -199,7 +199,7 @@ module.exports = function handleRootNodes() {
 
     componentModule = {
       filename: path.join(dirname, file),
-      requirePath: "./" + file.slice(0, file.lastIndexOf("."))
+      requirePath: "./" + file.slice(0, file.lastIndexOf(".")),
     };
   }
 
@@ -264,7 +264,7 @@ module.exports = function handleRootNodes() {
         walker.skip();
         return;
       }
-    }
+    },
   });
 
   walker.walk(templateRoot);
@@ -281,7 +281,7 @@ module.exports = function handleRootNodes() {
 
   // After normalizing the text nodes to remove whitespace we may have detached
   // some of the root text nodes so remove those from our list
-  rootNodes = rootNodes.filter(rootNode => {
+  rootNodes = rootNodes.filter((rootNode) => {
     return rootNode.isDetached() !== true;
   });
 
@@ -296,7 +296,7 @@ module.exports = function handleRootNodes() {
 
     componentModule = rendererModule = {
       filename: this.filename,
-      requirePath: "./" + path.basename(this.filename)
+      requirePath: "./" + path.basename(this.filename),
     };
   }
 
@@ -305,6 +305,6 @@ module.exports = function handleRootNodes() {
     isImplicitComponent,
     rootNodes,
     componentModule,
-    rendererModule
+    rendererModule,
   });
 };

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

@@ -9,7 +9,7 @@ module.exports = function handleComponentKeyAttrs() {
 
   var attrs = el.attributes.concat([]);
 
-  attrs.forEach(attribute => {
+  attrs.forEach((attribute) => {
     const attributeName = attribute.name;
     if (!attributeName) {
       return;