fix(ts-dsl): scope for-loop variable to loop block

Move ctx.analyze(this._variableOrInit) after ctx.pushScope() so the
iteration variable is registered in the for-loop's own scope rather
than the parent scope. This matches JS semantics where `for (const x of ...)`
scopes `x` to the loop block, preventing false conflicts between sibling loops.

Reverts the plugin.symbol('key') workaround since the correct scoping
makes it unnecessary — sibling for-loops no longer conflict.

Author: pullfrog[bot]

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/transformers.gen.ts

@@ -13,9 +13,9 @@ const barSchemaResponseTransformer = (data: any) => {
         data.baz[key] = fooSchemaResponseTransformer(data.baz[key]);
     }
     if (data.qux) {
-        for (const key2 of Object.keys(data.qux)) {
-            if (!['quux'].includes(key2)) {
-                data.qux[key2] = new Date(data.qux[key2]);
+        for (const key of Object.keys(data.qux)) {
+            if (!['quux'].includes(key)) {
+                data.qux[key] = new Date(data.qux[key]);
             }
         }
     }

packages/openapi-ts/src/plugins/@hey-api/transformers/plugin.ts

@@ -195,17 +195,16 @@ function processSchemaType({
     }
 
     if (schema.additionalProperties && dataExpression) {
-      const key = plugin.symbol('key');
       const entryValueNodes = processSchemaType({
-        dataExpression: $(dataExpression).attr(key).computed(),
+        dataExpression: $(dataExpression).attr('key').computed(),
         plugin,
         schema: schema.additionalProperties,
       });
 
       if (entryValueNodes.length) {
         const properties = Object.keys(schema.properties ?? {});
         nodes.push(
-          $.for($.const(key))
+          $.for($.const('key'))
             .of($('Object').attr('keys').call(dataExpression))
             .$if(
               properties.length,
@@ -215,7 +214,7 @@ function processSchemaType({
                     $.not(
                       $.array(...properties)
                         .attr('includes')
-                        .call(key),
+                        .call('key'),
                     ),
                   ).do(...entryValueNodes),
                 ),

packages/openapi-ts/src/ts-dsl/stmt/for.ts

@@ -42,8 +42,8 @@ class ImplForTsDsl<M extends ForMode = 'for'> extends Mixed {
   override analyze(ctx: AnalysisContext): void {
     ctx.analyze(this._condition);
     ctx.analyze(this._iterableOrUpdate);
-    ctx.analyze(this._variableOrInit);
     ctx.pushScope();
+    ctx.analyze(this._variableOrInit);
     try {
       super.analyze(ctx);
     } finally {