Refactor: wrap states in an object

Author: qnighy

src/analysis.ts

@@ -118,7 +118,7 @@ export function analyzeClass(
 
   const render = analyzeRender(renderPath, locals);
 
-  for (const [name, stateAnalysis] of states.entries()) {
+  for (const [name, stateAnalysis] of states.states.entries()) {
     const bindingPaths = stateAnalysis.sites.map((site) => site.path);
     stateAnalysis.localName = locals.newLocal(name, bindingPaths);
     stateAnalysis.localSetterName = locals.newLocal(`set${name.replace(/^[a-z]/, (s) => s.toUpperCase())}`, bindingPaths);

src/analysis/state.ts

@@ -7,7 +7,9 @@ import type { LocalManager } from "./local.js";
 import type { ClassFieldAnalysis } from "./class_fields.js";
 import { trackMember } from "./track_member.js";
 
-export type StateObjAnalysis = Map<string, StateAnalysis>;
+export type StateObjAnalysis = {
+  states: Map<string, StateAnalysis>;
+};
 
 export type StateAnalysis = {
   localName?: string | undefined;
@@ -183,5 +185,5 @@ export function analyzeState(
     }
     state.init = state.sites.find((site): site is StateInitSite => site.type === "state_init");
   }
-  return states;
+  return { states };
 }

src/analysis/user_defined.ts

@@ -347,7 +347,7 @@ export function postAnalyzeCallbackDependencies(
       type: "dep_props_obj",
     });
   }
-  for (const [name, state] of states) {
+  for (const [name, state] of states.states) {
     for (const site of state.sites) {
       if (site.type !== "expr") {
         continue;

src/index.ts

@@ -142,7 +142,7 @@ function transformClass(analysis: AnalysisResult, options: { ts: boolean }, babe
       }
     }
   }
-  for (const [name, stateAnalysis] of analysis.state) {
+  for (const [name, stateAnalysis] of analysis.state.states) {
     for (const site of stateAnalysis.sites) {
       if (site.type === "expr") {
         // this.state.foo -> foo
@@ -212,7 +212,7 @@ function transformClass(analysis: AnalysisResult, options: { ts: boolean }, babe
       ),
     ]));
   }
-  for (const field of analysis.state.values()) {
+  for (const field of analysis.state.states.values()) {
     // State declarations
     const call = t.callExpression(
       getReactImport("useState", babel, analysis.superClassRef),
@@ -265,7 +265,7 @@ function transformClass(analysis: AnalysisResult, options: { ts: boolean }, babe
               break;
             }
             case "dep_state": {
-              const state = analysis.state.get(dep.name)!;
+              const state = analysis.state.states.get(dep.name)!;
               depVars.add(state.localName!);
               break;
             }