fix: ensure unique function registry ids

marko-js · Feb 7, 2025 · 14ffe18 · 14ffe18
1 parent 9d1ea70
commit 14ffe18
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 32 deletions.
diff --git a/.changeset/young-days-raise.md b/.changeset/young-days-raise.md
@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Fix issue where function registry ids were not unique.
diff --git a/...ests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.hydrate.js b/...ests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 515 (min) 163 (brotli)
+// size: 515 (min) 165 (brotli)
 const _checkedValue = _$.state(4, (_scope, checkedValue) => {
   _$.controllable_input_checkedValue(
     _scope,
@@ -38,12 +38,12 @@ function _checkedValueChange3(_scope) {
     _checkedValue(_scope, _new_checkedValue);
   };
 }
-_$.effect("a2", (_scope) => {
+_$.effect("a3", (_scope) => {
   _$.controllable_input_checkedValue_effect(_scope, 0),
     _$.controllable_input_checkedValue_effect(_scope, 1),
     _$.controllable_input_checkedValue_effect(_scope, 2);
 }),
-  _$.register("a1", _checkedValueChange),
+  _$.register("a2", _checkedValueChange),
   _$.register("a1", _checkedValueChange2),
   _$.register("a0", _checkedValueChange3),
   init();
diff --git a/.../src/__tests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.js b/.../src/__tests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.js
@@ -31,7 +31,7 @@ function _checkedValueChange3(_scope) {
     _checkedValue(_scope, _new_checkedValue);
   };
 }
-_$.register("__tests__/template.marko_0/checkedValueChange_0", _checkedValueChange);
+_$.register("__tests__/template.marko_0/checkedValueChange_1", _checkedValueChange);
 _$.register("__tests__/template.marko_0/checkedValueChange_0", _checkedValueChange2);
 _$.register("__tests__/template.marko_0/checkedValueChange", _checkedValueChange3);
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _template_, _walks_, _setup_);
diff --git a/...src/__tests__/fixtures/controllable-checked-value/__snapshots__/html.expected/template.js b/...src/__tests__/fixtures/controllable-checked-value/__snapshots__/html.expected/template.js
@@ -8,7 +8,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     checkedValue = _new_checkedValue2;
   }, "__tests__/template.marko_0/checkedValueChange_0", _scope0_id), "b")} type=radio>${_$.markResumeNode(_scope0_id, "#input/1")}<input${_$.controllable_input_checkedValue(_scope0_id, "#input/2", checkedValue, _$.register(_new_checkedValue3 => {
     checkedValue = _new_checkedValue3;
-  }, "__tests__/template.marko_0/checkedValueChange_0", _scope0_id), "c")} type=radio>${_$.markResumeNode(_scope0_id, "#input/2")}<span>${_$.escapeXML(checkedValue)}${_$.markResumeNode(_scope0_id, "#text/3")}</span>`);
+  }, "__tests__/template.marko_0/checkedValueChange_1", _scope0_id), "c")} type=radio>${_$.markResumeNode(_scope0_id, "#input/2")}<span>${_$.escapeXML(checkedValue)}${_$.markResumeNode(_scope0_id, "#text/3")}</span>`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.debug(_$.writeScope(_scope0_id, {
     "checkedValue": checkedValue

diff --git a/.../__tests__/fixtures/controllable-checked-value/__snapshots__/resume.expected.md b/.../__tests__/fixtures/controllable-checked-value/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -60,7 +60,7 @@ container.querySelectorAll(`input`)[1].click();
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -100,7 +100,7 @@ container.querySelectorAll(`input`)[2].click();
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -140,7 +140,7 @@ container.querySelectorAll(`input`)[0].click();
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>

diff --git a/...src/__tests__/fixtures/controllable-checked-value/__snapshots__/ssr.expected.md b/...src/__tests__/fixtures/controllable-checked-value/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input value=a checked type=radio><!--M_*1 #input/0--><input value=b type=radio><!--M_*1 #input/1--><input value=c type=radio><!--M_*1 #input/2--><span>a<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()</script>
+  <input value=a checked type=radio><!--M_*1 #input/0--><input value=b type=radio><!--M_*1 #input/1--><input value=c type=radio><!--M_*1 #input/2--><span>a<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()</script>
 ```
 
 # Render End
@@ -29,7 +29,7 @@
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:_.a={"#input/0=":1,"#input/1=":1,"#input/2=":1,checkedValue:"a"}},_.a["#input/0;"]=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.a["#input/1;"]=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.a["#input/2;"]=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.b),1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>

diff --git a/...ixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.hydrate.js b/...ixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 558 (min) 238 (brotli)
+// size: 558 (min) 240 (brotli)
 const _input__effect = _$.effect("a0", (_scope) => _$.attrsEvents(_scope, 0)),
   _input_ = _$.value(2, (_scope, input) => {
     _$.attrs(_scope, 0, { type: "checkbox", ...input }), _input__effect(_scope);
@@ -47,5 +47,5 @@ function _checkedValueChange3(_scope) {
 }
 _$.register("b0", _checkedValueChange),
   _$.register("b1", _checkedValueChange2),
-  _$.register("b1", _checkedValueChange3),
+  _$.register("b2", _checkedValueChange3),
   init();
diff --git a/...ests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.js b/...ests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.js
@@ -43,5 +43,5 @@ function _checkedValueChange3(_scope) {
 }
 _$.register("__tests__/template.marko_0/checkedValueChange", _checkedValueChange);
 _$.register("__tests__/template.marko_0/checkedValueChange_0", _checkedValueChange2);
-_$.register("__tests__/template.marko_0/checkedValueChange_0", _checkedValueChange3);
+_$.register("__tests__/template.marko_0/checkedValueChange_1", _checkedValueChange3);
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _template_, _walks_, _setup_);
diff --git a/...sts__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js b/...sts__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
@@ -24,7 +24,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     checkedValue: checkedValue,
     checkedValueChange: _$.register(_new_checkedValue3 => {
       checkedValue = _new_checkedValue3;
-    }, "__tests__/template.marko_0/checkedValueChange_0", _scope0_id),
+    }, "__tests__/template.marko_0/checkedValueChange_1", _scope0_id),
     value: "c"
   });
   _$.write(`<span>${_$.escapeXML(checkedValue)}${_$.markResumeNode(_scope0_id, "#text/3")}</span>`);

diff --git a/...__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md b/...__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
     </script>
   </body>
 </html>
@@ -61,7 +61,7 @@ container.querySelector("input").click();
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
     </script>
   </body>
 </html>
@@ -102,7 +102,7 @@ container.querySelector("input").click();
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
     </script>
   </body>
 </html>
@@ -142,7 +142,7 @@ container.querySelector("input").click();
       <!--M_*1 #text/3-->
     </span>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.i={1:_.a={"#childScope/0":_.b={"#input/0=":1,"#input/0:":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"#input/0=":1,"#input/0:":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"#input/0=":1,"#input/0:":_.c,input:_.h={checkedValue:_.c,value:"c"}}},2:_.b,3:_.e,4:_.g},_.b["#input/0;"]=_.d.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange"](_.a),_.e["#input/0;"]=_.f.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_0"](_.a),_.g["#input/0;"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange_1"](_.a),_.i),2,"__tests__/tags/checkbox.marko_0_input",3,"__tests__/tags/checkbox.marko_0_input",4,"__tests__/tags/checkbox.marko_0_input",0];M._.w()
     </script>
   </body>
 </html>