marko 4.25.0 → 4.26.0

package/src/runtime/html/StringWriter.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var escapeDoubleQuotes = require("./helpers/escape-quotes")
-  .___escapeDoubleQuotes;
+var escapeDoubleQuotes =
+  require("./helpers/escape-quotes").___escapeDoubleQuotes;
 
 function StringWriter() {
   this._content = "";
@@ -10,24 +10,30 @@ function StringWriter() {
 }
 
 StringWriter.prototype = {
-  write: function(str) {
+  write: function (str) {
     this._content += str;
   },
 
-  script: function(str) {
+  script: function (str) {
     if (str) {
       this._scripts += (this._scripts ? ";" : "") + str;
     }
   },
 
-  get: function(key) {
+  get: function (key) {
     const extra = (this._data = this._data || {});
     return (extra[key] = extra[key] || []);
   },
 
-  merge: function(otherWriter) {
+  merge: function (otherWriter) {
     this._content += otherWriter._content;
-    this._scripts += otherWriter._scripts;
+
+    if (otherWriter._scripts) {
+      this._scripts = this._scripts
+        ? this._scripts + ";" + otherWriter._scripts
+        : otherWriter._scripts;
+    }
+
     if (otherWriter._data) {
       if (this._data) {
         for (const key in otherWriter._data) {
@@ -43,13 +49,13 @@ StringWriter.prototype = {
     }
   },
 
-  clear: function() {
+  clear: function () {
     this._content = "";
     this._scripts = "";
     this._data = null;
   },
 
-  toString: function() {
+  toString: function () {
     this.state.events.emit("___toString", this);
     let str = this._content;
     if (this._scripts) {

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

@@ -6,11 +6,11 @@ var dynamicAttrHelper = require("./_dynamic-attr");
 module.exports = function attrs(arg) {
   switch (typeof arg) {
     case "object":
-      var out = "";
+      var result = "";
       for (var attrName in arg) {
-        out += dynamicAttrHelper(attrName, arg[attrName]);
+        result += dynamicAttrHelper(attrName, arg[attrName]);
       }
-      return out;
+      return result;
     case "string":
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {

package/src/runtime/html/helpers/data-marko.js

@@ -5,8 +5,6 @@ var escapeSingleQuotes = escapeQuoteHelpers.___escapeSingleQuotes;
 var escapeDoubleQuotes = escapeQuoteHelpers.___escapeDoubleQuotes;
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
-// var FLAG_IS_LEGACY = 4;
-// var FLAG_OLD_HYDRATE_NO_CREATE = 8;
 
 module.exports = function dataMarko(out, componentDef, props, key) {
   var result = "";

package/src/runtime/html/helpers/escape-quotes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-exports.d = function(value) {
+exports.d = function (value) {
   return escapeDoubleQuotes(value + "", 0);
 };
 

package/src/runtime/html/helpers/escape-xml.js

@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports.x = function(value) {
+module.exports.x = function (value) {
   if (value == null) {
     return "";
   }

package/src/runtime/html/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-var Template;
+globalThis.Marko = {
+  Component: function () {}
+};
 
 /**
  * Method is for internal usage only. This method
@@ -8,26 +10,34 @@ var Template;
  * it is used to create a new Template instance.
  * @private
  */
-exports.t = function createTemplate(path) {
-  return new Template(path);
+exports.t = function createTemplate(typeName) {
+  return new Template(typeName);
 };
 
-require("../../");
+function Template(typeName) {
+  this.path = this.___typeName = typeName;
+}
 
-var AsyncStream = require("./AsyncStream");
-Template = require("./Template");
+Template.prototype.stream = require("@internal/create-readable");
 
-function createOut(globalData, parent, state, buffer) {
-  return new AsyncStream(globalData, parent, state, buffer);
-}
+var AsyncStream = require("./AsyncStream");
 
-exports.createWriter = function(writer) {
+exports.createWriter = function (writer) {
   return new AsyncStream(null, writer);
 };
-
 exports.Template = Template;
-exports.___createOut = createOut;
 exports.AsyncStream = AsyncStream;
 exports.enableAsyncStackTrace = AsyncStream.enableAsyncStackTrace;
 
-require("../createOut").___setCreateOut(createOut);
+require("../createOut").___setCreateOut(
+  (Template.prototype.createOut = function createOut(
+    globalData,
+    writer,
+    parentOut,
+    buffer
+  ) {
+    return new AsyncStream(globalData, writer, parentOut, buffer);
+  })
+);
+
+require("../renderable")(Template.prototype);

package/src/runtime/queueMicrotask.js

@@ -3,12 +3,12 @@ module.exports =
   typeof queueMicrotask === "function"
     ? queueMicrotask
     : typeof Promise === "function" && (promise = Promise.resolve())
-    ? function(cb) {
+    ? function (cb) {
         promise.then(cb).catch(rethrow);
       }
     : setTimeout;
 function rethrow(err) {
-  setTimeout(function() {
+  setTimeout(function () {
     throw err;
   });
 }

package/src/runtime/renderable.js

@@ -1,5 +1,5 @@
 var defaultCreateOut = require("./createOut");
-var setImmediate = require("./setImmediate");
+var setImmediate = require("@internal/set-immediate").___setImmediate;
 var extend = require("raptor-util/extend");
 
 function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
@@ -11,9 +11,9 @@ function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
     }
   } catch (err) {
     var actualEnd = finalOut.end;
-    finalOut.end = function() {};
+    finalOut.end = function () {};
 
-    setImmediate(function() {
+    setImmediate(function () {
       finalOut.end = actualEnd;
       finalOut.error(err);
     });
@@ -21,7 +21,7 @@ function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
   return finalOut;
 }
 
-module.exports = function(target, renderer) {
+module.exports = function (target, renderer) {
   var renderFunc =
     renderer && (renderer.renderer || renderer.render || renderer);
   var createOut = target.createOut || renderer.createOut || defaultCreateOut;
@@ -29,7 +29,7 @@ module.exports = function(target, renderer) {
   return extend(target, {
     createOut: createOut,
 
-    renderToString: function(data, callback) {
+    renderToString: function (data, callback) {
       var localData = data || {};
       var render = renderFunc || this._;
       var globalData = localData.$global;
@@ -43,7 +43,7 @@ module.exports = function(target, renderer) {
 
       if (callback) {
         out
-          .on("finish", function() {
+          .on("finish", function () {
             callback(null, out.toString(), out);
           })
           .once("error", callback);
@@ -56,7 +56,7 @@ module.exports = function(target, renderer) {
       }
     },
 
-    renderSync: function(data) {
+    renderSync: function (data) {
       var localData = data || {};
       var render = renderFunc || this._;
       var globalData = localData.$global;
@@ -90,7 +90,7 @@ module.exports = function(target, renderer) {
      * @param  {AsyncStream/AsyncVDOMBuilder} out A Stream, an AsyncStream/AsyncVDOMBuilder instance, or a callback function
      * @return {AsyncStream/AsyncVDOMBuilder} Returns the AsyncStream/AsyncVDOMBuilder instance that the template is rendered to
      */
-    render: function(data, out) {
+    render: function (data, out) {
       var callback;
       var finalOut;
       var finalData;
@@ -126,7 +126,7 @@ module.exports = function(target, renderer) {
 
       if (callback) {
         finalOut
-          .on("finish", function() {
+          .on("finish", function () {
             callback(null, finalOut.___getResult(), finalOut);
           })
           .once("error", callback);

package/src/runtime/vdom/AsyncVDOMBuilder.js

@@ -8,7 +8,6 @@ var VComponent = vdom.___VComponent;
 var VFragment = vdom.___VFragment;
 var virtualizeHTML = vdom.___virtualizeHTML;
 var RenderResult = require("../RenderResult");
-var defaultDocument = vdom.___defaultDocument;
 var morphdom = require("./morphdom");
 var attrsHelper = require("./helpers/attrs");
 
@@ -55,19 +54,19 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
 
 var proto = (AsyncVDOMBuilder.prototype = {
   ___isOut: true,
-  ___document: defaultDocument,
+  ___host: typeof document === "object" && document,
 
-  bc: function(component, key, ownerComponent) {
+  bc: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent);
     return this.___beginNode(vComponent, 0, true);
   },
 
-  ___preserveComponent: function(component, key, ownerComponent) {
+  ___preserveComponent: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent, true);
     this.___beginNode(vComponent, 0);
   },
 
-  ___beginNode: function(child, childCount, pushToStack) {
+  ___beginNode: function (child, childCount, pushToStack) {
     this.___parent.___appendChild(child);
     if (pushToStack === true) {
       this.___stack.push(child);
@@ -76,7 +75,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return childCount === 0 ? this : child;
   },
 
-  element: function(tagName, attrs, key, component, childCount, flags, props) {
+  element: function (tagName, attrs, key, component, childCount, flags, props) {
     var element = new VElement(
       tagName,
       attrs,
@@ -89,7 +88,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this.___beginNode(element, childCount);
   },
 
-  ___elementDynamic: function(tagName, attrs, key, componentDef, props) {
+  ___elementDynamic: function (tagName, attrs, key, componentDef, props) {
     return this.element(
       tagName,
       attrsHelper(attrs),
@@ -101,7 +100,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     );
   },
 
-  n: function(node, component) {
+  n: function (node, component) {
     // NOTE: We do a shallow clone since we assume the node is being reused
     //       and a node can only have one parent node.
     var clone = node.___cloneNode();
@@ -111,12 +110,12 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  node: function(node) {
+  node: function (node) {
     this.___parent.___appendChild(node);
     return this;
   },
 
-  text: function(text, ownerComponent) {
+  text: function (text, ownerComponent) {
     var type = typeof text;
 
     if (type != "string") {
@@ -135,24 +134,20 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  comment: function(comment, ownerComponent) {
+  comment: function (comment, ownerComponent) {
     return this.node(new VComment(comment, ownerComponent));
   },
 
-  html: function(html, ownerComponent) {
+  html: function (html, ownerComponent) {
     if (html != null) {
-      var vdomNode = virtualizeHTML(
-        html,
-        this.___document || document,
-        ownerComponent
-      );
+      var vdomNode = virtualizeHTML(html, ownerComponent);
       this.node(vdomNode);
     }
 
     return this;
   },
 
-  beginElement: function(
+  beginElement: function (
     tagName,
     attrs,
     key,
@@ -174,7 +169,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  ___beginElementDynamic: function(tagName, attrs, key, componentDef, props) {
+  ___beginElementDynamic: function (tagName, attrs, key, componentDef, props) {
     return this.beginElement(
       tagName,
       attrsHelper(attrs),
@@ -186,23 +181,23 @@ var proto = (AsyncVDOMBuilder.prototype = {
     );
   },
 
-  bf: function(key, component, preserve) {
+  bf: function (key, component, preserve) {
     var fragment = new VFragment(key, component, preserve);
     this.___beginNode(fragment, null, true);
     return this;
   },
 
-  ef: function() {
+  ef: function () {
     this.endElement();
   },
 
-  endElement: function() {
+  endElement: function () {
     var stack = this.___stack;
     stack.pop();
     this.___parent = stack[stack.length - 1];
   },
 
-  end: function() {
+  end: function () {
     this.___parent = undefined;
 
     var remaining = --this.___remaining;
@@ -221,7 +216,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  ___handleChildDone: function() {
+  ___handleChildDone: function () {
     var remaining = --this.___remaining;
 
     if (remaining === 0) {
@@ -236,13 +231,13 @@ var proto = (AsyncVDOMBuilder.prototype = {
     }
   },
 
-  ___doFinish: function() {
+  ___doFinish: function () {
     var state = this.___state;
     state.___finished = true;
     state.___events.emit(EVENT_FINISH, this.___getResult());
   },
 
-  ___emitLast: function() {
+  ___emitLast: function () {
     var lastArray = this._last;
 
     var i = 0;
@@ -262,7 +257,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     next();
   },
 
-  error: function(e) {
+  error: function (e) {
     try {
       this.emit("error", e);
     } finally {
@@ -276,7 +271,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  beginAsync: function(options) {
+  beginAsync: function (options) {
     if (this.___sync) {
       throw Error(
         "Tried to render async while in sync mode. Note: Client side await is not currently supported in re-renders (Issue: #942)."
@@ -304,11 +299,11 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return asyncOut;
   },
 
-  createOut: function() {
+  createOut: function () {
     return new AsyncVDOMBuilder(this.global);
   },
 
-  flush: function() {
+  flush: function () {
     var events = this.___state.___events;
 
     if (events.listenerCount(EVENT_UPDATE)) {
@@ -316,15 +311,15 @@ var proto = (AsyncVDOMBuilder.prototype = {
     }
   },
 
-  ___getOutput: function() {
+  ___getOutput: function () {
     return this.___state.___tree;
   },
 
-  ___getResult: function() {
+  ___getResult: function () {
     return this.___result || (this.___result = new RenderResult(this));
   },
 
-  on: function(event, callback) {
+  on: function (event, callback) {
     var state = this.___state;
 
     if (event === EVENT_FINISH && state.___finished) {
@@ -338,7 +333,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  once: function(event, callback) {
+  once: function (event, callback) {
     var state = this.___state;
 
     if (event === EVENT_FINISH && state.___finished) {
@@ -352,7 +347,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  emit: function(type, arg) {
+  emit: function (type, arg) {
     var events = this.___state.___events;
     switch (arguments.length) {
       case 1:
@@ -368,21 +363,21 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  removeListener: function() {
+  removeListener: function () {
     var events = this.___state.___events;
     events.removeListener.apply(events, arguments);
     return this;
   },
 
-  sync: function() {
+  sync: function () {
     this.___sync = true;
   },
 
-  isSync: function() {
+  isSync: function () {
     return this.___sync;
   },
 
-  onLast: function(callback) {
+  onLast: function (callback) {
     var lastArray = this._last;
 
     if (lastArray === undefined) {
@@ -394,20 +389,20 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return this;
   },
 
-  ___getNode: function(doc) {
+  ___getNode: function (host) {
     var node = this.___vnode;
     if (!node) {
       var vdomTree = this.___getOutput();
-      // Create the root document fragment node
-      doc = doc || this.___document || document;
-      this.___vnode = node = vdomTree.___actualize(doc, null);
-      morphdom(node, vdomTree, doc, this.___components);
+
+      if (!host) host = this.___host;
+      this.___vnode = node = vdomTree.___actualize(host, null);
+      morphdom(node, vdomTree, host, this.___components);
     }
     return node;
   },
 
-  toString: function(doc) {
-    var docFragment = this.___getNode(doc);
+  toString: function (host) {
+    var docFragment = this.___getNode(host);
     var html = "";
 
     var child = docFragment.firstChild;
@@ -427,10 +422,10 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return html;
   },
 
-  then: function(fn, fnErr) {
+  then: function (fn, fnErr) {
     var out = this;
-    var promise = new Promise(function(resolve, reject) {
-      out.on("error", reject).on(EVENT_FINISH, function(result) {
+    var promise = new Promise(function (resolve, reject) {
+      out.on("error", reject).on(EVENT_FINISH, function (result) {
         resolve(result);
       });
     });
@@ -438,13 +433,13 @@ var proto = (AsyncVDOMBuilder.prototype = {
     return Promise.resolve(promise).then(fn, fnErr);
   },
 
-  catch: function(fnErr) {
+  catch: function (fnErr) {
     return this.then(undefined, fnErr);
   },
 
   isVDOM: true,
 
-  c: function(componentDef, key, customEvents) {
+  c: function (componentDef, key, customEvents) {
     this.___assignedComponentDef = componentDef;
     this.___assignedKey = key;
     this.___assignedCustomEvents = customEvents;

package/src/runtime/vdom/VComment.js

@@ -9,12 +9,12 @@ function VComment(value, ownerComponent) {
 VComment.prototype = {
   ___nodeType: 8,
 
-  ___actualize: function(doc) {
+  ___actualize: function (host) {
     var nodeValue = this.___nodeValue;
-    return doc.createComment(nodeValue);
+    return (host.ownerDocument || host).createComment(nodeValue);
   },
 
-  ___cloneNode: function() {
+  ___cloneNode: function () {
     return new VComment(this.___nodeValue);
   }
 };

package/src/runtime/vdom/VDocumentFragment.js

@@ -18,12 +18,12 @@ VDocumentFragment.prototype = {
 
   ___DocumentFragment: true,
 
-  ___cloneNode: function() {
+  ___cloneNode: function () {
     return new VDocumentFragmentClone(this);
   },
 
-  ___actualize: function(doc) {
-    return doc.createDocumentFragment();
+  ___actualize: function (host) {
+    return (host.ownerDocument || host).createDocumentFragment();
   }
 };