wip: save

diff --git a/packages/compiler-vapor/src/generators/prop.ts b/packages/compiler-vapor/src/generators/prop.ts
index cf1bce982e0596f12d4809ca1350e810351c3d1e..fb23c1a4e0005b32a57156eed08662186e2f629f 100644 (file)
--- a/packages/compiler-vapor/src/generators/prop.ts
+++ b/packages/compiler-vapor/src/generators/prop.ts
@@ -283,22 +283,29 @@ function processValue(
   needRewrite: boolean = true,
 ): string[] | undefined {
   const { processingRenderEffect, allRenderEffectSeenNames } = context
-  const { declareNames, earlyCheckExps, preAccessNames, preAccessExps } =
-    processingRenderEffect!
+  const {
+    declareNames,
+    rewrittenNames,
+    earlyCheckExps,
+    preAccessNames,
+    preAccessExps,
+  } = processingRenderEffect!
 
   for (const frag of values) {
     if (!isArray(frag)) continue
     // [code, newlineIndex, loc, name] -> [(__name), newlineIndex, loc, name]
     const [newName, , , rawName] = frag
     if (rawName) {
-      let name = rawName.replace(/[^\w]/g, '_')
-
-      name = `_${name}`
-      if (!declareNames.has(name)) {
-        if (allRenderEffectSeenNames[name] === undefined)
-          allRenderEffectSeenNames[name] = 0
-        else name += ++allRenderEffectSeenNames[name]
-        declareNames.add(name)
+      let name = rewrittenNames.get(rawName)
+      if (!name) {
+        name = `_${rawName.replace(/[^\w]/g, '_')}`
+        if (!declareNames.has(name)) {
+          if (allRenderEffectSeenNames[name] === undefined)
+            allRenderEffectSeenNames[name] = 0
+          else name += ++allRenderEffectSeenNames[name]
+          declareNames.add(name)
+        }
+        rewrittenNames.set(newName, name)
       }
 
       const preAccessName = `_${name}`

diff --git a/packages/compiler-vapor/src/ir/index.ts b/packages/compiler-vapor/src/ir/index.ts
index e0e1d979aa88a53d0bb003aab9e05b60162c2baa..a80a36ad1290375c7aaad405eb63f990a7cdc009 100644 (file)
--- a/packages/compiler-vapor/src/ir/index.ts
+++ b/packages/compiler-vapor/src/ir/index.ts
@@ -263,7 +263,7 @@ export interface IREffect {
   identifiers: string[]
   operations: OperationNode[]
   declareNames: Set<string>
-  rewrittenNames: Set<string>
+  rewrittenNames: Map<string, string>
   earlyCheckExps: string[]
   preAccessNames: Set<string>
   preAccessExps: Set<string>

diff --git a/packages/compiler-vapor/src/transform.ts b/packages/compiler-vapor/src/transform.ts
index f8484515c212d1d068d4ff16ee53ab1be39a2c03..34158f0f557e625cae475770f491c9e68612afdc 100644 (file)
--- a/packages/compiler-vapor/src/transform.ts
+++ b/packages/compiler-vapor/src/transform.ts
@@ -169,7 +169,7 @@ export class TransformContext<T extends AllNode = AllNode> {
         preAccessNames: new Set<string>(),
         preAccessExps: new Set<string>(),
         declareNames: new Set<string>(),
-        rewrittenNames: new Set<string>(),
+        rewrittenNames: new Map<string, string>(),
         inVFor: this.inVFor > 0,
         identifiers: Array.from(ids),
       })