marko 4.26.5 → 4.28.0

package/src/runtime/components/legacy/dependencies/index.js

@@ -11,7 +11,7 @@ function getRootDeps(template, context) {
   attachDepsAndComponentsToTemplate(template, context);
 
   var deps = (template.___depsArray = Object.keys(template.___deps).map(
-    key => template.___deps[key]
+    (key) => template.___deps[key]
   ));
   var initModule = getInitModule(template.path, template.___components);
 
@@ -20,7 +20,7 @@ function getRootDeps(template, context) {
   deps.push({
     type: "require",
     path: require.resolve("../../boot"),
-    run: true
+    run: true,
   });
 
   // these dependencies should be last
@@ -59,7 +59,7 @@ function attachDepsAndComponentsToTemplate(target, context) {
   var root = nodePath.dirname(template.path);
 
   if (meta.deps) {
-    meta.deps.forEach(dep => {
+    meta.deps.forEach((dep) => {
       dep = resolveDep(dep, root, context);
       deps[dep.virtualPath || dep.path] = dep;
     });
@@ -69,12 +69,12 @@ function attachDepsAndComponentsToTemplate(target, context) {
     var resolveFrom = (context && context.resolveFrom) || defaultResolveFrom;
     components[meta.id] = {
       id: meta.id,
-      path: resolveFrom(root, meta.component)
+      path: resolveFrom(root, meta.component),
     };
   }
 
   if (meta.tags) {
-    meta.tags.forEach(tagPath => {
+    meta.tags.forEach((tagPath) => {
       var resolveFrom = context.resolveFrom || defaultResolveFrom;
       var tag = resolveFrom(root, tagPath);
       var ext = nodePath.extname(tag);
@@ -100,13 +100,13 @@ function getInitModule(path, components) {
   var module = null;
 
   if (components) {
-    components = Object.keys(components).map(key => components[key]);
+    components = Object.keys(components).map((key) => components[key]);
 
     if (components.length) {
       var root = nodePath.dirname(path);
       var virtualPath = path + ".init.js";
       var registrations = components.map(
-        component =>
+        (component) =>
           `components.register('${component.id}', require('.${
             nodePath.sep
           }${nodePath.relative(root, component.path)}'));`
@@ -128,8 +128,8 @@ function getInitModule(path, components) {
             } else {
               return code;
             }
-          }
-        }
+          },
+        },
       };
     }
   }
@@ -167,7 +167,7 @@ function parseDependencyString(string) {
   var match = /^(?:([\w-]+)(?::\s*|\s+))?(.*?(?:\.(\w+))?)$/.exec(string);
   return {
     type: match[1] || match[3],
-    path: match[2]
+    path: match[2],
   };
 }
 

package/src/runtime/components/legacy/index.js

@@ -1 +1,6 @@
+// eslint-disable-next-line no-constant-condition
+if ("MARKO_DEBUG") {
+  require("complain")("marko-widgets is deprecated. When upgrading to Marko 5 ensure marko-widgets@8 is installed for compatibility.");
+}
+
 module.exports = require("@internal/components-entry-legacy");

package/src/runtime/components/legacy/renderer-legacy.js

@@ -103,7 +103,7 @@ function createRendererFunc(templateRenderFunc, componentProps) {
       isFakeComponent = true;
       component = {
         id: id,
-        ___keyedElements: {}
+        ___keyedElements: {},
       };
     } else {
       component.___updateQueued = true;

package/src/runtime/components/update-manager.js

@@ -54,7 +54,7 @@ function batchUpdate(func) {
   // batched update completes we invoke the "afterUpdate"
   // event listeners.
   var batch = {
-    ___queue: null
+    ___queue: null,
   };
 
   batchStack.push(batch);

package/src/runtime/dom-insert.js

@@ -72,6 +72,6 @@ module.exports = function (target, getEl, afterInsert) {
       var el = getEl(this, referenceEl);
       insertAfter(el, referenceEl, referenceEl.parentNode);
       return afterInsert(this, referenceEl);
-    }
+    },
   });
 };

package/src/runtime/helpers/_weak-map.js

@@ -10,6 +10,6 @@ module.exports =
       },
       set: function (ref, value) {
         ref[id] = value;
-      }
+      },
     };
   };

package/src/runtime/helpers/bind-component.js

@@ -12,7 +12,7 @@ module.exports = function (componentProps) {
   return function bindComponent(renderBody, out) {
     renderer(
       {
-        $renderBody: renderBody
+        $renderBody: renderBody,
       },
       out
     );

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/for-of.js

@@ -9,12 +9,7 @@ module.exports = function forOf(array, callback) {
   var i;
 
   if (array == null) {
-    // eslint-disable-next-line no-constant-condition
-    if ("MARKO_DEBUG") {
-      complain(
-        "Passing a non iterable to a <for> loop is deprecated. Prefer to use an <if> around the loop instead."
-      );
-    }
+    // ignore
   } else if (Array.isArray(array)) {
     for (i = 0; i < array.length; i++) {
       callback(array[i], i, array);

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

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

package/src/runtime/html/AsyncStream.js

@@ -23,7 +23,7 @@ var voidWriter = {
   },
   toString: function () {
     return "";
-  }
+  },
 };
 
 function State(root, stream, writer, events) {
@@ -237,7 +237,7 @@ var proto = (AsyncStream.prototype = {
       writer: newStream, // Legacy
       parentWriter: this, // Legacy
       out: newStream,
-      parentOut: this
+      parentOut: this,
     });
 
     return newStream;
@@ -498,7 +498,7 @@ var proto = (AsyncStream.prototype = {
     newOut.on("error", this.emit.bind(this, "error"));
     this._state.events.emit("beginDetachedAsync", {
       out: newOut,
-      parentOut: this
+      parentOut: this,
     });
     return newOut;
   },
@@ -655,7 +655,7 @@ var proto = (AsyncStream.prototype = {
     this.___assignedComponentDef = componentDef;
     this.___assignedKey = key;
     this.___assignedCustomEvents = customEvents;
-  }
+  },
 });
 
 // alias:
@@ -669,6 +669,6 @@ function getNonMarkoStack(error) {
     .toString()
     .split("\n")
     .slice(1)
-    .filter(line => !/\/node_modules\/marko\//.test(line))
+    .filter((line) => !/\/node_modules\/marko\//.test(line))
     .join("\n");
 }

package/src/runtime/html/BufferedWriter.js

@@ -30,7 +30,7 @@ BufferedWriter.prototype = Object.assign(
       if (!this._wrapped.isTTY) {
         this._wrapped.end();
       }
-    }
+    },
   },
   StringWriter.prototype
 );

package/src/runtime/html/StringWriter.js

@@ -67,7 +67,7 @@ StringWriter.prototype = {
       str += `<script${nonceAttr}>${this._scripts}</script>`;
     }
     return str;
-  }
+  },
 };
 
 module.exports = StringWriter;

package/src/runtime/html/helpers/attr.js

@@ -3,7 +3,6 @@
 var escapeQuoteHelpers = require("./escape-quotes");
 var escapeDoubleQuotes = escapeQuoteHelpers.___escapeDoubleQuotes;
 var escapeSingleQuotes = escapeQuoteHelpers.___escapeSingleQuotes;
-var complain = "MARKO_DEBUG" && require("complain");
 
 module.exports = maybeEmptyAttr;
 
@@ -30,14 +29,6 @@ function notEmptyAttr(name, value) {
       switch (value.toString) {
         case Object.prototype.toString:
         case Array.prototype.toString:
-          // eslint-disable-next-line no-constant-condition
-          if ("MARKO_DEBUG") {
-            complain(
-              "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead.",
-              { locationIndex: 2 }
-            );
-          }
-
           return " " + name + singleQuote(JSON.stringify(value), 2);
         case RegExp.prototype.toString:
           return " " + name + guessQuotes(value.source);

package/src/runtime/html/helpers/attrs.js

@@ -12,12 +12,6 @@ module.exports = function attrs(arg) {
       }
       return result;
     case "string":
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        complain(
-          "Passing a string as a dynamic attribute value is deprecated - More details: https://github.com/marko-js/marko/wiki/Deprecation:-String-as-dynamic-attribute-value"
-        );
-      }
       return arg;
     default:
       return "";

package/src/runtime/html/helpers/merge-attrs.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var complain = "MARKO_DEBUG" && require("complain");
 var dynamicAttrHelper = require("./_dynamic-attr");
 
 /**
@@ -13,13 +12,6 @@ module.exports = function mergeAttrs() {
   for (var i = arguments.length, last = i - 1; i--; ) {
     var source = arguments[i];
     if (typeof source === "string") {
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        complain(
-          "Passing a string as dynamic attributes ('<div ${string}>' or '<div ...string>') is deprecated, use an object instead."
-        );
-      }
-
       if (source[0] !== " ") {
         result += " " + source;
       } else {

package/src/runtime/html/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 globalThis.Marko = {
-  Component: function () {}
+  Component: function () {},
 };
 
 /**

package/src/runtime/renderable.js

@@ -140,6 +140,6 @@ module.exports = function (target, renderer) {
       globalData.template = globalData.template || this;
 
       return safeRender(render, finalData, finalOut, shouldEnd);
-    }
+    },
   });
 };

package/src/runtime/vdom/AsyncVDOMBuilder.js

@@ -293,7 +293,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
 
     state.___events.emit("beginAsync", {
       out: asyncOut,
-      parentOut: this
+      parentOut: this,
     });
 
     return asyncOut;
@@ -443,7 +443,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     this.___assignedComponentDef = componentDef;
     this.___assignedKey = key;
     this.___assignedCustomEvents = customEvents;
-  }
+  },
 });
 
 proto.e = proto.element;

package/src/runtime/vdom/VComment.js

@@ -16,7 +16,7 @@ VComment.prototype = {
 
   ___cloneNode: function () {
     return new VComment(this.___nodeValue);
-  }
+  },
 };
 
 inherit(VComment, VNode);

package/src/runtime/vdom/VComponent.js

@@ -9,7 +9,7 @@ function VComponent(component, key, ownerComponent, preserve) {
 }
 
 VComponent.prototype = {
-  ___nodeType: 2
+  ___nodeType: 2,
 };
 
 inherit(VComponent, VNode);

package/src/runtime/vdom/VDocumentFragment.js

@@ -24,7 +24,7 @@ VDocumentFragment.prototype = {
 
   ___actualize: function (host) {
     return (host.ownerDocument || host).createDocumentFragment();
-  }
+  },
 };
 
 inherit(VDocumentFragment, VNode);

package/src/runtime/vdom/VElement.js

@@ -1,6 +1,5 @@
 /* jshint newcap:false */
 
-var complain = "MARKO_DEBUG" && require("complain");
 var domData = require("../components/dom-data");
 var componentsUtil = require("@internal/components-util");
 var vElementByDOMNode = domData.___vElementByDOMNode;
@@ -15,7 +14,7 @@ var NS_MATH = "http://www.w3.org/1998/Math/MathML";
 var NS_SVG = "http://www.w3.org/2000/svg";
 var DEFAULT_NS = {
   svg: NS_SVG,
-  math: NS_MATH
+  math: NS_MATH,
 };
 
 var FLAG_SIMPLE_ATTRS = 1;
@@ -34,12 +33,6 @@ function convertAttrValue(type, value) {
     switch (value.toString) {
       case Object.prototype.toString:
       case Array.prototype.toString:
-        // eslint-disable-next-line no-constant-condition
-        if ("MARKO_DEBUG") {
-          complain(
-            "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead."
-          );
-        }
         return JSON.stringify(value);
       case RegExp.prototype.toString:
         return value.source;
@@ -212,7 +205,7 @@ VElement.prototype = {
     // different namespaces
     var value = this.___attributes[name];
     return value != null && value !== false;
-  }
+  },
 };
 
 inherit(VElement, VNode);
@@ -224,7 +217,7 @@ var proto = (VElementClone.prototype = VElement.prototype);
     get: function () {
       var value = this.___attributes[name];
       return value !== false && value != null;
-    }
+    },
   });
 });
 
@@ -240,7 +233,7 @@ defineProperty(proto, "___value", {
         this.___attributes.type === "radio"
       ? "on"
       : "";
-  }
+  },
 });
 
 VElement.___removePreservedAttributes = function (attrs) {

package/src/runtime/vdom/VFragment.js

@@ -18,7 +18,7 @@ VFragment.prototype = {
     keysByDOMNode.set(fragment, this.___key);
     vElementByDOMNode.set(fragment, this);
     return fragment;
-  }
+  },
 };
 
 inherit(VFragment, VNode);

package/src/runtime/vdom/VNode.js

@@ -80,7 +80,7 @@ VNode.prototype = {
     } else {
       return this;
     }
-  }
+  },
 
   // ,toJSON: function() {
   //     var clone = Object.assign({

package/src/runtime/vdom/VText.js

@@ -17,7 +17,7 @@ VText.prototype = {
 
   ___cloneNode: function () {
     return new VText(this.___nodeValue);
-  }
+  },
 };
 
 inherit(VText, VNode);

package/src/runtime/vdom/helpers/attrs.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var complain = "MARKO_DEBUG" && require("complain");
 var classHelper = require("../../helpers/class-value");
 var styleHelper = require("../../helpers/style-value");
 var parseHTML = require("../parse-html");
@@ -10,12 +9,6 @@ var parseHTML = require("../parse-html");
  */
 module.exports = function (attributes) {
   if (typeof attributes === "string") {
-    // eslint-disable-next-line no-constant-condition
-    if ("MARKO_DEBUG") {
-      complain(
-        "Passing a string as a dynamic attribute value is deprecated - More details: https://github.com/marko-js/marko/wiki/Deprecation:-String-as-dynamic-attribute-value"
-      );
-    }
     return parseAttrs(attributes);
   }
 

package/src/runtime/vdom/index.js

@@ -2,7 +2,7 @@
 
 typeof window === "object" &&
   (window.Marko = {
-    Component: function () {}
+    Component: function () {},
   });
 
 /**

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

@@ -55,7 +55,7 @@ var fragmentPrototype = {
     this.nodes.forEach(function (node) {
       this.detachedContainer.appendChild(node);
     }, this);
-  }
+  },
 };
 
 function createFragmentNode(startNode, nextNode, parentNode) {

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

@@ -100,7 +100,7 @@ SpecialElHandlers.prototype = {
         fromEl.selectedIndex = selected;
       }
     }
-  }
+  },
 };
 
 module.exports = new SpecialElHandlers();

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

@@ -36,19 +36,19 @@ function getAllDependencyNames(pkg) {
   var map = {};
 
   if (pkg.dependencies) {
-    Object.keys(pkg.dependencies).forEach(name => {
+    Object.keys(pkg.dependencies).forEach((name) => {
       map[name] = true;
     });
   }
 
   if (pkg.peerDependencies) {
-    Object.keys(pkg.peerDependencies).forEach(name => {
+    Object.keys(pkg.peerDependencies).forEach((name) => {
       map[name] = true;
     });
   }
 
   if (pkg.devDependencies) {
-    Object.keys(pkg.devDependencies).forEach(name => {
+    Object.keys(pkg.devDependencies).forEach((name) => {
       map[name] = true;
     });
   }
@@ -75,7 +75,7 @@ function find(dirname, registeredTaglibs) {
       added[taglib.id] = true;
       found.push(taglib);
     },
-    foundTaglibPackages: {}
+    foundTaglibPackages: {},
   };
 
   var rootDirname = process.cwd(); // Don't search up past this directory
@@ -119,11 +119,11 @@ function find(dirname, registeredTaglibs) {
 
   if (rootPkg) {
     // Now look for `marko.json` from installed packages
-    getAllDependencyNames(rootPkg).forEach(name => {
+    getAllDependencyNames(rootPkg).forEach((name) => {
       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/Tag.js

@@ -98,24 +98,24 @@ class Tag {
     attr.filePath = this.filePath;
     if (attr.name === "key" && !this.isCoreTag()) {
       complain("@key property is deprecated", {
-        location: this.filePath
+        location: this.filePath,
       });
     }
     //
     if (attr.setFlag && attr.setFlag !== "hasComponentEvents") {
       complain(`${attr.name} - : set-flag property is deprecated`, {
-        location: this.filePath
+        location: this.filePath,
       });
     }
     if (attr.type === "template") {
       complain(`${attr.name} - attribute template type is deprecated`, {
-        location: this.filePath
+        location: this.filePath,
       });
     }
 
     if (attr.type === "path") {
       complain(`${attr.name} - attribute path type is deprecated`, {
-        location: this.filePath
+        location: this.filePath,
       });
     }
   }
@@ -137,7 +137,7 @@ class Tag {
             complain(
               'The default "targetProperty" for "@*" attribute definitions is changing from "*" to "null" (merged in with the rest of the input) in a future Marko release. In order to avoid an issue upgrading, please explicitly define the "targetProperty".',
               {
-                location: this.filePath
+                location: this.filePath,
               }
             );
           attr.targetProperty = "*";
@@ -186,13 +186,13 @@ class Tag {
    */
   addNestedVariable(nestedVariable) {
     complain("addNestedVariable is deprecated. Use tag parameters instead.", {
-      location: this.filePath
+      location: this.filePath,
     });
 
     if (!this.nestedVariables) {
       this.nestedVariables = {
         __noMerge: true,
-        vars: []
+        vars: [],
       };
     }
 
@@ -220,7 +220,7 @@ class Tag {
     this.bodyFunction = {
       __noMerge: true,
       name: name,
-      params: params
+      params: params,
     };
   }
   /**

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 = [];
@@ -109,7 +110,7 @@ class Taglib {
       textTransformers: this.textTransformers,
       attributes: this.attributes,
       patternAttributes: this.patternAttributes,
-      imports: this.imports
+      imports: this.imports,
     };
   }
 }

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/loadAttributeFromProps.js

@@ -22,7 +22,7 @@ class AttrLoader {
       attrProps = {};
     } else if (typeof attrProps === "string") {
       attrProps = {
-        type: attrProps
+        type: attrProps,
       };
     } else {
       assert.ok(typeof attrProps === "object", 'Invalid "attrProps"');