marko 5.29.2 → 5.30.0

package/src/runtime/html/AsyncStream.js

@@ -23,7 +23,7 @@ var voidWriter = {
   },
   toString: function () {
     return "";
-  }
+  },
 };
 
 function State(root, stream, writer, events) {
@@ -235,7 +235,7 @@ var proto = (AsyncStream.prototype = {
 
     state.events.emit("beginAsync", {
       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,6 +3,7 @@
 var escapeQuoteHelpers = require("./escape-quotes");
 var escapeDoubleQuotes = escapeQuoteHelpers.___escapeDoubleQuotes;
 var escapeSingleQuotes = escapeQuoteHelpers.___escapeSingleQuotes;
+var complain = "MARKO_DEBUG" && require("complain");
 
 module.exports = maybeEmptyAttr;
 
@@ -26,8 +27,20 @@ function notEmptyAttr(name, value) {
     case "number":
       return " " + name + "=" + value;
     case "object":
-      if (value instanceof RegExp) {
-        return " " + name + doubleQuote(value.source);
+      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

@@ -1,5 +1,6 @@
 "use strict";
 
+var complain = "MARKO_DEBUG" && require("complain");
 var dynamicAttrHelper = require("./_dynamic-attr");
 
 module.exports = function attrs(arg) {
@@ -11,6 +12,12 @@ 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,20 +1,51 @@
 "use strict";
 
+var complain = "MARKO_DEBUG" && require("complain");
 var dynamicAttrHelper = require("./_dynamic-attr");
 
 /**
  * Merges attribute objects into a string.
  */
 module.exports = function mergeAttrs() {
-  var result = "";
+  var i = arguments.length;
+  var last = arguments[--i];
   var seen = new Set();
+  var result = "";
+  var attrName;
+
+  if (typeof last === "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."
+      );
+    }
+
+    result += last[0] === " " ? last : " " + last;
+  } else {
+    for (attrName in last) {
+      result += dynamicAttrHelper(attrName, last[attrName]);
+      seen.add(attrName);
+    }
+  }
+
+  while (i) {
+    var arg = arguments[--i];
+    if (typeof arg === "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."
+        );
+      }
 
-  for (var i = arguments.length, last = i - 1; i--; ) {
-    var source = arguments[i];
-    for (var k in source) {
-      if (i === last || !seen.has(k)) {
-        result += dynamicAttrHelper(k, source[k]);
-        seen.add(k);
+      result += arg[0] === " " ? arg : " " + arg;
+    } else {
+      for (attrName in arg) {
+        if (!seen.has(attrName)) {
+          result += dynamicAttrHelper(attrName, arg[attrName]);
+          seen.add(attrName);
+        }
       }
     }
   }

package/src/runtime/html/hot-reload.js

@@ -15,7 +15,7 @@ runtime.t = function (typeName) {
     },
     set: function (v) {
       renderFn = v;
-    }
+    },
   });
 
   return template;

package/src/runtime/html/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 globalThis.Marko = {
-  Component: function () {}
+  Component: function () {},
 };
 
 /**
@@ -15,7 +15,7 @@ exports.t = function createTemplate(typeName) {
 };
 
 function Template(typeName) {
-  this.___typeName = typeName;
+  this.path = this.___typeName = typeName;
 }
 
 Template.prototype.stream = require("@internal/create-readable");

package/src/runtime/renderable.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var defaultCreateOut = require("./createOut");
 var setImmediate = require("@internal/set-immediate").___setImmediate;
 var extend = require("raptor-util/extend");
@@ -27,6 +29,7 @@ module.exports = function (target, renderer) {
   var createOut = target.createOut || renderer.createOut || defaultCreateOut;
 
   return extend(target, {
+    _: renderFunc,
     createOut: createOut,
 
     renderToString: function (data, callback) {
@@ -127,7 +130,7 @@ module.exports = function (target, renderer) {
       if (callback) {
         finalOut
           .on("finish", function () {
-            callback(null, finalOut.___getResult());
+            callback(null, finalOut.___getResult(), finalOut);
           })
           .once("error", callback);
       }
@@ -137,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

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

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,5 +1,6 @@
 /* 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;
@@ -14,7 +15,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;
@@ -30,8 +31,18 @@ function convertAttrValue(type, value) {
   if (value === true) {
     return "";
   } else if (type == "object") {
-    if (value instanceof RegExp) {
-      return value.source;
+    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;
     }
   }
 
@@ -201,7 +212,7 @@ VElement.prototype = {
     // different namespaces
     var value = this.___attributes[name];
     return value != null && value !== false;
-  }
+  },
 };
 
 inherit(VElement, VNode);
@@ -213,7 +224,7 @@ var proto = (VElementClone.prototype = VElement.prototype);
     get: function () {
       var value = this.___attributes[name];
       return value !== false && value != null;
-    }
+    },
   });
 });
 
@@ -229,7 +240,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,22 +1,25 @@
 "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");
 
 /**
  * Helper for processing dynamic attributes
  */
 module.exports = function (attributes) {
-  if (attributes != null) {
+  if (typeof attributes === "string") {
     // eslint-disable-next-line no-constant-condition
     if ("MARKO_DEBUG") {
-      if (typeof attributes !== "object") {
-        throw new Error(
-          "A non object was passed as a dynamic attributes value."
-        );
-      }
+      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);
+  }
 
+  if (attributes) {
     var newAttributes = {};
 
     for (var attrName in attributes) {
@@ -39,3 +42,20 @@ module.exports = function (attributes) {
 
   return attributes;
 };
+
+function parseAttrs(str) {
+  if (str === "") {
+    return {};
+  }
+
+  var attrs = parseHTML("<a " + str + ">").attributes;
+  var result = {};
+  var attr;
+
+  for (var len = attrs.length, i = 0; i < len; i++) {
+    attr = attrs[i];
+    result[attr.name] = attr.value;
+  }
+
+  return result;
+}

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

@@ -0,0 +1,16 @@
+"use strict";
+
+var attrs = require("./attrs");
+
+/**
+ * Merges attribute objects into a object.
+ */
+module.exports = function mergeAttrs() {
+  var len = arguments.length;
+  var result = {};
+  for (var i = 0; i < len; i++) {
+    Object.assign(result, attrs(arguments[i]));
+  }
+
+  return result;
+};

package/src/runtime/vdom/hot-reload.js

@@ -61,7 +61,7 @@ runtime.t = function (typeName) {
           });
         });
       }
-    }
+    },
   });
 
   return template;

package/src/runtime/vdom/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 window.Marko = {
-  Component: function () {}
+  Component: function () {},
 };
 
 /**
@@ -15,7 +15,7 @@ exports.t = function createTemplate(typeName) {
 };
 
 function Template(typeName) {
-  this.___typeName = typeName;
+  this.path = this.___typeName = typeName;
 }
 
 var AsyncVDOMBuilder = require("./AsyncVDOMBuilder");

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

@@ -46,5 +46,5 @@ exports.lookup = {
     } else {
       register(taglib, taglib.id);
     }
-  }
+  },
 };

package/tags-html.d.ts

@@ -186,6 +186,7 @@ declare global {
           | "prev"
           | "search"
           | "tag"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -313,6 +314,7 @@ declare global {
           | "nofullscreen"
           | "noplaybackrate"
           | "noremoteplayback"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -816,6 +818,7 @@ declare global {
           | "opener"
           | "prev"
           | "search"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
         /**
          * Specifies the browsing context in which the linked resource will be opened.
@@ -925,6 +928,7 @@ declare global {
           | "allow-top-navigation-by-user-activation"
           | "allow-top-navigation-to-custom-protocols"
           | "allow-top-navigation"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
         /**
          * The URL of the page to embed in the iframe.
@@ -1429,6 +1433,7 @@ declare global {
           | "prev"
           | "search"
           | "stylesheet"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -1779,6 +1784,7 @@ declare global {
           | "application/javascript"
           | "module"
           | "import-map"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /** @deprecated */
@@ -2236,6 +2242,7 @@ declare global {
           | "nofullscreen"
           | "noplaybackrate"
           | "noremoteplayback"
+          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -3913,6 +3920,7 @@ type AttrTarget =
   | "_parent"
   | "_self"
   | "_top"
+  // eslint-disable-next-line @typescript-eslint/ban-types
   | (string & {});
 type AttrReferrerPolicy =
   | AttrMissing
@@ -3985,6 +3993,7 @@ type AttrAutoComplete =
   | "mobile"
   | "fax"
   | "pager"
+  // eslint-disable-next-line @typescript-eslint/ban-types
   | (string & {});
 type Tag<Input> = Input extends Marko.HTMLAttributes<infer Element>
   ? Marko.NativeTag<Input, Element>