@marko/translator-default 5.29.1 → 5.30.0

package/dist/placeholder/index[html].js

@@ -1,5 +1,10 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
 var _babelUtils = require("@marko/babel-utils");
+
+
+
+
+
 var _toString = _interopRequireDefault(require("marko/src/runtime/helpers/to-string"));
 var _escapeXml = require("marko/src/runtime/html/helpers/escape-xml");
 var _escapeScriptPlaceholder = _interopRequireDefault(require("marko/src/runtime/html/helpers/escape-script-placeholder"));
@@ -31,15 +36,15 @@ function _default(path) {
     node,
     hub: { file }
   } = path;
-  const { confident, value: computed } = path.get("value").evaluate();
+  const computed = (0, _babelUtils.computeNode)(node.value);
   let { escape, value } = node;
 
   if (escape) {
     const tagName = findParentTagName(path);
     const escapeType = ESCAPE_TYPES[tagName] || ESCAPE_TYPES.html;
 
-    value = confident ?
-    _compiler.types.stringLiteral(escapeType.fn(computed)) :
+    value = computed ?
+    _compiler.types.stringLiteral(escapeType.fn(computed.value)) :
     _compiler.types.callExpression(
     escapeType.name ?
     (0, _babelUtils.importNamed)(
@@ -52,8 +57,8 @@ function _default(path) {
     [value]);
 
   } else {
-    value = confident ?
-    _compiler.types.stringLiteral((0, _toString.default)(computed)) :
+    value = computed ?
+    _compiler.types.stringLiteral((0, _toString.default)(computed.value)) :
     _compiler.types.callExpression(
     (0, _babelUtils.importDefault)(
     file,

package/dist/placeholder/index[vdom].js

@@ -1,13 +1,14 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _vdomOutWrite = _interopRequireDefault(require("../util/vdom-out-write"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _babelUtils = require("@marko/babel-utils");
+var _vdomOutWrite = _interopRequireDefault(require("../util/vdom-out-write"));
 var _withPreviousLocation = _interopRequireDefault(require("../util/with-previous-location"));
 
 function _default(path) {
   const { node } = path;
   const { escape, value } = node;
   const method = escape ? "t" : "h";
-  const { confident, value: computed } = path.get("value").evaluate();
+  const computed = (0, _babelUtils.computeNode)(value);
 
-  if (confident && !computed) {
+  if (computed && computed.value == null) {
     path.remove();
   } else {
     path.replaceWith(

package/dist/tag/attribute/directives/class.js

@@ -9,27 +9,29 @@ var _withPreviousLocation = _interopRequireDefault(require("../../../util/with-p
       hub: { file }
     } = tag;
     if (!(0, _babelUtils.isNativeTag)(tag)) return;
-    if (value.isStringLiteral()) return;
 
-    const { confident, value: computed } = value.evaluate();
+    const computed = (0, _babelUtils.computeNode)(value.node);
+    if (computed) {
+      const str = (0, _classValue.default)(computed.value);
+      if (str) {
+        value.replaceWith(_compiler.types.stringLiteral(str));
+      } else {
+        value.parentPath.remove();
+      }
+    } else {
+      value.replaceWith(
+      (0, _withPreviousLocation.default)(
+      _compiler.types.callExpression(
+      (0, _babelUtils.importDefault)(
+      file,
+      "marko/src/runtime/helpers/class-value.js",
+      "marko_class_merge"),
 
-    const s = (0, _classValue.default)(computed);
-    value.replaceWith(
-    confident ?
-    s ?
-    _compiler.types.stringLiteral(s) :
-    _compiler.types.nullLiteral() :
-    (0, _withPreviousLocation.default)(
-    _compiler.types.callExpression(
-    (0, _babelUtils.importDefault)(
-    file,
-    "marko/src/runtime/helpers/class-value.js",
-    "marko_class_merge"),
+      [value.node]),
 
-    [value.node]),
-
-    value.node));
+      value.node));
 
 
+    }
   }
 };exports.default = _default;

package/dist/tag/attribute/directives/no-update-body-if.js

@@ -2,6 +2,9 @@
 var _babelUtils = require("@marko/babel-utils");var _default =
 
 {
+  enter(tag) {
+    tag.node.isPreserved = true;
+  },
   exit(tag, attr, value) {
     _noUpdate.default.exit(tag, attr, value, {
       if: (0, _babelUtils.getArgOrSequence)(attr),

package/dist/tag/attribute/directives/no-update-body.js

@@ -1,6 +1,9 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _noUpdate = _interopRequireDefault(require("./no-update"));var _default =
 
 {
+  enter(tag) {
+    tag.node.isPreserved = true;
+  },
   exit(tag, attr, value) {
     _noUpdate.default.exit(tag, attr, value, { bodyOnly: true });
   }

package/dist/tag/attribute/directives/no-update-if.js

@@ -2,6 +2,9 @@
 var _babelUtils = require("@marko/babel-utils");var _default =
 
 {
+  enter(tag) {
+    tag.node.isPreserved = true;
+  },
   exit(tag, attr, value) {
     _noUpdate.default.exit(tag, attr, value, { if: (0, _babelUtils.getArgOrSequence)(attr) });
   }

package/dist/tag/attribute/directives/no-update.js

@@ -3,6 +3,9 @@ var _babelUtils = require("@marko/babel-utils");
 const EMPTY_OBJECT = {};var _default =
 
 {
+  enter(tag) {
+    tag.node.isPreserved = true;
+  },
   exit(tag, attr, _, opts = EMPTY_OBJECT) {
     attr.remove();
     const { node } = tag;

package/dist/tag/attribute/directives/style.js

@@ -8,24 +8,30 @@ var _withPreviousLocation = _interopRequireDefault(require("../../../util/with-p
     const {
       hub: { file }
     } = tag;
-    if (value.isStringLiteral()) return;
     if (!(0, _babelUtils.isNativeTag)(tag)) return;
 
-    const { confident, value: computed } = value.evaluate();
-    value.replaceWith(
-    (0, _withPreviousLocation.default)(
-    confident ?
-    _compiler.types.stringLiteral((0, _styleValue.default)(computed) || "") :
-    _compiler.types.callExpression(
-    (0, _babelUtils.importDefault)(
-    file,
-    "marko/src/runtime/helpers/style-value.js",
-    "marko_style_merge"),
+    const computed = (0, _babelUtils.computeNode)(value.node);
+    if (computed) {
+      const str = (0, _styleValue.default)(computed.value);
+      if (str) {
+        value.replaceWith(_compiler.types.stringLiteral(str));
+      } else {
+        value.parentPath.remove();
+      }
+    } else {
+      value.replaceWith(
+      (0, _withPreviousLocation.default)(
+      _compiler.types.callExpression(
+      (0, _babelUtils.importDefault)(
+      file,
+      "marko/src/runtime/helpers/style-value.js",
+      "marko_style_merge"),
 
-    [value.node]),
+      [value.node]),
 
-    value.node));
+      value.node));
 
 
+    }
   }
 };exports.default = _default;

package/dist/tag/dynamic-tag.js

@@ -18,7 +18,9 @@ function _default(path) {
     tagProperties.push(
     _compiler.types.objectProperty(
     _compiler.types.identifier("pa"),
-    _compiler.types.arrayExpression(node.preserveAttrs.map((name) => _compiler.types.stringLiteral(name)))));
+    _compiler.types.arrayExpression(
+    node.preserveAttrs.map((name) => _compiler.types.stringLiteral(name)))));
+
 
 
   }

package/dist/tag/native-tag[html]/attributes.js

@@ -4,105 +4,116 @@ var _attr = _interopRequireDefault(require("marko/src/runtime/html/helpers/attr"
 var _util = require("../util");
 
 function _default(path, attrs) {
-  if (!attrs.length) return _compiler.types.stringLiteral("");
-
   const len = attrs.length;
   if (len === 0) return _compiler.types.stringLiteral("");
+  if (len === 1 && attrs[0].node.type === "MarkoSpreadAttribute") {
+    return _compiler.types.callExpression(
+    (0, _babelUtils.importDefault)(
+    path.hub.file,
+    "marko/src/runtime/html/helpers/attrs.js",
+    "marko_attrs"),
+
+    [attrs[0].node.value]);
+
+  }
+
+  if (attrs.some((attr) => attr.node.type === "MarkoSpreadAttribute")) {
+    const attrsObjects = [];
+    let props;
 
-  if (attrs.some((attr) => !attr.node.name)) {
-    const attrsObject = _compiler.types.objectExpression([]);
     for (let i = 0; i < len; i++) {
+      const attr = attrs[i];
       const {
         node: { name, value }
-      } = attrs[i];
+      } = attr;
 
       if (name) {
-        attrsObject.properties.push(
-        _compiler.types.objectProperty(_compiler.types.stringLiteral(name), value));
-
+        const computed = (0, _util.evaluateAttr)(attr);
+        const prop = _compiler.types.objectProperty(
+        _compiler.types.stringLiteral(name),
+        (computed == null ? void 0 : computed.value) !== undefined ?
+        _compiler.types.stringLiteral(computed.value) :
+        value);
+
+        if (props) {
+          props.push(prop);
+        } else {
+          attrsObjects.push(_compiler.types.objectExpression(props = [prop]));
+        }
       } else {
-        mergeSpread(attrsObject.properties, value);
+        attrsObjects.push(value);
+        props = undefined;
       }
     }
 
     return _compiler.types.callExpression(
     (0, _babelUtils.importDefault)(
     path.hub.file,
-    "marko/src/runtime/html/helpers/attrs.js",
-    "marko_attrs"),
-
-    [
-    attrsObject.properties.length === 1 &&
-    _compiler.types.isSpreadElement(attrsObject.properties[0]) ?
-    attrsObject.properties[0].argument :
-    attrsObject]);
+    "marko/src/runtime/html/helpers/merge-attrs.js",
+    "marko_merge_attrs"),
 
+    attrsObjects);
 
-  } else {
-    const file = path.hub.file;
-    const quasis = [];
-    const expressions = [];
-    const attrValues = new Map();
-    let curString = "";
-
-    // Remove duplicate attrs so last one wins.
-    for (let i = len; i--;) {
-      const attr = attrs[i];
-      const { name, value } = attr.node;
-      if (attrValues.has(name)) continue;
-      const { confident, computed } = (0, _util.evaluateAttr)(attr);
-      attrValues.set(name, {
-        confident,
-        computed,
-        value
-      });
-    }
+  }
 
-    for (const [name, { confident, computed, value }] of [
-    ...attrValues].
-    reverse()) {
-      if (confident) {
-        if (computed == null || computed === false) {
-          continue;
-        }
+  const file = path.hub.file;
+  const quasis = [];
+  const expressions = [];
+  const attrValues = new Map();
+  let curString = "";
+
+  // Remove duplicate attrs so last one wins.
+  for (let i = len; i--;) {
+    const attr = attrs[i];
+    const { name, value } = attr.node;
+    if (attrValues.has(name)) continue;
+    const computed = (0, _util.evaluateAttr)(attr);
+    attrValues.set(
+    name,
+    computed ?
+    {
+      confident: true,
+      computed: computed.value,
+      value
+    } :
+    {
+      confident: false,
+      computed: undefined,
+      value
+    });
 
-        curString += (0, _attr.default)(name, computed);
-      } else {
-        quasis.push(curString);
-        curString = "";
-        expressions.push(
-        _compiler.types.callExpression(
-        (0, _babelUtils.importDefault)(
-        file,
-        "marko/src/runtime/html/helpers/attr.js",
-        "marko_attr"),
+  }
 
-        [_compiler.types.stringLiteral(name), value]));
+  for (const [name, { confident, computed, value }] of [
+  ...attrValues].
+  reverse()) {
+    if (confident) {
+      if (computed == null || computed === false) {
+        continue;
+      }
 
+      curString += (0, _attr.default)(name, computed);
+    } else {
+      quasis.push(curString);
+      curString = "";
+      expressions.push(
+      _compiler.types.callExpression(
+      (0, _babelUtils.importDefault)(
+      file,
+      "marko/src/runtime/html/helpers/attr.js",
+      "marko_attr"),
 
-      }
-    }
+      [_compiler.types.stringLiteral(name), value]));
 
-    quasis.push(curString);
 
-    if (expressions.length) {
-      return (0, _babelUtils.normalizeTemplateString)(quasis, ...expressions);
-    } else {
-      return _compiler.types.stringLiteral(quasis.join(""));
     }
   }
-}
 
-function mergeSpread(properties, value) {
-  if (_compiler.types.isObjectExpression(value)) {
-    for (const prop of value.properties) {
-      if (_compiler.types.isSpreadElement(prop)) {
-        mergeSpread(properties, prop.argument);
-      } else {
-        properties.push(prop);
-      }
-    }
+  quasis.push(curString);
+
+  if (expressions.length) {
+    return (0, _babelUtils.normalizeTemplateString)(quasis, ...expressions);
   } else {
-    properties.push(_compiler.types.spreadElement(value));
+    return _compiler.types.stringLiteral(quasis.join(""));
   }
 }

package/dist/tag/native-tag[html]/index.js

@@ -75,7 +75,9 @@ function _default(path, isNullable) {
     tagProperties.push(
     _compiler.types.objectProperty(
     _compiler.types.identifier("pa"),
-    _compiler.types.arrayExpression(node.preserveAttrs.map((name) => _compiler.types.stringLiteral(name)))));
+    _compiler.types.arrayExpression(
+    node.preserveAttrs.map((name) => _compiler.types.stringLiteral(name)))));
+
 
 
   }

package/dist/tag/native-tag[vdom]/attributes.js

@@ -0,0 +1,104 @@
+"use strict";exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
+var _babelUtils = require("@marko/babel-utils");
+var _util = require("../util");
+
+function _default(path, attrs) {
+  const len = attrs.length;
+  if (len === 0) return _compiler.types.nullLiteral();
+  if (len === 1 && attrs[0].node.type === "MarkoSpreadAttribute") {
+    return _compiler.types.callExpression(
+    (0, _babelUtils.importDefault)(
+    path.hub.file,
+    "marko/src/runtime/vdom/helpers/attrs.js",
+    "marko_attrs"),
+
+    [attrs[0].node.value]);
+
+  }
+
+  if (attrs.some((attr) => attr.node.type === "MarkoSpreadAttribute")) {
+    const attrsObjects = [];
+    let props;
+
+    for (let i = 0; i < len; i++) {
+      const attr = attrs[i];
+      const {
+        node: { name, value }
+      } = attr;
+
+      if (name) {
+        const computed = (0, _util.evaluateAttr)(attr);
+        const prop = _compiler.types.objectProperty(
+        _compiler.types.stringLiteral(name),
+        (computed == null ? void 0 : computed.value) !== undefined ?
+        _compiler.types.stringLiteral(computed.value) :
+        value);
+
+        if (props) {
+          props.push(prop);
+        } else {
+          attrsObjects.push(_compiler.types.objectExpression(props = [prop]));
+        }
+      } else {
+        attrsObjects.push(value);
+        props = undefined;
+      }
+    }
+
+    return _compiler.types.callExpression(
+    (0, _babelUtils.importDefault)(
+    path.hub.file,
+    "marko/src/runtime/vdom/helpers/merge-attrs.js",
+    "marko_merge_attrs"),
+
+    attrsObjects);
+
+  }
+
+  const attrValues = new Map();
+  const props = [];
+
+  // Remove duplicate attrs so last one wins.
+  for (let i = len; i--;) {
+    const attr = attrs[i];
+    const { name, value } = attr.node;
+    if (attrValues.has(name)) continue;
+    const computed = (0, _util.evaluateAttr)(attr);
+    attrValues.set(
+    name,
+    computed ?
+    {
+      confident: true,
+      computed: computed.value,
+      value
+    } :
+    {
+      confident: false,
+      computed: undefined,
+      value
+    });
+
+  }
+
+  for (const [name, { confident, computed, value }] of [
+  ...attrValues].
+  reverse()) {
+    if (confident) {
+      if (computed == null || computed === false) {
+        continue;
+      }
+
+      props.push(
+      _compiler.types.objectProperty(_compiler.types.stringLiteral(name), _compiler.types.stringLiteral(computed)));
+
+    } else {
+      props.push(_compiler.types.objectProperty(_compiler.types.stringLiteral(name), value));
+    }
+  }
+
+  if (props.length) {
+    return _compiler.types.objectExpression(props);
+  }
+
+  return _compiler.types.nullLiteral();
+}

package/dist/tag/native-tag[vdom]/index.js

@@ -1,12 +1,8 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;exports.tagArguments = tagArguments;var _compiler = require("@marko/compiler");
 var _vdomOutWrite = _interopRequireDefault(require("../../util/vdom-out-write"));
 var FLAGS = _interopRequireWildcard(require("../../util/runtime-flags"));
-var _util = require("../util");
 var _babelUtils = require("@marko/babel-utils");
-
-
-
-
+var _attributes = _interopRequireDefault(require("./attributes"));
 var _withPreviousLocation = _interopRequireDefault(require("../../util/with-previous-location"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
 
 const SIMPLE_ATTRS = ["id", "class", "style"];
@@ -30,48 +26,11 @@ function tagArguments(path, isStatic) {
     handlers
   } = node;
   const tagProperties = path.node.extra && path.node.extra.properties || [];
-  const attrs = path.get("attributes");
-  const seen = new Set();
-  const len = attrs.length;
-  const hasSpread = attrs.some((attr) => !attr.node.name);
+  const attrsObj = (0, _attributes.default)(path, path.get("attributes"));
   let runtimeFlags = 0;
 
-  for (let i = len; i--;) {
-    const attr = attrs[i];
-    const { name } = attr.node;
-    if (seen.has(name)) {
-      if (!hasSpread) attr.remove();
-    }
-
-    seen.add(name);
-    const { confident, computed } = (0, _util.evaluateAttr)(attr);
-
-    if (confident) {
-      if (computed == null || computed === false) {
-        if (!hasSpread) attr.remove();
-      } else {
-        attr.set("value", _compiler.types.stringLiteral(computed));
-      }
-    }
-  }
-
-  let attrsObj = (0, _util.getAttrs)(path, true, true);
-
-  if (!_compiler.types.isNullLiteral(attrsObj)) {
-    if (
-    !_compiler.types.isObjectExpression(attrsObj) ||
-    attrsObj.properties.some(_compiler.types.isSpreadElement))
-    {
-      runtimeFlags |= FLAGS.SPREAD_ATTRS;
-      attrsObj = _compiler.types.callExpression(
-      (0, _babelUtils.importDefault)(
-      file,
-      "marko/src/runtime/vdom/helpers/attrs.js",
-      "marko_attrs"),
-
-      [attrsObj]);
-
-    }
+  if (!_compiler.types.isNullLiteral(attrsObj) && !_compiler.types.isObjectExpression(attrsObj)) {
+    runtimeFlags |= FLAGS.SPREAD_ATTRS;
   }
 
   const writeArgs = [
@@ -90,7 +49,9 @@ function tagArguments(path, isStatic) {
     tagProperties.push(
     _compiler.types.objectProperty(
     _compiler.types.identifier("pa"),
-    _compiler.types.arrayExpression(node.preserveAttrs.map((name) => _compiler.types.stringLiteral(name)))));
+    _compiler.types.arrayExpression(
+    node.preserveAttrs.map((name) => _compiler.types.stringLiteral(name)))));
+
 
 
   }

package/dist/tag/util.js

@@ -1,5 +1,7 @@
-"use strict";exports.__esModule = true;exports.buildEventHandlerArray = buildEventHandlerArray;exports.evaluateAttr = evaluateAttr;exports.getAttrs = getAttrs;var _compiler = require("@marko/compiler");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildEventHandlerArray = buildEventHandlerArray;exports.evaluateAttr = evaluateAttr;exports.getAttrs = getAttrs;var _compiler = require("@marko/compiler");
 var _babelUtils = require("@marko/babel-utils");
+var _classValue = _interopRequireDefault(require("marko/src/runtime/helpers/class-value"));
+var _styleValue = _interopRequireDefault(require("marko/src/runtime/helpers/style-value"));
 
 function getAttrs(path, preserveNames, skipRenderBody) {
   const { node } = path;
@@ -155,32 +157,44 @@ function buildEventHandlerArray(path) {
 
 }
 
-function evaluateAttr(attr) {
-  const name = attr.get("name").node;
-  const value = attr.get("value");
-  let confident = false;
-  let computed = undefined;
+function evaluateAttr(attr) {var _classToString, _styleToString;
+  const computed = (0, _babelUtils.computeNode)(attr.node.value);
+  if (computed) {
+    const { value } = computed;
+    switch (attr.node.name) {
+      case "class":
+        return {
+          value: (_classToString = (0, _classValue.default)(value)) == null ? void 0 : _classToString.replace(/\s+/, " ").trim()
+        };
+      case "style":
+        return {
+          value: (_styleToString = (0, _styleValue.default)(value)) == null ? void 0 : _styleToString.
+          replace(/\s+/, " ").
+          trim().
+          replace(/;$/, "")
+        };}
+
+
+    if (value == null || value === false) {
+      return { value: undefined };
+    }
 
-  if (name) {
-    if (value.isRegExpLiteral()) {
-      confident = true;
-      computed = value.get("pattern").node;
-    } else {
-      const evaluated = value.evaluate();
-      ({ confident, value: computed } = evaluated);
+    if (value === true) {
+      return { value: "" };
+    }
+
+    if (typeof value === "object") {
+      switch (value.toString) {
+        case Object.prototype.toString:
+        case Array.prototype.toString:
+          return { value: JSON.stringify(value) };
+        case RegExp.prototype.toString:
+          return { value: value.source };}
 
-      if (computed === true) {
-        computed = "";
-      } else if (computed != null && computed !== false) {
-        computed = computed + "";
-      }
     }
-  }
 
-  return {
-    confident,
-    computed
-  };
+    return { value: value + "" };
+  }
 }
 
 function camelCase(string) {

package/dist/taglib/core/index.js

@@ -82,7 +82,8 @@ var parseModuleCode = _interopRequireWildcard(require("./parse-module-code"));fu
       displayText: "static <statement>",
       description:
       "A JavaScript statement which is only evaluated once your template is loaded.",
-      descriptionMoreURL: "https://markojs.com/docs/syntax/#static-javascript"
+      descriptionMoreURL:
+      "https://markojs.com/docs/syntax/#static-javascript"
     }]
 
   },
@@ -284,7 +285,7 @@ var parseModuleCode = _interopRequireWildcard(require("./parse-module-code"));fu
   },
   "<await>": {
     renderer: "marko/src/core-tags/core/await/renderer.js",
-    types: "marko/src/core-tags/core/await/index.marko",
+    types: "marko/src/core-tags/core/await/index.d.marko",
     "code-generator": translateAwait,
     "@_provider": "expression",
     "@_name": "string",

package/dist/taglib/core/translate-await.js

@@ -28,7 +28,9 @@ function enter(path) {
   _compiler.types.markoAttribute("_provider", provider.node));
 
 
-  if (!path.get("attributes").some((attr) => attr.get("name").node === "name")) {
+  if (
+  !path.get("attributes").some((attr) => attr.get("name").node === "name"))
+  {
     path.pushContainer(
     "attributes",
     _compiler.types.markoAttribute("_name", _compiler.types.stringLiteral(provider.toString())));

package/dist/taglib/core/translate-for.js

@@ -44,7 +44,11 @@ function exit(path) {
     block);
 
   } else if (ofAttr) {
-    let ofAttrValue = ofAttr.value;
+    let ofAttrValue = _compiler.types.logicalExpression(
+    "||",
+    ofAttr.value,
+    _compiler.types.arrayExpression([]));
+
     allowedAttributes.push("of");
 
     const [valParam, keyParam, loopParam] = params;

package/dist/util/add-dependencies.js

@@ -1,8 +1,13 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _path = _interopRequireDefault(require("path"));
 var _magicString = _interopRequireDefault(require("magic-string"));
 var _compiler = require("@marko/compiler");
+var _resolveFrom = _interopRequireDefault(require("resolve-from"));
 var _babelUtils = require("@marko/babel-utils");var _default =
 
+
+
+
+
 (entryFile, isHydrate) => {
   const { resolveVirtualDependency, hydrateIncludeImports } =
   entryFile.markoOpts;
@@ -15,7 +20,6 @@ var _babelUtils = require("@marko/babel-utils");var _default =
     return;
   }
 
-  const registerId = _compiler.types.identifier("register");
   const watchFiles = new Set();
   let hasComponents = false;
   let splitComponentIndex = 0;
@@ -32,7 +36,7 @@ var _babelUtils = require("@marko/babel-utils");var _default =
 
     if (splitComponentIndex) {
       markoComponentsImport.specifiers.push(
-      _compiler.types.importSpecifier(registerId, registerId));
+      _compiler.types.importSpecifier(_compiler.types.identifier("register"), _compiler.types.identifier("register")));
 
     }
     markoComponentsImport.specifiers.push(_compiler.types.importSpecifier(initId, initId));
@@ -86,6 +90,15 @@ var _babelUtils = require("@marko/babel-utils");var _default =
         if (!hydratedFiles.has(resolvePath(file, tag))) {
           addHydrateDeps((0, _babelUtils.loadFileForImport)(file, tag));
         }
+      } else {
+        const importedTemplates = tryGetTemplateImports(file, tag);
+        if (importedTemplates) {
+          for (const templateFile of importedTemplates) {
+            if (!hydratedFiles.has(resolvePath(file, templateFile))) {
+              addHydrateDeps((0, _babelUtils.loadFileForImport)(file, templateFile));
+            }
+          }
+        }
       }
     }
 
@@ -104,7 +117,7 @@ var _babelUtils = require("@marko/babel-utils");var _default =
       program.pushContainer(
       "body",
       _compiler.types.expressionStatement(
-      _compiler.types.callExpression(registerId, [
+      _compiler.types.callExpression(_compiler.types.identifier("register"), [
       _compiler.types.stringLiteral(meta.id),
       splitComponentId])));
 
@@ -168,6 +181,62 @@ var _babelUtils = require("@marko/babel-utils");var _default =
   }
 };exports.default = _default;
 
+function tryGetTemplateImports(file, rendererRelativePath) {
+  const resolvedRendererPath = _path.default.join(
+  file.opts.filename,
+  "..",
+  rendererRelativePath);
+
+  let templateImports;
+
+  try {
+    for (const statement of (0, _babelUtils.parseStatements)(
+    file,
+    file.markoOpts.fileSystem.readFileSync(resolvedRendererPath, "utf-8")))
+    {
+      if (statement.type === "ImportDeclaration") {
+        addImport(statement.source.value);
+      } else {
+        _compiler.types.traverseFast(statement, (node) => {
+          if (
+          node.type === "CallExpression" && (
+          node.callee.name === "require" ||
+          node.callee.type === "MemberExpression" &&
+          node.callee.object.type === "Identifier" &&
+          node.callee.object.name === "require" &&
+          node.callee.property.type === "Identifier" &&
+          node.callee.property.name === "resolve") &&
+          node.arguments.length === 1 &&
+          node.arguments[0].type === "StringLiteral")
+          {
+            addImport(node.arguments[0].value);
+          }
+        });
+      }
+    }
+  } catch {
+
+    // Ignore
+  }
+  return templateImports;
+
+  function addImport(request) {
+    if (request.endsWith(".marko")) {
+      const resolvedTemplatePath =
+      request[0] === "." ?
+      _path.default.resolve(resolvedRendererPath, "..", request) :
+      _resolveFrom.default.silent(_path.default.dirname(resolvedRendererPath), request);
+      if (resolvedTemplatePath) {
+        if (templateImports) {
+          templateImports.push(resolvedTemplatePath);
+        } else {
+          templateImports = [resolvedTemplatePath];
+        }
+      }
+    }
+  }
+}
+
 function toTestFn(val) {
   if (typeof val === "function") {
     return val;

package/dist/util/optimize-vdom-create.js

@@ -6,10 +6,16 @@ var _babelUtils = require("@marko/babel-utils");
 
 
 
+
 var _keyManager = require("./key-manager");
 var _vdomOutWrite = _interopRequireDefault(require("./vdom-out-write"));
 var _nativeTagVdom = require("../tag/native-tag[vdom]");
-var _directives = _interopRequireDefault(require("../tag/attribute/directives"));
+
+const skipDirectives = new Set([
+"no-update",
+"no-update-if",
+"no-update-body",
+"no-update-body-if"]);
 
 const staticNodes = new WeakSet();
 
@@ -22,10 +28,14 @@ const mergeStaticCreateVisitor = {
 
   },
   MarkoPlaceholder(path, state) {
-    const { value } = path.get("value").evaluate();
+    const computed = (0, _babelUtils.computeNode)(path.node.value);
     state.currentRoot = _compiler.types.callExpression(
     _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
-    [_compiler.types.stringLiteral(value != null ? value.toString() : "")]);
+    [
+    _compiler.types.stringLiteral(
+    computed && computed.value != null ? `${computed.value}` : "")]);
+
+
 
   },
   MarkoTag(path, state) {
@@ -44,8 +54,8 @@ const analyzeStaticVisitor = {
   },
   MarkoPlaceholder(path) {
     if (path.node.escape) {
-      const { confident } = path.get("value").evaluate();
-      if (confident) {
+      const computed = (0, _babelUtils.computeNode)(path.node.value);
+      if (computed) {
         staticNodes.add(path.node);
       }
     }
@@ -68,24 +78,18 @@ const analyzeStaticVisitor = {
       // check attributes
       isStatic =
       isStatic &&
-      path.get("attributes").every((attr) => {
-        if (
-        !_compiler.types.isMarkoAttribute(attr) ||
-        attr.node.arguments ||
-        attr.node.modifier ||
-        _directives.default[attr.node.name])
-
-        return false;
-
-        const attrValue = attr.get("value");
-        const exclude =
-        _compiler.types.isObjectExpression(attrValue) ||
-        _compiler.types.isArrayExpression(attrValue) ||
-        _compiler.types.isRegExpLiteral(attrValue);
-        if (exclude) return false;
-        const { confident } = attrValue.evaluate();
-        return confident;
-      });
+      path.
+      get("attributes").
+      every(
+      (attr) =>
+      _compiler.types.isMarkoAttribute(attr) &&
+      !(
+      attr.node.arguments ||
+      attr.node.modifier ||
+      skipDirectives.has(attr.node.name) ||
+      !(0, _babelUtils.computeNode)(attr.node.value)));
+
+
 
       // check children
       isStatic =

package/package.json

@@ -1,26 +1,7 @@
 {
   "name": "@marko/translator-default",
+  "version": "5.30.0",
   "description": "Translates Marko templates to the default Marko runtime.",
-  "version": "5.29.1",
-  "author": "Dylan Piercey <dpiercey@ebay.com>",
-  "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
-  "dependencies": {
-    "@babel/runtime": "^7.16.0",
-    "@marko/babel-utils": "^6.2.0",
-    "escape-string-regexp": "^4.0.0",
-    "magic-string": "^0.27.0",
-    "self-closing-tags": "^1.0.1"
-  },
-  "devDependencies": {
-    "@marko/compiler": "^5.31.1",
-    "marko": "^5.29.1"
-  },
-  "files": [
-    "dist",
-    "index.d.ts"
-  ],
-  "types": "index.d.ts",
-  "homepage": "https://github.com/marko-js/marko/blob/master/packages/translator-default/README.md",
   "keywords": [
     "babel",
     "htmljs",
@@ -29,10 +10,34 @@
     "parser",
     "plugin"
   ],
+  "homepage": "https://github.com/marko-js/marko/blob/master/packages/translator-default/README.md",
+  "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/marko-js/marko/tree/master/packages/translator-default"
+  },
   "license": "MIT",
+  "author": "Dylan Piercey <dpiercey@ebay.com>",
   "main": "dist/index.js",
-  "main:dev": "src/index.js",
-  "main:npm": "dist/index.js",
+  "types": "index.d.ts",
+  "files": [
+    "dist",
+    "index.d.ts"
+  ],
+  "scripts": {
+    "build": "babel ./src --out-dir ./dist --delete-dir-on-start --copy-files --config-file ../../babel.config.js --env-name=production"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.16.0",
+    "@marko/babel-utils": "^6.3.0",
+    "escape-string-regexp": "^4.0.0",
+    "magic-string": "^0.27.0",
+    "self-closing-tags": "^1.0.1"
+  },
+  "devDependencies": {
+    "@marko/compiler": "^5.32.0",
+    "marko": "^5.30.0"
+  },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",
     "marko": "^5.17.2"
@@ -40,8 +45,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/marko-js/marko/tree/master/packages/translator-default"
-  }
+  "main:dev": "src/index.js",
+  "main:npm": "dist/index.js"
 }