marko 5.21.3 → 5.21.6

package/bin/markoc.js

@@ -65,6 +65,15 @@ var args = require("argly")
       type: "boolean",
       description: "Only print warnings and errors"
     },
+    "--migrate -m": {
+      type: "boolean",
+      description:
+        "Run any migrations that exist for the provided template and write changes to disk"
+    },
+    "--strip-types -t": {
+      type: "boolean",
+      description: "Strip all type information from the compiled template"
+    },
     "--browser -b": {
       type: "boolean",
       description: "Browser output"
@@ -123,12 +132,15 @@ var isForBrowser = false;
 if (args.browser) {
   output = "dom";
   isForBrowser = true;
+} else if (args.migrate) {
+  output = "migrate";
 }
 
 var compileOptions = {
   output: output,
   browser: isForBrowser,
   sourceOnly: false,
+  stripTypes: args.stripTypes,
   sourceMaps: args.sourceMaps || false,
   compilerType: "markoc",
   compilerVersion: markoPkgVersion || markocPkgVersion
@@ -325,7 +337,7 @@ if (args.clean) {
     }
 
     found[path] = true;
-    var outPath = path + ".js";
+    var outPath = args.migrate ? path : path + ".js";
 
     if (!args.quiet)
       console.log(

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

@@ -1,5 +1,8 @@
 "use strict";
 
+var escapeDoubleQuotes =
+require("../../../runtime/html/helpers/escape-quotes").y_;
+
 module.exports = function (input, out) {
   // We cannot call beginSync() when using renderSync(). In this case we will
   // ignore the await-reorderer tag.
@@ -54,13 +57,30 @@ module.exports = function (input, out) {
           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(" + (

package/dist/runtime/RenderResult.js

@@ -17,7 +17,7 @@ function getComponentDefs(result) {
 }
 
 function RenderResult(out) {
-  this.out = this.y_ = out;
+  this.out = this.z_ = out;
   this.b_ = undefined;
 }
 
@@ -47,10 +47,10 @@ var proto = RenderResult.prototype = {
   },
 
   afterInsert: function (host) {
-    var out = this.y_;
+    var out = this.z_;
     var componentsContext = out.b_;
     if (componentsContext) {
-      this.b_ = componentsContext.z_(host);
+      this.b_ = componentsContext.A_(host);
     } else {
       this.b_ = null;
     }
@@ -58,13 +58,13 @@ var proto = RenderResult.prototype = {
     return this;
   },
   getNode: function (host) {
-    return this.y_.A_(host);
+    return this.z_.B_(host);
   },
   getOutput: function () {
-    return this.y_.B_();
+    return this.z_.C_();
   },
   toString: function () {
-    return this.y_.toString();
+    return this.z_.toString();
   },
   document: typeof document === "object" && document };
 
@@ -89,7 +89,7 @@ Object.defineProperty(proto, "context", {
 
 
 
-    return this.y_;
+    return this.z_;
   } });
 
 

package/dist/runtime/components/Component.js

@@ -8,8 +8,8 @@ var defaultCreateOut = require("../createOut");
 var getComponentsContext =
 require("./ComponentsContext").o_;
 var componentsUtil = require("./util");
-var componentLookup = componentsUtil.C_;
-var destroyNodeRecursive = componentsUtil.D_;
+var componentLookup = componentsUtil.D_;
+var destroyNodeRecursive = componentsUtil.E_;
 var EventEmitter = require("events-light");
 var RenderResult = require("../RenderResult");
 var SubscriptionTracker = require("listener-tracker");
@@ -18,8 +18,8 @@ var updateManager = require("./update-manager");
 var morphdom = require("../vdom/morphdom");
 var eventDelegation = require("./event-delegation");
 var domData = require("./dom-data");
-var componentsByDOMNode = domData.E_;
-var keyedElementsByComponentId = domData.F_;
+var componentsByDOMNode = domData.F_;
+var keyedElementsByComponentId = domData.G_;
 var CONTEXT_KEY = "__subtree_context__";
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -66,7 +66,7 @@ extraArgs)
     args = extraArgs.concat(args);
   }
 
-  var targetComponent = componentLookup[component.G_];
+  var targetComponent = componentLookup[component.H_];
   var targetMethod =
   typeof targetMethodName === "function" ?
   targetMethodName :
@@ -128,8 +128,8 @@ function processUpdateHandlers(component, stateChanges, oldState) {
       handlerMethod.call(component, newValue, oldValue);
     });
 
-    component.H_();
     component.I_();
+    component.J_();
   }
 
   return true;
@@ -169,22 +169,22 @@ var componentProto;
 function Component(id) {
   EventEmitter.call(this);
   this.id = id;
-  this.J_ = null;
   this.K_ = null;
   this.L_ = null;
   this.M_ = null;
-  this.N_ = null; // Used to keep track of bubbling DOM events for components rendered on the server
-  this.O_ = null;
-  this.G_ = null;
+  this.N_ = null;
+  this.O_ = null; // Used to keep track of bubbling DOM events for components rendered on the server
   this.P_ = null;
-  this.Q_ = undefined;
-  this.R_ = false;
-  this.S_ = undefined;
-  this.T_ = false;
+  this.H_ = null;
+  this.Q_ = null;
+  this.R_ = undefined;
+  this.S_ = false;
+  this.T_ = undefined;
   this.U_ = false;
   this.V_ = false;
   this.W_ = false;
-  this.X_ = undefined;
+  this.X_ = false;
+  this.Y_ = undefined;
 
   var ssrKeyedElements = keyedElementsByComponentId[id];
 
@@ -197,7 +197,7 @@ function Component(id) {
 }
 
 Component.prototype = componentProto = {
-  Y_: true,
+  Z_: true,
 
   subscribeTo: function (target) {
     if (!target) {
@@ -205,10 +205,10 @@ Component.prototype = componentProto = {
     }
 
     var subscriptions =
-    this.L_ || (
-    this.L_ = new SubscriptionTracker());
+    this.M_ || (
+    this.M_ = new SubscriptionTracker());
 
-    var subscribeToOptions = target.Y_ ?
+    var subscribeToOptions = target.Z_ ?
     COMPONENT_SUBSCRIBE_TO_OPTIONS :
     NON_COMPONENT_SUBSCRIBE_TO_OPTIONS;
 
@@ -216,7 +216,7 @@ Component.prototype = componentProto = {
   },
 
   emit: function (eventType) {
-    var customEvents = this.O_;
+    var customEvents = this.P_;
     var target;
 
     if (customEvents && (target = customEvents[eventType])) {
@@ -303,20 +303,20 @@ Component.prototype = componentProto = {
     [];
   },
   destroy: function () {
-    if (this.T_) {
+    if (this.U_) {
       return;
     }
 
-    var root = this.K_;
+    var root = this.L_;
 
-    this.Z_();
+    this.___();
 
     var nodes = root.nodes;
 
     nodes.forEach(function (node) {
       destroyNodeRecursive(node);
 
-      if (eventDelegation.___(node) !== false) {
+      if (eventDelegation._a_(node) !== false) {
         node.parentNode.removeChild(node);
       }
     });
@@ -327,81 +327,81 @@ Component.prototype = componentProto = {
     this.k_ = {};
   },
 
-  Z_: function () {
-    if (this.T_) {
+  ___: function () {
+    if (this.U_) {
       return;
     }
 
-    this._a_();
-    this.T_ = true;
+    this._b_();
+    this.U_ = true;
 
-    componentsByDOMNode.set(this.K_, undefined);
+    componentsByDOMNode.set(this.L_, undefined);
 
-    this.K_ = null;
+    this.L_ = null;
 
     // Unsubscribe from all DOM events
-    this._b_();
+    this._c_();
 
-    var subscriptions = this.L_;
+    var subscriptions = this.M_;
     if (subscriptions) {
       subscriptions.removeAllListeners();
-      this.L_ = null;
+      this.M_ = null;
     }
   },
 
   isDestroyed: function () {
-    return this.T_;
+    return this.U_;
   },
   get state() {
-    return this.J_;
+    return this.K_;
   },
   set state(newState) {
-    var state = this.J_;
+    var state = this.K_;
     if (!state && !newState) {
       return;
     }
 
     if (!state) {
-      state = this.J_ = new this._c_(this);
+      state = this.K_ = new this._d_(this);
     }
 
-    state._d_(newState || {});
+    state._e_(newState || {});
 
-    if (state.V_) {
-      this._e_();
+    if (state.W_) {
+      this._f_();
     }
 
     if (!newState) {
-      this.J_ = null;
+      this.K_ = null;
     }
   },
   setState: function (name, value) {
-    var state = this.J_;
+    var state = this.K_;
 
     if (!state) {
-      state = this.J_ = new this._c_(this);
+      state = this.K_ = new this._d_(this);
     }
     if (typeof name == "object") {
       // Merge in the new state with the old state
       var newState = name;
       for (var k in newState) {
         if (hasOwnProperty.call(newState, k)) {
-          state._f_(k, newState[k], true /* ensure:true */);
+          state._g_(k, newState[k], true /* ensure:true */);
         }
       }
     } else {
-      state._f_(name, value, true /* ensure:true */);
+      state._g_(name, value, true /* ensure:true */);
     }
   },
 
   setStateDirty: function (name, value) {
-    var state = this.J_;
+    var state = this.K_;
 
     if (arguments.length == 1) {
       value = state[name];
     }
 
-    state._f_(
+    state._g_(
     name,
     value,
     true /* ensure:true */,
@@ -410,46 +410,46 @@ Component.prototype = componentProto = {
   },
 
   replaceState: function (newState) {
-    this.J_._d_(newState);
+    this.K_._e_(newState);
   },
 
   get input() {
-    return this.Q_;
+    return this.R_;
   },
   set input(newInput) {
-    if (this.W_) {
-      this.Q_ = newInput;
+    if (this.X_) {
+      this.R_ = newInput;
     } else {
-      this._g_(newInput);
+      this._h_(newInput);
     }
   },
 
-  _g_: function (newInput, onInput, out) {
+  _h_: function (newInput, onInput, out) {
     onInput = onInput || this.onInput;
     var updatedInput;
 
-    var oldInput = this.Q_;
-    this.Q_ = undefined;
-    this._h_ = out && out[CONTEXT_KEY] || this._h_;
+    var oldInput = this.R_;
+    this.R_ = undefined;
+    this._i_ = out && out[CONTEXT_KEY] || this._i_;
 
     if (onInput) {
       // We need to set a flag to preview `this.input = foo` inside
       // onInput causing infinite recursion
-      this.W_ = true;
+      this.X_ = true;
       updatedInput = onInput.call(this, newInput || {}, out);
-      this.W_ = false;
+      this.X_ = false;
     }
 
-    newInput = this.P_ = updatedInput || newInput;
+    newInput = this.Q_ = updatedInput || newInput;
 
-    if (this.V_ = checkInputChanged(this, oldInput, newInput)) {
-      this._e_();
+    if (this.W_ = checkInputChanged(this, oldInput, newInput)) {
+      this._f_();
     }
 
-    if (this.Q_ === undefined) {
-      this.Q_ = newInput;
+    if (this.R_ === undefined) {
+      this.R_ = newInput;
       if (newInput && newInput.$global) {
-        this.S_ = newInput.$global;
+        this.T_ = newInput.$global;
       }
     }
 
@@ -457,57 +457,57 @@ Component.prototype = componentProto = {
   },
 
   forceUpdate: function () {
-    this.V_ = true;
-    this._e_();
+    this.W_ = true;
+    this._f_();
   },
 
-  _e_: function () {
-    if (!this.U_) {
-      this.U_ = true;
-      updateManager._i_(this);
+  _f_: function () {
+    if (!this.V_) {
+      this.V_ = true;
+      updateManager._j_(this);
     }
   },
 
   update: function () {
-    if (this.T_ === true || this._j_ === false) {
+    if (this.U_ === true || this._k_ === false) {
       return;
     }
 
-    var input = this.Q_;
-    var state = this.J_;
+    var input = this.R_;
+    var state = this.K_;
 
-    if (this.V_ === false && state !== null && state.V_ === true) {
-      if (processUpdateHandlers(this, state._k_, state._l_, state)) {
-        state.V_ = false;
+    if (this.W_ === false && state !== null && state.W_ === true) {
+      if (processUpdateHandlers(this, state._l_, state._m_, state)) {
+        state.W_ = false;
       }
     }
 
-    if (this._j_ === true) {
+    if (this._k_ === true) {
       // The UI component is still dirty after process state handlers
       // then we should rerender
 
       if (this.shouldUpdate(input, state) !== false) {
-        this._m_();
+        this._n_();
       }
     }
 
-    this.I_();
+    this.J_();
   },
 
-  get _j_() {
+  get _k_() {
     return (
-      this.V_ === true ||
-      this.J_ !== null && this.J_.V_ === true);
+      this.W_ === true ||
+      this.K_ !== null && this.K_.W_ === true);
 
   },
 
-  I_: function () {
+  J_: function () {
+    this.W_ = false;
     this.V_ = false;
-    this.U_ = false;
-    this.P_ = null;
-    var state = this.J_;
+    this.Q_ = null;
+    var state = this.K_;
     if (state) {
-      state.I_();
+      state.J_();
     }
   },
 
@@ -515,72 +515,72 @@ Component.prototype = componentProto = {
     return true;
   },
 
-  _m_: function () {
+  _n_: function () {
     var self = this;
-    var renderer = self._n_;
+    var renderer = self._o_;
 
     if (!renderer) {
       throw TypeError();
     }
 
-    var input = this.P_ || this.Q_;
+    var input = this.Q_ || this.R_;
 
-    updateManager._o_(function () {
-      self._p_(input, false).afterInsert(self.X_);
+    updateManager._p_(function () {
+      self._q_(input, false).afterInsert(self.Y_);
     });
 
-    this.I_();
+    this.J_();
   },
 
-  _p_: function (input, isHydrate) {
-    var host = this.X_;
-    var globalData = this.S_;
-    var rootNode = this.K_;
-    var renderer = this._n_;
+  _q_: function (input, isHydrate) {
+    var host = this.Y_;
+    var globalData = this.T_;
+    var rootNode = this.L_;
+    var renderer = this._o_;
     var createOut = renderer.createOut || defaultCreateOut;
     var out = createOut(globalData);
     out.sync();
-    out.X_ = this.X_;
-    out[CONTEXT_KEY] = this._h_;
+    out.Y_ = this.Y_;
+    out[CONTEXT_KEY] = this._i_;
 
     var componentsContext = getComponentsContext(out);
     var globalComponentsContext = componentsContext.e_;
-    globalComponentsContext._q_ = this;
+    globalComponentsContext._r_ = this;
     globalComponentsContext.f_ = isHydrate;
 
     renderer(input, out);
 
     var result = new RenderResult(out);
 
-    var targetNode = out.B_()._r_;
+    var targetNode = out.C_()._s_;
 
     morphdom(rootNode, targetNode, host, componentsContext);
 
     return result;
   },
 
-  _s_: function () {
-    var root = this.K_;
+  _t_: function () {
+    var root = this.L_;
     root.remove();
     return root;
   },
 
-  _b_: function () {
-    var eventListenerHandles = this.M_;
+  _c_: function () {
+    var eventListenerHandles = this.N_;
     if (eventListenerHandles) {
       eventListenerHandles.forEach(removeListener);
-      this.M_ = null;
+      this.N_ = null;
     }
   },
 
-  get _t_() {
-    var state = this.J_;
-    return state && state._u_;
+  get _u_() {
+    var state = this.K_;
+    return state && state._v_;
   },
 
-  _v_: function (customEvents, scope) {
-    var finalCustomEvents = this.O_ = {};
-    this.G_ = scope;
+  _w_: function (customEvents, scope) {
+    var finalCustomEvents = this.P_ = {};
+    this.H_ = scope;
 
     customEvents.forEach(function (customEvent) {
       var eventType = customEvent[0];
@@ -595,7 +595,7 @@ Component.prototype = componentProto = {
   },
 
   get el() {
-    return walkFragments(this.K_);
+    return walkFragments(this.L_);
   },
 
   get els() {
@@ -605,43 +605,43 @@ Component.prototype = componentProto = {
 
 
 
-    return (this.K_ ? this.K_.nodes : []).filter(function (
+    return (this.L_ ? this.L_.nodes : []).filter(function (
     el)
     {
       return el.nodeType === ELEMENT_NODE;
     });
   },
 
-  _w_: emit,
-  _x_(input, out) {
+  _x_: emit,
+  _y_(input, out) {
     this.onCreate && this.onCreate(input, out);
-    this._w_("create", input, out);
+    this._x_("create", input, out);
   },
 
-  _y_(out) {
+  _z_(out) {
     this.onRender && this.onRender(out);
-    this._w_("render", out);
+    this._x_("render", out);
   },
 
-  H_() {
+  I_() {
     this.onUpdate && this.onUpdate();
-    this._w_("update");
+    this._x_("update");
   },
 
-  _z_() {
+  _A_() {
     this.onMount && this.onMount();
-    this._w_("mount");
+    this._x_("mount");
   },
 
-  _a_() {
+  _b_() {
     this.onDestroy && this.onDestroy();
-    this._w_("destroy");
+    this._x_("destroy");
   } };
 
 
 componentProto.elId = componentProto.getElId;
-componentProto._A_ = componentProto.update;
-componentProto._B_ = componentProto.destroy;
+componentProto._B_ = componentProto.update;
+componentProto._C_ = componentProto.destroy;
 
 // Add all of the following DOM methods to Component.prototype:
 // - appendTo(referenceEl)
@@ -653,7 +653,7 @@ componentProto._B_ = componentProto.destroy;
 domInsert(
 componentProto,
 function getEl(component) {
-  return component._s_();
+  return component._t_();
 },
 function afterInsert(component) {
   return component;