@marko/translator-default 5.24.0 → 5.25.0

package/dist/index.js

@@ -468,6 +468,8 @@ function getRuntimeEntryFiles(output, optimize) {
   `${base}runtime/helpers/dynamic-tag.js`,
   `${base}runtime/helpers/load-nested-tag.js`,
   `${base}runtime/helpers/merge.js`,
+  `${base}runtime/helpers/repeatable.js`,
+  `${base}runtime/helpers/self-iterator.js`,
   `${base}runtime/helpers/render-tag.js`,
   `${base}runtime/helpers/style-value.js`,
   `${base}runtime/helpers/to-string.js`,

package/dist/tag/attribute-tag.js

@@ -6,6 +6,7 @@ var _babelUtils = require("@marko/babel-utils");
 
 
 
+
 var _util = require("./util");
 var _withPreviousLocation = _interopRequireDefault(require("../util/with-previous-location"));
 
@@ -14,13 +15,13 @@ const parentIdentifierLookup = new WeakMap();
 
 // TODO: optimize inline repeated @tags.
 
-function _default(path) {
-  const { node } = path;
-  const namePath = path.get("name");
+function _default(tag) {
+  const { node } = tag;
+  const namePath = tag.get("name");
   const tagName = namePath.node.value;
-  const parentPath = (0, _babelUtils.findParentTag)(path);
+  const parentPath = (0, _babelUtils.findParentTag)(tag);
 
-  (0, _babelUtils.assertNoArgs)(path);
+  (0, _babelUtils.assertNoArgs)(tag);
 
   if (!parentPath) {
     throw namePath.buildCodeFrameError(
@@ -29,10 +30,10 @@ function _default(path) {
   }
 
   const parentAttributes = parentPath.get("attributes");
-  const tagDef = (0, _babelUtils.getTagDef)(path);
+  const tagDef = (0, _babelUtils.getTagDef)(tag);
   const { isRepeated, targetProperty = tagName.slice(1) } =
   tagDef || EMPTY_OBJECT;
-  const isDynamic = isRepeated || parentPath !== path.parentPath.parentPath;
+  const isDynamic = isRepeated || parentPath !== tag.parentPath.parentPath;
   parentPath.node.exampleAttributeTag = node;
 
   if (isDynamic) {
@@ -49,28 +50,40 @@ function _default(path) {
       }
     }
   } else {
-    if (
-    parentAttributes.some((attr) => attr.get("name").node === targetProperty))
-    {
-      throw namePath.buildCodeFrameError(
-      `Only one "${tagName}" tag is allowed here.`);
+    const previousAttr = parentAttributes.find(
+    (attr) => attr.get("name").node === targetProperty);
 
-    }
 
-    let attrs = (0, _util.getAttrs)(path);
+    if (previousAttr) {
+      const previousValue = previousAttr.get("value").node;
+      if (_compiler.types.isObjectExpression(previousValue)) {
+        previousAttr.set(
+        "value",
+        _compiler.types.arrayExpression([previousValue, getAttrTagObject(tag)]));
 
-    if (_compiler.types.isNullLiteral(attrs)) {
-      // TODO: this could be left as a null literal, but would require changes in the
-      // await tag runtime to handle `<@catch/>`. (this would be a breaking change though)
-      attrs = _compiler.types.objectExpression([]);
-    }
+      } else if (_compiler.types.isArrayExpression(previousAttr)) {
+        previousAttr.elements.push(getAttrTagObject(tag));
+      } else {
+        previousAttr.set(
+        "value",
+        _compiler.types.callExpression(
+        (0, _babelUtils.importDefault)(
+        tag.hub.file,
+        "marko/src/runtime/helpers/repeatable.js",
+        "marko_repeatable"),
+
+        [previousValue, getAttrTagObject(tag)]));
 
-    parentPath.pushContainer(
-    "attributes",
-    _compiler.types.markoAttribute(targetProperty, attrs));
 
+      }
+    } else {
+      parentPath.pushContainer(
+      "attributes",
+      _compiler.types.markoAttribute(targetProperty, getAttrTagObject(tag)));
+
+    }
 
-    path.remove();
+    tag.remove();
     return;
   }
 
@@ -84,7 +97,7 @@ function _default(path) {
 
   if (!identifier) {
     identifier = identifiers[targetProperty] =
-    path.scope.generateUidIdentifier(targetProperty);
+    tag.scope.generateUidIdentifier(targetProperty);
     parentPath.
     get("body").
     unshiftContainer(
@@ -103,22 +116,33 @@ function _default(path) {
   }
 
   if (isRepeated) {
-    path.replaceWith(
+    tag.replaceWith(
     (0, _withPreviousLocation.default)(
     _compiler.types.expressionStatement(
     _compiler.types.callExpression(
     _compiler.types.memberExpression(identifier, _compiler.types.identifier("push")),
-    [(0, _util.getAttrs)(path)])),
+    [getAttrTagObject(tag)])),
 
 
     node));
 
 
   } else {
-    path.replaceWith(
+    tag.replaceWith(
     (0, _withPreviousLocation.default)(
     _compiler.types.expressionStatement(
-    _compiler.types.assignmentExpression("=", identifier, (0, _util.getAttrs)(path))),
+    _compiler.types.assignmentExpression(
+    "=",
+    identifier,
+    _compiler.types.callExpression(
+    (0, _babelUtils.importDefault)(
+    tag.hub.file,
+    "marko/src/runtime/helpers/repeatable.js",
+    "marko_repeatable"),
+
+    [identifier, getAttrTagObject(tag)]))),
+
+
 
     node));
 
@@ -126,6 +150,30 @@ function _default(path) {
   }
 }
 
+function getAttrTagObject(tag) {
+  const attrs = (0, _util.getAttrs)(tag);
+  const iteratorProp = _compiler.types.objectProperty(
+  _compiler.types.memberExpression(_compiler.types.identifier("Symbol"), _compiler.types.identifier("iterator")),
+  (0, _babelUtils.importDefault)(
+  tag.hub.file,
+  "marko/src/runtime/helpers/self-iterator.js",
+  "marko_self_iterator"),
+
+  true);
+
+
+  if (_compiler.types.isNullLiteral(attrs)) {
+    return _compiler.types.objectExpression([iteratorProp]);
+  }
+
+  if (_compiler.types.isObjectExpression(attrs)) {
+    attrs.properties.push(iteratorProp);
+    return attrs;
+  }
+
+  return _compiler.types.objectExpression([iteratorProp, _compiler.types.spreadElement(attrs)]);
+}
+
 function isAttributeTagChild(tag) {
   if ((0, _babelUtils.isAttributeTag)(tag)) {
     return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/translator-default",
   "description": "Translates Marko templates to the default Marko runtime.",
-  "version": "5.24.0",
+  "version": "5.25.0",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -12,8 +12,8 @@
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.26.0",
-    "marko": "^5.24.0"
+    "@marko/compiler": "^5.27.0",
+    "marko": "^5.25.0"
   },
   "files": [
     "dist"