#88, ClassStatementsGetter rewrite, part 4.

ajvincent · Apr 5, 2024 · 51d08ae · 51d08ae
1 parent 996eaf9
commit 51d08ae
Show file tree

Hide file tree

Showing 22 changed files with 334 additions and 171 deletions.
diff --git a/dist/exports.js b/dist/exports.js
@@ -5490,6 +5490,7 @@ var ClassSupportsStatementsFlags;
     ClassSupportsStatementsFlags[ClassSupportsStatementsFlags["ConstructorHeadStatements"] = 32] = "ConstructorHeadStatements";
     ClassSupportsStatementsFlags[ClassSupportsStatementsFlags["ConstructorBodyStatements"] = 64] = "ConstructorBodyStatements";
     ClassSupportsStatementsFlags[ClassSupportsStatementsFlags["ConstructorTailStatements"] = 128] = "ConstructorTailStatements";
+    ClassSupportsStatementsFlags[ClassSupportsStatementsFlags["All"] = 255] = "All";
 })(ClassSupportsStatementsFlags || (ClassSupportsStatementsFlags = {}));
 /** Convert type members to a class members map, including statements. */
 class MemberedTypeToClass {
@@ -6053,7 +6054,8 @@ class MemberedTypeToClass {
                     if (getter.filterPropertyInitializer(key) === false)
                         continue;
                     const statement = getter.getPropertyInitializer(key);
-                    this.#addStatementsToMap(key, [statement]);
+                    if (statement)
+                        this.#addStatementsToMap(key, [statement]);
                     break;
                 }
                 catch (ex) {
@@ -6076,7 +6078,8 @@ class MemberedTypeToClass {
                     if (getter.filterAccessorMirror(key) === false)
                         continue;
                     const statement = getter.getAccessorMirror(key);
-                    this.#addStatementsToMap(key, [statement]);
+                    if (statement)
+                        this.#addStatementsToMap(key, [statement]);
                     break;
                 }
                 catch (ex) {

diff --git a/docs/api/ts-morph-structures.accessormirrorgetter.getaccessormirror.md b/docs/api/ts-morph-structures.accessormirrorgetter.getaccessormirror.md
@@ -7,7 +7,9 @@
 **Signature:**
 
 ```typescript
-getAccessorMirror(key: MemberedStatementsKey): stringWriterOrStatementImpl;
+getAccessorMirror(
+    key: MemberedStatementsKey,
+  ): stringWriterOrStatementImpl | undefined;
 ```
 
 ## Parameters
@@ -18,5 +20,5 @@ getAccessorMirror(key: MemberedStatementsKey): stringWriterOrStatementImpl;
 
 **Returns:**
 
-[stringWriterOrStatementImpl](./ts-morph-structures.stringwriterorstatementimpl.md)
+[stringWriterOrStatementImpl](./ts-morph-structures.stringwriterorstatementimpl.md) \| undefined
 
diff --git a/docs/api/ts-morph-structures.classstatementsgetter.md b/docs/api/ts-morph-structures.classstatementsgetter.md
@@ -24,5 +24,5 @@ export interface ClassStatementsGetter
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
 |  [keyword](./ts-morph-structures.classstatementsgetter.keyword.md) |  | readonly string |  |
-|  [supportsStatementFlags](./ts-morph-structures.classstatementsgetter.supportsstatementflags.md) |  | readonly NonNegativeInteger |  |
+|  [supportsStatementFlags](./ts-morph-structures.classstatementsgetter.supportsstatementflags.md) |  | readonly number |  |
 
diff --git a/docs/api/ts-morph-structures.classstatementsgetter.supportsstatementflags.md b/docs/api/ts-morph-structures.classstatementsgetter.supportsstatementflags.md
@@ -7,5 +7,5 @@
 **Signature:**
 
 ```typescript
-supportsStatementFlags: readonly NonNegativeInteger;
+supportsStatementFlags: readonly number;
 ```
diff --git a/docs/api/ts-morph-structures.classsupportsstatementsflags.md b/docs/api/ts-morph-structures.classsupportsstatementsflags.md
@@ -15,6 +15,7 @@ export declare enum ClassSupportsStatementsFlags
 |  Member | Value | Description |
 |  --- | --- | --- |
 |  AccessorMirror | <code>2</code> |  |
+|  All | <code>255</code> |  |
 |  BodyStatements | <code>8</code> |  |
 |  ConstructorBodyStatements | <code>64</code> |  |
 |  ConstructorHeadStatements | <code>32</code> |  |

diff --git a/docs/api/ts-morph-structures.propertyinitializergetter.getpropertyinitializer.md b/docs/api/ts-morph-structures.propertyinitializergetter.getpropertyinitializer.md
@@ -9,7 +9,7 @@
 ```typescript
 getPropertyInitializer(
     key: MemberedStatementsKey,
-  ): stringWriterOrStatementImpl;
+  ): stringWriterOrStatementImpl | undefined;
 ```
 
 ## Parameters
@@ -20,5 +20,5 @@ getPropertyInitializer(
 
 **Returns:**
 
-[stringWriterOrStatementImpl](./ts-morph-structures.stringwriterorstatementimpl.md)
+[stringWriterOrStatementImpl](./ts-morph-structures.stringwriterorstatementimpl.md) \| undefined
 
diff --git a/stage_2_integration/source/toolbox/MemberedTypeToClass.ts b/stage_2_integration/source/toolbox/MemberedTypeToClass.ts
@@ -66,6 +66,7 @@ export enum ClassSupportsStatementsFlags {
   ConstructorHeadStatements = 1 << 5,
   ConstructorBodyStatements = 1 << 6,
   ConstructorTailStatements = 1 << 7,
+  All = ClassSupportsStatementsFlags.ConstructorTailStatements * 2 - 1,
 }
 
 /** Convert type members to a class members map, including statements. */
@@ -971,7 +972,8 @@ export default class MemberedTypeToClass {
           if (getter.filterPropertyInitializer!(key) === false)
             continue;
           const statement = getter.getPropertyInitializer!(key);
-          this.#addStatementsToMap(key, [statement]);
+          if (statement)
+            this.#addStatementsToMap(key, [statement]);
           break;
         }
         catch (ex) {
@@ -999,7 +1001,8 @@ export default class MemberedTypeToClass {
           if (getter.filterAccessorMirror!(key) === false)
             continue;
           const statement = getter.getAccessorMirror!(key);
-          this.#addStatementsToMap(key, [statement]);
+          if (statement)
+            this.#addStatementsToMap(key, [statement]);
           break;
         }
         catch (ex) {

diff --git a/stage_2_integration/source/toolbox/types/toolbox.d.ts b/stage_2_integration/source/toolbox/types/toolbox.d.ts
@@ -3,10 +3,6 @@ import type {
   WriterFunction,
 } from "ts-morph";
 
-import {
-  NonNegativeInteger
-} from "type-fest";
-
 import type {
   CallSignatureDeclarationImpl,
   ConstructorDeclarationImpl,
@@ -132,12 +128,12 @@ export type stringWriterOrStatementImpl = stringOrWriterFunction | StatementStru
 
 export interface PropertyInitializerGetter {
   filterPropertyInitializer(key: MemberedStatementsKey): boolean;
-  getPropertyInitializer(key: MemberedStatementsKey): stringWriterOrStatementImpl;
+  getPropertyInitializer(key: MemberedStatementsKey): stringWriterOrStatementImpl | undefined;
 }
 
 export interface AccessorMirrorGetter {
   filterAccessorMirror(key: MemberedStatementsKey): boolean;
-  getAccessorMirror(key: MemberedStatementsKey): stringWriterOrStatementImpl;
+  getAccessorMirror(key: MemberedStatementsKey): stringWriterOrStatementImpl | undefined;
 }
 
 export interface ClassHeadStatementsGetter {
@@ -176,5 +172,5 @@ Partial<ClassHeadStatementsGetter>, Partial<ClassBodyStatementsGetter>, Partial<
 Partial<ConstructorHeadStatementsGetter>, Partial<ConstructorBodyStatementsGetter>, Partial<ConstructorTailStatementsGetter>
 {
   keyword: readonly string;
-  supportsStatementFlags: readonly NonNegativeInteger;
+  supportsStatementFlags: readonly number;
 }
diff --git a/stage_2_snapshot/snapshot/source/toolbox/MemberedTypeToClass.ts b/stage_2_snapshot/snapshot/source/toolbox/MemberedTypeToClass.ts
@@ -61,6 +61,7 @@ export enum ClassSupportsStatementsFlags {
   ConstructorHeadStatements = 1 << 5,
   ConstructorBodyStatements = 1 << 6,
   ConstructorTailStatements = 1 << 7,
+  All = ClassSupportsStatementsFlags.ConstructorTailStatements * 2 - 1,
 }
 
 /** Convert type members to a class members map, including statements. */
@@ -1065,7 +1066,7 @@ export default class MemberedTypeToClass {
         try {
           if (getter.filterPropertyInitializer!(key) === false) continue;
           const statement = getter.getPropertyInitializer!(key);
-          this.#addStatementsToMap(key, [statement]);
+          if (statement) this.#addStatementsToMap(key, [statement]);
           break;
         } catch (ex) {
           errors.push(ex as Error);
@@ -1096,7 +1097,7 @@ export default class MemberedTypeToClass {
         try {
           if (getter.filterAccessorMirror!(key) === false) continue;
           const statement = getter.getAccessorMirror!(key);
-          this.#addStatementsToMap(key, [statement]);
+          if (statement) this.#addStatementsToMap(key, [statement]);
           break;
         } catch (ex) {
           errors.push(ex as Error);

diff --git a/stage_2_snapshot/snapshot/source/toolbox/types/toolbox.d.ts b/stage_2_snapshot/snapshot/source/toolbox/types/toolbox.d.ts
@@ -1,7 +1,5 @@
 import type { Scope, WriterFunction } from "ts-morph";
 
-import { NonNegativeInteger } from "type-fest";
-
 import type {
   CallSignatureDeclarationImpl,
   ConstructorDeclarationImpl,
@@ -126,12 +124,14 @@ export interface PropertyInitializerGetter {
   filterPropertyInitializer(key: MemberedStatementsKey): boolean;
   getPropertyInitializer(
     key: MemberedStatementsKey,
-  ): stringWriterOrStatementImpl;
+  ): stringWriterOrStatementImpl | undefined;
 }
 
 export interface AccessorMirrorGetter {
   filterAccessorMirror(key: MemberedStatementsKey): boolean;
-  getAccessorMirror(key: MemberedStatementsKey): stringWriterOrStatementImpl;
+  getAccessorMirror(
+    key: MemberedStatementsKey,
+  ): stringWriterOrStatementImpl | undefined;
 }
 
 export interface ClassHeadStatementsGetter {
@@ -186,5 +186,5 @@ export interface ClassStatementsGetter
     Partial<ConstructorBodyStatementsGetter>,
     Partial<ConstructorTailStatementsGetter> {
   keyword: readonly string;
-  supportsStatementFlags: readonly NonNegativeInteger;
+  supportsStatementFlags: readonly number;
 }
diff --git a/stage_3_generation/build/fieldStatements/ArrayBooleanAndString.ts b/stage_3_generation/build/fieldStatements/ArrayBooleanAndString.ts
@@ -1,41 +1,40 @@
 import assert from "node:assert/strict";
 
 import {
-  ClassFieldStatementsMap,
+  ClassSupportsStatementsFlags,
   LiteralTypeStructureImpl,
   type MemberedStatementsKey,
+  type PropertyInitializerGetter,
   type stringWriterOrStatementImpl,
   TypeStructureKind,
 } from "#stage_two/snapshot/source/exports.js";
 import { StructureKind } from "ts-morph";
 
-import GetterFilter from "./GetterFilter.js";
 import {
   BaseClassModule,
 } from "../../moduleClasses/exports.js";
 
+import StatementGetterBase from "./GetterBase.js";
+
 const booleanType = LiteralTypeStructureImpl.get("boolean");
 const stringType = LiteralTypeStructureImpl.get("string");
 
 export default
-class ArrayBooleanAndString extends GetterFilter
+class ArrayBooleanAndString
+extends StatementGetterBase
+implements PropertyInitializerGetter
 {
   readonly #isStructureModule: boolean;
   constructor(
     module: BaseClassModule,
     isStructureModule: boolean
   )
   {
-    super(module);
+    super(module, "ArrayBooleanAndString", ClassSupportsStatementsFlags.PropertyInitializer);
     this.#isStructureModule = isStructureModule;
   }
 
-  accept(
-    key: MemberedStatementsKey
-  ): boolean
-  {
-    if (key.statementGroupKey !== ClassFieldStatementsMap.GROUP_INITIALIZER_OR_PROPERTY)
-      return false;
+  filterPropertyInitializer(key: MemberedStatementsKey): boolean {
     if (key.fieldType?.kind !== StructureKind.PropertySignature)
       return false;
     if (key.fieldType.hasQuestionToken)
@@ -49,18 +48,18 @@ class ArrayBooleanAndString extends GetterFilter
     );
   }
 
-  getStatements(
+  getPropertyInitializer(
     key: MemberedStatementsKey
-  ): stringWriterOrStatementImpl[]
+  ): stringWriterOrStatementImpl | undefined
   {
     assert(key.fieldType?.kind === StructureKind.PropertySignature);
     if (key.fieldType.typeStructure === booleanType)
-      return ["false"];
+      return "false";
 
     if (key.fieldType.typeStructure === stringType) {
-      return this.#isStructureModule ? [] : [`""`];
+      return this.#isStructureModule ? undefined : `""`;
     }
 
-    return ["[]"];
+    return "[]";
   }
 }