diff --git a/.changeset/lucky-onions-check.md b/.changeset/lucky-onions-check.md new file mode 100644 index 000000000..fe4306cf2 --- /dev/null +++ b/.changeset/lucky-onions-check.md @@ -0,0 +1,8 @@ +--- +"@marko/translator-tags": patch +"@marko/babel-utils": patch +"@marko/compiler": patch +"marko": patch +--- + +Partially revert #2380 which was causing non idempotent builds. diff --git a/.sizes.json b/.sizes.json index c1475cbc4..53faf82ca 100644 --- a/.sizes.json +++ b/.sizes.json @@ -14,22 +14,22 @@ { "name": "counter", "user": { - "min": 208, - "brotli": 146 + "min": 209, + "brotli": 147 }, "runtime": { "min": 3737, "brotli": 1580 }, "total": { - "min": 3945, - "brotli": 1726 + "min": 3946, + "brotli": 1727 } }, { "name": "counter 💧", "user": { - "min": 130, + "min": 131, "brotli": 125 }, "runtime": { @@ -37,14 +37,14 @@ "brotli": 1416 }, "total": { - "min": 3267, + "min": 3268, "brotli": 1541 } }, { "name": "comments", "user": { - "min": 1000, + "min": 1003, "brotli": 491 }, "runtime": { @@ -52,23 +52,23 @@ "brotli": 3141 }, "total": { - "min": 8744, + "min": 8747, "brotli": 3632 } }, { "name": "comments 💧", "user": { - "min": 851, - "brotli": 449 + "min": 854, + "brotli": 451 }, "runtime": { "min": 8751, "brotli": 3547 }, "total": { - "min": 9602, - "brotli": 3996 + "min": 9605, + "brotli": 3998 } } ] diff --git a/.sizes/comments.csr/entry.js b/.sizes/comments.csr/entry.js index 37d62bfaa..967f4b96e 100644 --- a/.sizes/comments.csr/entry.js +++ b/.sizes/comments.csr/entry.js @@ -1,4 +1,4 @@ -// size: 1000 (min) 491 (brotli) +// size: 1003 (min) 491 (brotli) const _expr_comment_id$ifBody = intersection( 2, (_scope) => { @@ -12,7 +12,7 @@ const _expr_comment_id$ifBody = intersection( _id$ifBody = closure(8, 0, void 0, () => _expr_comment_id$ifBody), _comment$ifBody = closure(6, 0, void 0, () => _expr_comment_id$ifBody), _ifBody = register( - "c", + "a0", createRenderer( "", "/ b&", @@ -34,7 +34,7 @@ const _expr_comment_id$ifBody = intersection( () => _id$forBody, ), _if$forBody = conditional(4), - _open$forBody_effect = effect("d", (_scope) => + _open$forBody_effect = effect("a1", (_scope) => on( _scope[2], "click", @@ -76,7 +76,7 @@ const _expr_comment_id$ifBody = intersection( _for = loopOf( 0, register( - "e", + "a2", createRenderer( "
  • ", " E l D l%", @@ -107,7 +107,7 @@ function _setup_(_scope) { _scope[0]; } createTemplate( - "a", + "b", "", "/ b&", _setup_, diff --git a/.sizes/comments.ssr/entry.js b/.sizes/comments.ssr/entry.js index a505bfefb..08cd1e746 100644 --- a/.sizes/comments.ssr/entry.js +++ b/.sizes/comments.ssr/entry.js @@ -1,4 +1,4 @@ -// size: 851 (min) 449 (brotli) +// size: 854 (min) 451 (brotli) const _expr_comment_id$ifBody = intersection( 2, (_scope) => { @@ -12,7 +12,7 @@ const _expr_comment_id$ifBody = intersection( _id$ifBody = closure(8, 0, void 0, () => _expr_comment_id$ifBody), _comment$ifBody = closure(6, 0, void 0, () => _expr_comment_id$ifBody), _ifBody = register( - "c", + "a0", createRenderer( "", "/ b&", @@ -34,7 +34,7 @@ const _expr_comment_id$ifBody = intersection( () => _id$forBody, ), _if$forBody = conditional(4), - _open$forBody_effect = effect("d", (_scope) => + _open$forBody_effect = effect("a1", (_scope) => on( _scope[2], "click", @@ -76,7 +76,7 @@ const _expr_comment_id$ifBody = intersection( _for = loopOf( 0, register( - "e", + "a2", createRenderer( "
  • ", " E l D l%", diff --git a/.sizes/counter.csr/entry.js b/.sizes/counter.csr/entry.js index d0d4b9c89..b49418b16 100644 --- a/.sizes/counter.csr/entry.js +++ b/.sizes/counter.csr/entry.js @@ -1,5 +1,5 @@ -// size: 208 (min) 146 (brotli) -const _clickCount_effect = effect("b", (_scope) => +// size: 209 (min) 147 (brotli) +const _clickCount_effect = effect("a0", (_scope) => on( _scope[0], "click", diff --git a/.sizes/counter.ssr/entry.js b/.sizes/counter.ssr/entry.js index 4cb609942..2895b4746 100644 --- a/.sizes/counter.ssr/entry.js +++ b/.sizes/counter.ssr/entry.js @@ -1,5 +1,5 @@ -// size: 130 (min) 125 (brotli) -const _clickCount_effect = effect("b", (_scope) => +// size: 131 (min) 125 (brotli) +const _clickCount_effect = effect("a0", (_scope) => on( _scope[0], "click", diff --git a/packages/babel-utils/src/tags.js b/packages/babel-utils/src/tags.js index 1a62b1fdb..e8edf8ada 100644 --- a/packages/babel-utils/src/tags.js +++ b/packages/babel-utils/src/tags.js @@ -323,14 +323,33 @@ export function getTemplateId(opts, request, child) { const optimize = typeof opts === "object" ? opts.optimize : opts; if (optimize) { - const optimizeRegistryId = - typeof opts === "object" && opts.optimizeRegistryId; - - if (optimizeRegistryId) { - const result = optimizeRegistryId( - child ? request + "_" + child : request, - ); - return typeof result === "number" ? encodeTemplateId(result) : result; + const optimizeKnownTemplates = + typeof opts === "object" && opts.optimizeKnownTemplates; + const knownTemplatesSize = optimizeKnownTemplates?.length || 0; + if (knownTemplatesSize) { + let lookup = idCache.get(optimizeKnownTemplates); + if (!lookup) { + lookup = new Map(); + idCache.set(optimizeKnownTemplates, lookup); + for (let i = 0; i < knownTemplatesSize; i++) { + lookup.set(optimizeKnownTemplates[i], { + id: encodeTemplateId(i), + children: new Map(), + }); + } + } + let registered = lookup.get(request); + if (registered) { + if (child) { + let childId = registered.children.get(child); + if (childId === undefined) { + childId = registered.children.size; + registered.children.set(child, childId); + } + return registered.id + childId; + } + return registered.id; + } } const hash = createHash("shake256", templateIdHashOpts).update(id); diff --git a/packages/compiler/config.d.ts b/packages/compiler/config.d.ts index 01436a08e..76c4e6821 100644 --- a/packages/compiler/config.d.ts +++ b/packages/compiler/config.d.ts @@ -24,7 +24,7 @@ declare const Config: { hydrateIncludeImports?: RegExp | ((request: string) => boolean); hydrateInit?: boolean; optimize?: boolean; - optimizeRegistryId?: (request: string) => string | number; + optimizeKnownTemplates?: string[]; cache?: Map; hot?: boolean; /** @deprecated */ diff --git a/packages/compiler/src/config.js b/packages/compiler/src/config.js index 26689fd26..af5f5a1ee 100644 --- a/packages/compiler/src/config.js +++ b/packages/compiler/src/config.js @@ -114,10 +114,11 @@ const config = { optimize: undefined, /** - * If `optimize` is enabled this function will be called to resolve the "template id" used for Marko's - * hydration registry. + * If `optimize` is enabled you can provide an array of template paths which the compiler will + * use to generate shorter registry/template ids using incrementing ids. This can only be used + * if the same `optimizeKnownTemplates` are used for both server and client compilations. */ - optimizeRegistryId: undefined, + optimizeKnownTemplates: undefined, /** * This option should be set if `hydrate` output is specified. diff --git a/packages/marko/docs/compiler.md b/packages/marko/docs/compiler.md index c276ac0fb..da8e77cd7 100644 --- a/packages/marko/docs/compiler.md +++ b/packages/marko/docs/compiler.md @@ -206,17 +206,12 @@ Default: [environment based](https://github.com/marko-js/marko/blob/0f212897d2d3 Enables production mode optimizations. -#### `optimizeRegistryId` +#### `optimizeKnownTemplates` -Type: `(request: string) => string | number`
    +Type: `string[]`
    Default: `undefined` -If `optimize` is enabled this function will be called with each "template id" / "registry id" that Marko uses for hydration. -The function must return a number (which will be encoded) or a string which is used verbatim. - -It is _required_ that when a template is compiled for the server it is given the same id when it is compiled for the browser. - -Without this function Marko will use a generic hash of the raw `request` id. +If `optimize` is enabled you can provide an array of template paths which the compiler will use to generate shorter registry/template ids using incrementing ids. This can only be used if the same `optimizeKnownTemplates` are used for both server and client compilations. #### `resolveVirtualDependency` diff --git a/packages/translator-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/dom.expected/template.hydrate.js index 805ebfa7c..5d431ab9d 100644 --- a/packages/translator-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/dom.expected/template.hydrate.js @@ -1,8 +1,8 @@ -// size: 189 (min) 129 (brotli) +// size: 190 (min) 126 (brotli) const _lastClickCount = _$.state(4, (_scope, lastClickCount) => _$.data(_scope[2], lastClickCount), ), - _clickCount_effect = _$.effect("b", (_scope) => + _clickCount_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.hydrate.js index 402410ecf..ea3396488 100644 --- a/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 131 (min) 84 (brotli) +// size: 133 (min) 82 (brotli) _$.dynamicTagAttrs(0), - _$.register("c", _$.createRendererWithOwner("Goodbye", "")), - _$.register("d", _$.createRendererWithOwner("Hello", "")); + _$.register("b0", _$.createRendererWithOwner("Goodbye", "")), + _$.register("b1", _$.createRendererWithOwner("Hello", "")); diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.hydrate.js index a1dc2409a..d2d8cdfa9 100644 --- a/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.hydrate.js @@ -1,2 +1,3 @@ -// size: 74 (min) 70 (brotli) -_$.dynamicTagAttrs(0), _$.register("c", _$.createRendererWithOwner("Foo!", "")); +// size: 75 (min) 70 (brotli) +_$.dynamicTagAttrs(0), + _$.register("b0", _$.createRendererWithOwner("Foo!", "")); diff --git a/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/dom.expected/template.hydrate.js index 8b669ca87..3ce0f417f 100644 --- a/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 189 (min) 135 (brotli) -const _disabled_effect = _$.effect("b", (_scope) => +// size: 190 (min) 135 (brotli) +const _disabled_effect = _$.effect("a0", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.hydrate.js index 63cf6769c..c774cfa0b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 299 (min) 179 (brotli) +// size: 301 (min) 178 (brotli) const _text_ = _$.value(5, (_scope, text) => _$.data(_scope[1], text)), - _onClick__effect = _$.effect("d", (_scope) => { + _onClick__effect = _$.effect("a0", (_scope) => { const { 4: onClick } = _scope; _$.on(_scope[0], "click", onClick); }), _onClick_ = _$.value(4, (_scope, onClick) => _onClick__effect(_scope)), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 1: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.hydrate.js index 56a73dc28..42c7645c3 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 299 (min) 181 (brotli) -const _onClick__effect = _$.effect("d", (_scope) => { +// size: 301 (min) 183 (brotli) +const _onClick__effect = _$.effect("a0", (_scope) => { const { 5: onClick } = _scope; _$.on(_scope[0], "click", onClick); }), _onClick_ = _$.value(5, (_scope, onClick) => _onClick__effect(_scope)), _text_ = _$.value(4, (_scope, text) => _$.data(_scope[1], text)), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 1: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.hydrate.js index 619d9c908..9ce93af41 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 492 (min) 231 (brotli) +// size: 495 (min) 228 (brotli) const _text_ = _$.value(7, (_scope, text) => { _$.data(_scope[1], text), ((_scope, textAlias) => { @@ -8,18 +8,18 @@ const _text_ = _$.value(7, (_scope, text) => { _pattern__ = _$.value(6, (_scope, _pattern_) => _text_(_scope, _pattern_.text), ), - _onClick__effect = _$.effect("e", (_scope) => { + _onClick__effect = _$.effect("a0", (_scope) => { const { 5: onClick } = _scope; _$.on(_scope[0], "click", onClick); }), _onClick_ = _$.value(5, (_scope, onClick) => _onClick__effect(_scope)), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 2: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); }; }), - _onClick2 = _$.register("d", (_scope) => { + _onClick2 = _$.register("b1", (_scope) => { const { 2: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.hydrate.js index 981a747bc..26be9cc8d 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.hydrate.js @@ -1,16 +1,16 @@ -// size: 332 (min) 188 (brotli) +// size: 334 (min) 189 (brotli) const _text_ = _$.value(6, (_scope, text) => { _$.data(_scope[1], text), ((_scope, textAlias) => { _$.data(_scope[2], textAlias); })(_scope, text); }), - _onClick__effect = _$.effect("d", (_scope) => { + _onClick__effect = _$.effect("a0", (_scope) => { const { 5: onClick } = _scope; _$.on(_scope[0], "click", onClick); }), _onClick_ = _$.value(5, (_scope, onClick) => _onClick__effect(_scope)), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 1: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.hydrate.js index 63cf6769c..c774cfa0b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 299 (min) 179 (brotli) +// size: 301 (min) 178 (brotli) const _text_ = _$.value(5, (_scope, text) => _$.data(_scope[1], text)), - _onClick__effect = _$.effect("d", (_scope) => { + _onClick__effect = _$.effect("a0", (_scope) => { const { 4: onClick } = _scope; _$.on(_scope[0], "click", onClick); }), _onClick_ = _$.value(4, (_scope, onClick) => _onClick__effect(_scope)), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 1: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js index 1a98fc592..341bc818b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js @@ -1,24 +1,24 @@ -// size: 426 (min) 247 (brotli) +// size: 430 (min) 241 (brotli) _$.dynamicTagAttrs(1); -const _onClick__effect = _$.effect("f", (_scope) => { +const _onClick__effect = _$.effect("a0", (_scope) => { const { 4: onClick } = _scope; _$.on(_scope[0], "click", onClick); }), _onClick_ = _$.value(4, (_scope, onClick) => _onClick__effect(_scope)), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 1: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); }; }), _clickCount$myButtonBody = _$.registerSubscriber( - "d", + "b1", _$.dynamicClosure(1, (_scope, clickCount) => _$.data(_scope[0], clickCount), ), ); _$.register( - "e", + "b2", _$.createRendererWithOwner(" ", " ", void 0, () => [ _clickCount$myButtonBody, ]), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.hydrate.js index d675f472f..504ff2745 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 145 (min) 108 (brotli) -const _clickCount_effect = _$.effect("c", (_scope) => +// size: 146 (min) 127 (brotli) +const _clickCount_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.hydrate.js index 30144cb2d..6eaae00ae 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.hydrate.js @@ -1,13 +1,13 @@ -// size: 438 (min) 225 (brotli) +// size: 441 (min) 228 (brotli) const _count$ifBody = _$.closure(4, (_scope, count) => _$.data(_scope[0], count), ), _ifBody = _$.register( - "b", + "a0", _$.createRenderer("The count is ", "b%", void 0, () => [_count$ifBody]), ), _if = _$.conditional(2, 0), - _count_effect = _$.effect("c", (_scope) => + _count_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", @@ -24,7 +24,7 @@ const _count$ifBody = _$.closure(4, (_scope, count) => (_scope, count) => _count_effect(_scope), () => _$.inConditionalScope(_count$ifBody, 2), ), - _show_effect = _$.effect("d", (_scope) => + _show_effect = _$.effect("a2", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.hydrate.js index 02da704bc..927f93ef9 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.hydrate.js @@ -1,13 +1,13 @@ -// size: 436 (min) 222 (brotli) +// size: 439 (min) 224 (brotli) const _count$ifBody = _$.closure(4, (_scope, count) => _$.data(_scope[0], count), ), _ifBody = _$.register( - "b", + "a0", _$.createRenderer(" ", "D ", void 0, () => [_count$ifBody]), ), _if = _$.conditional(2, 0), - _count_effect = _$.effect("c", (_scope) => + _count_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", @@ -24,7 +24,7 @@ const _count$ifBody = _$.closure(4, (_scope, count) => (_scope, count) => _count_effect(_scope), () => _$.inConditionalScope(_count$ifBody, 2), ), - _show_effect = _$.effect("d", (_scope) => + _show_effect = _$.effect("a2", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/dom.expected/template.hydrate.js index d6cca3fed..9b4dc7ec2 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 209 (min) 143 (brotli) -const _increment = _$.register("b", (_scope) => { +// size: 211 (min) 142 (brotli) +const _increment = _$.register("a0", (_scope) => { const { 2: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); }; }), - _increment2_effect = _$.effect("c", (_scope) => { + _increment2_effect = _$.effect("a1", (_scope) => { const { 3: increment } = _scope; _$.on(_scope[0], "click", increment); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/dom.expected/template.hydrate.js index 9ba3364ba..f80f7a207 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 369 (min) 189 (brotli) +// size: 371 (min) 190 (brotli) const _expr_count_multiplier = _$.intersection(2, (_scope) => { const { 4: count, 5: multiplier } = _scope; _multipliedCount(_scope, count * multiplier); @@ -6,7 +6,7 @@ const _expr_count_multiplier = _$.intersection(2, (_scope) => { _multipliedCount = _$.value(6, (_scope, multipliedCount) => _$.data(_scope[3], multipliedCount), ), - _multiplier_effect = _$.effect("b", (_scope) => + _multiplier_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -25,7 +25,7 @@ const _expr_count_multiplier = _$.intersection(2, (_scope) => { }, () => _expr_count_multiplier, ), - _count_effect = _$.effect("c", (_scope) => + _count_effect = _$.effect("a1", (_scope) => _$.on( _scope[2], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/dom.expected/template.hydrate.js index cd71c54f4..504ff2745 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 145 (min) 109 (brotli) -const _clickCount_effect = _$.effect("b", (_scope) => +// size: 146 (min) 127 (brotli) +const _clickCount_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/dom.expected/template.hydrate.js index 22e0b2d2e..99bb944c6 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 91 (min) 79 (brotli) +// size: 92 (min) 74 (brotli) const _tagNameBody = _$.register( - "b", + "a0", _$.createRendererWithOwner("Hello World", ""), ); _$.dynamicTagAttrs(0, _tagNameBody); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/dom.expected/template.hydrate.js index 73d1e7efa..e2d146bbf 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/dom.expected/template.hydrate.js @@ -1,2 +1,2 @@ -// size: 57 (min) 61 (brotli) -_$.effect("b", (_scope) => (document.body.className = "no-deps")), init(); +// size: 58 (min) 47 (brotli) +_$.effect("a0", (_scope) => (document.body.className = "no-deps")), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.hydrate.js index 121c620b6..51c58d213 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.hydrate.js @@ -1,9 +1,9 @@ -// size: 297 (min) 183 (brotli) +// size: 299 (min) 191 (brotli) const _message$ifBody = _$.closure(2, (_scope, message) => _$.data(_scope[0], message.text), ), _ifBody = _$.register( - "b", + "a0", _$.createRenderer(" ", " ", void 0, () => [_message$ifBody]), ), _if = _$.conditional(1, 0), @@ -13,7 +13,7 @@ const _message$ifBody = _$.closure(2, (_scope, message) => () => _if, ), _message = _$.state(2, 0, () => _$.inConditionalScope(_message$ifBody, 1)); -_$.effect("c", (_scope) => +_$.effect("a1", (_scope) => _$.on(_scope[0], "click", function () { _message(_scope, null), _show(_scope, !1); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/dom.expected/template.hydrate.js index bee8f52a7..e72945d9e 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 145 (min) 109 (brotli) -const _count_effect = _$.effect("b", (_scope) => +// size: 146 (min) 127 (brotli) +const _count_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/dom.expected/template.hydrate.js index 33c208e7b..64e96ef67 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 229 (min) 155 (brotli) -const _expr_a_b_effect = _$.effect("b", (_scope) => +// size: 230 (min) 156 (brotli) +const _expr_a_b_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/dom.expected/template.hydrate.js index de336eb4f..0dfd55209 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 106 (min) 87 (brotli) +// size: 107 (min) 89 (brotli) const _data = _$.state(2, (_scope, data) => _$.data(_scope[1], data)); -_$.effect("b", (_scope) => +_$.effect("a0", (_scope) => _$.on(_scope[0], "click", function () { _data(_scope, 1); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.hydrate.js index e939b9145..b39d1f0c4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 1090 (min) 508 (brotli) +// size: 1093 (min) 508 (brotli) const _expr_comment_id$ifBody = _$.intersection( 2, (_scope) => { @@ -15,7 +15,7 @@ const _expr_comment_id$ifBody = _$.intersection( _scope[0]; }, _ifBody = _$.register( - "c", + "a0", _$.createRenderer("", "/ b&", _setup$ifBody, () => [ _id$ifBody, _comment$ifBody, @@ -33,7 +33,7 @@ const _expr_comment_id$ifBody = _$.intersection( () => _id$forBody, ), _if$forBody = _$.conditional(4, 0), - _open$forBody_effect = _$.effect("d", (_scope) => + _open$forBody_effect = _$.effect("a1", (_scope) => _$.on( _scope[2], "click", @@ -80,7 +80,7 @@ const _expr_comment_id$ifBody = _$.intersection( _open$forBody(_scope, !0); }, _forBody = _$.register( - "e", + "a2", _$.createRenderer( "
  • ", " E l D l%", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js index a45b5d642..ad1fdafca 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 186 (min) 135 (brotli) +// size: 188 (min) 129 (brotli) _$.dynamicTagAttrs(0); const _name$layoutBody = _$.registerSubscriber( - "c", + "b0", _$.dynamicClosure(3, (_scope, name) => _$.data(_scope[0], name)), ); _$.register( - "d", + "b1", _$.createRendererWithOwner("

    Hello

    ", "Db%", void 0, () => [ _name$layoutBody, ]), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.hydrate.js index 44d5c53aa..a26e51a37 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 748 (min) 367 (brotli) +// size: 751 (min) 367 (brotli) const _name_ = _$.value(3, (_scope, name) => _$.data(_scope[0], name)), _expr_outer_inner$forBody = _$.intersection( 2, @@ -22,7 +22,7 @@ const _name_ = _$.value(3, (_scope, name) => _$.data(_scope[0], name)), _scope[0]; }, _forBody2 = _$.register( - "c", + "b0", _$.createRenderer( "
    ", "/D l&", @@ -45,7 +45,7 @@ const _name_ = _$.value(3, (_scope, name) => _$.data(_scope[0], name)), () => _outer$forBody2, ), _forBody = _$.register( - "d", + "b1", _$.createRenderer( "", "D%D", @@ -55,7 +55,7 @@ const _name_ = _$.value(3, (_scope, name) => _$.data(_scope[0], name)), ), ), _for = _$.loopOf(1, _forBody), - _items_effect = _$.effect("e", (_scope) => + _items_effect = _$.effect("b2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.hydrate.js index cc3b7d2e1..ae038f6e7 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 872 (min) 390 (brotli) +// size: 877 (min) 389 (brotli) const _renderBody_input = _$.dynamicTagAttrs(0), _expr_Text_value = _$.intersection( 2, @@ -17,14 +17,14 @@ const _renderBody_input = _$.dynamicTagAttrs(0), ), _inner$childBody = _$.value(3, (_scope, inner) => _$.data(_scope[1], inner)), _outer$childBody = _$.registerSubscriber( - "c", + "b0", _$.dynamicClosure(2, (_scope, outer) => _$.data(_scope[0], outer)), ), _params_3$childBody = _$.value(2, (_scope, _params_3) => _inner$childBody(_scope, _params_3[0]), ), _childBody2 = _$.register( - "d", + "b1", _$.createRendererWithOwner( "
    .
    ", "D%c%", @@ -34,7 +34,7 @@ const _renderBody_input = _$.dynamicTagAttrs(0), ), ), _y$childBody = _$.registerSubscriber( - "e", + "b2", _$.dynamicClosure( 3, (_scope, y) => _value_(_scope[0], y), @@ -52,7 +52,7 @@ const _renderBody_input = _$.dynamicTagAttrs(0), _scope[0], _renderBody_(_scope[0], _childBody2(_scope)); }; _$.register( - "f", + "b3", _$.createRendererWithOwner( "
    ", "/D%l&", @@ -61,7 +61,7 @@ _$.register( () => _params_2$childBody, ), ); -const _x_effect = _$.effect("g", (_scope) => +const _x_effect = _$.effect("b4", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js index 242032ae2..b047a3c13 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 345 (min) 215 (brotli) +// size: 348 (min) 216 (brotli) _$.dynamicTagAttrs(0); -const _count$childBody_effect = _$.effect("c", (_scope) => +const _count$childBody_effect = _$.effect("b0", (_scope) => _$.on( _scope[0], "click", @@ -15,13 +15,13 @@ const _count$childBody_effect = _$.effect("c", (_scope) => ), ), _count$childBody = _$.registerSubscriber( - "d", + "b1", _$.dynamicClosure(1, (_scope, count) => { _$.data(_scope[1], count), _count$childBody_effect(_scope); }), ); _$.register( - "e", + "b2", _$.createRendererWithOwner("", " D ", void 0, () => [ _count$childBody, ]), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js index 2d88f2280..1820cbc71 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 370 (min) 221 (brotli) +// size: 373 (min) 222 (brotli) _$.dynamicTagAttrs(0); -const _count$falseChildBody_effect = _$.effect("b", (_scope) => +const _count$falseChildBody_effect = _$.effect("b0", (_scope) => _$.on( _scope[0], "click", @@ -15,13 +15,13 @@ const _count$falseChildBody_effect = _$.effect("b", (_scope) => ), ), _count$falseChildBody = _$.registerSubscriber( - "c", + "b1", _$.dynamicClosure(1, (_scope, count) => { _$.data(_scope[1], count), _count$falseChildBody_effect(_scope); }), ), _falseChildBody = _$.register( - "d", + "b2", _$.createRendererWithOwner("", " D ", void 0, () => [ _count$falseChildBody, ]), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/dom.expected/template.hydrate.js index 17ce6ecbb..fb7a3ad8e 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 296 (min) 193 (brotli) +// size: 297 (min) 193 (brotli) const _expr_selected_num$forBody = _$.intersection(2, (_scope) => { const { _: { 1: selected }, @@ -7,7 +7,7 @@ const _expr_selected_num$forBody = _$.intersection(2, (_scope) => { _$.attr(_scope[0], "data-selected", selected === num), _$.attr(_scope[0], "data-multiple", num % selected == 0); }); -_$.effect("b", (_scope) => +_$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.hydrate.js index d1e2b9267..1ecb12df7 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.hydrate.js @@ -1,9 +1,9 @@ -// size: 515 (min) 270 (brotli) +// size: 518 (min) 272 (brotli) const _clickCount$elseBody = _$.closure(1, (_scope, clickCount) => _$.data(_scope[0], clickCount), ), _elseBody = _$.register( - "b", + "a0", _$.createRenderer( "The button was clicked times.", "Db%", @@ -11,7 +11,7 @@ const _clickCount$elseBody = _$.closure(1, (_scope, clickCount) => () => [_clickCount$elseBody], ), ), - _clickCount$ifBody_effect = _$.effect("c", (_scope) => + _clickCount$ifBody_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", @@ -29,7 +29,7 @@ const _clickCount$elseBody = _$.closure(1, (_scope, clickCount) => _$.data(_scope[1], clickCount), _clickCount$ifBody_effect(_scope); }), _ifBody = _$.register( - "d", + "a2", _$.createRenderer("", " D ", void 0, () => [ _clickCount$ifBody, ]), diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/dom.expected/template.hydrate.js index eebf80e7c..f5bdd3a7f 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/dom.expected/template.hydrate.js @@ -1,13 +1,13 @@ -// size: 482 (min) 249 (brotli) +// size: 485 (min) 250 (brotli) const _item$forBody = _$.value(2, (_scope, item) => _$.data(_scope[0], item)), _params_2$forBody = _$.value(1, (_scope, _params_2) => _item$forBody(_scope, _params_2[0]), ), _forBody = _$.register( - "b", + "a0", _$.createRenderer(" ", " ", void 0, void 0, () => _params_2$forBody), ), - _expr_id_items_effect = _$.effect("c", (_scope) => + _expr_id_items_effect = _$.effect("a1", (_scope) => _$.on( _scope[1], "click", @@ -24,7 +24,7 @@ const _item$forBody = _$.value(2, (_scope, item) => _$.data(_scope[0], item)), _expr_id_items_effect(_scope); }), _for = _$.loopOf(0, _forBody), - _items_effect = _$.effect("d", (_scope) => + _items_effect = _$.effect("a2", (_scope) => _$.on( _scope[2], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/dom.expected/template.hydrate.js index c58e710b9..908df68a1 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/dom.expected/template.hydrate.js @@ -1,10 +1,10 @@ -// size: 485 (min) 247 (brotli) +// size: 488 (min) 250 (brotli) const _x$forBody = _$.value(2, (_scope, x) => _$.data(_scope[0], x)), _params_2$forBody = _$.value(1, (_scope, _params_2) => _x$forBody(_scope, _params_2[0]), ), _forBody = _$.register( - "b", + "a0", _$.createRenderer( "
  • ", "D ", @@ -14,7 +14,7 @@ const _x$forBody = _$.value(2, (_scope, x) => _$.data(_scope[0], x)), ), ), _for = _$.loopOf(0, _forBody), - _list_effect = _$.effect("c", (_scope) => + _list_effect = _$.effect("a1", (_scope) => _$.on( _scope[2], "click", @@ -35,7 +35,7 @@ const _x$forBody = _$.value(2, (_scope, x) => _$.data(_scope[0], x)), }, ]); }), - _open_effect = _$.effect("d", (_scope) => + _open_effect = _$.effect("a2", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/dom.expected/template.hydrate.js index 2ad87fa5d..8c0245b3b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/dom.expected/template.hydrate.js @@ -1,7 +1,7 @@ -// size: 212 (min) 144 (brotli) -const _ifBody = _$.register("b", _$.createRenderer("Hello!", "")), +// size: 214 (min) 146 (brotli) +const _ifBody = _$.register("a0", _$.createRenderer("Hello!", "")), _if = _$.conditional(0, 0), - _show_effect = _$.effect("c", (_scope) => + _show_effect = _$.effect("a1", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/dom.expected/template.hydrate.js index cd71c54f4..504ff2745 100644 --- a/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 145 (min) 109 (brotli) -const _clickCount_effect = _$.effect("b", (_scope) => +// size: 146 (min) 127 (brotli) +const _clickCount_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.hydrate.js index 87cc4ac33..5740bbea6 100644 --- a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.hydrate.js @@ -1,14 +1,14 @@ -// size: 344 (min) 213 (brotli) +// size: 346 (min) 217 (brotli) const _message$ifBody = _$.closure(3, (_scope, message) => _$.data(_scope[0], message), ), _ifBody = _$.register( - "b", + "a0", _$.createRenderer(" ", "D ", void 0, () => [_message$ifBody]), ), _if = _$.conditional(1, 0), _message = _$.state(3, 0, () => _$.inConditionalScope(_message$ifBody, 1)), - _show_effect = _$.effect("c", (_scope) => + _show_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/dom.expected/template.hydrate.js index dfe9f6333..0bc86d3a4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 226 (min) 145 (brotli) -const _expr_a_b_effect = _$.effect("b", (_scope) => +// size: 227 (min) 146 (brotli) +const _expr_a_b_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.hydrate.js index eb4498cd5..4350d0a98 100644 --- a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 579 (min) 329 (brotli) +// size: 583 (min) 311 (brotli) const _renderBody_input = _$.dynamicTagAttrs(1), _dynamicTagName = _$.conditional( 1, (_scope) => _renderBody_input(_scope, () => ({})), () => _renderBody_input, ), - _attrs__effect = _$.effect("f", (_scope) => { + _attrs__effect = _$.effect("a0", (_scope) => { _$.attrsEvents(_scope, 0); }), _renderBody_ = _$.value( @@ -23,20 +23,20 @@ const _renderBody_input = _$.dynamicTagAttrs(1), }, () => _renderBody_, ), - _onClick = _$.register("c", (_scope) => { + _onClick = _$.register("b0", (_scope) => { const { 1: clickCount } = _scope; return function () { _clickCount(_scope, clickCount + 1); }; }), _clickCount$FancyButtonBody = _$.registerSubscriber( - "d", + "b1", _$.dynamicClosure(1, (_scope, clickCount) => _$.data(_scope[0], clickCount), ), ), _FancyButtonBody = _$.register( - "e", + "b2", _$.createRendererWithOwner(" ", " ", void 0, () => [ _clickCount$FancyButtonBody, ]), diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js index 9aa8df671..8cff64736 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 830 (min) 415 (brotli) -const _expr_name_write_effect = _$.effect("f", (_scope) => { +// size: 834 (min) 421 (brotli) +const _expr_name_write_effect = _$.effect("a0", (_scope) => { const { 5: name, 6: write } = _scope; write(`mounted ${name}`), (_$.getAbortSignal(_scope, 0).onabort = ((_scope) => { @@ -23,7 +23,7 @@ const _expr_name_write_effect = _$.effect("f", (_scope) => { () => _expr_name_write, ); _$.register( - "c", + "b0", (_scope) => function (msg) { _scope[1].innerHTML += "\n" + msg; @@ -49,7 +49,7 @@ const _write$forBody = _$.closure( _scope[0]; }, _forBody = _$.register( - "d", + "b1", _$.createRenderer( "

    ", "/D lD lD l&", @@ -59,7 +59,7 @@ const _write$forBody = _$.closure( ), ), _for = _$.loopOf(2, _forBody), - _items_effect = _$.effect("e", (_scope) => + _items_effect = _$.effect("b2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.hydrate.js index 4427e94c6..cf2bbc66b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 1608 (min) 568 (brotli) +// size: 1617 (min) 571 (brotli) const _template_ = "
    a
    a

    a

    ", - _expr_name_write_effect = _$.effect("k", (_scope) => { + _expr_name_write_effect = _$.effect("a0", (_scope) => { const { 5: name, 6: write } = _scope; write(`${name} mounted`), (_$.getAbortSignal(_scope, 0).onabort = ((_scope) => { @@ -24,7 +24,7 @@ const _template_ = "
    a
    a

    a

    ", () => _expr_name_write, ); _$.register( - "c", + "b0", (_scope) => function (msg) { _scope[3].innerHTML += "\n" + msg; @@ -40,7 +40,7 @@ const _write$ifBody3 = _$.dynamicClosure( _scope[0], _name_(_scope[0], "Inner"); }, _ifBody3 = _$.register( - "d", + "b1", _$.createRenderer(`${_template_}`, "/D%lD%lD%l&", _setup$ifBody3, () => [ _write$ifBody3, ]), @@ -53,7 +53,7 @@ const _write$ifBody3 = _$.dynamicClosure( () => _$.inChild(0, _write_), ), _showInner$ifBody = _$.registerSubscriber( - "e", + "b2", _$.dynamicClosure( 7, (_scope, showInner) => _if$ifBody(_scope, showInner ? _ifBody3 : null), @@ -65,7 +65,7 @@ const _write$ifBody3 = _$.dynamicClosure( _scope[0], _name_(_scope[0], "Middle"); }, _ifBody2 = _$.register( - "f", + "b3", _$.createRenderer( `
    ${_template_}
    `, "D/D%lD%lD%l&%", @@ -90,7 +90,7 @@ const _write$ifBody3 = _$.dynamicClosure( _scope[0], _name_(_scope[0], "Outer"); }, _ifBody = _$.register( - "g", + "b4", _$.createRenderer( `
    ${_template_}
    `, "D/D%lD%lD%l&%", @@ -99,7 +99,7 @@ const _write$ifBody3 = _$.dynamicClosure( ), ), _if = _$.conditional(4, 0), - _showInner_effect = _$.effect("h", (_scope) => + _showInner_effect = _$.effect("b5", (_scope) => _$.on( _scope[2], "click", @@ -116,7 +116,7 @@ const _write$ifBody3 = _$.dynamicClosure( (_scope, showInner) => _showInner_effect(_scope), () => _$.dynamicSubscribers(7), ), - _showMiddle_effect = _$.effect("i", (_scope) => + _showMiddle_effect = _$.effect("b6", (_scope) => _$.on( _scope[1], "click", @@ -133,7 +133,7 @@ const _write$ifBody3 = _$.dynamicClosure( (_scope, showMiddle) => _showMiddle_effect(_scope), () => _$.inConditionalScope(_showMiddle$ifBody, 4), ), - _showOuter_effect = _$.effect("j", (_scope) => + _showOuter_effect = _$.effect("b7", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js index d98ecfaf4..95399c89a 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 399 (min) 238 (brotli) -const _setup$ifBody_effect = _$.effect("b", (_scope) => { +// size: 402 (min) 240 (brotli) +const _setup$ifBody_effect = _$.effect("a0", (_scope) => { (_scope._[1].innerHTML += "\nmounted"), (_$.getAbortSignal(_scope, 0).onabort = () => { _scope._[1].innerHTML += "\ndestroyed"; @@ -9,11 +9,11 @@ const _setup$ifBody_effect = _$.effect("b", (_scope) => { _$.resetAbortSignal(_scope, 0), _setup$ifBody_effect(_scope); }, _ifBody = _$.register( - "c", + "a1", _$.createRenderer("
    a
    b

    c

    ", "", _setup$ifBody), ), _if = _$.conditional(2, 0), - _show_effect = _$.effect("d", (_scope) => + _show_effect = _$.effect("a2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js index d1afc52c9..bb63b866a 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 527 (min) 291 (brotli) -const _input__effect = _$.effect("f", (_scope) => { +// size: 531 (min) 293 (brotli) +const _input__effect = _$.effect("a0", (_scope) => { const { 1: input } = _scope; input.write("mounted"), (_$.getAbortSignal(_scope, 0).onabort = ((_scope) => { @@ -13,7 +13,7 @@ const _input__effect = _$.effect("f", (_scope) => { _$.resetAbortSignal(_scope, 0), _input__effect(_scope); }), _write = _$.register( - "c", + "b0", (_scope) => function (state) { _scope._[1].innerHTML = state; @@ -23,7 +23,7 @@ const _input__effect = _$.effect("f", (_scope) => { _scope[0], _input_(_scope[0], { write: _write(_scope) }); }, _ifBody = _$.register( - "d", + "b1", _$.createRenderer( "
    a
    b

    c

    ", "/d&", @@ -31,7 +31,7 @@ const _input__effect = _$.effect("f", (_scope) => { ), ), _if = _$.conditional(2, 0), - _show_effect = _$.effect("e", (_scope) => + _show_effect = _$.effect("b2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.hydrate.js index 5a9a8c78b..d24a7ed23 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 1260 (min) 532 (brotli) -const _expr_name_write_effect = _$.effect("g", (_scope) => { +// size: 1265 (min) 528 (brotli) +const _expr_name_write_effect = _$.effect("a0", (_scope) => { _$.getAbortSignal(_scope, 0).onabort = ((_scope) => { const { 3: name, 4: write } = _scope; return () => { @@ -17,7 +17,7 @@ const _expr_name_write_effect = _$.effect("g", (_scope) => { () => _expr_name_write, ); _$.register( - "b", + "b0", (_scope) => function (msg) { _scope[1].innerHTML += "\n" + msg; @@ -60,7 +60,7 @@ const _expr_outerItem_middleItem$forBody = _$.intersection( _scope[0]; }, _forBody2 = _$.register( - "d", + "b1", _$.createRenderer( "
    ", "D/D l&", @@ -100,7 +100,7 @@ const _expr_outerItem_middleItem$forBody = _$.intersection( _scope[0]; }, _forBody = _$.register( - "e", + "b2", _$.createRenderer( "
    ", "D/D l&%", @@ -110,7 +110,7 @@ const _expr_outerItem_middleItem$forBody = _$.intersection( ), ), _for = _$.loopOf(2, _forBody), - _items_effect = _$.effect("f", (_scope) => + _items_effect = _$.effect("b3", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js index cc6c95728..a6d927462 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 770 (min) 399 (brotli) -const _expr_name_write_effect = _$.effect("f", (_scope) => { +// size: 774 (min) 395 (brotli) +const _expr_name_write_effect = _$.effect("a0", (_scope) => { const { 3: name, 4: write } = _scope; write(`mounted ${name}`), (_$.getAbortSignal(_scope, 0).onabort = ((_scope) => { @@ -19,7 +19,7 @@ const _expr_name_write_effect = _$.effect("f", (_scope) => { () => _expr_name_write, ); _$.register( - "c", + "b0", (_scope) => function (msg) { _scope[1].innerHTML += "\n" + msg; @@ -45,7 +45,7 @@ const _write$forBody = _$.closure( _scope[0]; }, _forBody = _$.register( - "d", + "b1", _$.createRenderer( "
    ", "/D l&", @@ -55,7 +55,7 @@ const _write$forBody = _$.closure( ), ), _for = _$.loopOf(2, _forBody), - _items_effect = _$.effect("e", (_scope) => + _items_effect = _$.effect("b2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.hydrate.js index 3b342690c..8a2e08468 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 1519 (min) 547 (brotli) -const _expr_name_write_effect = _$.effect("k", (_scope) => { +// size: 1528 (min) 542 (brotli) +const _expr_name_write_effect = _$.effect("a0", (_scope) => { const { 3: name, 4: write } = _scope; write(`${name} mounted`), (_$.getAbortSignal(_scope, 0).onabort = ((_scope) => { @@ -19,7 +19,7 @@ const _expr_name_write_effect = _$.effect("k", (_scope) => { () => _expr_name_write, ); _$.register( - "c", + "b0", (_scope) => function (msg) { _scope[3].innerHTML += "\n" + msg; @@ -35,7 +35,7 @@ const _write$ifBody3 = _$.dynamicClosure( _scope[0], _name_(_scope[0], "Inner"); }, _ifBody3 = _$.register( - "d", + "b1", _$.createRenderer("

    ", "/D l&", _setup$ifBody3, () => [ _write$ifBody3, ]), @@ -48,7 +48,7 @@ const _write$ifBody3 = _$.dynamicClosure( () => _$.inChild(0, _write_), ), _showInner$ifBody = _$.registerSubscriber( - "e", + "b2", _$.dynamicClosure( 7, (_scope, showInner) => _if$ifBody(_scope, showInner ? _ifBody3 : null), @@ -60,7 +60,7 @@ const _write$ifBody3 = _$.dynamicClosure( _scope[0], _name_(_scope[0], "Middle"); }, _ifBody2 = _$.register( - "f", + "b3", _$.createRenderer( "

    ", "D/D l&%", @@ -85,7 +85,7 @@ const _write$ifBody3 = _$.dynamicClosure( _scope[0], _name_(_scope[0], "Outer"); }, _ifBody = _$.register( - "g", + "b4", _$.createRenderer( "

    ", "D/D l&%", @@ -94,7 +94,7 @@ const _write$ifBody3 = _$.dynamicClosure( ), ), _if = _$.conditional(4, 0), - _showInner_effect = _$.effect("h", (_scope) => + _showInner_effect = _$.effect("b5", (_scope) => _$.on( _scope[2], "click", @@ -111,7 +111,7 @@ const _write$ifBody3 = _$.dynamicClosure( (_scope, showInner) => _showInner_effect(_scope), () => _$.dynamicSubscribers(7), ), - _showMiddle_effect = _$.effect("i", (_scope) => + _showMiddle_effect = _$.effect("b6", (_scope) => _$.on( _scope[1], "click", @@ -128,7 +128,7 @@ const _write$ifBody3 = _$.dynamicClosure( (_scope, showMiddle) => _showMiddle_effect(_scope), () => _$.inConditionalScope(_showMiddle$ifBody, 4), ), - _showOuter_effect = _$.effect("j", (_scope) => + _showOuter_effect = _$.effect("b7", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js index c64c3c84e..bad938cab 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 381 (min) 223 (brotli) -const _setup$ifBody_effect = _$.effect("b", (_scope) => { +// size: 384 (min) 224 (brotli) +const _setup$ifBody_effect = _$.effect("a0", (_scope) => { (_scope._[1].innerHTML += "\nmounted"), (_$.getAbortSignal(_scope, 0).onabort = () => { _scope._[1].innerHTML += "\ndestroyed"; @@ -9,11 +9,11 @@ const _setup$ifBody_effect = _$.effect("b", (_scope) => { _$.resetAbortSignal(_scope, 0), _setup$ifBody_effect(_scope); }, _ifBody = _$.register( - "c", + "a1", _$.createRenderer("
    child
    ", "", _setup$ifBody), ), _if = _$.conditional(2, 0), - _show_effect = _$.effect("d", (_scope) => + _show_effect = _$.effect("a2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js index 0f1290ca4..14d90be79 100644 --- a/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 509 (min) 277 (brotli) -const _input__effect = _$.effect("f", (_scope) => { +// size: 513 (min) 285 (brotli) +const _input__effect = _$.effect("a0", (_scope) => { const { 1: input } = _scope; input.write("mounted"), (_$.getAbortSignal(_scope, 0).onabort = ((_scope) => { @@ -13,7 +13,7 @@ const _input__effect = _$.effect("f", (_scope) => { _$.resetAbortSignal(_scope, 0), _input__effect(_scope); }), _write = _$.register( - "c", + "b0", (_scope) => function (state) { _scope._[1].innerHTML = state; @@ -23,11 +23,11 @@ const _input__effect = _$.effect("f", (_scope) => { _scope[0], _input_(_scope[0], { write: _write(_scope) }); }, _ifBody = _$.register( - "d", + "b1", _$.createRenderer("
    child
    ", "/b&", _setup$ifBody), ), _if = _$.conditional(2, 0), - _show_effect = _$.effect("e", (_scope) => + _show_effect = _$.effect("b2", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.hydrate.js index 1dcf790d4..59f4eb8cc 100644 --- a/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.hydrate.js @@ -1,10 +1,10 @@ -// size: 243 (min) 167 (brotli) +// size: 244 (min) 161 (brotli) const _expr_value_dummy = _$.intersection(2, (_scope) => { const { 3: value, 4: dummy } = _scope; _$.data(_scope[0], value); }), _value_ = _$.value(3, 0, () => _expr_value_dummy), - _count_effect = _$.effect("c", (_scope) => + _count_effect = _$.effect("b0", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.hydrate.js index e0a2dd9bd..d5c64d7ae 100644 --- a/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.hydrate.js @@ -1,9 +1,9 @@ -// size: 297 (min) 183 (brotli) +// size: 300 (min) 185 (brotli) const _expr_input_count = _$.intersection(2, (_scope) => { const { 3: input, 4: count } = _scope; _$.data(_scope[1], input.format(count)); }), - _count_effect = _$.effect("e", (_scope) => + _count_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -20,8 +20,8 @@ const _expr_input_count = _$.intersection(2, (_scope) => { (_scope, count) => _count_effect(_scope), () => _expr_input_count, ); -_$.register("d", function (n) { +_$.register("b1", function (n) { return "$" + n.toFixed(2); }), - _$.register("c", (n) => "$" + n.toFixed(2)), + _$.register("b0", (n) => "$" + n.toFixed(2)), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.hydrate.js index 162275324..0a481aa8b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.hydrate.js @@ -1,10 +1,10 @@ -// size: 265 (min) 187 (brotli) -const _input__effect = _$.effect("d", (_scope) => _$.attrsEvents(_scope, 0)), +// size: 267 (min) 173 (brotli) +const _input__effect = _$.effect("a0", (_scope) => _$.attrsEvents(_scope, 0)), _input_ = _$.value(2, (_scope, input) => { _$.attrs(_scope, 0, { type: "checkbox", ...input }), _input__effect(_scope); }), _checkedChange = _$.register( - "c", + "b0", (_scope) => function (_new_checked) { _checked(_scope, _new_checked); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.hydrate.js index f25a7506a..bd710b933 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/dom.expected/template.hydrate.js @@ -1,20 +1,20 @@ -// size: 487 (min) 153 (brotli) +// size: 491 (min) 154 (brotli) const _checkedValueChange = _$.register( - "b", + "a0", (_scope) => function (_new_checkedValue) { _checkedValue(_scope, _new_checkedValue); }, ), _checkedValueChange2 = _$.register( - "c", + "a1", (_scope) => function (_new_checkedValue2) { _checkedValue(_scope, _new_checkedValue2); }, ), _checkedValueChange3 = _$.register( - "c", + "a1", (_scope) => function (_new_checkedValue3) { _checkedValue(_scope, _new_checkedValue3); @@ -44,7 +44,7 @@ const _checkedValueChange = _$.register( ), _$.data(_scope[3], checkedValue); }); -_$.effect("d", (_scope) => { +_$.effect("a2", (_scope) => { _$.controllable_input_checkedValue_effect(_scope, 0), _$.controllable_input_checkedValue_effect(_scope, 1), _$.controllable_input_checkedValue_effect(_scope, 2); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.hydrate.js index a2b4fe3ac..8326488af 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.hydrate.js @@ -1,24 +1,24 @@ -// size: 530 (min) 221 (brotli) -const _input__effect = _$.effect("e", (_scope) => _$.attrsEvents(_scope, 0)), +// size: 534 (min) 214 (brotli) +const _input__effect = _$.effect("a0", (_scope) => _$.attrsEvents(_scope, 0)), _input_ = _$.value(2, (_scope, input) => { _$.attrs(_scope, 0, { type: "checkbox", ...input }), _input__effect(_scope); }), _checkedValueChange = _$.register( - "c", + "b0", (_scope) => function (_new_checkedValue) { _checkedValue(_scope, _new_checkedValue); }, ), _checkedValueChange2 = _$.register( - "d", + "b1", (_scope) => function (_new_checkedValue2) { _checkedValue(_scope, _new_checkedValue2); }, ), _checkedValueChange3 = _$.register( - "d", + "b1", (_scope) => function (_new_checkedValue3) { _checkedValue(_scope, _new_checkedValue3); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/dom.expected/template.hydrate.js index f25a7506a..bd710b933 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/dom.expected/template.hydrate.js @@ -1,20 +1,20 @@ -// size: 487 (min) 153 (brotli) +// size: 491 (min) 154 (brotli) const _checkedValueChange = _$.register( - "b", + "a0", (_scope) => function (_new_checkedValue) { _checkedValue(_scope, _new_checkedValue); }, ), _checkedValueChange2 = _$.register( - "c", + "a1", (_scope) => function (_new_checkedValue2) { _checkedValue(_scope, _new_checkedValue2); }, ), _checkedValueChange3 = _$.register( - "c", + "a1", (_scope) => function (_new_checkedValue3) { _checkedValue(_scope, _new_checkedValue3); @@ -44,7 +44,7 @@ const _checkedValueChange = _$.register( ), _$.data(_scope[3], checkedValue); }); -_$.effect("d", (_scope) => { +_$.effect("a2", (_scope) => { _$.controllable_input_checkedValue_effect(_scope, 0), _$.controllable_input_checkedValue_effect(_scope, 1), _$.controllable_input_checkedValue_effect(_scope, 2); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/dom.expected/template.hydrate.js index d32220b3b..47c361be9 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 201 (min) 123 (brotli) +// size: 203 (min) 138 (brotli) const _checkedChange = _$.register( - "b", + "a0", (_scope) => function (_new_checked) { _checked(_scope, _new_checked); @@ -10,5 +10,5 @@ const _checkedChange = _$.register( _$.controllable_input_checked(_scope, 0, checked, _checkedChange(_scope)), _$.data(_scope[1], String(checked)); }); -_$.effect("c", (_scope) => _$.controllable_input_checked_effect(_scope, 0)), +_$.effect("a1", (_scope) => _$.controllable_input_checked_effect(_scope, 0)), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/dom.expected/template.hydrate.js index 60925cebe..f59127aff 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 189 (min) 125 (brotli) +// size: 191 (min) 134 (brotli) const _valueChange = _$.register( - "b", + "a0", (_scope) => function (_new_value) { _value(_scope, _new_value); @@ -10,5 +10,5 @@ const _valueChange = _$.register( _$.controllable_input_value(_scope, 0, value, _valueChange(_scope)), _$.data(_scope[1], value); }); -_$.effect("c", (_scope) => _$.controllable_input_value_effect(_scope, 0)), +_$.effect("a1", (_scope) => _$.controllable_input_value_effect(_scope, 0)), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/dom.expected/template.hydrate.js index e92d8118b..00934f96e 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 312 (min) 156 (brotli) -const _setup$tagSelectBody_effect = _$.effect("b", (_scope) => { +// size: 314 (min) 165 (brotli) +const _setup$tagSelectBody_effect = _$.effect("a0", (_scope) => { _$.attrsEvents(_scope, 0), _$.attrsEvents(_scope, 1), _$.attrsEvents(_scope, 2); @@ -11,7 +11,7 @@ const _setup$tagSelectBody_effect = _$.effect("b", (_scope) => { _setup$tagSelectBody_effect(_scope); }, _tagSelectBody = _$.register( - "c", + "a1", _$.createRendererWithOwner( "", " b b ", diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-select/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-select/__snapshots__/dom.expected/template.hydrate.js index 17bf66fd8..f9f69dbb7 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-select/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-select/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 191 (min) 120 (brotli) +// size: 193 (min) 125 (brotli) const _valueChange = _$.register( - "b", + "a0", (_scope) => function (v) { _value(_scope, v); @@ -10,5 +10,5 @@ const _valueChange = _$.register( _$.controllable_select_value(_scope, 0, value, _valueChange(_scope)), _$.data(_scope[1], value); }); -_$.effect("c", (_scope) => _$.controllable_select_value_effect(_scope, 0)), +_$.effect("a1", (_scope) => _$.controllable_select_value_effect(_scope, 0)), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/dom.expected/template.hydrate.js index 5255c4fef..bf6bc19e1 100644 --- a/packages/translator-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 195 (min) 118 (brotli) +// size: 197 (min) 119 (brotli) const _valueChange = _$.register( - "b", + "a0", (_scope) => function (_new_value) { _value(_scope, _new_value); @@ -10,5 +10,5 @@ const _valueChange = _$.register( _$.controllable_textarea_value(_scope, 0, value, _valueChange(_scope)), _$.data(_scope[1], value); }); -_$.effect("c", (_scope) => _$.controllable_textarea_value_effect(_scope, 0)), +_$.effect("a1", (_scope) => _$.controllable_textarea_value_effect(_scope, 0)), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/dom.expected/template.hydrate.js index caa6e8a7a..b028101ad 100644 --- a/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 263 (min) 162 (brotli) +// size: 264 (min) 148 (brotli) const _expr_a_b = _$.intersection(2, (_scope) => { const { 5: a, 6: b } = _scope; _$.data(_scope[4], a + b); @@ -13,7 +13,7 @@ const _expr_a_b = _$.intersection(2, (_scope) => { (_scope, a) => _$.data(_scope[1], a), () => _expr_a_b, ); -_$.effect("b", (_scope) => { +_$.effect("a0", (_scope) => { _$.on(_scope[0], "click", function () { _a(_scope, 10); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/dom.expected/template.hydrate.js index 7f8ae21f0..075244516 100644 --- a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/dom.expected/template.hydrate.js @@ -1,9 +1,9 @@ -// size: 143 (min) 108 (brotli) +// size: 144 (min) 123 (brotli) const _n$forBody = _$.value(2, (_scope, n) => _$.data(_scope[0], n)), _params_2$forBody = _$.value(1, (_scope, _params_2) => _n$forBody(_scope, _params_2[0]), ); _$.register( - "b", + "a0", _$.createRenderer(", ", "%", void 0, void 0, () => _params_2$forBody), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/dom.expected/template.hydrate.js index b96559e97..f9aa3c939 100644 --- a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/dom.expected/template.hydrate.js @@ -1,10 +1,10 @@ -// size: 352 (min) 165 (brotli) +// size: 354 (min) 156 (brotli) const _key$forBody2 = _$.value(2, (_scope, key) => _$.data(_scope[0], key)), _params_3$forBody = _$.value(1, (_scope, _params_3) => _key$forBody2(_scope, _params_3[0]), ); _$.register( - "b", + "a0", _$.createRenderer("

    ", "D ", void 0, void 0, () => _params_3$forBody), ); const _text$forBody = _$.value(4, (_scope, text) => _$.data(_scope[1], text)), @@ -13,7 +13,7 @@ const _text$forBody = _$.value(4, (_scope, text) => _$.data(_scope[1], text)), _key$forBody(_scope, _params_2[0]), _text$forBody(_scope, _params_2[1]); }); _$.register( - "c", + "a1", _$.createRenderer( "

    :

    ", "D%c%", diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.hydrate.js index 7aacc7347..a97b31fb1 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 599 (min) 290 (brotli) +// size: 601 (min) 301 (brotli) const _inputRenderBody_input = _$.dynamicTagAttrs(3, void 0, 1), _expr_Text_x_y = _$.intersection( 3, @@ -8,7 +8,7 @@ const _inputRenderBody_input = _$.dynamicTagAttrs(3, void 0, 1), }, () => _inputRenderBody_input, ), - _expr_x_y_effect = _$.effect("d", (_scope) => + _expr_x_y_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -44,7 +44,7 @@ const _inputRenderBody_input = _$.dynamicTagAttrs(3, void 0, 1), _count2$customTagBody(_scope, _params_2[1]); }); _$.register( - "c", + "b0", _$.createRendererWithOwner( "
    Counts: ,
    ", "Db%c%", diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.hydrate.js index ea32d826d..ea5ebb76b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 521 (min) 310 (brotli) +// size: 523 (min) 296 (brotli) const _inputRenderBody_input = _$.dynamicTagAttrs(2), _expr_Text_input_x = _$.intersection( 3, @@ -8,7 +8,7 @@ const _inputRenderBody_input = _$.dynamicTagAttrs(2), }, () => _inputRenderBody_input, ), - _x_effect = _$.effect("d", (_scope) => + _x_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -39,7 +39,7 @@ const _inputRenderBody_input = _$.dynamicTagAttrs(2), _pattern_$customTagBody(_scope, _params_2[0]), ); _$.register( - "c", + "b0", _$.createRendererWithOwner( "
    Count ():
    ", "Db%c%", diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.hydrate.js index 679896303..5979483cb 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 401 (min) 248 (brotli) +// size: 403 (min) 248 (brotli) const _inputRenderBody_input = _$.dynamicTagAttrs(2), _expr_Text_x = _$.intersection( 2, @@ -8,7 +8,7 @@ const _inputRenderBody_input = _$.dynamicTagAttrs(2), }, () => _inputRenderBody_input, ), - _x_effect = _$.effect("d", (_scope) => + _x_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -34,7 +34,7 @@ const _inputRenderBody_input = _$.dynamicTagAttrs(2), _count$customTagBody(_scope, _params_2[0]), ); _$.register( - "c", + "b0", _$.createRendererWithOwner( "
    Count:
    ", "Db%", diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js index b93be3089..a6279fe43 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js @@ -1,3 +1,3 @@ -// size: 94 (min) 72 (brotli) +// size: 95 (min) 73 (brotli) _$.dynamicTagAttrs(1), - _$.register("c", _$.createRendererWithOwner("This is the body content", "")); + _$.register("b0", _$.createRendererWithOwner("This is the body content", "")); diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js index 24c1fe959..a400580ae 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js @@ -1,12 +1,12 @@ -// size: 347 (min) 183 (brotli) +// size: 351 (min) 182 (brotli) _$.register( - "c", + "a0", (_scope) => function (_new_x) { _x(_scope, _new_x); }, ); -const _x_effect = _$.effect("f", (_scope) => +const _x_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", @@ -25,8 +25,8 @@ const _x_effect = _$.effect("f", (_scope) => }, () => _$.tagVarSignal, ); -_$.registerBoundSignal("d", (_scope, count) => {}), - _$.effect("e", (_scope) => +_$.registerBoundSignal("b0", (_scope, count) => {}), + _$.effect("b1", (_scope) => _$.on(_scope[1], "click", function () { _$.tagVarSignalChange(_scope[0], 0); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.hydrate.js index 4d2f906e8..e26fa27cc 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 62 (min) 66 (brotli) +// size: 63 (min) 67 (brotli) _$.registerBoundSignal( - "c", + "b0", _$.value(2, (_scope, data) => _$.data(_scope[1], data)), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.hydrate.js index 4d2f906e8..e26fa27cc 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 62 (min) 66 (brotli) +// size: 63 (min) 67 (brotli) _$.registerBoundSignal( - "c", + "b0", _$.value(2, (_scope, data) => _$.data(_scope[1], data)), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.hydrate.js index 3c7c769df..11a3e23a1 100644 --- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 248 (min) 153 (brotli) -const _x_effect = _$.effect("d", (_scope) => +// size: 250 (min) 155 (brotli) +const _x_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -19,7 +19,7 @@ const _x_effect = _$.effect("d", (_scope) => () => _$.tagVarSignal, ); _$.registerBoundSignal( - "c", + "b0", _$.value(2, (_scope, data) => _$.data(_scope[1], data)), ), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js index 0a0c89140..c1698607b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 478 (min) 275 (brotli) +// size: 480 (min) 275 (brotli) const _inputThingRenderBody_input = _$.dynamicTagAttrs(1), _dynamicTagName = _$.conditional( 1, @@ -14,7 +14,7 @@ const _inputThingRenderBody_input = _$.dynamicTagAttrs(1), () => _dynamicTagName, ), _defineBody = _$.register( - "c", + "b0", _$.createRendererWithOwner("The thing", ""), ), _myThing = _$.value( @@ -22,7 +22,7 @@ const _inputThingRenderBody_input = _$.dynamicTagAttrs(1), (_scope, myThing) => _input_(_scope[0], { thing: myThing }), () => _$.inChild(0, _input_), ), - _selected_effect = _$.effect("d", (_scope) => + _selected_effect = _$.effect("b1", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/dom.expected/template.hydrate.js index 0d3833a28..f3d5be1b9 100644 --- a/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/dom.expected/template.hydrate.js @@ -1,8 +1,8 @@ -// size: 219 (min) 152 (brotli) +// size: 220 (min) 154 (brotli) const _myObj = _$.value(4, (_scope, myObj) => _$.data(_scope[0], JSON.stringify(myObj)), ), - _x_effect = _$.effect("b", (_scope) => + _x_effect = _$.effect("a0", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js index fe90687a4..c52243cb0 100644 --- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 415 (min) 248 (brotli) -const _y$defineBody_effect = _$.effect("b", (_scope) => +// size: 417 (min) 250 (brotli) +const _y$defineBody_effect = _$.effect("a0", (_scope) => _$.on( _scope[2], "click", @@ -25,7 +25,7 @@ const _y$defineBody_effect = _$.effect("b", (_scope) => _y$defineBody(_scope, 1); }; _$.register( - "c", + "a1", _$.createRendererWithOwner( "
    Hello
    ", "Db%c%l D ", diff --git a/packages/translator-tags/src/__tests__/fixtures/do-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/do-tag/__snapshots__/dom.expected/template.hydrate.js index a04d067f9..d510b88b1 100644 --- a/packages/translator-tags/src/__tests__/fixtures/do-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/do-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,9 +1,9 @@ -// size: 193 (min) 115 (brotli) -_$.register("c", function () { +// size: 196 (min) 119 (brotli) +_$.register("a1", function () { log.static += "rendered"; }), _$.register( - "b", + "a0", (_scope) => function () { log.const += "rendered"; @@ -12,4 +12,4 @@ _$.register("c", function () { const _logOutput = _$.state(3, (_scope, logOutput) => _$.data(_scope[0], logOutput), ); -_$.effect("d", (_scope) => _logOutput(_scope, JSON.stringify(log))), init(); +_$.effect("a2", (_scope) => _logOutput(_scope, JSON.stringify(log))), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/dom.expected/template.hydrate.js index 0f958758b..4395affd4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/dom.expected/template.hydrate.js @@ -1,21 +1,21 @@ -// size: 396 (min) 216 (brotli) +// size: 399 (min) 215 (brotli) const _setup$ifBody2 = (_scope) => { _$.data(_scope[0], _scope.$global.x); }, _ifBody2 = _$.register( - "b", + "a0", _$.createRenderer("", "D ", _setup$ifBody2), ), _setup$ifBody = (_scope) => { _$.data(_scope[0], _scope.$global.x); }, _ifBody = _$.register( - "c", + "a1", _$.createRenderer(" ", "D ", _setup$ifBody), ), _if2 = _$.conditional(1, 0), _if = _$.conditional(0, 0), - _show_effect = _$.effect("d", (_scope) => + _show_effect = _$.effect("a2", (_scope) => _$.on( _scope[2], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js index 161f10401..cd15a7441 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js @@ -1,7 +1,7 @@ -// size: 441 (min) 217 (brotli) +// size: 445 (min) 212 (brotli) _$.dynamicTagAttrs(0); _$.registerSubscriber( - "c", + "b0", _$.dynamicClosure( 4, (_scope, c) => _$.data(_scope[2], c), @@ -9,7 +9,7 @@ _$.registerSubscriber( ), ); const _c$customTagBody = _$.registerSubscriber( - "d", + "b1", _$.dynamicClosure(4, (_scope, c) => _$.data(_scope[2], c)), ), _b$customTagBody = _$.dynamicClosure(3, (_scope, b) => _$.data(_scope[1], b)), @@ -17,7 +17,7 @@ const _c$customTagBody = _$.registerSubscriber( _$.data(_scope[0], 1); }; _$.register( - "e", + "b2", _$.createRendererWithOwner( " ", "%c%c%", @@ -26,7 +26,7 @@ _$.register( ), ); const _c = _$.state(4, 0, () => _$.dynamicSubscribers(4)); -_$.effect("f", (_scope) => +_$.effect("b3", (_scope) => _$.on(_scope[0], "click", function () { _c(_scope, 4); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/dom.expected/template.hydrate.js index 39845bde9..8189976c6 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 159 (min) 121 (brotli) -const _clickCount_effect = _$.effect("b", (_scope) => { +// size: 160 (min) 122 (brotli) +const _clickCount_effect = _$.effect("a0", (_scope) => { const { 2: clickCount } = _scope; _$.on( _scope[0], diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js index 65ca1d3ec..7ec45a700 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 359 (min) 221 (brotli) +// size: 361 (min) 228 (brotli) const _tagNameBody = _$.register( - "b", + "a0", _$.createRendererWithOwner("body content", ""), ), _tagName_input = _$.dynamicTagAttrs(0, _tagNameBody), @@ -13,7 +13,7 @@ const _tagNameBody = _$.register( () => _tagName_input, ), _dynamicTagName = _$.conditional(0, 0, () => _expr_Text_className), - _tagName_effect = _$.effect("c", (_scope) => + _tagName_effect = _$.effect("a1", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.hydrate.js index 1d46984ae..bd1ef9752 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 305 (min) 182 (brotli) +// size: 307 (min) 189 (brotli) const _tags0_input = _$.dynamicTagAttrs(2), _expr_Text_x = _$.intersection( 2, @@ -9,10 +9,10 @@ const _tags0_input = _$.dynamicTagAttrs(2), () => _tags0_input, ); _$.registerBoundSignal( - "b", + "b0", _$.value(5, (_scope, y) => _$.data(_scope[3], y)), ); -const _x_effect = _$.effect("c", (_scope) => +const _x_effect = _$.effect("b1", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.hydrate.js index a0fdfa8d7..0fc281859 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 254 (min) 176 (brotli) +// size: 255 (min) 174 (brotli) const _tags0_input = _$.dynamicTagAttrs(2, void 0, 1), _expr_Text_x = _$.intersection( 2, @@ -8,7 +8,7 @@ const _tags0_input = _$.dynamicTagAttrs(2, void 0, 1), }, () => _tags0_input, ), - _x_effect = _$.effect("b", (_scope) => + _x_effect = _$.effect("b0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/dom.expected/template.hydrate.js index 7631b174d..fc34f076d 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 162 (min) 143 (brotli) -const _className_effect = _$.effect("b", (_scope) => +// size: 163 (min) 125 (brotli) +const _className_effect = _$.effect("a0", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.hydrate.js index f46a8dab2..37cf0a4f6 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.hydrate.js @@ -1,10 +1,10 @@ -// size: 429 (min) 280 (brotli) +// size: 430 (min) 258 (brotli) const _setup_ = () => {}, _id_ = _$.value(3, (_scope, id) => _$.data(_scope[0], id)), _input_ = _$.value(2, (_scope, input) => _id_(_scope, input.id)), _params__ = _$.value(1, (_scope, _params_) => _input_(_scope, _params_[0])); var child = _$.createTemplate( - "c", + "a", "
    Id is
    ", "Db%l", _setup_, @@ -17,7 +17,7 @@ const _tagName_input = _$.dynamicTagAttrs(1), (_scope) => _tagName_input(_scope, () => ({ id: "dynamic" })), () => _tagName_input, ), - _tagName_effect = _$.effect("b", (_scope) => + _tagName_effect = _$.effect("b0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.hydrate.js index 606c09aca..84b72d0ec 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 674 (min) 290 (brotli) +// size: 675 (min) 293 (brotli) const _setup_$1 = () => {}, _value_$1 = _$.value(3, (_scope, value) => _$.data(_scope[0], value)), _input_$1 = _$.value(2, (_scope, input) => _value_$1(_scope, input.value)), @@ -6,7 +6,7 @@ const _setup_$1 = () => {}, _input_$1(_scope, _params_[0]), ); var child1 = _$.createTemplate( - "c", + "a", "
    Child 1 has
    ", "Db%l", _setup_$1, @@ -18,7 +18,7 @@ const _setup_ = () => {}, _input_ = _$.value(2, (_scope, input) => _value_(_scope, input.value)), _params__ = _$.value(1, (_scope, _params_) => _input_(_scope, _params_[0])); var child2 = _$.createTemplate( - "d", + "b", "
    Child 2 has
    ", "Db%l", _setup_, @@ -35,7 +35,7 @@ const _tagName_input = _$.dynamicTagAttrs(0), () => _tagName_input, ), _dynamicTagName = _$.conditional(0, 0, () => _expr_Text_val), - _tagName_effect = _$.effect("b", (_scope) => + _tagName_effect = _$.effect("c0", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/dom.expected/template.hydrate.js index ab0045f0b..3a5e07f4b 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 237 (min) 160 (brotli) +// size: 238 (min) 161 (brotli) const _tags0_input = _$.dynamicTagAttrs(2), _expr_Text_x = _$.intersection( 2, @@ -8,7 +8,7 @@ const _tags0_input = _$.dynamicTagAttrs(2), }, () => _tags0_input, ), - _x_effect = _$.effect("b", (_scope) => + _x_effect = _$.effect("b0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/dom.expected/template.hydrate.js index 42ac46ccb..9aa7fc3f3 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/dom.expected/template.hydrate.js @@ -1,12 +1,15 @@ -// size: 296 (min) 203 (brotli) -const _xBody = _$.register("b", _$.createRendererWithOwner("Body Content", "")), +// size: 298 (min) 210 (brotli) +const _xBody = _$.register( + "a0", + _$.createRendererWithOwner("Body Content", ""), + ), _x_input = _$.dynamicTagAttrs(0, _xBody), _dynamicTagName = _$.conditional( 0, (_scope) => _x_input(_scope, () => ({})), () => _x_input, ), - _x_effect = _$.effect("c", (_scope) => + _x_effect = _$.effect("a1", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js index a90fee5bd..cc7b8e1c2 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.hydrate.js @@ -1,12 +1,12 @@ -// size: 527 (min) 271 (brotli) +// size: 532 (min) 295 (brotli) const _valueChange = _$.register( - "f", + "a0", (_scope) => function (_new_x) { _x(_scope, _new_x); }, ), - _x_effect = _$.effect("g", (_scope) => + _x_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", @@ -29,17 +29,17 @@ function _setup_(_scope) { _x(_scope, 1), _$.setTagVarChange(_scope, _valueChange(_scope)); } var Counter = _$.createTemplate( - "e", + "a", "", " D l", _setup_, ); -_$.register("b", function () { +_$.register("b0", function () { return Counter; }), _$.dynamicTagAttrs(0), - _$.registerBoundSignal("c", (_scope, count) => {}), - _$.effect("d", (_scope) => + _$.registerBoundSignal("b1", (_scope, count) => {}), + _$.effect("b2", (_scope) => _$.on(_scope[1], "click", function () { _$.tagVarSignalChange(_scope["0!"], 0); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.hydrate.js index fada4aaff..9363b15bb 100644 --- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 499 (min) 289 (brotli) -const _count_effect = _$.effect("e", (_scope) => +// size: 502 (min) 268 (brotli) +const _count_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -20,7 +20,7 @@ const _setup$tagNameBody = (_scope) => { })(_scope[0]); }, _tagNameBody = _$.register( - "c", + "b0", _$.createRendererWithOwner( "", "/ D l&", @@ -33,7 +33,7 @@ const _setup$tagNameBody = (_scope) => { (_scope) => _tagName_input(_scope, () => ({})), () => _tagName_input, ), - _tagName_effect = _$.effect("d", (_scope) => + _tagName_effect = _$.effect("b1", (_scope) => _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/dom.expected/template.hydrate.js index fcf9e79a7..506f9ec7c 100644 --- a/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 191 (min) 118 (brotli) -const _clickCount_effect = _$.effect("b", (_scope) => { +// size: 192 (min) 120 (brotli) +const _clickCount_effect = _$.effect("a0", (_scope) => { const { 1: clickCount } = _scope; (document.getElementById("button").textContent = clickCount), _$.on( diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-serialize-promise/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/effect-serialize-promise/__snapshots__/dom.expected/template.hydrate.js index 320a76fdf..e72c1adfd 100644 --- a/packages/translator-tags/src/__tests__/fixtures/effect-serialize-promise/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/effect-serialize-promise/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 119 (min) 93 (brotli) -_$.effect("b", (_scope) => { +// size: 120 (min) 83 (brotli) +_$.effect("a0", (_scope) => { ((_scope) => { const { 0: promise } = _scope; return async () => { diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/dom.expected/template.hydrate.js index cf35049b5..89ed36a8e 100644 --- a/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 83 (min) 63 (brotli) -_$.effect("b", (_scope) => { +// size: 84 (min) 66 (brotli) +_$.effect("a0", (_scope) => { const { 0: x } = _scope; document.getElementById("ref").textContent = x; }), diff --git a/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/dom.expected/template.hydrate.js index c247e6012..8431d3b43 100644 --- a/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 542 (min) 263 (brotli) +// size: 544 (min) 268 (brotli) const _description$forBody = _$.value(5, (_scope, description) => _$.data(_scope[1], description), ), @@ -11,7 +11,7 @@ const _description$forBody = _$.value(5, (_scope, description) => _pattern_$forBody(_scope, _params_2[0]), ), _forBody = _$.register( - "b", + "a0", _$.createRenderer( "
    :
    ", "D%c%", @@ -21,7 +21,7 @@ const _description$forBody = _$.value(5, (_scope, description) => ), ), _for = _$.loopOf(0, _forBody), - _items_effect = _$.effect("c", (_scope) => { + _items_effect = _$.effect("a1", (_scope) => { _$.on( _scope[1], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/dom.expected/template.hydrate.js index 828c1158f..78eb58d4d 100644 --- a/packages/translator-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/dom.expected/template.hydrate.js @@ -1,9 +1,9 @@ -// size: 390 (min) 233 (brotli) +// size: 392 (min) 229 (brotli) const _i$forBody = _$.value(3, (_scope, i) => _$.data(_scope[1], i)), _params_2$forBody = _$.value(2, (_scope, _params_2) => _i$forBody(_scope, _params_2[0]), ), - _num$forBody_effect = _$.effect("b", (_scope) => + _num$forBody_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -19,7 +19,7 @@ const _i$forBody = _$.value(3, (_scope, i) => _$.data(_scope[1], i)), ), _num$forBody = _$.closure(1, (_scope, num) => _num$forBody_effect(_scope)), _forBody = _$.register( - "c", + "a1", _$.createRenderer( "", " D ", diff --git a/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/dom.expected/template.hydrate.js index 38651c721..d6c46d2e4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 209 (min) 145 (brotli) +// size: 210 (min) 142 (brotli) const _i$forBody2 = _$.value(4, (_scope, i) => _$.data(_scope[0], i)), _val$forBody2 = _$.value(3, (_scope, val) => _$.data(_scope[1], val)), _params_3$forBody = _$.value(2, (_scope, _params_3) => { _val$forBody2(_scope, _params_3[0]), _i$forBody2(_scope, _params_3[1]); }); _$.register( - "b", + "a0", _$.createRenderer( "
    :
    ", "D%c%", diff --git a/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/dom.expected/template.hydrate.js index a5081864d..483f4c2fd 100644 --- a/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 181 (min) 128 (brotli) -const _count_effect = _$.effect("b", (_scope) => +// size: 182 (min) 130 (brotli) +const _count_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.hydrate.js index 6334f4ba1..40768c180 100644 --- a/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.hydrate.js @@ -1,16 +1,16 @@ -// size: 248 (min) 125 (brotli) +// size: 251 (min) 125 (brotli) const _tagName = _$.state( 1, (_scope, tagName) => _$.tagVarSignal(_scope, tagName), () => _$.tagVarSignal, ); -_$.effect("e", (_scope) => _tagName(_scope, _scope[0].parentElement.tagName)), +_$.effect("a0", (_scope) => _tagName(_scope, _scope[0].parentElement.tagName)), _$.registerBoundSignal( - "c", + "b0", _$.value(5, (_scope, spanName) => _$.data(_scope[3], spanName)), ), _$.registerBoundSignal( - "d", + "b1", _$.value(4, (_scope, divName) => _$.data(_scope[1], divName)), ), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/dom.expected/template.hydrate.js index 952a091ee..9c4f90de2 100644 --- a/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/dom.expected/template.hydrate.js @@ -1,7 +1,7 @@ -// size: 208 (min) 150 (brotli) -const _ifBody = _$.register("b", _$.createRenderer("hi", "")), +// size: 210 (min) 155 (brotli) +const _ifBody = _$.register("a0", _$.createRenderer("hi", "")), _if = _$.conditional(1, 0), - _show_effect = _$.effect("c", (_scope) => + _show_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/dom.expected/template.hydrate.js index 0caa60880..4670f3366 100644 --- a/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 213 (min) 74 (brotli) -_$.register("b", _$.createRenderer("C", "")), - _$.register("c", _$.createRenderer("B", "")), - _$.register("d", _$.createRenderer("A", "")), - _$.register("e", _$.createRenderer("World", "")), - _$.register("f", _$.createRenderer("Hello", "")); +// size: 218 (min) 71 (brotli) +_$.register("a0", _$.createRenderer("C", "")), + _$.register("a1", _$.createRenderer("B", "")), + _$.register("a2", _$.createRenderer("A", "")), + _$.register("a3", _$.createRenderer("World", "")), + _$.register("a4", _$.createRenderer("Hello", "")); diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.hydrate.js index e33757cc5..deda7b866 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 720 (min) 294 (brotli) -const _expr__otherState_change_otherState_effect = _$.effect("d", (_scope) => +// size: 723 (min) 290 (brotli) +const _expr__otherState_change_otherState_effect = _$.effect("a0", (_scope) => _$.on( _scope[3], "click", @@ -14,7 +14,7 @@ const _expr__otherState_change_otherState_effect = _$.effect("d", (_scope) => _expr__otherState_change_otherState = _$.intersection(2, (_scope) => { _expr__otherState_change_otherState_effect(_scope); }), - _expr__state_change_state_effect = _$.effect("e", (_scope) => + _expr__state_change_state_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", @@ -64,7 +64,7 @@ const _expr__otherState_change_otherState_effect = _$.effect("d", (_scope) => ]), ), _valueChange = _$.register( - "c", + "b0", (_scope) => function (_new_source) { _source(_scope, _new_source); diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/dom.expected/template.hydrate.js index 0f46278d3..0dc46e222 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/dom.expected/template.hydrate.js @@ -1,12 +1,12 @@ -// size: 286 (min) 168 (brotli) +// size: 288 (min) 176 (brotli) _$.register( - "b", + "a0", (_scope) => function (newValue) { _x(_scope, newValue + 1); }, ); -const _expr_handler_y_effect = _$.effect("c", (_scope) => +const _expr_handler_y_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/dom.expected/template.hydrate.js index c98acc6bd..4a41917f4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/dom.expected/template.hydrate.js @@ -1,12 +1,12 @@ -// size: 279 (min) 171 (brotli) +// size: 281 (min) 171 (brotli) _$.register( - "b", + "a0", (_scope) => function (newValue) { _x(_scope, newValue + 1); }, ); -const _expr__y_change_y_effect = _$.effect("c", (_scope) => +const _expr__y_change_y_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/dom.expected/template.hydrate.js index 00352168b..672a0ba54 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 140 (min) 126 (brotli) -const _b_effect = _$.effect("b", (_scope) => +// size: 141 (min) 129 (brotli) +const _b_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/dom.expected/template.hydrate.js index 64959f749..fb91d35ef 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 141 (min) 103 (brotli) +// size: 142 (min) 103 (brotli) const _y = _$.state(3, (_scope, y) => _$.data(_scope[1], y)), - _x_effect = _$.effect("b", (_scope) => { + _x_effect = _$.effect("a0", (_scope) => { const { 2: x } = _scope; _y(_scope, x), _x(_scope, 2); }), diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/dom.expected/template.hydrate.js index ea5fd4e5d..55ccb38cc 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 367 (min) 197 (brotli) +// size: 368 (min) 200 (brotli) const _expr_y_z = _$.intersection(2, (_scope) => { const { 6: y, 7: z } = _scope; _a(_scope, y + z); @@ -14,7 +14,7 @@ const _expr_y_z = _$.intersection(2, (_scope) => { (_scope, y) => _$.data(_scope[2], y), () => _expr_y_z, ), - _x_effect = _$.effect("b", (_scope) => + _x_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/dom.expected/template.hydrate.js index 7f9338f77..1edb95656 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 223 (min) 143 (brotli) -const _expr_x_y_effect = _$.effect("b", (_scope) => +// size: 224 (min) 144 (brotli) +const _expr_x_y_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/dom.expected/template.hydrate.js index 307ad68b5..caed73985 100644 --- a/packages/translator-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/dom.expected/template.hydrate.js @@ -1,3 +1,3 @@ -// size: 85 (min) 78 (brotli) +// size: 86 (min) 77 (brotli) const _x = _$.state(1, (_scope, x) => _$.data(_scope[0], x)); -_$.effect("b", (_scope) => _x(_scope, "Client Only")), init(); +_$.effect("a0", (_scope) => _x(_scope, "Client Only")), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/dom.expected/template.hydrate.js index 0b1ce1aac..6d5651292 100644 --- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 344 (min) 173 (brotli) +// size: 345 (min) 174 (brotli) const _prev = _$.state(4, (_scope, prev) => _$.data(_scope[1], prev)), _onMount = (_scope) => { const { 3: x } = _scope; @@ -12,7 +12,7 @@ const _prev = _$.state(4, (_scope, prev) => _$.data(_scope[1], prev)), _prev(_scope, this.cur), (this.cur = x); }; }, - _x_effect = _$.effect("b", (_scope) => { + _x_effect = _$.effect("a0", (_scope) => { _$.lifecycle(_scope, 4, { onMount: _onMount(_scope), onUpdate: _onUpdate(_scope), diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/dom.expected/template.hydrate.js index e5c415023..19c422a2e 100644 --- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 318 (min) 178 (brotli) +// size: 319 (min) 179 (brotli) const _onUpdate = (_scope) => { const { 1: x } = _scope; return function () { @@ -6,7 +6,7 @@ const _onUpdate = (_scope) => { (this.cur = x); }; }, - _x_effect = _$.effect("b", (_scope) => { + _x_effect = _$.effect("a0", (_scope) => { _$.lifecycle(_scope, 3, { onMount: function () { this.onUpdate(); diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/dom.expected/template.hydrate.js index 301142030..42bf80d50 100644 --- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 363 (min) 166 (brotli) +// size: 364 (min) 166 (brotli) const _onMount = (_scope) => { const { 1: x } = _scope; return function () { @@ -11,7 +11,7 @@ const _onMount = (_scope) => { document.getElementById("ref").textContent = "Update " + x; }; }, - _x_effect = _$.effect("b", (_scope) => { + _x_effect = _$.effect("a0", (_scope) => { _$.lifecycle(_scope, 3, { onMount: _onMount(_scope), onUpdate: _onUpdate(_scope), diff --git a/packages/translator-tags/src/__tests__/fixtures/log-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/log-tag/__snapshots__/dom.expected/template.hydrate.js index 2ed84bc45..19d0dcd16 100644 --- a/packages/translator-tags/src/__tests__/fixtures/log-tag/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/log-tag/__snapshots__/dom.expected/template.hydrate.js @@ -1,3 +1,3 @@ -// size: 89 (min) 82 (brotli) +// size: 90 (min) 84 (brotli) const _output = _$.state(2, (_scope, output) => _$.data(_scope[0], output)); -_$.effect("b", (_scope) => _output(_scope, JSON.stringify(testLog))), init(); +_$.effect("a0", (_scope) => _output(_scope, JSON.stringify(testLog))), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/dom.expected/template.hydrate.js index 7fb917c0c..d481565fe 100644 --- a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 144 (min) 101 (brotli) +// size: 145 (min) 103 (brotli) const _child$forBody = _$.value(2, (_scope, child) => _$.data(_scope[0], child.text), ), @@ -6,6 +6,6 @@ const _child$forBody = _$.value(2, (_scope, child) => _child$forBody(_scope, _params_2[0]), ); _$.register( - "b", + "a0", _$.createRenderer(" ", " ", void 0, void 0, () => _params_2$forBody), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/dom.expected/template.hydrate.js index 7fb917c0c..d481565fe 100644 --- a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 144 (min) 101 (brotli) +// size: 145 (min) 103 (brotli) const _child$forBody = _$.value(2, (_scope, child) => _$.data(_scope[0], child.text), ), @@ -6,6 +6,6 @@ const _child$forBody = _$.value(2, (_scope, child) => _child$forBody(_scope, _params_2[0]), ); _$.register( - "b", + "a0", _$.createRenderer(" ", " ", void 0, void 0, () => _params_2$forBody), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.hydrate.js index ad3731603..f7bb76f91 100644 --- a/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.hydrate.js @@ -1,7 +1,7 @@ -// size: 79 (min) 74 (brotli) -_$.effect("d", (_scope) => { +// size: 81 (min) 77 (brotli) +_$.effect("a0", (_scope) => { const { 2: el } = _scope; el().textContent = "hello"; }), - _$.nodeRef("c", 0), + _$.nodeRef("b0", 0), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/dom.expected/template.hydrate.js index 378559e7f..1ac73b164 100644 --- a/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/dom.expected/template.hydrate.js @@ -1,2 +1,2 @@ -// size: 48 (min) 52 (brotli) -_$.effect("b", (_scope) => (_scope[0].textContent = "hello")), init(); +// size: 49 (min) 53 (brotli) +_$.effect("a0", (_scope) => (_scope[0].textContent = "hello")), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/dom.expected/template.hydrate.js index ecbf05d7f..587120e90 100644 --- a/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/dom.expected/template.hydrate.js @@ -1,11 +1,11 @@ -// size: 243 (min) 139 (brotli) +// size: 244 (min) 141 (brotli) const _lastCount2 = _$.state(6, (_scope, lastCount2) => _$.data(_scope[3], lastCount2), ), _lastCount = _$.state(5, (_scope, lastCount) => _$.data(_scope[2], lastCount), ), - _clickCount_effect = _$.effect("b", (_scope) => + _clickCount_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/dom.expected/template.hydrate.js index 4dcc335a7..f25e22930 100644 --- a/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 318 (min) 137 (brotli) -const _count_effect = _$.effect("b", (_scope) => { +// size: 319 (min) 138 (brotli) +const _count_effect = _$.effect("a0", (_scope) => { _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/dom.expected/template.hydrate.js index 7fb917c0c..d481565fe 100644 --- a/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/dom.expected/template.hydrate.js @@ -1,4 +1,4 @@ -// size: 144 (min) 101 (brotli) +// size: 145 (min) 103 (brotli) const _child$forBody = _$.value(2, (_scope, child) => _$.data(_scope[0], child.text), ), @@ -6,6 +6,6 @@ const _child$forBody = _$.value(2, (_scope, child) => _child$forBody(_scope, _params_2[0]), ); _$.register( - "b", + "a0", _$.createRenderer(" ", " ", void 0, void 0, () => _params_2$forBody), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/dom.expected/template.hydrate.js index 14acaa0a2..3f6d597bd 100644 --- a/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/dom.expected/template.hydrate.js @@ -1,8 +1,8 @@ -// size: 285 (min) 169 (brotli) +// size: 287 (min) 168 (brotli) function createWrapper(a) { return { a: a }; } -_$.register("b", createWrapper); +_$.register("a0", createWrapper); const _a = _$.value(5, (_scope, a) => { _$.data(_scope[1], a), ((_scope, b) => { @@ -10,7 +10,7 @@ const _a = _$.value(5, (_scope, a) => { })(_scope, a); }), _pattern_ = _$.value(4, (_scope, _pattern_) => _a(_scope, _pattern_.a)), - _count_effect = _$.effect("c", (_scope) => + _count_effect = _$.effect("a1", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/dom.expected/template.hydrate.js index 3fcbd939b..00fa9dbf7 100644 --- a/packages/translator-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 554 (min) 167 (brotli) -const _count4_effect = _$.effect("b", (_scope) => +// size: 558 (min) 169 (brotli) +const _count4_effect = _$.effect("a0", (_scope) => _$.on( _scope[6], "click", @@ -14,7 +14,7 @@ const _count4_effect = _$.effect("b", (_scope) => _count4 = _$.state(11, (_scope, _count3) => { _$.data(_scope[7], _count3), _count4_effect(_scope); }), - _count3_effect = _$.effect("c", (_scope) => + _count3_effect = _$.effect("a1", (_scope) => _$.on( _scope[4], "click", @@ -29,7 +29,7 @@ const _count4_effect = _$.effect("b", (_scope) => _count3 = _$.state(10, (_scope, _count2) => { _$.data(_scope[5], _count2), _count3_effect(_scope); }), - _count2_effect = _$.effect("d", (_scope) => + _count2_effect = _$.effect("a2", (_scope) => _$.on( _scope[2], "click", @@ -44,7 +44,7 @@ const _count4_effect = _$.effect("b", (_scope) => _count2 = _$.state(9, (_scope, _count) => { _$.data(_scope[3], _count), _count2_effect(_scope); }), - _count_effect = _$.effect("e", (_scope) => + _count_effect = _$.effect("a3", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/dom.expected/template.hydrate.js index 414eba570..e497e4500 100644 --- a/packages/translator-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/dom.expected/template.hydrate.js @@ -1,12 +1,12 @@ -// size: 461 (min) 224 (brotli) +// size: 463 (min) 222 (brotli) function noop(_) {} -_$.register("b", noop); +_$.register("a0", noop); const _e = _$.state(10, (_scope, e) => _$.data(_scope[5], JSON.stringify(e))), _d = _$.state(9, (_scope, d) => _$.data(_scope[4], d)), _c = _$.state(8, (_scope, c) => _$.data(_scope[3], JSON.stringify(c))), _b = _$.state(7, (_scope, b) => _$.data(_scope[2], b)), _a = _$.state(6, (_scope, a) => _$.data(_scope[1], a)); -_$.effect("c", (_scope) => +_$.effect("a1", (_scope) => _$.on(_scope[0], "click", function () { let local, _a2, _b2, _c2, _d2, _e2; ({ diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.hydrate.js index 345bf7363..9d26c1594 100644 --- a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.hydrate.js @@ -1,8 +1,8 @@ -// size: 118 (min) 92 (brotli) +// size: 119 (min) 109 (brotli) const _value$ifBody = _$.closure(3, (_scope, value) => _$.data(_scope[0], value), ); _$.register( - "b", + "a0", _$.createRenderer(" ", "D ", void 0, () => [_value$ifBody]), ); diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.hydrate.js index 576a1e1ba..5ddd22997 100644 --- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.hydrate.js @@ -1,5 +1,5 @@ -// size: 818 (min) 332 (brotli) -const _count$ifBody_effect = _$.effect("b", (_scope) => +// size: 824 (min) 341 (brotli) +const _count$ifBody_effect = _$.effect("a0", (_scope) => _$.on( _scope[0], "click", @@ -16,7 +16,7 @@ const _count$ifBody_effect = _$.effect("b", (_scope) => ), ), _count$ifBody = _$.registerSubscriber( - "c", + "a1", _$.dynamicClosure( 4, (_scope, count) => { @@ -26,13 +26,13 @@ const _count$ifBody_effect = _$.effect("b", (_scope) => ), ), _ifBody2 = _$.register( - "d", + "a2", _$.createRenderer("", " D ", void 0, () => [ _count$ifBody, ]), ), _if$ifBody = _$.conditional(1, 0), - _inner$ifBody_effect = _$.effect("e", (_scope) => + _inner$ifBody_effect = _$.effect("a3", (_scope) => _$.on( _scope[0], "click", @@ -55,7 +55,7 @@ const _count$ifBody_effect = _$.effect("b", (_scope) => () => _if$ifBody, ), _ifBody = _$.register( - "f", + "a4", _$.createRenderer( "", " b%D", @@ -66,7 +66,7 @@ const _count$ifBody_effect = _$.effect("b", (_scope) => _if = _$.conditional(1, 0), _count = _$.state(4, 0, () => _$.dynamicSubscribers(4)), _inner = _$.state(3, 0, () => _$.inConditionalScope(_inner$ifBody, 1)), - _outer_effect = _$.effect("g", (_scope) => + _outer_effect = _$.effect("a5", (_scope) => _$.on( _scope[0], "click", diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.hydrate.js index 5ff54f38b..53db2e4a4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 546 (min) 223 (brotli) +// size: 551 (min) 198 (brotli) const _value2$ifBody = _$.registerSubscriber( - "b", + "a0", _$.dynamicClosure( 5, (_scope, value2) => _$.data(_scope[0], value2), @@ -8,11 +8,11 @@ const _value2$ifBody = _$.registerSubscriber( ), ), _ifBody3 = _$.register( - "c", + "a1", _$.createRenderer(" ", "D ", void 0, () => [_value2$ifBody]), ), _value1$ifBody = _$.registerSubscriber( - "d", + "a2", _$.dynamicClosure( 4, (_scope, value1) => _$.data(_scope[0], value1), @@ -20,7 +20,7 @@ const _value2$ifBody = _$.registerSubscriber( ), ), _ifBody2 = _$.register( - "e", + "a3", _$.createRenderer(" ", "D ", void 0, () => [_value1$ifBody]), ), _if$ifBody2 = _$.conditional(1, 0), @@ -38,7 +38,7 @@ const _value2$ifBody = _$.registerSubscriber( () => _if$ifBody, ); _$.register( - "f", + "a4", _$.createRenderer("", "D%b%D", void 0, () => [ _value2$ifBody2, _value1$ifBody2, diff --git a/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/dom.expected/template.hydrate.js index e4086781e..1235941cc 100644 --- a/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/dom.expected/template.hydrate.js @@ -1,6 +1,6 @@ -// size: 101 (min) 66 (brotli) -_$.effect("b", (_scope) => _$.attrsEvents(_scope, 1)), - _$.effect("c", (_scope) => { +// size: 103 (min) 71 (brotli) +_$.effect("a0", (_scope) => _$.attrsEvents(_scope, 1)), + _$.effect("a1", (_scope) => { _$.attrsEvents(_scope, 0), _$.attrsEvents(_scope, 2); }), init(); diff --git a/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/dom.expected/template.hydrate.js index 9ab67cc86..911416fa4 100644 --- a/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/dom.expected/template.hydrate.js +++ b/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/dom.expected/template.hydrate.js @@ -1,7 +1,7 @@ -// size: 184 (min) 145 (brotli) +// size: 185 (min) 131 (brotli) const _b = _$.state(5, (_scope, b) => _$.data(_scope[1], b)), _a = _$.state(4, (_scope, a) => _$.data(_scope[0], a)); -_$.effect("b", (_scope) => { +_$.effect("a0", (_scope) => { const { 3: input } = _scope; { const previousValue = _a(_scope, input.value + 1); diff --git a/packages/translator-tags/src/__tests__/utils/bundle.ts b/packages/translator-tags/src/__tests__/utils/bundle.ts index cca533fee..3701dfa7f 100644 --- a/packages/translator-tags/src/__tests__/utils/bundle.ts +++ b/packages/translator-tags/src/__tests__/utils/bundle.ts @@ -1,9 +1,11 @@ import * as compiler from "@marko/compiler"; import pluginTerser from "@rollup/plugin-terser"; import fs from "fs/promises"; +import path from "path"; import { format } from "prettier"; import { type OutputChunk, rollup } from "rollup"; import { minify } from "terser"; +import glob from "tiny-glob"; import zlib from "zlib"; interface Sizes { @@ -18,8 +20,11 @@ export async function bundle( ) { const cache = new Map(); const hydratePrefix = "\0hydrate:"; - const registryIds = new Map(); const entryCode = await fs.readFile(entryTemplate, "utf-8"); + const optimizeKnownTemplates: string[] = await glob( + path.join(path.dirname(entryTemplate), "**/*.marko"), + { absolute: true }, + ); const bundle = await rollup({ input: hydratePrefix + entryTemplate, onwarn(warning, warn) { @@ -77,13 +82,7 @@ export async function bundle( ...compilerConfig, cache, optimize: true, - optimizeRegistryId(id) { - let registryId = registryIds.get(id); - if (registryId === undefined) { - registryIds.set(id, (registryId = registryIds.size)); - } - return registryId; - }, + optimizeKnownTemplates, output: isHydrate ? "hydrate" : "dom", }) ).code; diff --git a/scripts/sizes.ts b/scripts/sizes.ts index 337a08070..e2225e675 100644 --- a/scripts/sizes.ts +++ b/scripts/sizes.ts @@ -8,6 +8,7 @@ import { format } from "prettier"; import { type OutputAsset, type OutputChunk, rollup } from "rollup"; import { table } from "table"; import { minify } from "terser"; +import glob from "tiny-glob"; import zlib from "zlib"; const compiledOutputDir = path.join(process.cwd(), ".sizes"); @@ -226,7 +227,11 @@ function addSizes(all: Sizes[]) { async function bundleExample(examplePath: string, hydrate: boolean) { const isRuntime = examplePath === runtimePath; const virtualEntry = "./entry.js"; - const registryIds = new Map(); + const optimizeKnownTemplates: string[] | undefined = isRuntime + ? undefined + : await glob(path.join(path.dirname(examplePath), "**/*.marko"), { + absolute: true, + }); const bundle = await rollup({ input: isRuntime ? runtimePath : virtualEntry, plugins: [ @@ -249,13 +254,7 @@ async function bundleExample(examplePath: string, hydrate: boolean) { configFile: false, }, writeVersionComment: false, - optimizeRegistryId(id) { - let registryId = registryIds.get(id); - if (registryId === undefined) { - registryIds.set(id, (registryId = registryIds.size)); - } - return registryId; - }, + optimizeKnownTemplates, }) ).code; }