marko 4.25.0 → 4.26.0

package/dist/runtime/html/AsyncStream.js

@@ -3,14 +3,13 @@
 var EventEmitter = require("events-light");
 var StringWriter = require("./StringWriter");
 var BufferedWriter = require("./BufferedWriter");
-var defaultDocument = typeof document != "undefined" && document;
 var RenderResult = require("../RenderResult");
 var attrsHelper = require("./helpers/attrs");
 var markoAttr = require("./helpers/data-marko");
 var escapeXmlHelper = require("./helpers/escape-xml");
 var parseHTML = require("../vdom/parse-html");
 var escapeXmlOrNullish = escapeXmlHelper.x;
-var escapeXmlString = escapeXmlHelper.bg_;
+var escapeXmlString = escapeXmlHelper.bo_;
 var selfClosingTags = require("self-closing-tags");
 
 function noop() {}
@@ -38,7 +37,7 @@ function State(root, stream, writer, events) {
 }
 
 function escapeEndingComment(text) {
-  return text.replace(/-->/g, "-->");
+  return text.replace(/(--!?)>/g, "$1>");
 }
 
 function AsyncStream(global, writer, parentOut) {
@@ -90,11 +89,12 @@ function AsyncStream(global, writer, parentOut) {
 
   this._elStack = undefined; // Array
 
-  this.h_ = null; // ComponentsContext
+  this.t_ = null; // ComponentsContext
 
-  this.m_ = null;
-  this.o_ = null;
-  this.aQ_ = null;
+  this.aa_ = null;
+  this.ab_ = null;
+  this.bc_ = null;
+  this.bp_ = false;
 }
 
 AsyncStream.DEFAULT_TIMEOUT = 10000;
@@ -110,8 +110,8 @@ AsyncStream.enableAsyncStackTrace = function () {
 
 var proto = AsyncStream.prototype = {
   constructor: AsyncStream,
-  _c_: defaultDocument,
-  bh_: true,
+  E_: typeof document === "object" && document,
+  bq_: true,
 
   sync: function () {
     this._sync = true;
@@ -135,7 +135,7 @@ var proto = AsyncStream.prototype = {
     return this;
   },
 
-  H_: function () {
+  aj_: function () {
     return this._state.writer.toString();
   },
 
@@ -143,14 +143,14 @@ var proto = AsyncStream.prototype = {
    * Legacy...
    */
   getOutput: function () {
-    return this.H_();
+    return this.aj_();
   },
 
   toString: function () {
     return this._state.writer.toString();
   },
 
-  bi_: function () {
+  br_: function () {
     this._result = this._result || new RenderResult(this);
     return this._result;
   },
@@ -201,6 +201,7 @@ var proto = AsyncStream.prototype = {
           }
 
           this._lastCount++;
+          newStream.bp_ = true;
         }
 
         name = options.name;
@@ -238,7 +239,7 @@ var proto = AsyncStream.prototype = {
     if (state.writer.end) {
       state.writer.end();
     } else {
-      state.events.emit("finish", this.bi_());
+      state.events.emit("finish", this.br_());
     }
   },
 
@@ -290,7 +291,7 @@ var proto = AsyncStream.prototype = {
       }
 
       if (remaining === 0) {
-        parentOut._handleChildDone();
+        parentOut._handleChildDone(this);
       } else if (remaining - this._lastCount === 0) {
         this._emitLast();
       }
@@ -299,7 +300,7 @@ var proto = AsyncStream.prototype = {
     return this;
   },
 
-  _handleChildDone: function () {
+  _handleChildDone: function (childOut) {
     var remaining = --this._remaining;
 
     if (remaining === 0) {
@@ -307,10 +308,16 @@ var proto = AsyncStream.prototype = {
       if (parentOut === undefined) {
         this._doFinish();
       } else {
-        parentOut._handleChildDone();
+        parentOut._handleChildDone(this);
+      }
+    } else {
+      if (childOut.bp_) {
+        this._lastCount--;
+      }
+
+      if (remaining - this._lastCount === 0) {
+        this._emitLast();
       }
-    } else if (remaining - this._lastCount === 0) {
-      this._emitLast();
     }
   },
 
@@ -345,7 +352,7 @@ var proto = AsyncStream.prototype = {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
-      callback(this.bi_());
+      callback(this.br_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
@@ -359,7 +366,7 @@ var proto = AsyncStream.prototype = {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
-      callback(this.bi_());
+      callback(this.br_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
@@ -382,23 +389,22 @@ var proto = AsyncStream.prototype = {
   },
 
   _emitLast: function () {
-    var lastArray = this._last;
-
-    var i = 0;
-
-    function next() {
-      if (i === lastArray.length) {
-        return;
-      }
-      var lastCallback = lastArray[i++];
-      lastCallback(next);
+    if (this._last) {
+      var i = 0;
+      var lastArray = this._last;
+      this._last = undefined;
+      (function next() {
+        if (i === lastArray.length) {
+          return;
+        }
+        var lastCallback = lastArray[i++];
+        lastCallback(next);
 
-      if (lastCallback.length === 0) {
-        next();
-      }
+        if (lastCallback.length === 0) {
+          next();
+        }
+      })();
     }
-
-    next();
   },
 
   emit: function (type, arg) {
@@ -482,11 +488,15 @@ var proto = AsyncStream.prototype = {
     return newOut;
   },
 
-  bf_: function (tagName, elementAttrs, key, componentDef, props) {
-    var str = "<" + tagName + markoAttr(this, componentDef, props, key) + attrsHelper(elementAttrs) + ">";
+  bn_: function (tagName, elementAttrs, key, componentDef, props) {
+    var str = "<" + tagName + markoAttr(this, componentDef, props, key) + attrsHelper(elementAttrs);
 
-    if (selfClosingTags.indexOf(tagName) === -1) {
-      str += "</" + tagName + ">";
+    if (selfClosingTags.voidElements.indexOf(tagName) !== -1) {
+      str += ">";
+    } else if (selfClosingTags.svgElements.indexOf(tagName) !== -1) {
+      str += "/>";
+    } else {
+      str += "></" + tagName + ">";
     }
 
     this.write(str);
@@ -502,7 +512,7 @@ var proto = AsyncStream.prototype = {
     this.write(str);
   },
 
-  bd_: function (name, elementAttrs, key, componentDef, props) {
+  bl_: function (name, elementAttrs, key, componentDef, props) {
     var str = "<" + name + markoAttr(this, componentDef, props, key) + attrsHelper(elementAttrs) + ">";
 
     this.write(str);
@@ -557,17 +567,16 @@ var proto = AsyncStream.prototype = {
     }
   },
 
-  G_: function (doc) {
+  ai_: function (host) {
     var node = this._node;
-    var nextEl;
-    var fragment;
-    var html = this.H_();
-
-    if (!doc) {
-      doc = this._c_;
-    }
 
     if (!node) {
+      var nextEl;
+      var fragment;
+      var html = this.aj_();
+      if (!host) host = this.E_;
+      var doc = host.ownerDocument || host;
+
       if (html) {
         node = parseHTML(html);
 
@@ -607,15 +616,15 @@ var proto = AsyncStream.prototype = {
   },
 
   c: function (componentDef, key, customEvents) {
-    this.m_ = componentDef;
-    this.o_ = key;
-    this.aQ_ = customEvents;
+    this.aa_ = componentDef;
+    this.ab_ = key;
+    this.bc_ = customEvents;
   }
 };
 
 // alias:
 proto.w = proto.write;
-proto.be_ = proto.endElement;
+proto.bm_ = proto.endElement;
 
 module.exports = AsyncStream;
 

package/dist/runtime/html/BufferedWriter.js

@@ -1,5 +1,8 @@
 "use strict";
 
+const immediate = require("@internal/set-immediate");
+const setImmediate = immediate.af_;
+const clearImmediate = immediate.ag_;
 const StringWriter = require("./StringWriter");
 
 /**
@@ -17,7 +20,7 @@ function BufferedWriter(wrappedStream) {
 BufferedWriter.prototype = Object.assign({
   scheduleFlush() {
     if (!this._scheduled) {
-      this._scheduled = setImmediate(flush, this);
+      this._scheduled = setImmediate(flush.bind(0, this));
     }
   },
 
@@ -38,6 +41,7 @@ function flush(writer) {
       writer._wrapped.flush();
     }
   }
+
   clearImmediate(writer._scheduled);
   writer._scheduled = null;
 }

package/dist/runtime/html/StringWriter.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var escapeDoubleQuotes = require("./helpers/escape-quotes").bj_;
+var escapeDoubleQuotes = require("./helpers/escape-quotes").o_;
 
 function StringWriter() {
   this._content = "";
@@ -26,7 +26,11 @@ StringWriter.prototype = {
 
   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) {
@@ -49,7 +53,7 @@ StringWriter.prototype = {
   },
 
   toString: function () {
-    this.state.events.emit("i_", this);
+    this.state.events.emit("p_", this);
     let str = this._content;
     if (this._scripts) {
       const outGlobal = this.state.root.global;

package/dist/runtime/html/helpers/_dynamic-attr.js

@@ -1,8 +1,8 @@
 "use strict";
 
 var attrHelper = require("./attr");
-var notEmptyAttr = attrHelper.bl_;
-var isEmptyAttrValue = attrHelper.bm_;
+var notEmptyAttr = attrHelper.bs_;
+var isEmptyAttrValue = attrHelper.bt_;
 var classHelper = require("./class-attr");
 var styleHelper = require("./style-attr");
 

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

@@ -1,14 +1,14 @@
 "use strict";
 
 var escapeQuoteHelpers = require("./escape-quotes");
-var escapeDoubleQuotes = escapeQuoteHelpers.bj_;
-var escapeSingleQuotes = escapeQuoteHelpers.bn_;
+var escapeDoubleQuotes = escapeQuoteHelpers.o_;
+var escapeSingleQuotes = escapeQuoteHelpers.bu_;
 var complain;
 
 module.exports = maybeEmptyAttr;
 
-maybeEmptyAttr.bl_ = notEmptyAttr;
-maybeEmptyAttr.bm_ = isEmpty;
+maybeEmptyAttr.bs_ = notEmptyAttr;
+maybeEmptyAttr.bt_ = isEmpty;
 
 function maybeEmptyAttr(name, value) {
   if (isEmpty(value)) {

package/dist/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":
       return arg;
       // eslint-disable-next-line no-constant-condition

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

@@ -1,16 +1,14 @@
 "use strict";
 
 var escapeQuoteHelpers = require("./escape-quotes");
-var escapeSingleQuotes = escapeQuoteHelpers.bn_;
-var escapeDoubleQuotes = escapeQuoteHelpers.bj_;
+var escapeSingleQuotes = escapeQuoteHelpers.bu_;
+var escapeDoubleQuotes = escapeQuoteHelpers.o_;
 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 = "";
-  var willNotRerender = out.h_.v_ || componentDef._M_ && (componentDef._N_ & FLAG_WILL_RERENDER_IN_BROWSER) === 0;
+  var willNotRerender = out.t_.y_ || componentDef.w_ && (componentDef.x_ & FLAG_WILL_RERENDER_IN_BROWSER) === 0;
 
   if (willNotRerender) {
     if (props) {
@@ -22,7 +20,7 @@ module.exports = function dataMarko(out, componentDef, props, key) {
     }
 
     if (key && key[0] === "@") {
-      result += ' data-marko-key="' + escapeDoubleQuotes(componentDef._Q_(key) + " " + componentDef.id) + '"';
+      result += ' data-marko-key="' + escapeDoubleQuotes(componentDef.aN_(key) + " " + componentDef.id) + '"';
     }
   }
 

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

@@ -4,9 +4,9 @@ exports.d = function (value) {
   return escapeDoubleQuotes(value + "", 0);
 };
 
-exports.bj_ = escapeDoubleQuotes;
+exports.o_ = escapeDoubleQuotes;
 
-exports.bn_ = escapeSingleQuotes;
+exports.bu_ = escapeSingleQuotes;
 
 function escapeSingleQuotes(value, startPos) {
   return escapeQuote(value, startPos, "'", "'");

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

@@ -12,7 +12,7 @@ module.exports.x = function (value) {
   return escapeXML(value + "");
 };
 
-exports.bg_ = escapeXML;
+exports.bo_ = escapeXML;
 
 function escapeXML(str) {
   var len = str.length;

package/dist/runtime/html/helpers/props-script.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var escapeDoubleQuotes = require("./escape-quotes").bj_;
+var escapeDoubleQuotes = require("./escape-quotes").o_;
 var escapeScript = require("./escape-script-placeholder");
 var assignPropsFunction = `
     function ap_(p) {

package/dist/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,27 @@ 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.bv_ = 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) {
   return new AsyncStream(null, writer);
 };
-
 exports.Template = Template;
-exports.bo_ = createOut;
 exports.AsyncStream = AsyncStream;
 exports.enableAsyncStackTrace = AsyncStream.enableAsyncStackTrace;
 
-require("../createOut").aY_(createOut);
+require("../createOut").bf_(Template.prototype.createOut = function createOut(globalData, writer, parentOut, buffer) {
+  return new AsyncStream(globalData, writer, parentOut, buffer);
+});
+
+require("../renderable")(Template.prototype);

package/dist/runtime/renderable.js

@@ -1,5 +1,5 @@
 var defaultCreateOut = require("./createOut");
-var setImmediate = require("./setImmediate");
+var setImmediate = require("@internal/set-immediate").af_;
 var extend = require("raptor-util/extend");
 
 function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
@@ -67,7 +67,7 @@ module.exports = function (target, renderer) {
       }
 
       render(localData, out);
-      return out.bi_();
+      return out.br_();
     },
 
     /**
@@ -93,7 +93,7 @@ module.exports = function (target, renderer) {
       var finalData;
       var globalData;
       var render = renderFunc || this._;
-      var shouldBuffer = this.bk_;
+      var shouldBuffer = this._W_;
       var shouldEnd = true;
 
       if (data) {
@@ -105,7 +105,7 @@ module.exports = function (target, renderer) {
         finalData = {};
       }
 
-      if (out && out.bh_) {
+      if (out && out.bq_) {
         finalOut = out;
         shouldEnd = false;
         extend(out.global, globalData);
@@ -122,7 +122,7 @@ module.exports = function (target, renderer) {
 
       if (callback) {
         finalOut.on("finish", function () {
-          callback(null, finalOut.bi_(), finalOut);
+          callback(null, finalOut.br_(), finalOut);
         }).once("error", callback);
       }