marko 4.25.0 → 4.26.1

package/src/runtime/components/renderer.js

@@ -1,13 +1,13 @@
-var componentsUtil = require("./util");
+var componentsUtil = require("@internal/components-util");
 var componentLookup = componentsUtil.___componentLookup;
 
 var ComponentsContext = require("./ComponentsContext");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
-var registry = require("./registry");
+var registry = require("@internal/components-registry");
 var copyProps = require("raptor-util/copyProps");
 var isServer = componentsUtil.___isServer === true;
-var beginComponent = require("./beginComponent");
-var endComponent = require("./endComponent");
+var beginComponent = require("@internal/components-beginComponent");
+var endComponent = require("@internal/components-endComponent");
 
 var COMPONENT_BEGIN_ASYNC_ADDED_KEY = "$wa";
 

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

@@ -4,7 +4,7 @@ var updatesScheduled = false;
 var batchStack = []; // A stack of batched updates
 var unbatchedQueue = []; // Used for scheduled batched updates
 
-var setImmediate = require("../setImmediate");
+var setImmediate = require("@internal/set-immediate").___setImmediate;
 
 /**
  * This function is called when we schedule the update of "unbatched"

package/src/runtime/dom-insert.js

@@ -1,5 +1,5 @@
 var extend = require("raptor-util/extend");
-var componentsUtil = require("./components/util");
+var componentsUtil = require("@internal/components-util");
 var destroyComponentForNode = componentsUtil.___destroyComponentForNode;
 var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive;
 var helpers = require("./vdom/morphdom/helpers");
@@ -24,21 +24,21 @@ function beforeRemove(referenceEl) {
   destroyComponentForNode(referenceEl);
 }
 
-module.exports = function(target, getEl, afterInsert) {
+module.exports = function (target, getEl, afterInsert) {
   extend(target, {
-    appendTo: function(referenceEl) {
+    appendTo: function (referenceEl) {
       referenceEl = resolveEl(referenceEl);
       var el = getEl(this, referenceEl);
       insertBefore(el, null, referenceEl);
       return afterInsert(this, referenceEl);
     },
-    prependTo: function(referenceEl) {
+    prependTo: function (referenceEl) {
       referenceEl = resolveEl(referenceEl);
       var el = getEl(this, referenceEl);
       insertBefore(el, referenceEl.firstChild || null, referenceEl);
       return afterInsert(this, referenceEl);
     },
-    replace: function(referenceEl) {
+    replace: function (referenceEl) {
       referenceEl = resolveEl(referenceEl);
       var el = getEl(this, referenceEl);
       beforeRemove(referenceEl);
@@ -46,7 +46,7 @@ module.exports = function(target, getEl, afterInsert) {
       removeChild(referenceEl);
       return afterInsert(this, referenceEl);
     },
-    replaceChildrenOf: function(referenceEl) {
+    replaceChildrenOf: function (referenceEl) {
       referenceEl = resolveEl(referenceEl);
       var el = getEl(this, referenceEl);
 
@@ -61,13 +61,13 @@ module.exports = function(target, getEl, afterInsert) {
       insertBefore(el, null, referenceEl);
       return afterInsert(this, referenceEl);
     },
-    insertBefore: function(referenceEl) {
+    insertBefore: function (referenceEl) {
       referenceEl = resolveEl(referenceEl);
       var el = getEl(this, referenceEl);
       insertBefore(el, referenceEl, referenceEl.parentNode);
       return afterInsert(this, referenceEl);
     },
-    insertAfter: function(referenceEl) {
+    insertAfter: function (referenceEl) {
       referenceEl = resolveEl(referenceEl);
       var el = getEl(this, referenceEl);
       insertAfter(el, referenceEl, referenceEl.parentNode);

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

@@ -5,10 +5,10 @@ module.exports =
   function WeakMap() {
     var id = seed + counter++;
     return {
-      get: function(ref) {
+      get: function (ref) {
         return ref[id];
       },
-      set: function(ref, value) {
+      set: function (ref, value) {
         ref[id] = value;
       }
     };

package/src/runtime/helpers/assign.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
 /**
  * Merges object properties
  */
@@ -9,7 +11,7 @@ module.exports = function assign() {
     var source = arguments[i];
     if (source != null) {
       for (var k in source) {
-        if (source.hasOwnProperty(k)) {
+        if (hasOwnProperty.call(source, k)) {
           into[k] = source[k];
         }
       }

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

@@ -1,8 +1,8 @@
 var createRendererFunc = require("../components/renderer");
 
-module.exports = function(componentProps) {
+module.exports = function (componentProps) {
   var renderer = createRendererFunc(
-    function(data, out, component, state) {
+    function (data, out, component, state) {
       data.$renderBody(out, component, state);
     },
     componentProps,

package/src/runtime/helpers/dynamic-tag.js

@@ -6,16 +6,14 @@ var ComponentsContext = require("../components/ComponentsContext");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
 var ComponentDef = require("../components/ComponentDef");
 var w10NOOP = require("warp10/constants").NOOP;
-var RENDER_BODY_TO_JSON = function() {
+var RENDER_BODY_TO_JSON = function () {
   return w10NOOP;
 };
 
 var autoKeyReg = /^\d[\d[\]]*$/;
 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;
-var IS_SERVER = typeof window === "undefined";
+var IS_SERVER = typeof document === "undefined";
 
 /**
  * Helper to render a dynamic tag

package/src/runtime/helpers/for-in.js

@@ -23,7 +23,7 @@ module.exports = function forIn(o, func) {
         "Passing a Map to a <for in> loop is deprecated and will be removed in a future version of Marko. Please switch to <for of> instead."
       );
     }
-    o.forEach(function(v, k) {
+    o.forEach(function (v, k) {
       func(k, v);
     });
   } else {

package/src/runtime/helpers/load-nested-tag.js

@@ -1,7 +1,7 @@
 "use strict";
 
 module.exports = function loadNestedTagHelper(targetProperty, isRepeated) {
-  return function(input, parent) {
+  return function (input, parent) {
     // If we are nested tag then we do not have a renderer
     if (isRepeated) {
       var existingArray = parent[targetProperty];

package/src/runtime/helpers/load-template.js

@@ -1,3 +1,3 @@
 "use strict";
 
-module.exports = require("../../loader");
+module.exports = require("@internal/loader");

package/src/runtime/helpers/merge.js

@@ -1,9 +1,11 @@
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
 /**
  * Merges object properties
  */
 module.exports = function merge(into, source) {
   for (var k in source) {
-    if (source.hasOwnProperty(k) && !into.hasOwnProperty(k)) {
+    if (hasOwnProperty.call(source, k) && !hasOwnProperty.call(into, k)) {
       into[k] = source[k];
     }
   }

package/src/runtime/helpers/noop.js

@@ -1,3 +1,3 @@
 "use strict";
 
-module.exports = function() {};
+module.exports = function () {};

package/src/runtime/helpers/style-value.js

@@ -23,7 +23,7 @@ module.exports = function styleHelper(style) {
     } else if (type === "object") {
       for (var name in style) {
         var value = style[name];
-        if (value != null) {
+        if (value != null && value !== false) {
           if (typeof value === "number" && value) {
             value += "px";
           }

package/src/runtime/helpers/to-string.js

@@ -1,5 +1,5 @@
 "use strict";
 
-module.exports = function(value) {
+module.exports = function (value) {
   return value == null ? "" : value + "";
 };

package/src/runtime/html/AsyncStream.js

@@ -2,7 +2,6 @@
 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");
@@ -19,10 +18,10 @@ var voidWriter = {
   script: noop,
   merge: noop,
   clear: noop,
-  get: function() {
+  get: function () {
     return [];
   },
-  toString: function() {
+  toString: function () {
     return "";
   }
 };
@@ -37,7 +36,7 @@ function State(root, stream, writer, events) {
 }
 
 function escapeEndingComment(text) {
-  return text.replace(/-->/g, "-->");
+  return text.replace(/(--!?)>/g, "$1>");
 }
 
 function AsyncStream(global, writer, parentOut) {
@@ -95,6 +94,7 @@ function AsyncStream(global, writer, parentOut) {
   this.___assignedComponentDef = null;
   this.___assignedKey = null;
   this.___assignedCustomEvents = null;
+  this.___isLast = false;
 }
 
 AsyncStream.DEFAULT_TIMEOUT = 10000;
@@ -108,58 +108,58 @@ AsyncStream.INCLUDE_STACK =
     process.env.NODE_ENV === "development" ||
     process.env.NODE_ENV === "dev");
 
-AsyncStream.enableAsyncStackTrace = function() {
+AsyncStream.enableAsyncStackTrace = function () {
   AsyncStream.INCLUDE_STACK = true;
 };
 
 var proto = (AsyncStream.prototype = {
   constructor: AsyncStream,
-  ___document: defaultDocument,
+  ___host: typeof document === "object" && document,
   ___isOut: true,
 
-  sync: function() {
+  sync: function () {
     this._sync = true;
   },
 
-  isSync: function() {
+  isSync: function () {
     return this._sync === true;
   },
 
-  write: function(str) {
+  write: function (str) {
     if (str != null) {
       this.writer.write(str.toString());
     }
     return this;
   },
 
-  script: function(str) {
+  script: function (str) {
     if (str != null) {
       this.writer.script(str.toString());
     }
     return this;
   },
 
-  ___getOutput: function() {
+  ___getOutput: function () {
     return this._state.writer.toString();
   },
 
   /**
    * Legacy...
    */
-  getOutput: function() {
+  getOutput: function () {
     return this.___getOutput();
   },
 
-  toString: function() {
+  toString: function () {
     return this._state.writer.toString();
   },
 
-  ___getResult: function() {
+  ___getResult: function () {
     this._result = this._result || new RenderResult(this);
     return this._result;
   },
 
-  beginAsync: function(options) {
+  beginAsync: function (options) {
     if (this._sync) {
       throw new Error("beginAsync() not allowed when using renderSync()");
     }
@@ -205,6 +205,7 @@ var proto = (AsyncStream.prototype = {
           }
 
           this._lastCount++;
+          newStream.___isLast = true;
         }
 
         name = options.name;
@@ -219,7 +220,7 @@ var proto = (AsyncStream.prototype = {
     newStream.name = name;
 
     if (timeout > 0) {
-      newStream._timeoutId = setTimeout(function() {
+      newStream._timeoutId = setTimeout(function () {
         newStream.error(
           new Error(
             "Async fragment " +
@@ -242,7 +243,7 @@ var proto = (AsyncStream.prototype = {
     return newStream;
   },
 
-  _doFinish: function() {
+  _doFinish: function () {
     var state = this._state;
 
     state.finished = true;
@@ -254,7 +255,7 @@ var proto = (AsyncStream.prototype = {
     }
   },
 
-  end: function(data) {
+  end: function (data) {
     if (this._ended === true) {
       return;
     }
@@ -302,7 +303,7 @@ var proto = (AsyncStream.prototype = {
       }
 
       if (remaining === 0) {
-        parentOut._handleChildDone();
+        parentOut._handleChildDone(this);
       } else if (remaining - this._lastCount === 0) {
         this._emitLast();
       }
@@ -311,7 +312,7 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  _handleChildDone: function() {
+  _handleChildDone: function (childOut) {
     var remaining = --this._remaining;
 
     if (remaining === 0) {
@@ -319,14 +320,20 @@ var proto = (AsyncStream.prototype = {
       if (parentOut === undefined) {
         this._doFinish();
       } else {
-        parentOut._handleChildDone();
+        parentOut._handleChildDone(this);
+      }
+    } else {
+      if (childOut.___isLast) {
+        this._lastCount--;
+      }
+
+      if (remaining - this._lastCount === 0) {
+        this._emitLast();
       }
-    } else if (remaining - this._lastCount === 0) {
-      this._emitLast();
     }
   },
 
-  _flushNext: function(currentWriter) {
+  _flushNext: function (currentWriter) {
     // It is possible that currentWriter is the
     // last writer in the chain, so let's make
     // sure there is a nextWriter to flush.
@@ -353,7 +360,7 @@ var proto = (AsyncStream.prototype = {
     }
   },
 
-  on: function(event, callback) {
+  on: function (event, callback) {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
@@ -367,7 +374,7 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  once: function(event, callback) {
+  once: function (event, callback) {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
@@ -381,7 +388,7 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  onLast: function(callback) {
+  onLast: function (callback) {
     var lastArray = this._last;
 
     if (lastArray === undefined) {
@@ -393,27 +400,26 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  _emitLast: function() {
-    var lastArray = this._last;
-
-    var i = 0;
-
-    function next() {
-      if (i === lastArray.length) {
-        return;
-      }
-      var lastCallback = lastArray[i++];
-      lastCallback(next);
+  _emitLast: function () {
+    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) {
+  emit: function (type, arg) {
     var events = this._state.events;
     switch (arguments.length) {
       case 1:
@@ -429,24 +435,24 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  removeListener: function() {
+  removeListener: function () {
     var events = this._state.events;
     events.removeListener.apply(events, arguments);
     return this;
   },
 
-  prependListener: function() {
+  prependListener: function () {
     var events = this._state.events;
     events.prependListener.apply(events, arguments);
     return this;
   },
 
-  pipe: function(stream) {
+  pipe: function (stream) {
     this._state.stream.pipe(stream);
     return this;
   },
 
-  error: function(e) {
+  error: function (e) {
     var name = this.name;
     var stack = this._stack;
     if (stack) stack = getNonMarkoStack(stack);
@@ -474,7 +480,7 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  flush: function() {
+  flush: function () {
     var state = this._state;
 
     if (!state.finished) {
@@ -486,7 +492,7 @@ var proto = (AsyncStream.prototype = {
     return this;
   },
 
-  createOut: function() {
+  createOut: function () {
     var newOut = new AsyncStream(this.global);
     // Forward error events to the parent out.
     newOut.on("error", this.emit.bind(this, "error"));
@@ -497,22 +503,31 @@ var proto = (AsyncStream.prototype = {
     return newOut;
   },
 
-  ___elementDynamic: function(tagName, elementAttrs, key, componentDef, props) {
+  ___elementDynamic: function (
+    tagName,
+    elementAttrs,
+    key,
+    componentDef,
+    props
+  ) {
     var str =
       "<" +
       tagName +
       markoAttr(this, componentDef, props, key) +
-      attrsHelper(elementAttrs) +
-      ">";
+      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);
   },
 
-  element: function(tagName, elementAttrs, openTagOnly) {
+  element: function (tagName, elementAttrs, openTagOnly) {
     var str = "<" + tagName + attrsHelper(elementAttrs) + ">";
 
     if (openTagOnly !== true) {
@@ -522,7 +537,7 @@ var proto = (AsyncStream.prototype = {
     this.write(str);
   },
 
-  ___beginElementDynamic: function(
+  ___beginElementDynamic: function (
     name,
     elementAttrs,
     key,
@@ -545,7 +560,7 @@ var proto = (AsyncStream.prototype = {
     }
   },
 
-  beginElement: function(name, elementAttrs) {
+  beginElement: function (name, elementAttrs) {
     var str = "<" + name + attrsHelper(elementAttrs) + ">";
 
     this.write(str);
@@ -557,20 +572,20 @@ var proto = (AsyncStream.prototype = {
     }
   },
 
-  endElement: function() {
+  endElement: function () {
     var tagName = this._elStack.pop();
     this.write("</" + tagName + ">");
   },
 
-  comment: function(str) {
+  comment: function (str) {
     this.write("<!--" + escapeEndingComment(str) + "-->");
   },
 
-  text: function(str) {
+  text: function (str) {
     this.write(escapeXmlOrNullish(str));
   },
 
-  bf: function(key, component, preserve) {
+  bf: function (key, component, preserve) {
     if (preserve) {
       this.write("<!--F#" + escapeXmlString(key) + "-->");
     }
@@ -581,24 +596,23 @@ var proto = (AsyncStream.prototype = {
     }
   },
 
-  ef: function() {
+  ef: function () {
     var preserve = this._elStack.pop();
     if (preserve) {
       this.write("<!--F/-->");
     }
   },
 
-  ___getNode: function(doc) {
+  ___getNode: function (host) {
     var node = this._node;
-    var nextEl;
-    var fragment;
-    var html = this.___getOutput();
-
-    if (!doc) {
-      doc = this.___document;
-    }
 
     if (!node) {
+      var nextEl;
+      var fragment;
+      var html = this.___getOutput();
+      if (!host) host = this.___host;
+      var doc = host.ownerDocument || host;
+
       if (html) {
         node = parseHTML(html);
 
@@ -621,11 +635,11 @@ var proto = (AsyncStream.prototype = {
     return node;
   },
 
-  then: function(fn, fnErr) {
+  then: function (fn, fnErr) {
     var out = this;
-    var promise = new Promise(function(resolve, reject) {
+    var promise = new Promise(function (resolve, reject) {
       out.on("error", reject);
-      out.on("finish", function(result) {
+      out.on("finish", function (result) {
         resolve(result);
       });
     });
@@ -633,11 +647,11 @@ var proto = (AsyncStream.prototype = {
     return Promise.resolve(promise).then(fn, fnErr);
   },
 
-  catch: function(fnErr) {
+  catch: function (fnErr) {
     return this.then(undefined, fnErr);
   },
 
-  c: function(componentDef, key, customEvents) {
+  c: function (componentDef, key, customEvents) {
     this.___assignedComponentDef = componentDef;
     this.___assignedKey = key;
     this.___assignedCustomEvents = customEvents;

package/src/runtime/html/BufferedWriter.js

@@ -1,5 +1,8 @@
 "use strict";
 
+const immediate = require("@internal/set-immediate");
+const setImmediate = immediate.___setImmediate;
+const clearImmediate = immediate.___clearImmediate;
 const StringWriter = require("./StringWriter");
 
 /**
@@ -18,11 +21,11 @@ BufferedWriter.prototype = Object.assign(
   {
     scheduleFlush() {
       if (!this._scheduled) {
-        this._scheduled = setImmediate(flush, this);
+        this._scheduled = setImmediate(flush.bind(0, this));
       }
     },
 
-    end: function() {
+    end: function () {
       flush(this);
       if (!this._wrapped.isTTY) {
         this._wrapped.end();
@@ -41,6 +44,7 @@ function flush(writer) {
       writer._wrapped.flush();
     }
   }
+
   clearImmediate(writer._scheduled);
   writer._scheduled = null;
 }