marko 4.24.6 → 4.26.0

package/bin/markoc.js

@@ -99,7 +99,7 @@ var args = require("argly")
     "Delete all *.marko.js files in the current directory",
     "$0 . --clean"
   )
-  .validate(function(result) {
+  .validate(function (result) {
     if (result.help) {
       this.printUsage();
       process.exit(0);
@@ -116,7 +116,7 @@ var args = require("argly")
       process.exit(1);
     }
   })
-  .onError(function(err) {
+  .onError(function (err) {
     this.printUsage();
 
     if (err) {
@@ -151,7 +151,7 @@ if (force) {
 
 var paths = args.paths;
 if (paths && paths.length) {
-  paths.forEach(function(path) {
+  paths.forEach(function (path) {
     appModulePath.addPath(nodePath.resolve(cwd, path));
   });
 }
@@ -162,12 +162,12 @@ if (!ignoreRules) {
   ignoreRules = ["/node_modules", ".*"];
 }
 
-ignoreRules = ignoreRules.filter(function(s) {
+ignoreRules = ignoreRules.filter(function (s) {
   s = s.trim();
   return s && !s.match(/^#/);
 });
 
-ignoreRules = ignoreRules.map(function(pattern) {
+ignoreRules = ignoreRules.map(function (pattern) {
   return new Minimatch(pattern, mmOptions);
 });
 
@@ -223,10 +223,10 @@ function walk(files, options, done) {
   var fileCallback = options.file;
   var context = {
     errors: [],
-    beginAsync: function() {
+    beginAsync: function () {
       pending++;
     },
-    endAsync: function(err) {
+    endAsync: function (err) {
       if (err) {
         this.errors.push(err);
       }
@@ -245,17 +245,17 @@ function walk(files, options, done) {
 
   function doWalk(dir) {
     context.beginAsync();
-    fs.readdir(dir, function(err, list) {
+    fs.readdir(dir, function (err, list) {
       if (err) {
         return context.endAsync(err);
       }
 
       if (list.length) {
-        list.forEach(function(basename) {
+        list.forEach(function (basename) {
           var file = nodePath.join(dir, basename);
 
           context.beginAsync();
-          fs.stat(file, function(err, stat) {
+          fs.stat(file, function (err, stat) {
             if (err) {
               return context.endAsync(err);
             }
@@ -296,7 +296,7 @@ if (args.clean) {
   walk(
     args.files,
     {
-      file: function(file, context) {
+      file: function (file, context) {
         var basename = nodePath.basename(file);
 
         if (
@@ -305,7 +305,7 @@ if (args.clean) {
           basename.endsWith(".marko.xml.js")
         ) {
           context.beginAsync();
-          fs.unlink(file, function(err) {
+          fs.unlink(file, function (err) {
             if (err) {
               return context.endAsync(err);
             }
@@ -316,7 +316,7 @@ if (args.clean) {
         }
       }
     },
-    function() {
+    function () {
       if (deleteCount === 0) {
         console.log("No *.marko.js files were found. Already clean.");
       } else {
@@ -329,7 +329,7 @@ if (args.clean) {
   var compileCount = 0;
   var failed = [];
 
-  var compile = function(path, context) {
+  var compile = function (path, context) {
     if (found[path]) {
       return;
     }
@@ -348,7 +348,7 @@ if (args.clean) {
 
     context.beginAsync();
 
-    markoCompiler.compileFile(path, compileOptions, function(err, src) {
+    markoCompiler.compileFile(path, compileOptions, function (err, src) {
       if (err) {
         failed.push(
           'Failed to compile "' +
@@ -361,7 +361,7 @@ if (args.clean) {
       }
 
       context.beginAsync();
-      fs.writeFile(outPath, src, { encoding: "utf8" }, function(err) {
+      fs.writeFile(outPath, src, { encoding: "utf8" }, function (err) {
         if (err) {
           failed.push(
             'Failed to write "' + path + '". Error: ' + (err.stack || err)
@@ -382,7 +382,7 @@ if (args.clean) {
     walk(
       args.files,
       {
-        file: function(file, context) {
+        file: function (file, context) {
           var basename = nodePath.basename(file);
 
           if (
@@ -394,7 +394,7 @@ if (args.clean) {
           }
         }
       },
-      function(err) {
+      function (err) {
         if (err) {
           if (failed.length) {
             console.error(

package/dist/compiler/CompileContext.js

@@ -79,10 +79,7 @@ const helpers = {
     vdom: "marko/runtime/components/legacy/defineComponent-legacy",
     html: "marko/runtime/helpers/noop"
   },
-  "defineWidget-legacy": {
-    html: "marko/runtime/components/legacy/defineWidget-legacy",
-    vdom: "marko/runtime/components/legacy/defineWidget-legacy-browser"
-  },
+  "defineWidget-legacy": "marko/runtime/components/legacy/defineWidget-legacy",
   dynamicTag: "marko/runtime/helpers/dynamic-tag",
   escapeXml: {
     html: {
@@ -114,10 +111,8 @@ const helpers = {
   renderer: "marko/runtime/components/renderer",
   rendererLegacy: "marko/runtime/components/legacy/renderer-legacy",
   registerComponent: {
-    vdom: {
-      module: "marko/runtime/components/registry-browser",
-      method: "r"
-    }
+    module: "marko/runtime/components/registry",
+    method: "r"
   },
   str: "marko/runtime/helpers/to-string",
   styleValue: "marko/runtime/helpers/style-value",

package/dist/core-tags/components/init-components-tag.js

@@ -1,52 +1 @@
-"use strict";
-
-const INIT_COMPONENTS_KEY = Symbol();
-
-const addComponentsFromContext = require("../../runtime/components").f_;
-const getInitComponentsCode = require("../../runtime/components").g_;
-
-function addComponentsFromOut(source, target) {
-  const sourceOut = source.out || source;
-  const targetOut = target || sourceOut;
-  const componentsContext = sourceOut.h_;
-  const componentDefs = targetOut.writer.get("componentDefs");
-  addComponentsFromContext(componentsContext, componentDefs);
-}
-
-function addInitScript(writer) {
-  const out = writer.state.root;
-  const componentDefs = writer.get("componentDefs");
-  writer.script(getInitComponentsCode(out, componentDefs));
-}
-
-module.exports = function render(input, out) {
-  const $global = out.global;
-  if ($global[INIT_COMPONENTS_KEY] === undefined) {
-    $global[INIT_COMPONENTS_KEY] = true;
-
-    out.on("await:finish", addComponentsFromOut);
-    out.on("i_", addInitScript);
-
-    if (out.isSync() === true) {
-      // Generate initialization code for any of the UI components that were
-      // rendered synchronously
-      addComponentsFromOut(out);
-    } else {
-      // Generate initialization code for any of the UI components that were
-      // rendered asynchronously, but were outside an `<await>` tag
-      // (each `<await>` tag will have its own component initialization block)
-      const asyncOut = out.beginAsync({ last: true, timeout: -1 });
-      out.onLast(function (next) {
-        // Ensure we're getting init code starting from the root
-        let rootOut = out;
-        while (rootOut._parentOut) {
-          rootOut = rootOut._parentOut;
-        }
-        // Write out all of the component init code from the main out
-        addComponentsFromOut(rootOut, asyncOut);
-        asyncOut.end();
-        next();
-      });
-    }
-  }
-};
+module.exports = require("@internal/init-components-tag");

package/dist/core-tags/components/package.json

@@ -1,7 +1,5 @@
 {
     "browser": {
-        "./getRequirePath.js": "./getRequirePath-browser.js",
-        "./init-components-tag.js": "./init-components-tag-browser.js",
-        "./preserve-tag.js": "./preserve-tag-browser.js"
+        "./getRequirePath.js": "./getRequirePath-browser.js"
     }
 }

package/dist/core-tags/components/preferred-script-location-tag.js

@@ -3,9 +3,9 @@
 function forceScriptTagAtThisPoint(out) {
   const writer = out.writer;
 
-  out.global.j_ = true;
+  out.global.f_ = true;
   const htmlSoFar = writer.toString();
-  out.global.j_ = undefined;
+  out.global.f_ = undefined;
 
   writer.clear();
   writer.write(htmlSoFar);

package/dist/core-tags/components/preserve-tag.js

@@ -1,27 +1 @@
-var ComponentsContext = require("../../runtime/components/ComponentsContext");
-var getComponentsContext = ComponentsContext.u_;
-
-module.exports = function render(input, out) {
-  var shouldPreserve = Boolean(!("i" in input) || input.i);
-  var isComponent = !input.n;
-
-  if (isComponent) {
-    out.bf(out.o_, out.m_.n_, true);
-  }
-
-  if (input.renderBody) {
-    if (shouldPreserve) {
-      var componentsContext = getComponentsContext(out);
-      var parentPreserved = componentsContext.v_;
-      componentsContext.v_ = true;
-      input.renderBody(out);
-      componentsContext.v_ = parentPreserved;
-    } else {
-      input.renderBody(out);
-    }
-  }
-
-  if (isComponent) {
-    out.ef();
-  }
-};
+module.exports = require("@internal/preserve-tag");

package/dist/core-tags/core/await/AsyncValue.js

@@ -5,30 +5,30 @@ function AsyncValue() {
    * The data that was provided via call to resolve(data).
    * This property is assumed to be public and available for inspection.
    */
-  this.w_ = undefined;
+  this.g_ = undefined;
 
   /**
    * The data that was provided via call to reject(err)
    * This property is assumed to be public and available for inspection.
    */
-  this.x_ = undefined;
+  this.h_ = undefined;
 
   /**
    * The queue of callbacks that are waiting for data
    */
-  this.y_ = undefined;
+  this.i_ = undefined;
 
   /**
    * The state of the data holder (STATE_INITIAL, STATE_RESOLVED, or STATE_REJECTED)
    */
-  this.z_ = false;
+  this.j_ = false;
 }
 
 function notifyCallbacks(asyncValue, err, value) {
-  var callbacks = asyncValue.y_;
+  var callbacks = asyncValue.i_;
   if (callbacks) {
     // clear out the registered callbacks (we still have reference to the original value)
-    asyncValue.y_ = undefined;
+    asyncValue.i_ = undefined;
 
     // invoke all of the callbacks and use their scope
     for (var i = 0; i < callbacks.length; i++) {
@@ -46,14 +46,14 @@ AsyncValue.prototype = {
    * The given callback will be invoked when there is an error or resolved data
    * available.
    */
-  A_: function (callback) {
+  k_: function (callback) {
     // Do we already have data or error?
-    if (this.z_) {
+    if (this.j_) {
       // invoke the callback immediately
-      return callback(this.x_, this.w_);
+      return callback(this.h_, this.g_);
     }
 
-    var callbacks = this.y_ || (this.y_ = []);
+    var callbacks = this.i_ || (this.i_ = []);
     callbacks.push(callback);
   },
 
@@ -63,19 +63,19 @@ AsyncValue.prototype = {
    * its initial state so that any future requests to load data will trigger a
    * new load call.
    */
-  B_: function (err) {
-    if (this.z_) {
+  l_: function (err) {
+    if (this.j_) {
       return;
     }
 
     // remember the error
-    this.x_ = err;
+    this.h_ = err;
 
     // Go to the rejected state if we don't have a loader.
     // If we do have a loader then return to the initial state
     // (we do this so that next call to done() will trigger load
     // again in case the error was transient).
-    this.z_ = true;
+    this.j_ = true;
 
     // always notify callbacks regardless of whether or not we return to the initial state
     notifyCallbacks(this, err, null);
@@ -84,8 +84,8 @@ AsyncValue.prototype = {
   /**
    * This method will trigger any callbacks to be notified of data.
    */
-  C_: function (value) {
-    if (this.z_) {
+  m_: function (value) {
+    if (this.j_) {
       return;
     }
 
@@ -93,9 +93,9 @@ AsyncValue.prototype = {
       var asyncValue = this;
 
       var finalPromise = value.then(function onFulfilled(value) {
-        queueMicrotask(asyncValue.C_.bind(asyncValue, value));
+        queueMicrotask(asyncValue.m_.bind(asyncValue, value));
       }, function onRejected(err) {
-        queueMicrotask(asyncValue.B_.bind(asyncValue, err));
+        queueMicrotask(asyncValue.l_.bind(asyncValue, err));
       });
 
       if (finalPromise.done) {
@@ -103,10 +103,10 @@ AsyncValue.prototype = {
       }
     } else {
       // remember the state
-      this.w_ = value;
+      this.g_ = value;
 
       // go to the resolved state
-      this.z_ = true;
+      this.j_ = true;
 
       // notify callbacks
       notifyCallbacks(this, null, value);

package/dist/core-tags/core/await/renderer.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var complain;
-var isClientReorderSupported = require("./client-reorder").isSupported;
 var AsyncValue = require("./AsyncValue");
 
 function safeRenderBody(renderBody, targetOut, data) {
@@ -19,9 +18,9 @@ function requestData(provider, timeout) {
 
     var callback = function (err, data) {
       if (err) {
-        asyncValue.B_(err);
+        asyncValue.l_(err);
       } else {
-        asyncValue.C_(data);
+        asyncValue.m_(data);
       }
     };
     // eslint-disable-next-line no-constant-condition
@@ -32,11 +31,11 @@ function requestData(provider, timeout) {
     provider(null, callback);
 
     if (value !== undefined) {
-      asyncValue.C_(value);
+      asyncValue.m_(value);
     }
   } else {
     // Assume the provider is a data object...
-    asyncValue.C_(provider);
+    asyncValue.m_(provider);
   }
 
   if (timeout == null) {
@@ -53,10 +52,10 @@ function requestData(provider, timeout) {
       if (!error) error = new Error(errorMsg);
       error.code = "ERR_AWAIT_TIMEDOUT";
       error.name = "TimeoutError";
-      asyncValue.B_(error);
+      asyncValue.l_(error);
     }, timeout);
 
-    asyncValue.A_(function () {
+    asyncValue.k_(function () {
       if (timeoutId != null) {
         clearTimeout(timeoutId);
       }
@@ -69,7 +68,7 @@ function requestData(provider, timeout) {
 const LAST_OPTIONS = { last: true, name: "await:finish" };
 
 module.exports = function awaitTag(input, out) {
-  var clientReorder = isClientReorderSupported && input.clientReorder === true && !out.isVDOM;
+  var clientReorder = typeof document === "undefined" && input.clientReorder === true && !out.isVDOM;
 
   var name = input.name || input._name;
   var timeout = input.timeout;
@@ -77,8 +76,8 @@ module.exports = function awaitTag(input, out) {
   var asyncValue = requestData(provider, timeout);
   var placeholderRenderer = input.placeholder && input.placeholder.renderBody;
 
-  if (asyncValue.z_) {
-    renderContents(asyncValue.x_, asyncValue.w_, input, out);
+  if (asyncValue.j_) {
+    renderContents(asyncValue.h_, asyncValue.g_, input, out);
     return;
   }
 
@@ -94,7 +93,7 @@ module.exports = function awaitTag(input, out) {
   if (clientReorder) {
     awaitInfo.after = input.showAfter;
 
-    clientReorderContext = out.global.D_ || (out.global.D_ = {
+    clientReorderContext = out.global.n_ || (out.global.n_ = {
       instances: [],
       nextId: 0
     });
@@ -194,7 +193,7 @@ module.exports = function awaitTag(input, out) {
     }
   }
 
-  asyncValue.A_(renderBody);
+  asyncValue.k_(renderBody);
 };
 
 function renderContents(err, data, input, out) {

package/dist/core-tags/core/await/reorderer-renderer.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const clientReorder = require("./client-reorder");
+var escapeDoubleQuotes = require("../../../runtime/html/helpers/escape-quotes").o_;
 
 module.exports = function (input, out) {
   // We cannot call beginSync() when using renderSync(). In this case we will
@@ -19,7 +19,7 @@ module.exports = function (input, out) {
 
   global.__awaitReordererInvoked = true;
 
-  if (out.global.D_) {
+  if (out.global.n_) {
     out.flush();
   }
 
@@ -30,7 +30,7 @@ module.exports = function (input, out) {
   });
 
   out.onLast(function (next) {
-    var awaitContext = global.D_;
+    var awaitContext = global.n_;
     var remaining;
 
     // Validate that we have remaining <await> instances that need handled
@@ -41,13 +41,18 @@ module.exports = function (input, out) {
     }
 
     function handleAwait(awaitInfo) {
-      awaitInfo.out.on("i_", out.emit.bind(out, "i_")).on("finish", function (result) {
+      awaitInfo.out.on("p_", out.emit.bind(out, "p_")).on("finish", function (result) {
         if (!global._afRuntime) {
-          asyncOut.script(clientReorder.getCode());
+          // Minified version of ./client-reorder-runtime.js
+          asyncOut.script(`function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`);
           global._afRuntime = true;
         }
 
-        asyncOut.write('<div id="af' + awaitInfo.id + '" style="display:none">' + result.toString() + "</div>");
+        if (global.cspNonce) {
+          asyncOut.write('<style nonce="' + escapeDoubleQuotes(global.cspNonce) + '">' + "#af" + awaitInfo.id + "{display:none;}" + "</style>" + '<div id="af' + awaitInfo.id + '">' + result.toString() + "</div>");
+        } else {
+          asyncOut.write('<div id="af' + awaitInfo.id + '" style="display:none">' + result.toString() + "</div>");
+        }
 
         asyncOut.script("$af(" + (typeof awaitInfo.id === "number" ? awaitInfo.id : '"' + awaitInfo.id + '"') + (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") + ")");
 

package/dist/index.js

@@ -1,42 +1,4 @@
 "use strict";
 
-// the following development and legacy apis should not be included
-// when bundling the server with a tool like webpack
-
-if (!process.env.BUNDLE) {
-  if (process.env.MARKO_HOT_RELOAD) {
-    require("./hot-reload").enable();
-  }
-
-  // If process was launched with browser refresh then automatically
-  // enable browser-refresh
-  require("./browser-refresh").enable();
-
-  // Adds the template.getDependencies() method needed by older versions of lasso-marko
-  require("./runtime/components/legacy/dependencies/html");
-}
-
-function fixFlush() {
-  try {
-    var OutgoingMessage = require("http").OutgoingMessage;
-    if (OutgoingMessage.prototype.flush && OutgoingMessage.prototype.flush.toString().indexOf("deprecated") !== -1) {
-      // Yes, we are monkey-patching http. This method should never have been added and it was introduced on
-      // the iojs fork. It was quickly deprecated and I'm 99% sure no one is actually using it.
-      // See:
-      // - https://github.com/marko-js/async-writer/issues/3
-      // - https://github.com/nodejs/node/issues/2920
-      //
-      // This method causes problems since marko looks for the flush method and calls it found.
-      // The `res.flush()` method is introduced by the [compression](https://www.npmjs.com/package/compression)
-      // middleware, but, otherwise, it should typically not exist.
-      delete require("http").OutgoingMessage.prototype.flush;
-    }
-  } catch (e) {
-    /* ignore error */
-  }
-}
-
-fixFlush();
-
 exports.createOut = require("./runtime/createOut");
-exports.load = require("./loader");
+exports.load = require("@internal/loader");

package/dist/node-require/index.js

@@ -8,6 +8,17 @@ const fs = require("fs");
 const fsReadOptions = { encoding: "utf8" };
 const MARKO_EXTENSIONS = Symbol("MARKO_EXTENSIONS");
 
+if (process.env.MARKO_HOT_RELOAD) {
+  require("../hot-reload").enable();
+}
+
+// If process was launched with browser refresh then automatically
+// enable browser-refresh
+require("../browser-refresh").enable();
+
+// Adds the template.getDependencies() method needed by older versions of lasso-marko
+require("../runtime/components/legacy/dependencies/html");
+
 function normalizeExtension(extension) {
   if (extension.charAt(0) !== ".") {
     extension = "." + extension;

package/dist/node_modules/@internal/components-beginComponent/index-browser.js

@@ -0,0 +1,12 @@
+var ComponentDef = require("../../../runtime/components/ComponentDef");
+
+module.exports = function beginComponent(componentsContext, component, key, ownerComponentDef) {
+  var componentId = component.id;
+  var componentDef = componentsContext.q_ = new ComponentDef(component, componentId, componentsContext);
+  componentsContext.r_.s_[componentId] = true;
+  componentsContext.t_.push(componentDef);
+
+  var out = componentsContext.u_;
+  out.bc(component, key, ownerComponentDef && ownerComponentDef.v_);
+  return componentDef;
+};

package/dist/{runtime/components/beginComponent.js → node_modules/@internal/components-beginComponent/index.js}

@@ -1,10 +1,9 @@
 "use strict";
 
-const ComponentDef = require("./ComponentDef");
+const ComponentDef = require("../../../runtime/components/ComponentDef");
 
 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;
 
 module.exports = function beginComponent(componentsContext, component, key, ownerComponentDef, isSplitComponent, isImplicitComponent, existingComponentDef) {
@@ -12,13 +11,14 @@ module.exports = function beginComponent(componentsContext, component, key, owne
 
   // existingComponentDef is only here to allow binding a conditional
   // widget.  It should be removed when the legacy compat layer is removed.
-  var componentDef = existingComponentDef || (componentsContext.p_ = new ComponentDef(component, componentId, componentsContext));
+  var componentDef = existingComponentDef || (componentsContext.q_ = new ComponentDef(component, componentId, componentsContext));
 
-  var ownerIsRenderBoundary = ownerComponentDef && ownerComponentDef._M_;
-  var ownerWillRerender = ownerComponentDef && ownerComponentDef._N_ & FLAG_WILL_RERENDER_IN_BROWSER;
+  var ownerIsRenderBoundary = ownerComponentDef && ownerComponentDef.w_;
+  var ownerWillRerender = ownerComponentDef && ownerComponentDef.x_ & FLAG_WILL_RERENDER_IN_BROWSER;
   // On the server
-  if (!componentsContext.v_ && ownerWillRerender) {
-    componentDef._N_ |= FLAG_WILL_RERENDER_IN_BROWSER;
+  if (!componentsContext.y_ && ownerWillRerender) {
+    componentDef.x_ |= FLAG_WILL_RERENDER_IN_BROWSER;
+    componentDef._wrr = true;
     return componentDef;
   }
 
@@ -29,21 +29,21 @@ module.exports = function beginComponent(componentsContext, component, key, owne
     return componentDef;
   }
 
-  componentsContext.h_.push(componentDef);
+  componentsContext.t_.push(componentDef);
 
-  let out = componentsContext.E_;
+  let out = componentsContext.u_;
   let runtimeId = out.global.runtimeId;
 
-  componentDef._M_ = true;
-  componentDef.ah_ = componentsContext.v_;
+  componentDef.w_ = true;
+  componentDef.z_ = componentsContext.y_;
 
   if (isSplitComponent === false && out.global.noBrowserRerender !== true) {
-    componentDef._N_ |= FLAG_WILL_RERENDER_IN_BROWSER;
-    componentsContext.v_ = false;
+    componentDef.x_ |= FLAG_WILL_RERENDER_IN_BROWSER;
+    componentsContext.y_ = false;
   }
 
   if (out.global.oldHydrateNoCreate === true) {
-    componentDef._N_ |= FLAG_OLD_HYDRATE_NO_CREATE;
+    componentDef.x_ |= FLAG_OLD_HYDRATE_NO_CREATE;
   }
 
   if ((ownerIsRenderBoundary || ownerWillRerender) && key != null) {

package/dist/node_modules/@internal/components-beginComponent/package.json

@@ -0,0 +1,11 @@
+{
+  "main": "./index.js",
+  "browser": "./index-browser.js",
+  "exports": {
+    ".": {
+      "worker": "./index.js",
+      "browser": "./index-browser.js",
+      "default": "./index.js"
+    }
+  }
+}