marko 4.25.0 → 4.26.0

package/src/runtime/vdom/VElement.js

@@ -2,12 +2,13 @@
 
 var complain = "MARKO_DEBUG" && require("complain");
 var domData = require("../components/dom-data");
-var componentsUtil = require("../components/util");
+var componentsUtil = require("@internal/components-util");
 var vElementByDOMNode = domData.___vElementByDOMNode;
 var VNode = require("./VNode");
 var inherit = require("raptor-util/inherit");
 var ATTR_XLINK_HREF = "xlink:href";
 var xmlnsRegExp = /^xmlns(:|$)/;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 var NS_XLINK = "http://www.w3.org/1999/xlink";
 var NS_HTML = "http://www.w3.org/1999/xhtml";
 var NS_MATH = "http://www.w3.org/1998/Math/MathML";
@@ -50,7 +51,7 @@ function convertAttrValue(type, value) {
 
 function assign(a, b) {
   for (var key in b) {
-    if (b.hasOwnProperty(key)) {
+    if (hasOwnProperty.call(b, key)) {
       a[key] = b[key];
     }
   }
@@ -117,7 +118,7 @@ function VElement(
 VElement.prototype = {
   ___nodeType: 1,
 
-  ___cloneNode: function() {
+  ___cloneNode: function () {
     return new VElementClone(this);
   },
 
@@ -128,7 +129,7 @@ VElement.prototype = {
    * @param  {int|null} attrCount  The number of attributes (or `null` if not known)
    * @param  {int|null} childCount The number of child nodes (or `null` if not known)
    */
-  e: function(tagName, attrs, key, ownerComponent, childCount, flags, props) {
+  e: function (tagName, attrs, key, ownerComponent, childCount, flags, props) {
     var child = this.___appendChild(
       new VElement(
         tagName,
@@ -154,20 +155,23 @@ VElement.prototype = {
    *
    * @param  {String} value The value for the new Comment node
    */
-  n: function(node, ownerComponent) {
+  n: function (node, ownerComponent) {
     node = node.___cloneNode();
     node.___ownerComponent = ownerComponent;
     this.___appendChild(node);
     return this.___finishChild();
   },
 
-  ___actualize: function(doc, parentNamespaceURI) {
+  ___actualize: function (host, parentNamespaceURI) {
     var tagName = this.___nodeName;
     var attributes = this.___attributes;
     var namespaceURI = DEFAULT_NS[tagName] || parentNamespaceURI || NS_HTML;
 
     var flags = this.___flags;
-    var el = doc.createElementNS(namespaceURI, tagName);
+    var el = (host.ownerDocument || host).createElementNS(
+      namespaceURI,
+      tagName
+    );
 
     if (flags & FLAG_CUSTOM_ELEMENT) {
       assign(el, attributes);
@@ -202,7 +206,7 @@ VElement.prototype = {
     return el;
   },
 
-  ___hasAttribute: function(name) {
+  ___hasAttribute: function (name) {
     // We don't care about the namespaces since the there
     // is no chance that attributes with the same name will have
     // different namespaces
@@ -215,9 +219,9 @@ inherit(VElement, VNode);
 
 var proto = (VElementClone.prototype = VElement.prototype);
 
-["checked", "selected", "disabled"].forEach(function(name) {
+["checked", "selected", "disabled"].forEach(function (name) {
   defineProperty(proto, name, {
-    get: function() {
+    get: function () {
       var value = this.___attributes[name];
       return value !== false && value != null;
     }
@@ -225,7 +229,7 @@ var proto = (VElementClone.prototype = VElement.prototype);
 });
 
 defineProperty(proto, "___value", {
-  get: function() {
+  get: function () {
     var value = this.___valueInternal;
     if (value == null) {
       value = this.___attributes.value;
@@ -239,7 +243,7 @@ defineProperty(proto, "___value", {
   }
 });
 
-VElement.___removePreservedAttributes = function(attrs) {
+VElement.___removePreservedAttributes = function (attrs) {
   // By default this static method is a no-op, but if there are any
   // compiled components that have "no-update" attributes then
   // `preserve-attrs.js` will be imported and this method will be replaced
@@ -298,7 +302,7 @@ function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
 
 VElement.___virtualize = virtualizeElement;
 
-VElement.___morphAttrs = function(fromEl, vFromEl, toEl) {
+VElement.___morphAttrs = function (fromEl, vFromEl, toEl) {
   var removePreservedAttributes = VElement.___removePreservedAttributes;
 
   var fromFlags = vFromEl.___flags;

package/src/runtime/vdom/VFragment.js

@@ -13,7 +13,7 @@ function VFragment(key, ownerComponent, preserve) {
 
 VFragment.prototype = {
   ___nodeType: 12,
-  ___actualize: function() {
+  ___actualize: function () {
     var fragment = createFragmentNode();
     keysByDOMNode.set(fragment, this.___key);
     vElementByDOMNode.set(fragment, this);

package/src/runtime/vdom/VNode.js

@@ -2,7 +2,7 @@
 function VNode() {}
 
 VNode.prototype = {
-  ___VNode: function(finalChildCount, ownerComponent) {
+  ___VNode: function (finalChildCount, ownerComponent) {
     this.___finalChildCount = finalChildCount;
     this.___childCount = 0;
     this.___firstChildInternal = null;
@@ -45,7 +45,7 @@ VNode.prototype = {
     return nextSibling;
   },
 
-  ___appendChild: function(child) {
+  ___appendChild: function (child) {
     this.___childCount++;
 
     if (this.___nodeName === "textarea") {

package/src/runtime/vdom/VText.js

@@ -11,11 +11,11 @@ VText.prototype = {
 
   ___nodeType: 3,
 
-  ___actualize: function(doc) {
-    return doc.createTextNode(this.___nodeValue);
+  ___actualize: function (host) {
+    return (host.ownerDocument || host).createTextNode(this.___nodeValue);
   },
 
-  ___cloneNode: function() {
+  ___cloneNode: function () {
     return new VText(this.___nodeValue);
   }
 };

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

@@ -8,7 +8,7 @@ var parseHTML = require("../parse-html");
 /**
  * Helper for processing dynamic attributes
  */
-module.exports = function(attributes) {
+module.exports = function (attributes) {
   if (typeof attributes === "string") {
     // eslint-disable-next-line no-constant-condition
     if ("MARKO_DEBUG") {

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

@@ -1,8 +1,8 @@
 "use strict";
 
-module.exports = function(id) {
+module.exports = function (id) {
   var i = 0;
-  return function() {
+  return function () {
     return id + i++;
   };
 };

package/src/runtime/vdom/helpers/v-element.js

@@ -2,7 +2,7 @@
 
 var VElement = require("../vdom").___VElement;
 
-module.exports = function(
+module.exports = function (
   tagName,
   attrs,
   key,

package/src/runtime/vdom/helpers/v-text.js

@@ -2,6 +2,6 @@
 
 var VText = require("../vdom").___VText;
 
-module.exports = function(value) {
+module.exports = function (value) {
   return new VText(value);
 };

package/src/runtime/vdom/index.js

@@ -1,10 +1,9 @@
 "use strict";
-require("../../");
 
-// helpers provide a core set of various utility methods
-// that are available in every template
-var AsyncVDOMBuilder = require("./AsyncVDOMBuilder");
-var makeRenderable = require("../renderable");
+typeof window === "object" &&
+  (window.Marko = {
+    Component: function () {}
+  });
 
 /**
  * Method is for internal usage only. This method
@@ -12,27 +11,26 @@ var makeRenderable = require("../renderable");
  * 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);
 };
 
-function Template(path, func) {
-  this.path = path;
+exports.Template = Template;
+function Template(typeName, func) {
+  this.path = typeName;
   this._ = func;
   this.meta = undefined;
 }
 
-function createOut(globalData, parent, parentOut) {
-  return new AsyncVDOMBuilder(globalData, parent, parentOut);
-}
-
-var Template_prototype = (Template.prototype = {
-  createOut: createOut
-});
-
-makeRenderable(Template_prototype);
-
-exports.Template = Template;
-exports.___createOut = createOut;
-
-require("../createOut").___setCreateOut(createOut);
+var AsyncVDOMBuilder = require("./AsyncVDOMBuilder");
+require("../createOut").___setCreateOut(
+  (Template.prototype.createOut = function createOut(
+    globalData,
+    parent,
+    parentOut
+  ) {
+    return new AsyncVDOMBuilder(globalData, parent, parentOut);
+  })
+);
+
+require("../renderable")(Template.prototype);

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

@@ -37,7 +37,7 @@ var fragmentPrototype = {
     nodes.push(current);
     return nodes;
   },
-  insertBefore: function(newChildNode, referenceNode) {
+  insertBefore: function (newChildNode, referenceNode) {
     var actualReference = referenceNode == null ? this.endNode : referenceNode;
     return insertBefore(
       newChildNode,
@@ -45,14 +45,14 @@ var fragmentPrototype = {
       this.startNode.parentNode
     );
   },
-  insertInto: function(newParentNode, referenceNode) {
-    this.nodes.forEach(function(node) {
+  insertInto: function (newParentNode, referenceNode) {
+    this.nodes.forEach(function (node) {
       insertBefore(node, referenceNode, newParentNode);
     }, this);
     return this;
   },
-  remove: function() {
-    this.nodes.forEach(function(node) {
+  remove: function () {
+    this.nodes.forEach(function (node) {
       this.detachedContainer.appendChild(node);
     }, this);
   }
@@ -69,7 +69,8 @@ function createFragmentNode(startNode, nextNode, parentNode) {
     : document.createTextNode("");
   fragment.startNode.fragment = fragment;
   fragment.endNode.fragment = fragment;
-  var detachedContainer = (fragment.detachedContainer = document.createDocumentFragment());
+  var detachedContainer = (fragment.detachedContainer =
+    document.createDocumentFragment());
   parentNode =
     parentNode || (startNode && startNode.parentNode) || detachedContainer;
   insertBefore(fragment.startNode, startNode, parentNode);
@@ -79,7 +80,7 @@ function createFragmentNode(startNode, nextNode, parentNode) {
 
 function beginFragmentNode(startNode, parentNode) {
   var fragment = createFragmentNode(startNode, null, parentNode);
-  fragment.___finishFragment = function(nextNode) {
+  fragment.___finishFragment = function (nextNode) {
     fragment.___finishFragment = null;
     insertBefore(
       fragment.endNode,

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

@@ -1,7 +1,7 @@
 "use strict";
 var specialElHandlers = require("./specialElHandlers");
 var KeySequence = require("../../components/KeySequence");
-var componentsUtil = require("../../components/util");
+var componentsUtil = require("@internal/components-util");
 var existingComponentLookup = componentsUtil.___componentLookup;
 var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive;
 var addComponentRootToKeyedElements =
@@ -56,7 +56,7 @@ function onNodeAdded(node, componentsContext) {
   }
 }
 
-function morphdom(fromNode, toNode, doc, componentsContext) {
+function morphdom(fromNode, toNode, host, componentsContext) {
   var globalComponentsContext;
   var isHydrate = false;
   var keySequences = Object.create(null);
@@ -74,7 +74,7 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
     ownerComponent,
     parentComponent
   ) {
-    var realNode = vNode.___actualize(doc, parentEl.namespaceURI);
+    var realNode = vNode.___actualize(host, parentEl.namespaceURI);
     insertBefore(realNode, referenceEl, parentEl);
 
     if (
@@ -321,9 +321,8 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
                 curVFromNodeChild.___nodeName = curToNodeChild.___nodeName;
                 keysByDOMNode.set(curFromNodeChild, curToNodeKey);
-                referenceComponent.___keyedElements[
-                  curToNodeKey
-                ] = curFromNodeChild;
+                referenceComponent.___keyedElements[curToNodeKey] =
+                  curFromNodeChild;
 
                 if (curToNodeChild.___preserve) {
                   vElementByDOMNode.set(curFromNodeChild, curVFromNodeChild);
@@ -565,6 +564,17 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
             isCompatible = true;
             // Simply update nodeValue on the original node to
             // change the text value
+
+            if (
+              isHydrate === true &&
+              toNextSibling &&
+              curFromNodeType === TEXT_NODE &&
+              toNextSibling.___nodeType === TEXT_NODE
+            ) {
+              fromNextSibling = curFromNodeChild.splitText(
+                curToNodeChild.___nodeValue.length
+              );
+            }
             if (curFromNodeChild.nodeValue !== curToNodeChild.___nodeValue) {
               curFromNodeChild.nodeValue = curToNodeChild.___nodeValue;
             }
@@ -668,12 +678,12 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
 
   // eslint-disable-next-line no-constant-condition
   if ("MARKO_DEBUG") {
-    componentsUtil.___stopDOMManipulationWarning();
+    componentsUtil.___stopDOMManipulationWarning(host);
   }
 
   morphChildren(fromNode, toNode, toNode.___component);
 
-  detachedNodes.forEach(function(node) {
+  detachedNodes.forEach(function (node) {
     var detachedFromComponent = detachedByDOMNode.get(node);
 
     if (detachedFromComponent !== undefined) {
@@ -697,7 +707,7 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
 
   // eslint-disable-next-line no-constant-condition
   if ("MARKO_DEBUG") {
-    componentsUtil.___startDOMManipulationWarning();
+    componentsUtil.___startDOMManipulationWarning(host);
   }
 }
 

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

@@ -32,10 +32,10 @@ SpecialElHandlers.prototype = {
    * Needed for IE. Apparently IE doesn't think that "selected" is an
    * attribute when reading over the attributes using selectEl.attributes
    */
-  option: function(fromEl, toEl) {
+  option: function (fromEl, toEl) {
     syncBooleanAttrProp(fromEl, toEl, "selected");
   },
-  button: function(fromEl, toEl) {
+  button: function (fromEl, toEl) {
     syncBooleanAttrProp(fromEl, toEl, "disabled");
   },
   /**
@@ -44,7 +44,7 @@ SpecialElHandlers.prototype = {
    * "value" property will have no effect since it is only used to the set the
    * initial value.  Similar for the "checked" attribute, and "disabled".
    */
-  input: function(fromEl, toEl) {
+  input: function (fromEl, toEl) {
     syncBooleanAttrProp(fromEl, toEl, "checked");
     syncBooleanAttrProp(fromEl, toEl, "disabled");
 
@@ -57,7 +57,7 @@ SpecialElHandlers.prototype = {
     }
   },
 
-  textarea: function(fromEl, toEl) {
+  textarea: function (fromEl, toEl) {
     if (toEl.___preserveTextAreaValue) {
       return;
     }
@@ -83,12 +83,12 @@ SpecialElHandlers.prototype = {
       firstChild.nodeValue = newValue;
     }
   },
-  select: function(fromEl, toEl) {
+  select: function (fromEl, toEl) {
     if (!toEl.___hasAttribute("multiple")) {
       var selected = 0;
       forEachOption(
         toEl,
-        function(option, i) {
+        function (option, i) {
           if (option.___hasAttribute("selected")) {
             selected = i;
           }

package/src/runtime/vdom/parse-html.js

@@ -1,11 +1,11 @@
-var parseHTML = function(html) {
+var parseHTML = function (html) {
   var container = document.createElement("template");
   parseHTML = container.content
-    ? function(html) {
+    ? function (html) {
         container.innerHTML = html;
         return container.content;
       }
-    : function(html) {
+    : function (html) {
         container.innerHTML = html;
         return container;
       };
@@ -13,6 +13,6 @@ var parseHTML = function(html) {
   return parseHTML(html);
 };
 
-module.exports = function(html) {
+module.exports = function (html) {
   return parseHTML(html).firstChild;
 };

package/src/runtime/vdom/preserve-attrs.js

@@ -4,7 +4,7 @@ function removePreservedAttributes(attrs, props) {
   var preservedAttrs = props && props.pa;
   if (preservedAttrs) {
     attrs = extend({}, attrs);
-    preservedAttrs.forEach(function(preservedAttrName) {
+    preservedAttrs.forEach(function (preservedAttrName) {
       delete attrs[preservedAttrName];
     });
   }

package/src/runtime/vdom/vdom.js

@@ -7,7 +7,6 @@ var VComponent = require("./VComponent");
 var VFragment = require("./VFragment");
 var parseHTML = require("./parse-html");
 
-var defaultDocument = typeof document != "undefined" && document;
 var specialHtmlRegexp = /[&<]/;
 
 function virtualizeChildNodes(node, vdomParent, ownerComponent) {
@@ -33,7 +32,7 @@ function virtualize(node, ownerComponent) {
   }
 }
 
-function virtualizeHTML(html, doc, ownerComponent) {
+function virtualizeHTML(html, ownerComponent) {
   if (!specialHtmlRegexp.test(html)) {
     return new VText(html, ownerComponent);
   }
@@ -55,7 +54,7 @@ var Node_prototype = VNode.prototype;
  * Shorthand method for creating and appending a Text node with a given value
  * @param  {String} value The text value for the new Text node
  */
-Node_prototype.t = function(value) {
+Node_prototype.t = function (value) {
   var type = typeof value;
   var vdomNode;
 
@@ -64,7 +63,7 @@ Node_prototype.t = function(value) {
       value = "";
     } else if (type === "object") {
       if (value.toHTML) {
-        vdomNode = virtualizeHTML(value.toHTML(), document);
+        vdomNode = virtualizeHTML(value.toHTML());
       }
     }
   }
@@ -77,12 +76,12 @@ Node_prototype.t = function(value) {
  * Shorthand method for creating and appending a Comment node with a given value
  * @param  {String} value The value for the new Comment node
  */
-Node_prototype.c = function(value) {
+Node_prototype.c = function (value) {
   this.___appendChild(new VComment(value));
   return this.___finishChild();
 };
 
-Node_prototype.___appendDocumentFragment = function() {
+Node_prototype.___appendDocumentFragment = function () {
   return this.___appendChild(new VDocumentFragment());
 };
 
@@ -94,4 +93,3 @@ exports.___VComponent = VComponent;
 exports.___VFragment = VFragment;
 exports.___virtualize = virtualize;
 exports.___virtualizeHTML = virtualizeHTML;
-exports.___defaultDocument = defaultDocument;

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

@@ -67,7 +67,7 @@ function find(dirname, registeredTaglibs) {
   var added = {};
 
   var helper = {
-    addTaglib: function(taglib) {
+    addTaglib: function (taglib) {
       if (added[taglib.id]) {
         return;
       }

package/src/taglib/taglib-loader/Tag.js

@@ -74,13 +74,13 @@ class Tag {
       return;
     }
 
-    forEachEntry(this.importedVariables, function(key, importedVariable) {
+    forEachEntry(this.importedVariables, function (key, importedVariable) {
       callback.call(thisObj, importedVariable);
     });
   }
 
   forEachTransformer(callback, thisObj) {
-    forEachEntry(this.transformers, function(key, transformer) {
+    forEachEntry(this.transformers, function (key, transformer) {
       callback.call(thisObj, transformer);
     });
   }
@@ -249,7 +249,7 @@ class Tag {
       return;
     }
 
-    forEachEntry(this.nestedTags, function(key, nestedTag) {
+    forEachEntry(this.nestedTags, function (key, nestedTag) {
       callback.call(thisObj, nestedTag);
     });
   }
@@ -259,7 +259,7 @@ class Tag {
 
   forEachMigrator(callback, thisObj) {
     this.migratorPaths
-      .map(function(path) {
+      .map(function (path) {
         return (this.migrators[path] =
           this.migrators[path] || markoModules.require(path));
       }, this)
@@ -278,7 +278,7 @@ class Tag {
       var loadedCodeGenerator = markoModules.require(
         this.codeGeneratorModulePath
       );
-      nodeFactory = function(elNode) {
+      nodeFactory = function (elNode) {
         elNode.setType(codeGeneratorModulePath);
         elNode.setCodeGenerator(loadedCodeGenerator);
         return elNode;

package/src/taglib/taglib-loader/Taglib.js

@@ -20,7 +20,7 @@ function handleImport(taglib, importedTaglib) {
   taglib.imports.push(importedTaglib);
 
   if (importedTaglib.imports) {
-    importedTaglib.imports.forEach(function(nestedImportedTaglib) {
+    importedTaglib.imports.forEach(function (nestedImportedTaglib) {
       handleImport(taglib, nestedImportedTaglib);
     });
   }
@@ -90,7 +90,7 @@ class Taglib {
   forEachTag(callback, thisObj) {
     forEachEntry(
       this.tags,
-      function(key, tag) {
+      function (key, tag) {
         callback.call(thisObj, tag);
       },
       this

package/src/taglib/taglib-loader/json-file-reader.js

@@ -2,7 +2,7 @@ var fs = require("fs");
 var stripJsonComments = require("strip-json-comments");
 var fsReadOptions = { encoding: "utf8" };
 
-exports.readFileSync = function(path) {
+exports.readFileSync = function (path) {
   var json = fs.readFileSync(path, fsReadOptions);
 
   try {

package/src/taglib/taglib-loader/loadAttributeFromProps.js

@@ -235,7 +235,7 @@ function loadAttributeFromProps(attrName, attrProps, dependencyChain) {
   return attr;
 }
 
-loadAttributeFromProps.isSupportedProperty = function(name) {
+loadAttributeFromProps.isSupportedProperty = function (name) {
   return AttrLoader.prototype.hasOwnProperty(name);
 };
 

package/src/taglib/taglib-loader/loadTagFromProps.js

@@ -24,7 +24,7 @@ function exists(path) {
 }
 
 function removeDashes(str) {
-  return str.replace(/-([a-z])/g, function(match, lower) {
+  return str.replace(/-([a-z])/g, function (match, lower) {
     return lower.toUpperCase();
   });
 }
@@ -136,11 +136,11 @@ class TagLoader {
       propertyHandlers(
         value,
         {
-          name: function(value) {
+          name: function (value) {
             nestedVariable.name = value;
           },
 
-          nameFromAttribute: function(value) {
+          nameFromAttribute: function (value) {
             nestedVariable.nameFromAttribute = value;
           }
         },
@@ -577,9 +577,8 @@ class TagLoader {
         );
       }
 
-      importedVar.expression = markoCompiler.builder.parseExpression(
-        expression
-      );
+      importedVar.expression =
+        markoCompiler.builder.parseExpression(expression);
       tag.addImportedVariable(importedVar);
     });
   }

package/src/taglib/taglib-loader/tag-def-from-code.js

@@ -3,7 +3,8 @@
 var tagStartRegExp = /(^\s*(?:(?:exports.(?:tag|TAG))|(?:TAG))\s*=\s*)\{/m;
 
 // Tokens: "<string>", '<string>', /*<some comment*/, //<single line comment>, {, }, ;
-var tokensRegExp = /"(?:[^"]|\\")*"|'(?:[^'])|(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(\/\/.*)|[{};]/g;
+var tokensRegExp =
+  /"(?:[^"]|\\")*"|'(?:[^'])|(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(\/\/.*)|[{};]/g;
 
 function extractTagDef(code) {
   var startMatches = tagStartRegExp.exec(code);