Merge pull request #1377 from marko-js/w-id-repeated

no id:scoped for repeated w-id
marko-js · Jul 3, 2019 · 676a6b7 · 676a6b7
2 parents 535daf9 + a80ad07
commit 676a6b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/core-tags/migrate/all-tags/w-id.js b/src/core-tags/migrate/all-tags/w-id.js
@@ -20,7 +20,9 @@ module.exports = function migrate(el, context) {
     el.setAttributeValue("key", attr.value);
     const isHTML = el.tagDef && el.tagDef.html;
     const isDynamic = Boolean(el.rawTagNameExpression);
-    if (!el.hasAttribute("id") && (isHTML || isDynamic))
+    const isRepeated =
+        attr.value.type === "Literal" && /\[\]$/.test(attr.value.value);
+    if (!el.hasAttribute("id") && !isRepeated && (isHTML || isDynamic))
         el.setAttributeValue("id:scoped", attr.value);
     el.removeAttribute(attr.name);
 };
diff --git a/test/migrate/fixtures/w-id/snapshot-expected.marko b/test/migrate/fixtures/w-id/snapshot-expected.marko
@@ -4,4 +4,6 @@
 <div key="a" id:scoped="a"/>
 <div key="b" id:scoped="b"/>
 <test key="c"/>
-<${tag} key="d" id:scoped="d"/>
+<${tag} key="d" id:scoped="d"/>
+<div key="e[]"/>
+<div key="e[]"/>
diff --git a/test/migrate/fixtures/w-id/template.marko b/test/migrate/fixtures/w-id/template.marko
@@ -1,4 +1,6 @@
 <div w-id="a"/>
 <div w-id="b"/>
 <test w-id="c"/>
-<${tag} w-id="d"/>
+<${tag} w-id="d"/>
+<div w-id="e[]"/>
+<div w-id="e[]"/>