Merge InstanceFieldSite and StaticFieldSite

Author: qnighy

src/analysis/class_fields.ts

@@ -13,21 +13,26 @@ import { AnalysisError } from "./error.js";
  */
 export type ClassFieldsAnalysis = {
   /** Access to instance fields (`this.foo`), indexed by their names. */
-  instanceFields: Map<string, InstanceFieldSite[]>;
+  instanceFields: Map<string, ClassFieldSite[]>;
   /** Access to static fields (`C.foo`, where `C` is the class), indexed by their names. */
-  staticFields: Map<string, StaticFieldSite[]>;
+  staticFields: Map<string, ClassFieldSite[]>;
 };
 
 /**
- * A place where the instance field is declared or used.
+ * A place where the class field is declared or used.
  */
-export type InstanceFieldSite = {
+export type ClassFieldSite =
+  | ClassFieldDeclSite
+  | ClassFieldExprSite;
+
+export type ClassFieldDeclSite = {
   type: "decl";
   /**
    * Declaration. One of:
    *
    * - Class element (methods, fields, etc.)
-   * - Assignment to `this` in the constructor
+   * - Assignment to `this` in the constructor (instance case)
+   * - Assignment to `this` in a static initialization block (static case)
    */
   path: NodePath<ClassProperty | ClassPrivateProperty | ClassMethod | ClassPrivateMethod | ClassAccessorProperty | TSDeclareMethod | AssignmentExpression>;
   /**
@@ -45,7 +50,9 @@ export type InstanceFieldSite = {
    * true if the initializer has a side effect.
    */
   hasSideEffect: boolean;
-} | {
+};
+
+export type ClassFieldExprSite = {
   type: "expr";
   /**
    * The node that accesses the field (both read and write)
@@ -86,45 +93,16 @@ export type FieldInit = {
   methodPath: NodePath<ClassMethod | ClassPrivateMethod>;
 };
 
-/**
- * A place where the static field is declared or used.
- */
-export type StaticFieldSite = {
-  type: "decl";
-  /**
-   * Declaration. One of:
-   *
-   * - Class element (methods, fields, etc.)
-   * - Assignment to `this` in a static initialization block
-   */
-  path: NodePath<ClassProperty | ClassPrivateProperty | ClassMethod | ClassPrivateMethod | ClassAccessorProperty | TSDeclareMethod | AssignmentExpression>;
-  /**
-   * Type annotation, if any.
-   *
-   * Param/return annotations attached to function-like implementations are ignored.
-   */
-  typing: FieldTyping | undefined;
-  /**
-   * Initializing expression, if any.
-   */
-  init: FieldInit | undefined;
-  hasWrite: undefined;
-  /**
-   * true if the initializer has a side effect.
-   */
-  hasSideEffect: boolean;
-};
-
 /**
  * Collect declarations and uses of the following:
  *
  * - Instance fields ... `this.foo`
  * - Static fields ... `C.foo`, where `C` is the class
  */
 export function analyzeClassFields(path: NodePath<ClassDeclaration>): ClassFieldsAnalysis {
-  const instanceFields = new Map<string, InstanceFieldSite[]>();
+  const instanceFields = new Map<string, ClassFieldSite[]>();
   const getInstanceField = (name: string) => getOr(instanceFields, name, () => []);
-  const staticFields = new Map<string, StaticFieldSite[]>();
+  const staticFields = new Map<string, ClassFieldSite[]>();
   const getStaticField = (name: string) => getOr(staticFields, name, () => []);
   let constructor: NodePath<ClassMethod> | undefined = undefined;
   const bodies: NodePath[] = [];

src/analysis/prop.ts

@@ -4,7 +4,7 @@ import type { Expression, MemberExpression, TSMethodSignature, TSPropertySignatu
 import { getOr, memberName } from "../utils.js";
 import { AnalysisError } from "./error.js";
 import type { LocalManager } from "./local.js";
-import { StaticFieldSite, InstanceFieldSite } from "./class_fields.js";
+import { ClassFieldSite } from "./class_fields.js";
 import { trackMember } from "./track_member.js";
 import { PreAnalysisResult } from "./pre.js";
 
@@ -55,8 +55,8 @@ export type PropAlias = {
  * ```
  */
 export function analyzeProps(
-  propsObjSites: InstanceFieldSite[],
-  defaultPropsObjSites: StaticFieldSite[],
+  propsObjSites: ClassFieldSite[],
+  defaultPropsObjSites: ClassFieldSite[],
   locals: LocalManager,
   preanalysis: PreAnalysisResult,
 ): PropsObjAnalysis {
@@ -114,7 +114,7 @@ export function analyzeProps(
 }
 
 function analyzeDefaultProps(
-  defaultPropsSites: StaticFieldSite[],
+  defaultPropsSites: ClassFieldSite[],
 ): Map<string, NodePath<Expression>> | undefined {
   for (const site of defaultPropsSites) {
     if (!site.init) {

src/analysis/state.ts

@@ -4,7 +4,7 @@ import { getOr, memberName } from "../utils.js";
 import { AnalysisError } from "./error.js";
 import { PreAnalysisResult } from "./pre.js";
 import type { LocalManager } from "./local.js";
-import type { InstanceFieldSite } from "./class_fields.js";
+import type { ClassFieldSite } from "./class_fields.js";
 import { trackMember } from "./track_member.js";
 
 export type StateObjAnalysis = Map<string, StateAnalysis>;
@@ -44,8 +44,8 @@ export type StateTypeAnnotation = {
 };
 
 export function analyzeState(
-  stateObjSites: InstanceFieldSite[],
-  setStateSites: InstanceFieldSite[],
+  stateObjSites: ClassFieldSite[],
+  setStateSites: ClassFieldSite[],
   locals: LocalManager,
   preanalysis: PreAnalysisResult,
 ): StateObjAnalysis {

src/analysis/user_defined.ts

@@ -3,7 +3,7 @@ import { ArrowFunctionExpression, ClassMethod, ClassPrivateMethod, Expression, F
 import { isClassMethodLike, nonNullPath } from "../utils.js";
 import { AnalysisError } from "./error.js";
 import { analyzeLibRef, isReactRef } from "./lib.js";
-import type { InstanceFieldSite } from "./class_fields.js";
+import type { ClassFieldSite } from "./class_fields.js";
 
 const SPECIAL_MEMBER_NAMES = new Set<string>([
   // Special variables
@@ -49,21 +49,21 @@ export type UserDefinedRef = {
   type: "user_defined_ref";
   localName?: string | undefined;
   typeAnnotation?: NodePath<TSType> | undefined;
-  sites: InstanceFieldSite[];
+  sites: ClassFieldSite[];
 };
 export type UserDefinedDirectRef = {
   type: "user_defined_direct_ref";
   localName?: string | undefined;
   init: NodePath<Expression>;
   typeAnnotation?: NodePath<TSType> | undefined;
-  sites: InstanceFieldSite[];
+  sites: ClassFieldSite[];
 };
 export type UserDefinedFn = {
   type: "user_defined_function";
   localName?: string | undefined;
   init: FnInit;
   typeAnnotation?: NodePath<TSType> | undefined;
-  sites: InstanceFieldSite[];
+  sites: ClassFieldSite[];
 };
 
 export type FnInit = {
@@ -75,7 +75,7 @@ export type FnInit = {
 };
 
 export function analyzeUserDefined(
-  instanceFields: Map<string, InstanceFieldSite[]>
+  instanceFields: Map<string, ClassFieldSite[]>
 ): UserDefinedAnalysis {
   const fields = new Map<string, UserDefined>();
   for (const [name, fieldSites]  of instanceFields) {