marko 4.25.0 → 4.26.1

package/src/runtime/components/KeySequence.js

@@ -2,7 +2,7 @@ function KeySequence() {
   this.___lookup = Object.create(null);
 }
 
-KeySequence.prototype.___nextKey = function(key) {
+KeySequence.prototype.___nextKey = function (key) {
   var lookup = this.___lookup;
 
   if (lookup[key]) {

package/src/runtime/components/State.js

@@ -4,10 +4,10 @@ function ensure(state, propertyName) {
   var proto = state.constructor.prototype;
   if (!(propertyName in proto)) {
     Object.defineProperty(proto, propertyName, {
-      get: function() {
+      get: function () {
         return this.___raw[propertyName];
       },
-      set: function(value) {
+      set: function (value) {
         this.___set(propertyName, value, false /* ensure:false */);
       }
     });
@@ -27,7 +27,7 @@ function State(component) {
 }
 
 State.prototype = {
-  ___reset: function() {
+  ___reset: function () {
     var self = this;
 
     self.___dirty = false;
@@ -36,7 +36,7 @@ State.prototype = {
     self.___forced = null;
   },
 
-  ___replace: function(newState) {
+  ___replace: function (newState) {
     var state = this;
     var key;
 
@@ -62,7 +62,7 @@ State.prototype = {
       );
     }
   },
-  ___set: function(name, value, shouldEnsure, forceDirty) {
+  ___set: function (name, value, shouldEnsure, forceDirty) {
     var rawState = this.___raw;
 
     if (shouldEnsure) {
@@ -97,7 +97,7 @@ State.prototype = {
       rawState[name] = value;
     }
   },
-  toJSON: function() {
+  toJSON: function () {
     return this.___raw;
   }
 };

package/src/runtime/components/attach-detach.js

@@ -2,7 +2,7 @@ var eventDelegation = require("./event-delegation");
 var delegateEvent = eventDelegation.___delegateEvent;
 var getEventFromEl = eventDelegation.___getEventFromEl;
 
-// var componentsUtil = require('./util');
+// var componentsUtil = require('@internal/components-util');
 // var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive;
 // var destroyComponentForNode = componentsUtil.___destroyComponentForNode;
 
@@ -17,7 +17,7 @@ function handleNodeAttach(node, componentsContext) {
       var attachTargets = data.___attachTargets;
       if (!attachTargets) {
         attachTargets = data.___attachTargets = [];
-        out.on("___componentsInitialized", function() {
+        out.on("___componentsInitialized", function () {
           for (var i = 0; i < attachTargets.length; i += 2) {
             var node = attachTargets[i];
             var target = attachTargets[i + 1];
@@ -40,10 +40,10 @@ function handleNodeDetach(node) {
       var allowDetach;
 
       delegateEvent(node, eventName, target, {
-        preventDefault: function() {
+        preventDefault: function () {
           allowDetach = false;
         },
-        detach: function() {
+        detach: function () {
           var parentNode = node.parentNode;
           if (parentNode) {
             parentNode.removeChild(node);

package/src/runtime/components/defineComponent.js

@@ -10,7 +10,7 @@ module.exports = function defineComponent(def, renderer) {
     return def;
   }
 
-  var ComponentClass = function() {};
+  var ComponentClass = function () {};
   var proto;
 
   var type = typeof def;

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

@@ -1,4 +1,4 @@
-var componentsUtil = require("./util");
+var componentsUtil = require("@internal/components-util");
 var runtimeId = componentsUtil.___runtimeId;
 var componentLookup = componentsUtil.___componentLookup;
 var getMarkoPropsFromEl = componentsUtil.___getMarkoPropsFromEl;
@@ -72,13 +72,13 @@ 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.body || host).addEventListener(
       eventType,
-      (listeners[eventType] = function(event) {
+      (listeners[eventType] = function (event) {
         var curNode = event.target;
         if (!curNode) {
           return;
@@ -107,7 +107,7 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
           // Monkey-patch to fix #97
           var oldStopPropagation = event.stopPropagation;
 
-          event.stopPropagation = function() {
+          event.stopPropagation = function () {
             oldStopPropagation.call(event);
             propagationStopped = true;
           };
@@ -137,8 +137,8 @@ exports.___handleNodeDetach = noop;
 exports.___delegateEvent = delegateEvent;
 exports.___getEventFromEl = getEventFromEl;
 exports.___addDelegatedEventHandler = addDelegatedEventHandler;
-exports.___init = function(doc) {
-  Object.keys(delegatedEvents).forEach(function(eventType) {
-    addDelegatedEventHandlerToDoc(eventType, doc);
+exports.___init = function (host) {
+  Object.keys(delegatedEvents).forEach(function (eventType) {
+    addDelegatedEventHandlerToHost(eventType, host);
   });
 };

package/src/runtime/components/index.js

@@ -1,301 +1 @@
-"use strict";
-
-var warp10 = require("warp10");
-var safeJSONRegExp = /<\/|\u2028|\u2029/g;
-var IGNORE_GLOBAL_TYPES = new Set(["undefined", "function", "symbol"]);
-var DEFAULT_RUNTIME_ID = "M";
-
-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;
-
-function safeJSONReplacer(match) {
-  if (match === "</") {
-    return "\\u003C/";
-  } else {
-    return "\\u" + match.charCodeAt(0).toString(16);
-  }
-}
-
-function isNotEmpty(obj) {
-  var keys = Object.keys(obj);
-  for (var i = keys.length; i--; ) {
-    if (obj[keys[i]] !== undefined) {
-      return true;
-    }
-  }
-
-  return false;
-}
-function safeStringify(data) {
-  return JSON.stringify(warp10.stringifyPrepare(data)).replace(
-    safeJSONRegExp,
-    safeJSONReplacer
-  );
-}
-
-function getSerializedGlobals($global) {
-  let serializedGlobalsLookup = $global.serializedGlobals;
-  if (serializedGlobalsLookup) {
-    let serializedGlobals;
-    let keys = Object.keys(serializedGlobalsLookup);
-    for (let i = keys.length; i--; ) {
-      let key = keys[i];
-      if (serializedGlobalsLookup[key]) {
-        let value = $global[key];
-        if (!IGNORE_GLOBAL_TYPES.has(typeof value)) {
-          if (serializedGlobals === undefined) {
-            serializedGlobals = {};
-          }
-          serializedGlobals[key] = value;
-        }
-      }
-    }
-
-    return serializedGlobals;
-  }
-}
-
-function addComponentsFromContext(componentsContext, componentsToHydrate) {
-  var components = componentsContext.___components;
-
-  var len = components.length;
-
-  for (var i = 0; i < len; i++) {
-    var componentDef = components[i];
-    var id = componentDef.id;
-    var component = componentDef.___component;
-    var flags = componentDef.___flags;
-    var isLegacy = componentDef.___isLegacy;
-
-    var state = component.state;
-    var input = component.input || 0;
-    var typeName = component.typeName;
-    var customEvents = component.___customEvents;
-    var scope = component.___scope;
-    var bubblingDomEvents = component.___bubblingDomEvents;
-
-    var needsState;
-    var serializedProps;
-    var renderBody;
-
-    if (isLegacy) {
-      flags |= FLAG_IS_LEGACY;
-      renderBody = component.___widgetBody;
-
-      if (component.widgetConfig && isNotEmpty(component.widgetConfig)) {
-        serializedProps = component.widgetConfig;
-      }
-
-      needsState = true;
-    } else {
-      if (input && input.renderBody) {
-        renderBody = input.renderBody;
-        input.renderBody = undefined;
-      }
-
-      if (
-        !(flags & FLAG_WILL_RERENDER_IN_BROWSER) ||
-        flags & FLAG_OLD_HYDRATE_NO_CREATE
-      ) {
-        component.___state = undefined; // We don't use `delete` to avoid V8 deoptimization
-        component.___input = undefined; // We don't use `delete` to avoid V8 deoptimization
-        component.typeName = undefined;
-        component.id = undefined;
-        component.___customEvents = undefined;
-        component.___scope = undefined;
-        component.___bubblingDomEvents = undefined;
-        component.___bubblingDomEventsExtraArgsCount = undefined;
-        component.___updatedInput = undefined;
-        component.___updateQueued = undefined;
-
-        needsState = true;
-
-        if (isNotEmpty(component)) {
-          serializedProps = component;
-        }
-      }
-    }
-
-    var undefinedPropNames = undefined;
-
-    if (needsState && state) {
-      // Update state properties with an `undefined` value to have a `null`
-      // value so that the property name will be serialized down to the browser.
-      // This ensures that we add the proper getter/setter for the state property.
-      const stateKeys = Object.keys(state);
-      for (let i = stateKeys.length; i--; ) {
-        const stateKey = stateKeys[i];
-
-        if (state[stateKey] === undefined) {
-          if (undefinedPropNames) {
-            undefinedPropNames.push(stateKey);
-          } else {
-            undefinedPropNames = [stateKey];
-          }
-        }
-      }
-    }
-
-    if (typeof renderBody === "function") {
-      flags |= FLAG_HAS_RENDER_BODY;
-      renderBody = undefined;
-    }
-
-    var extra = {
-      b: bubblingDomEvents,
-      d: componentDef.___domEvents,
-      e: customEvents,
-      f: flags || undefined,
-      p: customEvents && scope, // Only serialize scope if we need to attach custom events
-      s: needsState && state,
-      u: undefinedPropNames,
-      w: serializedProps,
-      r: renderBody
-    };
-
-    var parts = [id, typeName];
-    var hasExtra = isNotEmpty(extra);
-
-    if (input) {
-      parts.push(input);
-
-      if (hasExtra) {
-        parts.push(extra);
-      }
-    } else if (hasExtra) {
-      parts.push(0, extra); // empty input;
-    }
-
-    componentsToHydrate.push(parts);
-  }
-
-  components.length = 0;
-
-  // Also add any components from nested contexts
-  var nestedContexts = componentsContext.___nestedContexts;
-  if (nestedContexts !== undefined) {
-    nestedContexts.forEach(function(nestedContext) {
-      addComponentsFromContext(nestedContext, componentsToHydrate);
-    });
-  }
-}
-
-function getInitComponentsData(out, componentDefs) {
-  const len = componentDefs.length;
-  const $global = out.global;
-  const isLast = $global.___isLastFlush;
-  const didSerializeComponents = $global.___didSerializeComponents;
-  const prefix = $global.componentIdPrefix || $global.widgetIdPrefix;
-
-  if (len === 0) {
-    if (isLast && didSerializeComponents) {
-      return { p: prefix, l: 1 };
-    }
-
-    return;
-  }
-
-  const TYPE_INDEX = 1;
-  const typesLookup =
-    $global.___typesLookup || ($global.___typesLookup = new Map());
-  let newTypes;
-
-  for (let i = 0; i < len; i++) {
-    const componentDef = componentDefs[i];
-    const typeName = componentDef[TYPE_INDEX];
-    let typeIndex = typesLookup.get(typeName);
-
-    if (typeIndex === undefined) {
-      typeIndex = typesLookup.size;
-      typesLookup.set(typeName, typeIndex);
-
-      if (newTypes) {
-        newTypes.push(typeName);
-      } else {
-        newTypes = [typeName];
-      }
-    }
-
-    componentDef[TYPE_INDEX] = typeIndex;
-  }
-
-  let serializedGlobals;
-
-  if (!didSerializeComponents) {
-    $global.___didSerializeComponents = true;
-    serializedGlobals = getSerializedGlobals($global);
-  }
-
-  return {
-    p: prefix,
-    l: isLast && 1,
-    g: serializedGlobals,
-    w: componentDefs,
-    t: newTypes
-  };
-}
-
-function getInitComponentsDataFromOut(out) {
-  const componentsContext = out.___components;
-
-  if (componentsContext === null) {
-    return;
-  }
-
-  const $global = out.global;
-  const runtimeId = $global.runtimeId;
-  const componentsToHydrate = [];
-  addComponentsFromContext(componentsContext, componentsToHydrate);
-
-  $global.___isLastFlush = true;
-  const data = getInitComponentsData(out, componentsToHydrate);
-  $global.___isLastFlush = undefined;
-
-  if (runtimeId !== DEFAULT_RUNTIME_ID && data) {
-    data.r = runtimeId;
-  }
-
-  return data;
-}
-
-function writeInitComponentsCode(out) {
-  out.script(exports.___getInitComponentsCode(out));
-}
-
-exports.___getInitComponentsCode = function getInitComponentsCode(
-  out,
-  componentDefs
-) {
-  const initComponentsData =
-    arguments.length === 2
-      ? getInitComponentsData(out, componentDefs)
-      : getInitComponentsDataFromOut(out);
-
-  if (initComponentsData === undefined) {
-    return "";
-  }
-
-  const runtimeId = out.global.runtimeId;
-  const componentGlobalKey =
-    runtimeId === DEFAULT_RUNTIME_ID ? "MC" : runtimeId + "_C";
-
-  return `$${componentGlobalKey}=(window.$${componentGlobalKey}||[]).concat(${safeStringify(
-    initComponentsData
-  )})`;
-};
-
-exports.___addComponentsFromContext = addComponentsFromContext;
-exports.writeInitComponentsCode = writeInitComponentsCode;
-
-/**
- * Returns an object that can be sent to the browser using JSON.stringify. The parsed object should be
- * passed to require('marko-components').initComponents(...);
- *
- * @param  {ComponentsContext|AsyncWriter} componentsContext A ComponentsContext or an AsyncWriter
- * @return {Object} An object with information about the rendered components that can be serialized to JSON. The object should be treated as opaque
- */
-exports.getRenderedComponents = function(out) {
-  return warp10.stringifyPrepare(getInitComponentsDataFromOut(out));
-};
+module.exports = require("@internal/components-entry");

package/src/runtime/components/jquery.js

@@ -2,7 +2,7 @@ var ready = require("./ready");
 
 var idRegExp = /^#(\S+)( .*)?/;
 
-exports.patchComponent = function(jQuery, proto, delayThrow) {
+exports.patchComponent = function (jQuery, proto, delayThrow) {
   /* globals window */
 
   if (!(jQuery || (jQuery = window.$)) && !delayThrow) {
@@ -20,7 +20,7 @@ exports.patchComponent = function(jQuery, proto, delayThrow) {
     if (args.length === 1) {
       //Handle an "ondomready" callback function
       if (typeof arg === "function") {
-        return ready(function() {
+        return ready(function () {
           arg.call(self);
         });
       } else if (typeof arg === "string") {

package/src/runtime/components/legacy/browser.json

@@ -2,7 +2,7 @@
   "dependencies": [
     {
       "type": "require",
-      "path": "./index-browser",
+      "path": "./index",
       "run": true
     }
   ]

package/src/runtime/components/legacy/defineRenderer-legacy.js

@@ -1,11 +1,10 @@
 var complain = "MARKO_DEBUG" && require("complain");
-var marko = require("../../../");
 var makeRenderable = require("../../renderable");
-var getComponentsContext = require("../ComponentsContext")
-  .___getComponentsContext;
-var componentsUtil = require("../util");
-var componentLookup = componentsUtil.___componentLookup;
+var getComponentsContext =
+  require("../ComponentsContext").___getComponentsContext;
+var componentLookup = require("@internal/components-util").___componentLookup;
 var modernRenderer = require("../renderer");
+var loader = require("@internal/loader");
 var resolveComponentKey = modernRenderer.___resolveComponentKey;
 
 module.exports = function defineRenderer(renderingLogic) {
@@ -23,7 +22,7 @@ module.exports = function defineRenderer(renderingLogic) {
   var template = renderingLogic.template;
 
   if (typeof template === "string") {
-    template = marko.load(template);
+    template = loader(template);
   }
 
   if (!renderer) {

package/src/runtime/components/legacy/defineWidget-legacy.js

@@ -1,18 +1 @@
-module.exports = function defineWidget(def, renderer) {
-  if (def.___isComponent) {
-    return def;
-  }
-
-  if (renderer) {
-    return {
-      ___isComponent: true,
-      _isWidget: true,
-      renderer: renderer,
-      render: renderer.render,
-      renderSync: renderer.renderSync,
-      template: renderer.template
-    };
-  } else {
-    return { ___isComponent: true, _isWidget: true };
-  }
-};
+module.exports = require("@internal/components-define-widget-legacy");

package/src/runtime/components/legacy/dependencies/html.js

@@ -1,3 +1,3 @@
 var patch = require("./").patch;
-var Template = require("../../../html/Template");
+var Template = require("../../../html").Template;
 patch(Template);

package/src/runtime/components/legacy/dependencies/index.js

@@ -24,7 +24,7 @@ function getRootDeps(template, context) {
   });
 
   // these dependencies should be last
-  deps.concat = function() {
+  deps.concat = function () {
     var result = [];
     result = result.concat.apply(result, arguments);
     result.push.apply(result, this);
@@ -121,7 +121,7 @@ function getInitModule(path, components) {
         run: true,
         virtualModule: {
           path: virtualPath,
-          read: function(_, callback) {
+          read: function (_, callback) {
             // TODO: Check if read can just return string in lasso 2
             if (callback) {
               callback(null, code);
@@ -172,7 +172,7 @@ function parseDependencyString(string) {
 }
 
 function patch(Template) {
-  Template.prototype.getDependencies = function(context) {
+  Template.prototype.getDependencies = function (context) {
     context = context || {};
 
     return getRootDeps(this, context);

package/src/runtime/components/legacy/helper-getWidgetFromOut.js

@@ -1,7 +1,7 @@
-var getComponentsContext = require("../ComponentsContext")
-  .___getComponentsContext;
+var getComponentsContext =
+  require("../ComponentsContext").___getComponentsContext;
 
-module.exports = function(out) {
+module.exports = function (out) {
   var componentsContext = getComponentsContext(out);
   var componentDef =
     (componentsContext && componentsContext.___legacyComponentDef) || {};

package/src/runtime/components/legacy/index.js

@@ -1,15 +1 @@
-var modernMarko = require("../");
-
-// legacy api
-exports.defineComponent = require("./defineComponent-legacy");
-exports.defineWidget = require("./defineWidget-legacy");
-exports.defineRenderer = require("./defineRenderer-legacy");
-exports.makeRenderable = exports.renderable = require("../../renderable");
-
-// server only
-exports.writeInitWidgetsCode = modernMarko.writeInitComponentsCode;
-exports.getRenderedWidgets = exports.getRenderedWidgetIds =
-  modernMarko.getRenderedComponents;
-exports.getInitWidgetsCode = function(out) {
-  return modernMarko.___getInitComponentsCode(out);
-};
+module.exports = require("@internal/components-entry-legacy");

package/src/runtime/components/legacy/renderer-legacy.js

@@ -1,13 +1,13 @@
-var getComponentsContext = require("../ComponentsContext")
-  .___getComponentsContext;
-var componentsUtil = require("../util");
+var getComponentsContext =
+  require("../ComponentsContext").___getComponentsContext;
+var componentsUtil = require("@internal/components-util");
 var componentLookup = componentsUtil.___componentLookup;
-var registry = require("../registry");
+var registry = require("@internal/components-registry");
 var modernRenderer = require("../renderer");
 var resolveComponentKey = modernRenderer.___resolveComponentKey;
 var trackAsyncComponents = modernRenderer.___trackAsyncComponents;
-var beginComponent = require("../beginComponent");
-var endComponent = require("../endComponent");
+var beginComponent = require("@internal/components-beginComponent");
+var endComponent = require("@internal/components-endComponent");
 var complain = "MARKO_DEBUG" && require("complain");
 
 function createRendererFunc(templateRenderFunc, componentProps) {
@@ -134,7 +134,7 @@ function createRendererFunc(templateRenderFunc, componentProps) {
     componentDef.___isExisting = isExisting;
     componentDef.___isLegacy = true;
 
-    componentDef.t = function(typeName) {
+    componentDef.t = function (typeName) {
       if (typeName) {
         if (registry.___isServer) {
           var oldComponent = component;

package/src/runtime/components/ready.js

@@ -141,13 +141,13 @@ function ready(callback, thisObj, doc) {
 
 module.exports = ready;
 
-module.exports.patchComponent = function(proto) {
+module.exports.patchComponent = function (proto) {
   if (proto && proto.ready) {
     // Don't patch if the component has overwritten the ready method.
     return;
   }
 
-  (proto || require("./Component").prototype).ready = function(callback) {
+  (proto || require("./Component").prototype).ready = function (callback) {
     var document = this.el.ownerDocument;
     ready(callback, this, document);
   };

package/src/runtime/components/registry.js

@@ -1,44 +1 @@
-"use strict";
-const copyProps = require("raptor-util/copyProps");
-const constructorCache = new Map();
-const BaseServerComponent = require("./ServerComponent");
-
-function createServerComponentClass(renderingLogic) {
-  var renderingLogicProps =
-    typeof renderingLogic === "function"
-      ? renderingLogic.prototype
-      : renderingLogic;
-
-  class ServerComponent extends BaseServerComponent {}
-
-  copyProps(renderingLogicProps, ServerComponent.prototype);
-
-  return ServerComponent;
-}
-function createComponent(
-  renderingLogic,
-  id,
-  input,
-  out,
-  typeName,
-  customEvents,
-  scope
-) {
-  let ServerComponent;
-
-  if (renderingLogic) {
-    ServerComponent = constructorCache.get(renderingLogic);
-
-    if (!ServerComponent) {
-      ServerComponent = createServerComponentClass(renderingLogic);
-      constructorCache.set(renderingLogic, ServerComponent);
-    }
-  } else {
-    ServerComponent = BaseServerComponent;
-  }
-
-  return new ServerComponent(id, input, out, typeName, customEvents, scope);
-}
-
-exports.___isServer = true;
-exports.___createComponent = createComponent;
+module.exports = require("@internal/components-registry");