marko 4.26.3 → 4.27.0

package/src/core-tags/migrate/util/parseFor.js

@@ -8,60 +8,60 @@ var numberRegExp = /^-?(?:\d+|\d+\.\d*|\d*\.\d+|\d+\.\d+)$/;
 var tokenizer = require("../../../compiler/util/tokenizer").create([
   {
     name: "stringDouble",
-    pattern: /"(?:[^"]|\\")*"/
+    pattern: /"(?:[^"]|\\")*"/,
   },
   {
     name: "stringSingle",
-    pattern: /'(?:[^']|\\')*'/
+    pattern: /'(?:[^']|\\')*'/,
   },
   {
     name: "in",
-    pattern: /\s+in\s+/
+    pattern: /\s+in\s+/,
   },
   {
     name: "from",
-    pattern: /\s+from\s+/
+    pattern: /\s+from\s+/,
   },
   {
     name: "to",
-    pattern: /\s+to\s+/
+    pattern: /\s+to\s+/,
   },
   {
     name: "step",
-    pattern: /\s+step\s+/
+    pattern: /\s+step\s+/,
   },
   {
     name: "semicolon",
-    pattern: /[;]/
+    pattern: /[;]/,
   },
   {
     name: "separator",
-    pattern: /separator\s?=\s?/
+    pattern: /separator\s?=\s?/,
   },
   {
     name: "status-var",
-    pattern: /status-var\s?=\s?/
+    pattern: /status-var\s?=\s?/,
   },
   {
     name: "iterator",
-    pattern: /iterator\s?=\s?/
+    pattern: /iterator\s?=\s?/,
   },
   {
     name: "pipe",
-    pattern: /\s+\|\s+/
+    pattern: /\s+\|\s+/,
   },
   {
     name: "groupOpen",
-    pattern: /[{([]/
+    pattern: /[{([]/,
   },
   {
     name: "groupClose",
-    pattern: /[})\]]/
+    pattern: /[})\]]/,
   },
   {
     name: "array",
-    pattern: /array/
-  }
+    pattern: /array/,
+  },
 ]);
 
 var inRegExp =
@@ -204,7 +204,7 @@ module.exports = function (str) {
     }
   }
 
-  tokenizer.forEachToken(str, token => {
+  tokenizer.forEachToken(str, (token) => {
     switch (token.name) {
       case "groupOpen":
         depth++;
@@ -371,7 +371,7 @@ module.exports = function (str) {
       separator: separatorExpression,
       statusVarName: statusVarName,
       iterator: iteratorExpression,
-      isArray: isArray
+      isArray: isArray,
     };
   } else if (loopType === "ForEachProp") {
     return {
@@ -380,7 +380,7 @@ module.exports = function (str) {
       valueVarName: valueVarName,
       in: inExpression,
       separator: separatorExpression,
-      statusVarName: statusVarName
+      statusVarName: statusVarName,
     };
   } else if (loopType === "ForRange") {
     return {
@@ -388,7 +388,7 @@ module.exports = function (str) {
       varName: varName,
       from: fromExpression,
       to: toExpression,
-      step: stepExpression
+      step: stepExpression,
     };
   } else if (loopType === "For") {
     if (forTest == null) {
@@ -400,7 +400,7 @@ module.exports = function (str) {
       loopType: loopType,
       init: forInit,
       test: forTest,
-      update: forUpdate
+      update: forUpdate,
     };
   } else {
     throwError("Invalid for loop");

package/src/core-tags/migrate/util/renderCallToDynamicTag.js

@@ -5,7 +5,7 @@ module.exports = function renderCallToDynamicTag(ast, context) {
   const args = ast.args;
   const callee = ast.callee;
   const argsLength = args.length;
-  const outIndex = args.findIndex(arg => arg.name === "out");
+  const outIndex = args.findIndex((arg) => arg.name === "out");
   const calleeProperty = callee.property && callee.property.name;
 
   if (outIndex === -1) {
@@ -57,7 +57,7 @@ module.exports = function renderCallToDynamicTag(ast, context) {
                   null,
                   [builder.identifier("_"), builder.identifier("out")],
                   [ast]
-                )
+                ),
         });
       }
     }
@@ -87,18 +87,18 @@ function toAttributesOrSpread(val) {
 
   if (
     val.type === "ObjectExpression" &&
-    val.properties.every(prop => !prop.computed)
+    val.properties.every((prop) => !prop.computed)
   ) {
-    return val.properties.map(prop => ({
+    return val.properties.map((prop) => ({
       name: prop.literalKeyValue,
-      value: prop.value
+      value: prop.value,
     }));
   }
 
   return [
     {
       value: val,
-      spread: true
-    }
+      spread: true,
+    },
   ];
 }

package/src/core-tags/migrate/var-tag.js

@@ -19,10 +19,6 @@ module.exports = function nodeFactory(elNode, context) {
     return elNode;
   }
 
-  context.deprecate(
-    'The "<var>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var,-assign,-invoke-tags'
-  );
-
   if (
     firstChild &&
     firstChild.type === "Text" &&
@@ -39,7 +35,7 @@ module.exports = function nodeFactory(elNode, context) {
     lastChild.argument.value = lastChild.argument.value.trimRight();
   }
 
-  const scriptlets = elNode.attributes.map(attr => {
+  const scriptlets = elNode.attributes.map((attr) => {
     const name = attr.name;
     const val = attr.rawValue;
 
@@ -55,7 +51,7 @@ module.exports = function nodeFactory(elNode, context) {
     return builder.scriptlet({
       value: `var ${
         val == null ? name : `${name} = ${printJS(attr.value, context)}`
-      }`
+      }`,
     });
   });
 
@@ -63,7 +59,7 @@ module.exports = function nodeFactory(elNode, context) {
     return;
   }
 
-  scriptlets.forEach(scriptlet => elNode.insertSiblingBefore(scriptlet));
-  elNode.forEachChild(node => elNode.insertSiblingBefore(node));
+  scriptlets.forEach((scriptlet) => elNode.insertSiblingBefore(scriptlet));
+  elNode.forEachChild((node) => elNode.insertSiblingBefore(node));
   elNode.detach();
 };

package/src/express.js

@@ -46,7 +46,7 @@ function patchResponse(response) {
 
       if (data) {
         data = Object.assign(data, {
-          $global: Object.assign($global, data.$global)
+          $global: Object.assign($global, data.$global),
         });
       } else {
         data = { $global };

package/src/hot-reload.js

@@ -63,7 +63,7 @@ exports.enable = function (options) {
       hotReloadData = template[HOT_RELOAD_KEY] = {
         modifiedId: modifiedId,
         latest: template,
-        originals: {}
+        originals: {},
       };
     }
 
@@ -118,7 +118,7 @@ exports.enable = function (options) {
           originalTemplate,
           "_"
         );
-      }
+      },
     });
 
     return originalTemplate;
@@ -192,7 +192,7 @@ exports.handleFileModified = function (path, options) {
     handleFileModified();
     // If we taglib was modified then uncache *all* templates so that they will
     // all be reloaded
-    Object.keys(require.cache).forEach(filename => {
+    Object.keys(require.cache).forEach((filename) => {
       if (filename.endsWith(".marko") || filename.endsWith(".marko.js")) {
         delete require.cache[filename];
       }

package/src/node-require/index.js

@@ -140,7 +140,7 @@ function install(options) {
     requireExtensions[MARKO_EXTENSIONS] ||
     (requireExtensions[MARKO_EXTENSIONS] = []);
 
-  extensions.forEach(extension => {
+  extensions.forEach((extension) => {
     extension = normalizeExtension(extension);
     requireExtensions[extension] = markoRequireExtension;
     requireExtensions[MARKO_EXTENSIONS].push(extension);

package/src/node_modules/@internal/components-define-widget-legacy/index-browser.js

@@ -14,7 +14,7 @@ var stateToJSONDef = {
     return this;
   }
 };
-function noop() {}
+function noop() { }
 
 module.exports = function defineWidget(def, renderer) {
   def = def.Widget || def;
@@ -23,7 +23,7 @@ module.exports = function defineWidget(def, renderer) {
     return def;
   }
 
-  var ComponentClass = function () {};
+  var ComponentClass = function () { };
   var proto;
   var legacyInit;
 
@@ -78,47 +78,18 @@ module.exports = function defineWidget(def, renderer) {
     },
     set: function (newState) {
       newState = newState || {};
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        if (
-          Object.keys(newState).sort().join("") !==
-          Object.keys((this.___state && this.___state.___raw) || {})
-            .sort()
-            .join("")
-        )
-          complain(
-            "'widget.state = newState' has changed from merging the newState to replacing the old state."
-          );
-      }
-
       this.setState(newState);
     }
   });
 
   Object.defineProperty(proto, "__document", {
     get: function () {
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        complain("__document is deprecated");
-      }
       return this.___host;
     }
   });
 
   Object.defineProperty(proto, "el", {
     get: function () {
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        if (
-          this.___currentLegacyBindEl !==
-          (this.___rootNode && this.___rootNode.firstChild)
-        ) {
-          complain(
-            "this.el no longer returns the `w-bind` element and instead returns the first node in the template. Assign a key to the w-bind element and use getEl(key) instead."
-          );
-        }
-      }
-
       return this.___currentLegacyBindEl;
     }
   });
@@ -206,19 +177,7 @@ module.exports = function defineWidget(def, renderer) {
         this.___legacyInit && this.___legacyInit(this.widgetConfig || {});
         this.___legacyOnRender && this.___legacyOnRender({ firstRender: true });
         this.___legacyRender = legacyRender;
-
-        // eslint-disable-next-line no-constant-condition
-        if ("MARKO_DEBUG") {
-          Object.defineProperty(el, "__widget", {
-            configurable: true,
-            get: function () {
-              complain("__widget is deprecated");
-              return self;
-            }
-          });
-        } else {
-          el.__widget = this;
-        }
+        el.__widget = this;
       }
     } else if (el) {
       if (prevEl) {
@@ -300,17 +259,7 @@ module.exports = function defineWidget(def, renderer) {
     Component.renderSync = renderer.renderSync;
   }
 
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    Object.defineProperty(Component, "_isWidget", {
-      get: function () {
-        complain("_isWidget is deprecated");
-        return true;
-      }
-    });
-  } else {
-    Component._isWidget = true;
-  }
+  Component._isWidget = true;
 
   return Component;
 };

package/src/node_modules/@internal/components-entry-legacy/index-browser.js

@@ -3,8 +3,6 @@ var loader = require("@internal/loader");
 var getComponentForEl =
   require("@internal/components-util").___getComponentForEl;
 
-var complain = "MARKO_DEBUG" && require("complain");
-
 // expose legacy
 require("@internal/components-registry").___legacy = exports;
 exports.load = function (typeName) {
@@ -55,17 +53,9 @@ if (Widget) {
 var RenderResult = require("../../../runtime/RenderResult");
 
 RenderResult.prototype.getWidget = function () {
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    complain("getWidget is deprecated. use getComponent instead.");
-  }
   return this.getWidgets()[0];
 };
 RenderResult.prototype.getWidgets = function () {
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    complain("getWidgets is deprecated. use getComponents instead.");
-  }
   return RenderResult.prototype.getComponents
     .apply(this, arguments)
     .filter(function (component) {

package/src/runtime/RenderResult.js

@@ -1,5 +1,4 @@
 var domInsert = require("./dom-insert");
-var complain = "MARKO_DEBUG" && require("complain");
 
 function getRootNode(el) {
   var cur = el;
@@ -66,31 +65,19 @@ var proto = (RenderResult.prototype = {
   toString: function () {
     return this.___out.toString();
   },
-  document: typeof document === "object" && document
+  document: typeof document === "object" && document,
 });
 
 Object.defineProperty(proto, "html", {
   get: function () {
-    // eslint-disable-next-line no-constant-condition
-    if ("MARKO_DEBUG") {
-      complain(
-        'The "html" property is deprecated. Please use "toString" instead.'
-      );
-    }
     return this.toString();
-  }
+  },
 });
 
 Object.defineProperty(proto, "context", {
   get: function () {
-    // eslint-disable-next-line no-constant-condition
-    if ("MARKO_DEBUG") {
-      complain(
-        'The "context" property is deprecated. Please use "out" instead.'
-      );
-    }
     return this.___out;
-  }
+  },
 });
 
 // Add all of the following DOM methods to Component.prototype:

package/src/runtime/components/Component.js

@@ -1,8 +1,6 @@
 "use strict";
 /* jshint newcap:false */
 
-var complain = "MARKO_DEBUG" && require("complain");
-
 var domInsert = require("../dom-insert");
 var defaultCreateOut = require("../createOut");
 var getComponentsContext =
@@ -27,7 +25,7 @@ var slice = Array.prototype.slice;
 
 var COMPONENT_SUBSCRIBE_TO_OPTIONS;
 var NON_COMPONENT_SUBSCRIBE_TO_OPTIONS = {
-  addDestroyListener: false
+  addDestroyListener: false,
 };
 
 var emit = EventEmitter.prototype.emit;
@@ -254,13 +252,6 @@ Component.prototype = componentProto = {
         var keyedComponentRoot = this.___keyedElements[resolvedKey];
 
         if (keyedComponentRoot) {
-          // eslint-disable-next-line no-constant-condition
-          if ("MARKO_DEBUG") {
-            complain(
-              "Accessing the elements of a child component using 'component.getEl' is deprecated."
-            );
-          }
-
           return keyedComponentRoot.nodeType === 1 /** Node.ELEMENT_NODE */
             ? keyedComponentRoot
             : walkFragments(keyedComponentRoot);
@@ -287,12 +278,6 @@ Component.prototype = componentProto = {
   getComponent: function (key, index) {
     var rootNode = this.___keyedElements[resolveKeyHelper(key, index)];
     if (/\[\]$/.test(key)) {
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        complain(
-          "A repeated key[] was passed to getComponent. Use a non-repeating key if there is only one of these components."
-        );
-      }
       rootNode = rootNode && rootNode[Object.keys(rootNode)[0]];
     }
     return rootNode && componentsByDOMNode.get(rootNode);
@@ -604,12 +589,6 @@ Component.prototype = componentProto = {
   },
 
   get els() {
-    // eslint-disable-next-line no-constant-condition
-    if ("MARKO_DEBUG") {
-      complain(
-        'The "this.els" attribute is deprecated. Please use "this.getEls(key)" instead.'
-      );
-    }
     return (this.___rootNode ? this.___rootNode.nodes : []).filter(function (
       el
     ) {
@@ -641,7 +620,7 @@ Component.prototype = componentProto = {
   ___emitDestroy() {
     this.onDestroy && this.onDestroy();
     this.___emit("destroy");
-  }
+  },
 };
 
 componentProto.elId = componentProto.getElId;

package/src/runtime/components/ComponentDef.js

@@ -1,5 +1,4 @@
 "use strict";
-var complain = "MARKO_DEBUG" && require("complain");
 var w10Noop = require("warp10/constants").NOOP;
 var componentUtil = require("@internal/components-util");
 var attachBubblingEvent = componentUtil.___attachBubblingEvent;
@@ -53,11 +52,6 @@ ComponentDef.prototype = {
       return id;
     } else {
       if (typeof nestedId !== "string") {
-        // eslint-disable-next-line no-constant-condition
-        if ("MARKO_DEBUG") {
-          complain("Using non strings as keys is deprecated.");
-        }
-
         nestedId = String(nestedId);
       }
 
@@ -83,7 +77,7 @@ ComponentDef.prototype = {
 
   get ___type() {
     return this.___component.___type;
-  }
+  },
 };
 
 ComponentDef.prototype.nk = ComponentDef.prototype.___nextKey;
@@ -162,7 +156,7 @@ ComponentDef.___deserialize = function (o, types, global, registry) {
     id: id,
     ___component: component,
     ___domEvents: extra.d,
-    ___flags: extra.f || 0
+    ___flags: extra.f || 0,
   };
 };
 

package/src/runtime/components/ComponentsContext.js

@@ -47,7 +47,7 @@ ComponentsContext.prototype = {
     this.___out.global.___components = undefined;
 
     return componentDefs;
-  }
+  },
 };
 
 function getComponentsContext(out) {

package/src/runtime/components/ServerComponent.js

@@ -1,5 +1,4 @@
 "use strict";
-var complain = "MARKO_DEBUG" && require("complain");
 
 class ServerComponent {
   constructor(id, input, out, typeName, customEvents, scope) {
@@ -45,11 +44,6 @@ class ServerComponent {
       return id;
     } else {
       if (typeof nestedId !== "string") {
-        // eslint-disable-next-line no-constant-condition
-        if ("MARKO_DEBUG") {
-          complain("Using non strings as keys is deprecated.");
-        }
-
         nestedId = String(nestedId);
       }
 

package/src/runtime/components/State.js

@@ -9,7 +9,7 @@ function ensure(state, propertyName) {
       },
       set: function (value) {
         this.___set(propertyName, value, false /* ensure:false */);
-      }
+      },
     });
   }
 }
@@ -99,7 +99,7 @@ State.prototype = {
   },
   toJSON: function () {
     return this.___raw;
-  }
+  },
 };
 
 module.exports = State;

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

@@ -48,7 +48,7 @@ function handleNodeDetach(node) {
           if (parentNode) {
             parentNode.removeChild(node);
           }
-        }
+        },
       });
 
       return allowDetach;

package/src/runtime/components/dom-data.js

@@ -6,5 +6,5 @@ module.exports = {
   ___componentByDOMNode: new WeakMap(),
   ___detachedByDOMNode: new WeakMap(),
   ___keyByDOMNode: new WeakMap(),
-  ___ssrKeyedElementsByComponentId: {}
+  ___ssrKeyedElementsByComponentId: {},
 };

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

@@ -8,11 +8,6 @@ var defineRenderer;
 var defineWidget;
 
 module.exports = function defineComponent(def) {
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    require("complain")("defineComponent is deprecated");
-  }
-
   if (def.___isComponent) {
     return def;
   }

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

@@ -1,4 +1,3 @@
-var complain = "MARKO_DEBUG" && require("complain");
 var makeRenderable = require("../../renderable");
 var getComponentsContext =
   require("../ComponentsContext").___getComponentsContext;
@@ -10,11 +9,6 @@ var resolveComponentKey = modernRenderer.___resolveComponentKey;
 module.exports = function defineRenderer(renderingLogic) {
   var renderer = renderingLogic.renderer;
 
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    require("complain")("defineRenderer is deprecated");
-  }
-
   if (renderer && renderer.___isRenderer) {
     return renderer;
   }
@@ -128,16 +122,6 @@ module.exports = function defineRenderer(renderingLogic) {
         // widget config will be serialized.
         widgetConfig = getWidgetConfig(newProps, out);
       }
-      // eslint-disable-next-line no-constant-condition
-      if ("MARKO_DEBUG") {
-        if (widgetState && "widgetState" in templateData) {
-          complain("Passing widgetState as input is deprecated.");
-        }
-
-        if (widgetConfig && "widgetConfig" in templateData) {
-          complain("Passing widgetConfig as input is deprecated.");
-        }
-      }
 
       templateData.widgetProps = newProps;
       widgetBody && (templateData.renderBody = widgetBody);
@@ -153,6 +137,7 @@ module.exports = function defineRenderer(renderingLogic) {
   renderer.template = template;
 
   makeRenderable(renderer, renderer);
+  renderer.render = renderer.render.bind(this);
 
   return renderer;
 };