ripple 0.2.67 → 0.2.69

package/src/compiler/phases/3-transform/index.js

@@ -3,7 +3,13 @@ import path from 'node:path';
 import { print } from 'esrap';
 import tsx from 'esrap/languages/tsx';
 import * as b from '../../../utils/builders.js';
-import { IS_CONTROLLED, TEMPLATE_FRAGMENT } from '../../../constants.js';
+import {
+  IS_CONTROLLED,
+  IS_INDEXED,
+  TEMPLATE_FRAGMENT,
+  TEMPLATE_SVG_NAMESPACE,
+  TEMPLATE_MATHML_NAMESPACE,
+} from '../../../constants.js';
 import { sanitize_template_string } from '../../../utils/sanitize_template_string.js';
 import {
   build_hoisted_params,
@@ -13,7 +19,6 @@ import {
   escape_html,
   is_boolean_attribute,
   is_dom_property,
-  is_ripple_import,
   is_declared_function_within_component,
   is_inside_call_expression,
   is_value_static,
@@ -21,6 +26,7 @@ import {
   is_component_level_function,
   is_element_dom_element,
   is_top_level_await,
+  is_ripple_track_call,
 } from '../../utils.js';
 import is_reference from 'is-reference';
 import { object } from '../../../utils/ast.js';
@@ -29,8 +35,8 @@ import { is_event_attribute, is_passive_event } from '../../../utils/events.js';
 
 function add_ripple_internal_import(context) {
   if (!context.state.to_ts) {
-    if (!context.state.imports.has(`import * as $ from 'ripple/internal/client'`)) {
-      context.state.imports.add(`import * as $ from 'ripple/internal/client'`);
+    if (!context.state.imports.has(`import * as _$_ from 'ripple/internal/client'`)) {
+      context.state.imports.add(`import * as _$_ from 'ripple/internal/client'`);
     }
   }
 }
@@ -66,7 +72,7 @@ function visit_function(node, context) {
 
     if (!is_inside_component(context, true) && is_component_level_function(context)) {
       add_ripple_internal_import(context);
-      new_body.push(b.var('__block', b.call('$.scope')));
+      new_body.push(b.var('__block', b.call('_$_.scope')));
     }
     if (body.type === 'BlockStatement') {
       new_body.push(...body.body);
@@ -104,6 +110,22 @@ function build_getter(node, context) {
   return node;
 }
 
+function determine_namespace_for_children(element_name, current_namespace) {
+  if (element_name === 'foreignObject') {
+    return 'html';
+  }
+
+  if (element_name === 'svg') {
+    return 'svg';
+  }
+
+  if (element_name === 'math') {
+    return 'mathml';
+  }
+
+  return current_namespace;
+}
+
 const visitors = {
   _: function set_scope(node, { next, state }) {
     const scope = state.scopes.get(node);
@@ -128,14 +150,17 @@ const visitors = {
         if (
           (context.state.metadata?.tracking === false ||
             (parent.type !== 'AssignmentExpression' && parent.type !== 'UpdateExpression')) &&
-          (node.tracked || binding?.kind === 'prop' || binding?.kind === 'prop_fallback') &&
+          (node.tracked ||
+            binding?.kind === 'prop' ||
+            binding?.kind === 'index' ||
+            binding?.kind === 'prop_fallback') &&
           binding?.node !== node
         ) {
           if (context.state.metadata?.tracking === false) {
             context.state.metadata.tracking = true;
           }
           if (node.tracked) {
-            return b.call('$.get', build_getter(node, context));
+            return b.call('_$_.get', build_getter(node, context));
           }
         }
 
@@ -165,12 +190,7 @@ const visitors = {
       context.state.metadata.tracking = true;
     }
 
-    if (
-      !context.state.to_ts &&
-      callee.type === 'Identifier' &&
-      callee.name === 'track' &&
-      is_ripple_import(callee, context)
-    ) {
+    if (!context.state.to_ts && is_ripple_track_call(callee, context)) {
       if (node.arguments.length === 0) {
         node.arguments.push(b.void0);
       }
@@ -186,9 +206,6 @@ const visitors = {
       (parent?.type === 'MemberExpression' && parent.property === node) ||
       is_inside_call_expression(context) ||
       !context.path.some((node) => node.type === 'Component') ||
-      (is_ripple_import(callee, context) &&
-        (callee.type !== 'Identifier' ||
-          (callee.name !== 'array' && callee.name !== 'deferred'))) ||
       is_declared_function_within_component(callee, context)
     ) {
       return context.next();
@@ -200,11 +217,11 @@ const visitors = {
 
       if (callee.computed) {
         return b.call(
-          '$.with_scope',
+          '_$_.with_scope',
           b.id('__block'),
           b.thunk(
             b.call(
-              '$.call_property',
+              '_$_.call_property',
               context.visit(callee.object),
               context.visit(property),
               callee.optional ? b.true : undefined,
@@ -217,7 +234,7 @@ const visitors = {
     }
 
     return b.call(
-      '$.with_scope',
+      '_$_.with_scope',
       b.id('__block'),
       b.thunk(
         {
@@ -269,7 +286,7 @@ const visitors = {
     }
 
     return b.call(
-      '$.with_scope',
+      '_$_.with_scope',
       b.id('__block'),
       b.thunk({
         ...node,
@@ -290,7 +307,7 @@ const visitors = {
       add_ripple_internal_import(context);
 
       return b.call(
-        '$.get_property',
+        '_$_.get_property',
         context.visit(node.object),
         node.computed ? context.visit(node.property) : b.literal(node.property.name),
         node.optional ? b.true : undefined,
@@ -351,13 +368,13 @@ const visitors = {
             // TypeScript mode: lighter transformation
             if (metadata.tracking && !metadata.await) {
               expression = b.call(
-                '$.derived',
+                '_$_.derived',
                 b.thunk(context.visit(declarator.init)),
                 b.id('__block'),
               );
             } else {
               expression = b.call(
-                '$.tracked',
+                '_$_.tracked',
                 declarator.init === null ? undefined : context.visit(declarator.init),
                 b.id('__block'),
               );
@@ -369,9 +386,9 @@ const visitors = {
               expression = b.call(
                 b.await(
                   b.call(
-                    '$.resume_context',
+                    '_$_.resume_context',
                     b.call(
-                      '$.async_computed',
+                      '_$_.async_computed',
                       b.thunk(context.visit(declarator.init), true),
                       b.id('__block'),
                     ),
@@ -380,13 +397,13 @@ const visitors = {
               );
             } else if (metadata.tracking && !metadata.await) {
               expression = b.call(
-                '$.derived',
+                '_$_.derived',
                 b.thunk(context.visit(declarator.init)),
                 b.id('__block'),
               );
             } else {
               expression = b.call(
-                '$.tracked',
+                '_$_.tracked',
                 declarator.init === null ? undefined : context.visit(declarator.init),
                 b.id('__block'),
               );
@@ -426,6 +443,10 @@ const visitors = {
     const is_spreading = node.attributes.some((attr) => attr.type === 'SpreadAttribute');
     const spread_attributes = is_spreading ? [] : null;
 
+    const child_namespace = is_dom_element
+      ? determine_namespace_for_children(node.id.name, state.namespace)
+      : state.namespace;
+
     const handle_static_attr = (name, value) => {
       const attr_value = b.literal(
         ` ${name}${
@@ -481,9 +502,9 @@ const visitors = {
               const expression = visit(attr.value, { ...state, metadata });
 
               if (name === '$value' || metadata.tracking) {
-                local_updates.push(b.stmt(b.call('$.set_value', id, expression)));
+                local_updates.push(b.stmt(b.call('_$_.set_value', id, expression)));
               } else {
-                state.init.push(b.stmt(b.call('$.set_value', id, expression)));
+                state.init.push(b.stmt(b.call('_$_.set_value', id, expression)));
               }
 
               continue;
@@ -495,9 +516,9 @@ const visitors = {
               const expression = visit(attr.value, { ...state, metadata });
 
               if (name === '$checked' || metadata.tracking) {
-                local_updates.push(b.stmt(b.call('$.set_checked', id, expression)));
+                local_updates.push(b.stmt(b.call('_$_.set_checked', id, expression)));
               } else {
-                state.init.push(b.stmt(b.call('$.set_checked', id, expression)));
+                state.init.push(b.stmt(b.call('_$_.set_checked', id, expression)));
               }
               continue;
             }
@@ -508,9 +529,9 @@ const visitors = {
               const expression = visit(attr.value, { ...state, metadata });
 
               if (name === '$selected' || metadata.tracking) {
-                local_updates.push(b.stmt(b.call('$.set_selected', id, expression)));
+                local_updates.push(b.stmt(b.call('_$_.set_selected', id, expression)));
               } else {
-                state.init.push(b.stmt(b.call('$.set_selected', id, expression)));
+                state.init.push(b.stmt(b.call('_$_.set_selected', id, expression)));
               }
               continue;
             }
@@ -563,7 +584,7 @@ const visitors = {
                 state.init.push(
                   b.stmt(
                     b.call(
-                      '$.event',
+                      '_$_.event',
                       b.literal(event_name),
                       id,
                       handler,
@@ -588,7 +609,7 @@ const visitors = {
                 local_updates.push(b.stmt(b.assignment('=', b.member(id, attribute), expression)));
               } else {
                 local_updates.push(
-                  b.stmt(b.call('$.set_attribute', id, b.literal(attribute), expression)),
+                  b.stmt(b.call('_$_.set_attribute', id, b.literal(attribute), expression)),
                 );
               }
             } else {
@@ -597,7 +618,9 @@ const visitors = {
               if (is_dom_property(name)) {
                 state.init.push(b.stmt(b.assignment('=', b.member(id, name), expression)));
               } else {
-                state.init.push(b.stmt(b.call('$.set_attribute', id, b.literal(name), expression)));
+                state.init.push(
+                  b.stmt(b.call('_$_.set_attribute', id, b.literal(name), expression)),
+                );
               }
             }
           }
@@ -605,7 +628,7 @@ const visitors = {
           spread_attributes.push(b.spread(visit(attr.argument, state)));
         } else if (attr.type === 'RefAttribute') {
           const id = state.flush_node();
-          state.init.push(b.stmt(b.call('$.ref', id, b.thunk(visit(attr.argument, state)))));
+          state.init.push(b.stmt(b.call('_$_.ref', id, b.thunk(visit(attr.argument, state)))));
         }
       }
 
@@ -626,11 +649,16 @@ const visitors = {
           if (node.metadata.scoped && state.component.css) {
             expression = b.binary('+', b.literal(state.component.css.hash + ' '), expression);
           }
+          const is_html = context.state.metadata.namespace === 'html' && node.id.name !== 'svg';
 
           if (class_attribute.name.name === '$class' || metadata.tracking) {
-            local_updates.push(b.stmt(b.call('$.set_class', id, expression)));
+            local_updates.push(
+              b.stmt(b.call('_$_.set_class', id, expression, undefined, b.literal(is_html))),
+            );
           } else {
-            state.init.push(b.stmt(b.call('$.set_class', id, expression)));
+            state.init.push(
+              b.stmt(b.call('_$_.set_class', id, expression, undefined, b.literal(is_html))),
+            );
           }
         }
       } else if (node.metadata.scoped && state.component.css) {
@@ -644,7 +672,7 @@ const visitors = {
       if (spread_attributes !== null && spread_attributes.length > 0) {
         const id = state.flush_node();
         state.init.push(
-          b.stmt(b.call('$.render_spread', id, b.thunk(b.object(spread_attributes)))),
+          b.stmt(b.call('_$_.render_spread', id, b.thunk(b.object(spread_attributes)))),
         );
       }
 
@@ -654,7 +682,7 @@ const visitors = {
       if (!is_void) {
         transform_children(node.children, {
           visit,
-          state: { ...state, init, update },
+          state: { ...state, init, update, namespace: child_namespace },
           root: false,
         });
         state.template.push(`</${node.id.name}>`);
@@ -668,7 +696,7 @@ const visitors = {
 
       if (update.length > 0) {
         if (state.scope.parent.declarations.size > 0) {
-          state.init.push(b.stmt(b.call('$.render', b.thunk(b.block(update), !!update.async))));
+          state.init.push(b.stmt(b.call('_$_.render', b.thunk(b.block(update), !!update.async))));
         } else {
           state.update.push(...update);
         }
@@ -710,7 +738,7 @@ const visitors = {
             ),
           );
         } else if (attr.type === 'RefAttribute') {
-          props.push(b.prop('init', b.call('$.ref_prop'), visit(attr.argument, state), true));
+          props.push(b.prop('init', b.call('_$_.ref_prop'), visit(attr.argument, state), true));
         } else if (attr.type === 'AccessorAttribute') {
           let get_expr;
 
@@ -765,7 +793,7 @@ const visitors = {
       for (const child of node.children) {
         if (child.type === 'Component') {
           const id = child.id;
-          props.push(b.prop('init', id, visit(child, state)));
+          props.push(b.prop('init', id, visit(child, { ...state, namespace: child_namespace })));
         } else {
           children_filtered.push(child);
         }
@@ -776,6 +804,7 @@ const visitors = {
         const children = visit(b.component(b.id('children'), [], children_filtered), {
           ...context.state,
           scope: component_scope,
+          namespace: child_namespace,
         });
 
         if (children_prop) {
@@ -791,14 +820,14 @@ const visitors = {
             b.call(
               node.id,
               id,
-              b.call('$.spread_props', b.thunk(b.object(props)), b.id('__block')),
-              b.id('$.active_block'),
+              b.call('_$_.spread_props', b.thunk(b.object(props)), b.id('__block')),
+              b.id('_$_.active_block'),
             ),
           ),
         );
       } else {
         state.init.push(
-          b.stmt(b.call(visit(node.id, state), id, b.object(props), b.id('$.active_block'))),
+          b.stmt(b.call(visit(node.id, state), id, b.object(props), b.id('_$_.active_block'))),
         );
       }
     }
@@ -821,7 +850,7 @@ const visitors = {
       [b.id('__anchor'), ...node.params.map((param) => context.visit(param, context.state))],
       b.block(
         metadata.await
-          ? [b.stmt(b.call('$.async', b.thunk(b.block(body_statements), true)))]
+          ? [b.stmt(b.call('_$_.async', b.thunk(b.block(body_statements), true)))]
           : body_statements,
       ),
     );
@@ -859,12 +888,12 @@ const visitors = {
     }
 
     const body_statements = [
-      b.stmt(b.call('$.push_component')),
+      b.stmt(b.call('_$_.push_component')),
       ...transform_body(node.body, {
         ...context,
         state: { ...context.state, component: node, metadata },
       }),
-      b.stmt(b.call('$.pop_component')),
+      b.stmt(b.call('_$_.pop_component')),
     ];
 
     if (node.css !== null && node.css) {
@@ -879,7 +908,7 @@ const visitors = {
       b.block([
         ...(prop_statements ?? []),
         ...(metadata.await
-          ? [b.stmt(b.call('$.async', b.thunk(b.block(body_statements), true)))]
+          ? [b.stmt(b.call('_$_.async', b.thunk(b.block(body_statements), true)))]
           : body_statements),
       ]),
     );
@@ -906,7 +935,7 @@ const visitors = {
       }
 
       return b.call(
-        '$.set_property',
+        '_$_.set_property',
         context.visit(left.object, { ...context.state, metadata: { tracking: false } }),
         left.computed ? context.visit(left.property) : b.literal(left.property.name),
         operator === '='
@@ -926,7 +955,7 @@ const visitors = {
       const right = node.right;
 
       return b.call(
-        '$.set',
+        '_$_.set',
         context.visit(left, { ...context.state, metadata: { tracking: null } }),
         operator === '='
           ? context.visit(right)
@@ -960,7 +989,7 @@ const visitors = {
       context.state.metadata.tracking = true;
 
       return b.call(
-        node.prefix ? '$.update_pre_property' : '$.update_property',
+        node.prefix ? '_$_.update_pre_property' : '_$_.update_property',
         context.visit(argument.object, { ...context.state, metadata: { tracking: false } }),
         argument.computed ? context.visit(argument.property) : b.literal(argument.property.name),
         b.id('__block'),
@@ -970,7 +999,7 @@ const visitors = {
 
     if (argument.type === 'Identifier' && argument.tracked) {
       return b.call(
-        node.prefix ? '$.update_pre' : '$.update',
+        node.prefix ? '_$_.update_pre' : '_$_.update',
         context.visit(argument, { ...context.state, metadata: { tracking: null } }),
         b.id('__block'),
         node.operator === '--' ? b.literal(-1) : undefined,
@@ -997,6 +1026,12 @@ const visitors = {
       return;
     }
     const is_controlled = node.is_controlled;
+    const index = node.index;
+    let flags = is_controlled ? IS_CONTROLLED : 0;
+
+    if (index !== null) {
+      flags |= IS_INDEXED;
+    }
 
     // do only if not controller
     if (!is_controlled) {
@@ -1010,19 +1045,19 @@ const visitors = {
     context.state.init.push(
       b.stmt(
         b.call(
-          '$.for',
+          '_$_.for',
           id,
           b.thunk(context.visit(node.right)),
           b.arrow(
-            [b.id('__anchor'), pattern],
+            index ? [b.id('__anchor'), pattern, index] : [b.id('__anchor'), pattern],
             b.block(
               transform_body(node.body.body, {
                 ...context,
-                state: { ...context.state, scope: body_scope },
+                state: { ...context.state, scope: body_scope, namespace: context.state.namespace },
               }),
             ),
           ),
-          b.literal(is_controlled ? IS_CONTROLLED : 0),
+          b.literal(flags),
         ),
       ),
     );
@@ -1070,7 +1105,7 @@ const visitors = {
     statements.push(
       b.stmt(
         b.call(
-          '$.if',
+          '_$_.if',
           id,
           b.arrow(
             [b.id('__render')],
@@ -1119,13 +1154,13 @@ const visitors = {
     });
 
     if (metadata.pending) {
-      body = [b.stmt(b.call('$.async', b.thunk(b.block(body), true)))];
+      body = [b.stmt(b.call('_$_.async', b.thunk(b.block(body), true)))];
     }
 
     context.state.init.push(
       b.stmt(
         b.call(
-          '$.try',
+          '_$_.try',
           id,
           b.arrow([b.id('__anchor')], b.block(body)),
           node.handler === null
@@ -1151,7 +1186,7 @@ const visitors = {
       context.state.metadata.await = true;
     }
 
-    return b.call(b.await(b.call('$.maybe_tracked', context.visit(node.argument))));
+    return b.call(b.await(b.call('_$_.maybe_tracked', context.visit(node.argument))));
   },
 
   BinaryExpression(node, context) {
@@ -1466,9 +1501,15 @@ function transform_children(children, context) {
 
     if (child.type === 'Text' && prev_child?.type === 'Text') {
       if (child.expression.type === 'Literal' && prev_child.expression.type === 'Literal') {
-        prev_child.expression = b.literal(prev_child.expression.value + child.expression.value);
+        prev_child.expression = b.literal(
+          prev_child.expression.value + String(child.expression.value),
+        );
       } else {
-        prev_child.expression = b.binary('+', prev_child.expression, child.expression);
+        prev_child.expression = b.binary(
+          '+',
+          prev_child.expression,
+          b.call('String', child.expression),
+        );
       }
       normalized.splice(i, 1);
     }
@@ -1489,7 +1530,7 @@ function transform_children(children, context) {
       const metadata = { await: false };
       state.init.push(visit(node, { ...state, metadata }));
       if (metadata.await) {
-        state.init.push(b.if(b.call('$.aborted'), b.return(null)));
+        state.init.push(b.if(b.call('_$_.aborted'), b.return(null)));
         if (state.metadata?.await === false) {
           state.metadata.await = true;
         }
@@ -1508,13 +1549,13 @@ function transform_children(children, context) {
           return cached;
         } else if (current_prev !== null) {
           const id = get_id(node);
-          state.setup.push(b.var(id, b.call('$.sibling', current_prev())));
+          state.setup.push(b.var(id, b.call('_$_.sibling', current_prev())));
           cached = id;
           return id;
         } else if (initial !== null) {
           if (is_fragment) {
             const id = get_id(node);
-            state.setup.push(b.var(id, b.call('$.child_frag', initial)));
+            state.setup.push(b.var(id, b.call('_$_.child_frag', initial)));
             cached = id;
             return id;
           }
@@ -1525,7 +1566,7 @@ function transform_children(children, context) {
           }
 
           const id = get_id(node);
-          state.setup.push(b.var(id, b.call('$.child', state.flush_node())));
+          state.setup.push(b.var(id, b.call('_$_.child', state.flush_node())));
           cached = id;
           return id;
         } else {
@@ -1536,7 +1577,7 @@ function transform_children(children, context) {
       prev = flush_node;
 
       if (node.type === 'Element') {
-        visit(node, { ...state, flush_node });
+        visit(node, { ...state, flush_node, namespace: state.namespace });
       } else if (node.type === 'Text') {
         const metadata = { tracking: false, await: false };
         const expression = visit(node.expression, { ...state, metadata });
@@ -1544,7 +1585,7 @@ function transform_children(children, context) {
         if (metadata.tracking) {
           state.template.push(' ');
           const id = flush_node();
-          state.update.push(b.stmt(b.call('$.set_text', id, expression)));
+          state.update.push(b.stmt(b.call('_$_.set_text', id, expression)));
           if (metadata.await) {
             state.update.async = true;
           }
@@ -1556,7 +1597,7 @@ function transform_children(children, context) {
             state.template.push(' ');
             state.init.push(
               b.stmt(
-                b.assignment('=', b.member(b.call('$.child', id), b.id('nodeValue')), expression),
+                b.assignment('=', b.member(b.call('_$_.child', id), b.id('nodeValue')), expression),
               ),
             );
           }
@@ -1564,7 +1605,7 @@ function transform_children(children, context) {
           // Handle Text nodes in fragments
           state.template.push(' ');
           const id = flush_node();
-          state.update.push(b.stmt(b.call('$.set_text', id, expression)));
+          state.update.push(b.stmt(b.call('_$_.set_text', id, expression)));
           if (metadata.await) {
             state.update.async = true;
           }
@@ -1572,26 +1613,33 @@ function transform_children(children, context) {
       } else if (node.type === 'ForOfStatement') {
         const is_controlled = normalized.length === 1;
         node.is_controlled = is_controlled;
-        visit(node, { ...state, flush_node });
+        visit(node, { ...state, flush_node, namespace: state.namespace });
       } else if (node.type === 'IfStatement') {
         const is_controlled = normalized.length === 1;
         node.is_controlled = is_controlled;
-        visit(node, { ...state, flush_node });
+        visit(node, { ...state, flush_node, namespace: state.namespace });
       } else if (node.type === 'TryStatement') {
         const is_controlled = normalized.length === 1;
         node.is_controlled = is_controlled;
-        visit(node, { ...state, flush_node });
+        visit(node, { ...state, flush_node, namespace: state.namespace });
       } else {
         debugger;
       }
     }
   }
 
+  const template_namespace = state.namespace || 'html';
+
   if (root && initial !== null && template_id !== null) {
-    const flags = is_fragment ? b.literal(TEMPLATE_FRAGMENT) : b.literal(0);
-    state.final.push(b.stmt(b.call('$.append', b.id('__anchor'), initial)));
+    let flags = is_fragment ? TEMPLATE_FRAGMENT : 0;
+    if (template_namespace === 'svg') {
+      flags |= TEMPLATE_SVG_NAMESPACE;
+    } else if (template_namespace === 'mathml') {
+      flags |= TEMPLATE_MATHML_NAMESPACE;
+    }
+    state.final.push(b.stmt(b.call('_$_.append', b.id('__anchor'), initial)));
     state.hoisted.push(
-      b.var(template_id, b.call('$.template', join_template(state.template), flags)),
+      b.var(template_id, b.call('_$_.template', join_template(state.template), b.literal(flags))),
     );
   }
 }
@@ -1605,12 +1653,13 @@ function transform_body(body, { visit, state }) {
     update: [],
     final: [],
     metadata: state.metadata,
+    namespace: state.namespace || 'html', // Preserve namespace context
   };
 
   transform_children(body, { visit, state: body_state, root: true });
 
   if (body_state.update.length > 0) {
-    body_state.init.push(b.stmt(b.call('$.render', b.thunk(b.block(body_state.update)))));
+    body_state.init.push(b.stmt(b.call('_$_.render', b.thunk(b.block(body_state.update)))));
   }
 
   return [...body_state.setup, ...body_state.init, ...body_state.final];
@@ -1633,7 +1682,9 @@ export function transform(filename, source, analysis, to_ts) {
     to_ts,
   };
 
-  const program = /** @type {ESTree.Program} */ (walk(analysis.ast, state, visitors));
+  const program = /** @type {ESTree.Program} */ (
+    walk(analysis.ast, { ...state, namespace: 'html' }, visitors)
+  );
 
   for (const hoisted of state.hoisted) {
     program.body.unshift(hoisted);
@@ -1646,7 +1697,7 @@ export function transform(filename, source, analysis, to_ts) {
   if (state.events.size > 0) {
     program.body.push(
       b.stmt(
-        b.call('$.delegate', b.array(Array.from(state.events).map((name) => b.literal(name)))),
+        b.call('_$_.delegate', b.array(Array.from(state.events).map((name) => b.literal(name)))),
       ),
     );
   }