marko 5.15.11 → 5.17.0

package/src/runtime/components/Component.js

@@ -184,7 +184,7 @@ function Component(id) {
   this.___updateQueued = false;
   this.___dirty = false;
   this.___settingInput = false;
-  this.___document = undefined;
+  this.___host = undefined;
 
   var ssrKeyedElements = keyedElementsByComponentId[id];
 
@@ -526,21 +526,21 @@ Component.prototype = componentProto = {
     var input = this.___renderInput || this.___input;
 
     updateManager.___batchUpdate(function () {
-      self.___rerender(input, false).afterInsert(self.___document);
+      self.___rerender(input, false).afterInsert(self.___host);
     });
 
     this.___reset();
   },
 
   ___rerender: function (input, isHydrate) {
-    var doc = this.___document;
+    var host = this.___host;
     var globalData = this.___global;
     var rootNode = this.___rootNode;
     var renderer = this.___renderer;
     var createOut = renderer.createOut || defaultCreateOut;
     var out = createOut(globalData);
     out.sync();
-    out.___document = this.___document;
+    out.___host = this.___host;
     out[CONTEXT_KEY] = this.___context;
 
     var componentsContext = getComponentsContext(out);
@@ -554,7 +554,7 @@ Component.prototype = componentProto = {
 
     var targetNode = out.___getOutput().___firstChild;
 
-    morphdom(rootNode, targetNode, doc, componentsContext);
+    morphdom(rootNode, targetNode, host, componentsContext);
 
     return result;
   },

package/src/runtime/components/ComponentsContext.js

@@ -35,10 +35,10 @@ function ComponentsContext(out, parentComponentsContext) {
 }
 
 ComponentsContext.prototype = {
-  ___initComponents: function (doc) {
+  ___initComponents: function (host) {
     var componentDefs = this.___components;
 
-    ComponentsContext.___initClientRendered(componentDefs, doc);
+    ComponentsContext.___initClientRendered(componentDefs, host);
 
     this.___out.emit("___componentsInitialized");
 

package/src/runtime/components/event-delegation.js

@@ -72,11 +72,11 @@ function addDelegatedEventHandler(eventType) {
   }
 }
 
-function addDelegatedEventHandlerToDoc(eventType, doc) {
-  var body = doc.body || doc;
-  var listeners = (doc[listenersAttachedKey] = doc[listenersAttachedKey] || {});
+function addDelegatedEventHandlerToHost(eventType, host) {
+  var listeners = (host[listenersAttachedKey] =
+    host[listenersAttachedKey] || {});
   if (!listeners[eventType]) {
-    body.addEventListener(
+    host.addEventListener(
       eventType,
       (listeners[eventType] = function (event) {
         var propagationStopped = false;
@@ -133,8 +133,8 @@ exports.___handleNodeDetach = noop;
 exports.___delegateEvent = delegateEvent;
 exports.___getEventFromEl = getEventFromEl;
 exports.___addDelegatedEventHandler = addDelegatedEventHandler;
-exports.___init = function (doc) {
+exports.___init = function (host) {
   Object.keys(delegatedEvents).forEach(function (eventType) {
-    addDelegatedEventHandlerToDoc(eventType, doc);
+    addDelegatedEventHandlerToHost(eventType, host);
   });
 };

package/src/runtime/components/init-components/index-browser.js

@@ -3,7 +3,6 @@ var complain = "MARKO_DEBUG" && require("complain");
 var warp10Finalize = require("warp10/finalize");
 var eventDelegation = require("../event-delegation");
 var win = window;
-var defaultDocument = document;
 var createFragmentNode =
   require("../../vdom/morphdom/fragment").___createFragmentNode;
 var componentsUtil = require("../util");
@@ -168,11 +167,11 @@ function addDOMEventListeners(
   handles.push(removeListener);
 }
 
-function initComponent(componentDef, doc) {
+function initComponent(componentDef, host) {
   var component = componentDef.___component;
 
   component.___reset();
-  component.___document = doc;
+  component.___host = host;
 
   var isExisting = componentDef.___isExisting;
 
@@ -225,12 +224,11 @@ function initComponent(componentDef, doc) {
  * in the components context (nested components are initialized before ancestor components).
  * @param  {Array<marko-components/lib/ComponentDef>} componentDefs An array of ComponentDef instances
  */
-function initClientRendered(componentDefs, doc) {
+function initClientRendered(componentDefs, host) {
+  if (!host) host = document;
   // Ensure that event handlers to handle delegating events are
   // always attached before initializing any components
-  eventDelegation.___init(doc);
-
-  doc = doc || defaultDocument;
+  eventDelegation.___init(host);
   var len = componentDefs.length;
   var componentDef;
   var i;
@@ -242,7 +240,7 @@ function initClientRendered(componentDefs, doc) {
 
   for (i = len; i--; ) {
     componentDef = componentDefs[i];
-    initComponent(componentDef, doc);
+    initComponent(componentDef, host);
   }
 }
 
@@ -250,7 +248,7 @@ function initClientRendered(componentDefs, doc) {
  * This method initializes all components that were rendered on the server by iterating over all
  * of the component IDs.
  */
-function initServerRendered(renderedComponents, doc) {
+function initServerRendered(renderedComponents, host) {
   var type = typeof renderedComponents;
   var globalKey = "$";
   var runtimeId;
@@ -302,10 +300,10 @@ function initServerRendered(renderedComponents, doc) {
 
   if (isFromSerializedGlobals) {
     runtimeId = this.r;
-    doc = defaultDocument;
+    host = document;
   } else {
     runtimeId = renderedComponents.r || DEFAULT_RUNTIME_ID;
-    doc = doc || defaultDocument;
+    if (!host) host = document;
 
     // eslint-disable-next-line no-constant-condition
     if ("MARKO_DEBUG") {
@@ -317,7 +315,7 @@ function initServerRendered(renderedComponents, doc) {
 
   // eslint-disable-next-line no-constant-condition
   if ("MARKO_DEBUG") {
-    if (doc !== defaultDocument) {
+    if (host !== document) {
       complain(
         "Passing a document other than the current document to `require('marko/components).init` is deprecated."
       );
@@ -342,8 +340,8 @@ function initServerRendered(renderedComponents, doc) {
 
   // Ensure that event handlers to handle delegating events are
   // always attached before initializing any components
-  indexServerComponentBoundaries(doc, runtimeId);
-  eventDelegation.___init(doc);
+  indexServerComponentBoundaries(host, runtimeId);
+  eventDelegation.___init(host);
 
   if (renderedComponents.g) {
     meta.___globals = renderedComponents.g;
@@ -362,12 +360,12 @@ function initServerRendered(renderedComponents, doc) {
       var typeName = meta.___types[componentDef[1]];
 
       return registry.___isRegistered(typeName)
-        ? tryHydrateComponent(componentDef, meta, doc, runtimeId)
+        ? tryHydrateComponent(componentDef, meta, host, runtimeId)
         : registry.___addPendingDef(
             componentDef,
             typeName,
             meta,
-            doc,
+            host,
             runtimeId
           );
     })
@@ -377,14 +375,14 @@ function initServerRendered(renderedComponents, doc) {
   return this;
 }
 
-function tryHydrateComponent(rawDef, meta, doc, runtimeId) {
+function tryHydrateComponent(rawDef, meta, host, runtimeId) {
   var componentDef = ComponentDef.___deserialize(
     rawDef,
     meta.___types,
     meta.___globals,
     registry
   );
-  var mount = hydrateComponentAndGetMount(componentDef, doc);
+  var mount = hydrateComponentAndGetMount(componentDef, host);
 
   if (!mount) {
     // hydrateComponentAndGetMount will return false if there is not rootNode
@@ -394,11 +392,11 @@ function tryHydrateComponent(rawDef, meta, doc, runtimeId) {
       deferredDefs.push(componentDef);
     } else {
       deferredDefs = [componentDef];
-      doc.addEventListener("DOMContentLoaded", function () {
-        indexServerComponentBoundaries(doc, runtimeId);
+      document.addEventListener("DOMContentLoaded", function () {
+        indexServerComponentBoundaries(host, runtimeId);
         deferredDefs
           .map(function (componentDef) {
-            return hydrateComponentAndGetMount(componentDef, doc);
+            return hydrateComponentAndGetMount(componentDef, host);
           })
           .reverse()
           .forEach(tryInvoke);
@@ -410,7 +408,7 @@ function tryHydrateComponent(rawDef, meta, doc, runtimeId) {
   return mount;
 }
 
-function hydrateComponentAndGetMount(componentDef, doc) {
+function hydrateComponentAndGetMount(componentDef, host) {
   var componentId = componentDef.id;
   var component = componentDef.___component;
   var rootNode = serverComponentRootNodes[componentId];
@@ -423,18 +421,18 @@ function hydrateComponentAndGetMount(componentDef, doc) {
     componentsByDOMNode.set(rootNode, component);
 
     if (componentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER) {
-      component.___document = doc;
+      component.___host = host;
       renderResult = component.___rerender(component.___input, true);
       trackComponent(componentDef);
       return function mount() {
-        renderResult.afterInsert(doc);
+        renderResult.afterInsert(host);
       };
     } else {
       trackComponent(componentDef);
     }
 
     return function mount() {
-      initComponent(componentDef, doc);
+      initComponent(componentDef, host);
     };
   }
 }

package/src/runtime/components/registry/index-browser.js

@@ -35,13 +35,13 @@ function register(type, def) {
   return type;
 }
 
-function addPendingDef(def, type, meta, doc, runtimeId) {
+function addPendingDef(def, type, meta, host, runtimeId) {
   if (!pendingDefs) {
     pendingDefs = {};
 
     // eslint-disable-next-line no-constant-condition
     if ("MARKO_DEBUG") {
-      doc.addEventListener("load", function () {
+      document.addEventListener("load", function () {
         var pendingComponentIds = Object.keys(pendingDefs);
         if (pendingComponentIds.length) {
           complain(
@@ -54,7 +54,7 @@ function addPendingDef(def, type, meta, doc, runtimeId) {
   (pendingDefs[type] = pendingDefs[type] || []).push([
     def,
     meta,
-    doc,
+    host,
     runtimeId
   ]);
 }

package/src/runtime/components/util/index-browser.js

@@ -8,12 +8,13 @@ var runtimeId = markoUID.i++;
 
 var componentLookup = {};
 
-var defaultDocument = document;
 var EMPTY_OBJECT = {};
 
-function getComponentForEl(el, doc) {
+function getComponentForEl(el, host) {
   var node =
-    typeof el == "string" ? (doc || defaultDocument).getElementById(el) : el;
+    typeof el == "string"
+      ? ((host ? host.ownerDocument : host) || document).getElementById(el)
+      : el;
   var component;
   var vElement;
 
@@ -158,11 +159,11 @@ if ("MARKO_DEBUG") {
       };
     }
   };
-  exports.___startDOMManipulationWarning = function () {
-    document.addEventListener("DOMNodeRemoved", warnNodeRemoved);
+  exports.___startDOMManipulationWarning = function (host) {
+    host.addEventListener("DOMNodeRemoved", warnNodeRemoved);
   };
-  exports.___stopDOMManipulationWarning = function () {
-    document.removeEventListener("DOMNodeRemoved", warnNodeRemoved);
+  exports.___stopDOMManipulationWarning = function (host) {
+    host.removeEventListener("DOMNodeRemoved", warnNodeRemoved);
   };
 }
 

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");
@@ -115,7 +114,7 @@ AsyncStream.enableAsyncStackTrace = function () {
 
 var proto = (AsyncStream.prototype = {
   constructor: AsyncStream,
-  ___document: defaultDocument,
+  ___host: typeof window === "object" && document,
   ___isOut: true,
 
   sync: function () {
@@ -603,17 +602,16 @@ var proto = (AsyncStream.prototype = {
     }
   },
 
-  ___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);
 

package/src/runtime/vdom/AsyncVDOMBuilder.js

@@ -7,7 +7,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");
 
@@ -54,7 +53,7 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
 
 var proto = (AsyncVDOMBuilder.prototype = {
   ___isOut: true,
-  ___document: defaultDocument,
+  ___host: typeof window === "object" && document,
 
   bc: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent);
@@ -136,11 +135,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
 
   html: function (html, ownerComponent) {
     if (html != null) {
-      var vdomNode = virtualizeHTML(
-        html,
-        this.___document || document,
-        ownerComponent
-      );
+      var vdomNode = virtualizeHTML(html, ownerComponent);
       this.node(vdomNode);
     }
 
@@ -389,20 +384,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;

package/src/runtime/vdom/VDocumentFragment.js

@@ -22,8 +22,8 @@ VDocumentFragment.prototype = {
     return new VDocumentFragmentClone(this);
   },
 
-  ___actualize: function (doc) {
-    return doc.createDocumentFragment();
+  ___actualize: function (host) {
+    return (host.ownerDocument || host).createDocumentFragment();
   }
 };
 

package/src/runtime/vdom/VElement.js

@@ -151,13 +151,16 @@ VElement.prototype = {
     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);

package/src/runtime/vdom/VText.js

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

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

@@ -60,7 +60,7 @@ runtime.t = function (typeName) {
             instance.__proto__ = newProto;
             instance
               .___rerender(instance.___input, false)
-              .afterInsert(instance.___document);
+              .afterInsert(instance.___host);
           });
         });
       }

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

@@ -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 (
@@ -564,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;
             }
@@ -667,7 +678,7 @@ 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);
@@ -696,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/vdom.js

@@ -6,7 +6,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) {
@@ -30,7 +29,7 @@ function virtualize(node, ownerComponent) {
   }
 }
 
-function virtualizeHTML(html, doc, ownerComponent) {
+function virtualizeHTML(html, ownerComponent) {
   if (!specialHtmlRegexp.test(html)) {
     return new VText(html, ownerComponent);
   }
@@ -61,7 +60,7 @@ Node_prototype.t = function (value) {
       value = "";
     } else if (type === "object") {
       if (value.toHTML) {
-        vdomNode = virtualizeHTML(value.toHTML(), document);
+        vdomNode = virtualizeHTML(value.toHTML());
       }
     }
   }
@@ -81,4 +80,3 @@ exports.___VComponent = VComponent;
 exports.___VFragment = VFragment;
 exports.___virtualize = virtualize;
 exports.___virtualizeHTML = virtualizeHTML;
-exports.___defaultDocument = defaultDocument;