marko 4.25.0 → 4.26.0

package/dist/runtime/components/index.js

@@ -1,285 +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.h_;
-
-  var len = components.length;
-
-  for (var i = 0; i < len; i++) {
-    var componentDef = components[i];
-    var id = componentDef.id;
-    var component = componentDef.n_;
-    var flags = componentDef._N_;
-    var isLegacy = componentDef.ar_;
-
-    var state = component.state;
-    var input = component.input || 0;
-    var typeName = component.typeName;
-    var customEvents = component.U_;
-    var scope = component.M_;
-    var bubblingDomEvents = component.T_;
-
-    var needsState;
-    var serializedProps;
-    var renderBody;
-
-    if (isLegacy) {
-      flags |= FLAG_IS_LEGACY;
-      renderBody = component._U_;
-
-      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.P_ = undefined; // We don't use `delete` to avoid V8 deoptimization
-        component.W_ = undefined; // We don't use `delete` to avoid V8 deoptimization
-        component.typeName = undefined;
-        component.id = undefined;
-        component.U_ = undefined;
-        component.M_ = undefined;
-        component.T_ = undefined;
-        component.aa_ = undefined;
-        component.ab_ = undefined;
-        component.___ = 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._K_,
-      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._V_;
-  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.j_;
-  const didSerializeComponents = $global.as_;
-  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.at_ || ($global.at_ = 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.as_ = true;
-    serializedGlobals = getSerializedGlobals($global);
-  }
-
-  return {
-    p: prefix,
-    l: isLast && 1,
-    g: serializedGlobals,
-    w: componentDefs,
-    t: newTypes
-  };
-}
-
-function getInitComponentsDataFromOut(out) {
-  const componentsContext = out.h_;
-
-  if (componentsContext === null) {
-    return;
-  }
-
-  const $global = out.global;
-  const runtimeId = $global.runtimeId;
-  const componentsToHydrate = [];
-  addComponentsFromContext(componentsContext, componentsToHydrate);
-
-  $global.j_ = true;
-  const data = getInitComponentsData(out, componentsToHydrate);
-  $global.j_ = undefined;
-
-  if (runtimeId !== DEFAULT_RUNTIME_ID && data) {
-    data.r = runtimeId;
-  }
-
-  return data;
-}
-
-function writeInitComponentsCode(out) {
-  out.script(exports.g_(out));
-}
-
-exports.g_ = 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.f_ = 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/dist/runtime/components/legacy/browser.json

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

package/dist/runtime/components/legacy/defineComponent-legacy.js

@@ -9,7 +9,7 @@ var defineWidget;
 
 module.exports = function defineComponent(def) {
 
-  if (def._d_) {
+  if (def.A_) {
     return def;
   }
   // eslint-disable-next-line no-constant-condition

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

@@ -1,11 +1,10 @@
 var complain;
-var marko = require("../../../");
 var makeRenderable = require("../../renderable");
-var getComponentsContext = require("../ComponentsContext").u_;
-var componentsUtil = require("../util");
-var componentLookup = componentsUtil.I_;
+var getComponentsContext = require("../ComponentsContext").U_;
+var componentLookup = require("@internal/components-util")._n_;
 var modernRenderer = require("../renderer");
-var resolveComponentKey = modernRenderer.ay_;
+var loader = require("@internal/loader");
+var resolveComponentKey = modernRenderer.aX_;
 
 module.exports = function defineRenderer(renderingLogic) {
   var renderer = renderingLogic.renderer;
@@ -13,14 +12,14 @@ module.exports = function defineRenderer(renderingLogic) {
   // eslint-disable-next-line no-constant-condition
 
 
-  if (renderer && renderer.az_) {
+  if (renderer && renderer.aY_) {
     return renderer;
   }
 
   var template = renderingLogic.template;
 
   if (typeof template === "string") {
-    template = marko.load(template);
+    template = loader(template);
   }
 
   if (!renderer) {
@@ -43,13 +42,13 @@ module.exports = function defineRenderer(renderingLogic) {
     // takes care of re-using existing components.
     renderer = function renderer(input, out) {
       var componentsContext = getComponentsContext(out);
-      var globalComponentsContext = componentsContext.k_;
-      var component = globalComponentsContext._w_;
-      var isReceivingNewInput = !component || component.aA_;
+      var globalComponentsContext = componentsContext.r_;
+      var component = globalComponentsContext.aB_;
+      var isReceivingNewInput = !component || component._k_;
       var parentComponentDef;
 
       if (component) {
-        component.aA_ = false;
+        component._k_ = false;
       }
 
       // Render the template associated with the component using the final template
@@ -61,14 +60,14 @@ module.exports = function defineRenderer(renderingLogic) {
       var id;
 
       if (!component && componentLookup) {
-        var key = out.o_;
+        var key = out.ab_;
 
-        if ((parentComponentDef = componentsContext.p_) && key != null) {
+        if ((parentComponentDef = componentsContext.q_) && key != null) {
           id = resolveComponentKey(key.toString(), parentComponentDef);
         } else if (parentComponentDef) {
-          id = parentComponentDef._R_();
+          id = parentComponentDef.aO_();
         } else {
-          id = globalComponentsContext._R_();
+          id = globalComponentsContext.aO_();
         }
 
         component = componentLookup[id];
@@ -101,9 +100,9 @@ module.exports = function defineRenderer(renderingLogic) {
           widgetBody = newProps.renderBody;
         }
       } else if (component) {
-        newProps = newProps || component.aB_;
-        widgetBody = component._U_;
-        widgetState = component._y_;
+        newProps = newProps || component.Q_;
+        widgetBody = component.___;
+        widgetState = component.aD_;
         widgetConfig = component.widgetConfig;
       }
 
@@ -131,7 +130,7 @@ module.exports = function defineRenderer(renderingLogic) {
     };
   }
 
-  renderer.az_ = true;
+  renderer.aY_ = true;
   renderer.createOut = template ? template.createOut : renderingLogic.createOut;
   renderer.template = template;
 

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

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

package/dist/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/dist/runtime/components/legacy/dependencies/index.js

@@ -4,14 +4,14 @@ var env = process.env.NODE_ENV;
 var production = !env || env !== "development";
 
 function getRootDeps(template, context) {
-  if (production && template.aL_) {
-    return template.aL_;
+  if (production && template.aZ_) {
+    return template.aZ_;
   }
 
   attachDepsAndComponentsToTemplate(template, context);
 
-  var deps = template.aL_ = Object.keys(template.aM_).map(key => template.aM_[key]);
-  var initModule = getInitModule(template.path, template.h_);
+  var deps = template.aZ_ = Object.keys(template.b__).map(key => template.b__[key]);
+  var initModule = getInitModule(template.path, template.t_);
 
   if (initModule) deps.push(initModule);
 
@@ -42,10 +42,10 @@ function attachDepsAndComponentsToTemplate(target, context) {
   }
 
   if (typeof template.createOut !== "function") return;
-  if (production && target.aM_) return;
+  if (production && target.b__) return;
 
-  var deps = target.aM_ = {};
-  var components = target.h_ = {};
+  var deps = target.b__ = {};
+  var components = target.t_ = {};
 
   if (!template.meta) {
     // eslint-disable-next-line no-console
@@ -88,8 +88,8 @@ function attachDepsAndComponentsToTemplate(target, context) {
 
       attachDepsAndComponentsToTemplate(tag, context);
 
-      if (tag.aM_) Object.assign(deps, tag.aM_);
-      if (tag.h_) Object.assign(components, tag.h_);
+      if (tag.b__) Object.assign(deps, tag.b__);
+      if (tag.t_) Object.assign(components, tag.t_);
     });
   }
 }

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

@@ -1,8 +1,8 @@
-var getComponentsContext = require("../ComponentsContext").u_;
+var getComponentsContext = require("../ComponentsContext").U_;
 
 module.exports = function (out) {
   var componentsContext = getComponentsContext(out);
-  var componentDef = componentsContext && componentsContext.aN_ || {};
-  componentDef._c = componentDef.n_;
+  var componentDef = componentsContext && componentsContext.ba_ || {};
+  componentDef._c = componentDef.v_;
   return componentDef;
 };

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

@@ -1,14 +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.g_(out);
-};
+module.exports = require("@internal/components-entry-legacy");

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

@@ -1,12 +1,12 @@
-var getComponentsContext = require("../ComponentsContext").u_;
-var componentsUtil = require("../util");
-var componentLookup = componentsUtil.I_;
-var registry = require("../registry");
+var getComponentsContext = require("../ComponentsContext").U_;
+var componentsUtil = require("@internal/components-util");
+var componentLookup = componentsUtil._n_;
+var registry = require("@internal/components-registry");
 var modernRenderer = require("../renderer");
-var resolveComponentKey = modernRenderer.ay_;
-var trackAsyncComponents = modernRenderer.aP_;
-var beginComponent = require("../beginComponent");
-var endComponent = require("../endComponent");
+var resolveComponentKey = modernRenderer.aX_;
+var trackAsyncComponents = modernRenderer.bb_;
+var beginComponent = require("@internal/components-beginComponent");
+var endComponent = require("@internal/components-endComponent");
 var complain;
 
 function createRendererFunc(templateRenderFunc, componentProps) {
@@ -22,38 +22,38 @@ function createRendererFunc(templateRenderFunc, componentProps) {
     var widgetConfig = input.widgetConfig;
 
     var componentsContext = getComponentsContext(out);
-    var globalComponentsContext = componentsContext.k_;
+    var globalComponentsContext = componentsContext.r_;
 
-    var component = globalComponentsContext._w_;
+    var component = globalComponentsContext.aB_;
 
     var isRerender = component !== undefined;
     var id = assignedId;
     var isExisting;
-    var parentComponentDef = componentsContext.p_;
-    var ownerComponentDef = out.m_;
+    var parentComponentDef = componentsContext.q_;
+    var ownerComponentDef = out.aa_;
     var ownerComponentId = ownerComponentDef && ownerComponentDef.id;
-    var key = out.o_;
-    var customEvents = out.aQ_;
+    var key = out.ab_;
+    var customEvents = out.bc_;
 
-    out.m_ = null;
+    out.aa_ = null;
 
     if (component) {
       id = component.id;
       isExisting = true;
-      globalComponentsContext._w_ = null;
+      globalComponentsContext.aB_ = null;
     } else {
       if (key != null) {
         id = id || resolveComponentKey(key.toString(), parentComponentDef);
       } else if (parentComponentDef) {
-        id = parentComponentDef._R_();
+        id = parentComponentDef.aO_();
       } else {
-        id = globalComponentsContext._R_();
+        id = globalComponentsContext.aO_();
       }
     }
 
-    if (registry.aR_ && typeName) {
+    if (registry._J_ && typeName) {
       if (renderingLogic) delete renderingLogic.onRender;
-      component = registry._T_(renderingLogic, id, input, out, typeName, customEvents, ownerComponentId);
+      component = registry._G_(renderingLogic, id, input, out, typeName, customEvents, ownerComponentId);
       if (isSplit || widgetState) {
         component.input = null;
       } else if (input.widgetProps) {
@@ -76,7 +76,7 @@ function createRendererFunc(templateRenderFunc, componentProps) {
           isExisting = false;
           // We need to create a new instance of the component
           if (typeName) {
-            component = registry._T_(typeName, id);
+            component = registry._G_(typeName, id);
           }
         }
       }
@@ -88,10 +88,10 @@ function createRendererFunc(templateRenderFunc, componentProps) {
       isFakeComponent = true;
       component = {
         id: id,
-        q_: {}
+        N_: {}
       };
     } else {
-      component.___ = true;
+      component._c_ = true;
 
       if (widgetState) {
         component.state = widgetState;
@@ -99,25 +99,25 @@ function createRendererFunc(templateRenderFunc, componentProps) {
     }
 
     component.widgetConfig = widgetConfig;
-    component._U_ = widgetBody || component._U_;
+    component.___ = widgetBody || component.___;
 
     var componentDef = beginComponent(componentsContext, component, key, ownerComponentDef, isSplit, isFakeComponent);
-    var parentLegacyComponentDef = componentsContext.aN_;
-    componentsContext.aN_ = componentDef;
+    var parentLegacyComponentDef = componentsContext.ba_;
+    componentsContext.ba_ = componentDef;
 
     // This is a hack, but we have to swap out the component instance stored with this node
-    var vComponentNode = out.r_;
+    var vComponentNode = out.ac_;
 
-    componentDef.n_ = isFakeComponent ? null : component;
-    componentDef._L_ = isExisting;
-    componentDef.ar_ = true;
+    componentDef.v_ = isFakeComponent ? null : component;
+    componentDef._u_ = isExisting;
+    componentDef.B_ = true;
 
     componentDef.t = function (typeName) {
       if (typeName) {
-        if (registry.aR_) {
+        if (registry._J_) {
           var oldComponent = component;
           if (renderingLogic) delete renderingLogic.onRender;
-          component = registry._T_(renderingLogic || {}, id, input, out, typeName, customEvents, ownerComponentId);
+          component = registry._G_(renderingLogic || {}, id, input, out, typeName, customEvents, ownerComponentId);
           if (isSplit || widgetState) {
             component.input = null;
           } else if (input.widgetProps) {
@@ -127,32 +127,32 @@ function createRendererFunc(templateRenderFunc, componentProps) {
           Object.assign(component, oldComponent);
           beginComponent(componentsContext, component, key, ownerComponentDef, isSplit, false, this);
         } else {
-          vComponentNode.n_ = component = registry._T_(typeName, component.id);
+          vComponentNode.v_ = component = registry._G_(typeName, component.id);
         }
-        this.n_ = component;
+        this.v_ = component;
       }
     };
 
-    if (!registry.aR_) {
-      component.aJ_ && component.aJ_();
+    if (!registry._J_) {
+      component.O_ && component.O_();
     }
 
     // Render the template associated with the component using the final template
     // data that we constructed
     templateRenderFunc(input, out, componentDef, componentDef, component);
 
-    if (customEvents && componentDef.n_) {
-      if (registry.aR_) {
-        componentDef.U_ = customEvents;
-        componentDef.M_ = ownerComponentId;
+    if (customEvents && componentDef.v_) {
+      if (registry._J_) {
+        componentDef.X_ = customEvents;
+        componentDef.Y_ = ownerComponentId;
       } else {
-        componentDef.n_._A_(customEvents, ownerComponentId);
+        componentDef.v_.aE_(customEvents, ownerComponentId);
       }
     }
 
     endComponent(out, componentDef);
-    componentsContext.p_ = parentComponentDef;
-    componentsContext.aN_ = parentLegacyComponentDef;
+    componentsContext.q_ = parentComponentDef;
+    componentsContext.ba_ = parentLegacyComponentDef;
   };
 }