@barefootjs/jsx 0.31.3 → 0.31.4

package/src/jsx-to-ir.ts

@@ -63,6 +63,7 @@ import { reconstructAsSegments } from './strip-types.ts'
 import { templatePartsToJsExpr } from './template-parts.ts'
 import { toHTMLAttrName, decodeEntities } from '@barefootjs/shared'
 import { BindingScope } from './scope/binding-scope.ts'
+import { identifierPattern, identifierCallPattern } from './identifier-pattern.ts'
 
 // =============================================================================
 // Transform Context
@@ -681,19 +682,19 @@ function createTransformContext(analyzer: AnalyzerContext): TransformContext {
     patterns: {
       signals: analyzer.signals.map(s => ({
         getter: s.getter,
-        pattern: new RegExp(`\\b${s.getter}\\s*\\(`),
+        pattern: identifierCallPattern(s.getter),
       })),
       memos: analyzer.memos.map(m => ({
         name: m.name,
-        pattern: new RegExp(`\\b${m.name}\\s*\\(`),
+        pattern: identifierCallPattern(m.name),
       })),
       props: analyzer.propsParams
         .filter(p => p.name !== 'children')
-        .map(p => ({ name: p.name, pattern: new RegExp(`\\b${p.name}\\b`) })),
+        .map(p => ({ name: p.name, pattern: identifierPattern(p.name) })),
       constants: analyzer.localConstants.map(c => ({
         name: c.name,
         value: c.value,
-        pattern: new RegExp(`\\b${c.name}\\b`),
+        pattern: identifierPattern(c.name),
       })),
     },
     getJS(node: ts.Node): string {
@@ -2201,7 +2202,7 @@ function transformExpressionInner(
   // (#2482 Stage 1a Commit 2).
   const scopeValueNames = ctx.scope.valueBoundNames()
   const refsLoopParam = scopeValueNames.size > 0
-    && Array.from(scopeValueNames).some(p => new RegExp(`\\b${p}\\b`).test(exprText))
+    && Array.from(scopeValueNames).some(p => identifierPattern(p).test(exprText))
 
   // Compute AST-derived flags. `callsReactive` recognises signal-getter / memo
   // calls even inside deeper expressions (e.g., `format(count())`); `hasCalls`
@@ -2267,7 +2268,11 @@ function transformJsxFunctionCall(
   const substitutedGetJS = (node: ts.Node) => {
     let text = baseGetJS(node)
     for (const [paramName, argExpr] of substitutions) {
-      text = text.replace(new RegExp(`\\b${paramName}\\b`, 'g'), argExpr)
+      // Replacer function, not the string form: `argExpr` is arbitrary
+      // caller-supplied JS text and may itself contain `$` sequences
+      // (`$&`, `$1`, …) that `String.replace`'s string-replacement form
+      // would interpret specially instead of inserting literally (#2592).
+      text = text.replace(identifierPattern(paramName, 'g'), () => argExpr)
     }
     return text
   }
@@ -2319,7 +2324,11 @@ function transformMultiReturnJsxFunctionCall(
   const substitutedGetJS = (node: ts.Node) => {
     let text = baseGetJS(node)
     for (const [paramName, argExpr] of substitutions) {
-      text = text.replace(new RegExp(`\\b${paramName}\\b`, 'g'), argExpr)
+      // Replacer function, not the string form: `argExpr` is arbitrary
+      // caller-supplied JS text and may itself contain `$` sequences
+      // (`$&`, `$1`, …) that `String.replace`'s string-replacement form
+      // would interpret specially instead of inserting literally (#2592).
+      text = text.replace(identifierPattern(paramName, 'g'), () => argExpr)
     }
     return text
   }
@@ -7104,7 +7113,7 @@ function referencesLoopParam(expr: string, ctx: TransformContext): boolean {
   const boundNames = ctx.scope.valueBoundNames()
   if (boundNames.size === 0) return false
   for (const p of boundNames) {
-    if (new RegExp(`\\b${p}\\b`).test(expr)) return true
+    if (identifierPattern(p).test(expr)) return true
   }
   return false
 }
@@ -7238,7 +7247,7 @@ function hasReactiveAttributes(attrs: IRAttribute[], ctx: TransformContext): boo
     const scopeValueNames = ctx.scope.valueBoundNames()
     if (scopeValueNames.size > 0) {
       for (const p of scopeValueNames) {
-        if (new RegExp(`\\b${p}\\b`).test(valueToCheck)) return true
+        if (identifierPattern(p).test(valueToCheck)) return true
       }
     }
   }

package/src/module-exports.ts

@@ -6,6 +6,7 @@
  */
 
 import type { ComponentIR, ParamInfo } from './types.ts'
+import { identifierPattern } from './identifier-pattern.ts'
 
 /**
  * Emit module-level exports for local declarations and `export { ... } [from '...']`
@@ -140,7 +141,7 @@ export function findReachableNames(
   const queue: string[] = []
 
   for (const name of allNames) {
-    if (new RegExp(`\\b${name}\\b`).test(primaryRefs)) {
+    if (identifierPattern(name).test(primaryRefs)) {
       reachable.add(name)
       queue.push(name)
     }
@@ -150,7 +151,7 @@ export function findReachableNames(
     const current = queue.shift()!
     const body = bodyMap.get(current) || ''
     for (const name of allNames) {
-      if (!reachable.has(name) && new RegExp(`\\b${name}\\b`).test(body)) {
+      if (!reachable.has(name) && identifierPattern(name).test(body)) {
         reachable.add(name)
         queue.push(name)
       }

package/src/relocate.ts

@@ -22,6 +22,7 @@ import type {
 } from './adapters/interface.ts'
 import { tsNodeToParsedExpr, type ParsedExpr } from './expression-parser.ts'
 import { prepareLoweringMatchers, type LoweringMatcher } from './lowering-registry.ts'
+import { identifierPattern } from './identifier-pattern.ts'
 
 export interface RelocateEnv {
   /**
@@ -713,7 +714,7 @@ function scanRefsByName(
 ): Map<string, ts.Identifier[]> {
   const result = new Map<string, ts.Identifier[]>()
   for (const name of bindings.keys()) {
-    const re = new RegExp(`\\b${name}\\b`)
+    const re = identifierPattern(name)
     if (re.test(text)) result.set(name, [])
   }
   return result