#36, convert type node: Intersection, Tuple, TypeArgumented, Union.

ajvincent · Jan 10, 2024 · a9d6e13 · a9d6e13
1 parent a167694
commit a9d6e13
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 4 deletions.
diff --git a/stage_1_integration/bootstrap/convertTypeNode.ts b/stage_1_integration/bootstrap/convertTypeNode.ts
@@ -81,10 +81,23 @@ export default function convertTypeNode(
         TupleTypeStructureImpl |
         TypeArgumentedTypeStructureImpl |
         undefined
-      ) = undefined;
+      );
+
+  if (Node.isUnionTypeNode(typeNode)) {
+    parentStructure = new UnionTypeStructureImpl;
+    childTypeNodes = typeNode.getTypeNodes();
+  }
+  else if (Node.isIntersectionTypeNode(typeNode)) {
+    parentStructure = new IntersectionTypeStructureImpl;
+    childTypeNodes = typeNode.getTypeNodes();
+  }
+  else if (Node.isTupleTypeNode(typeNode)) {
+    parentStructure = new TupleTypeStructureImpl;
+    childTypeNodes = typeNode.getElements();
+  }
 
   // identifiers, type-argumented type nodes
-  if (Node.isTypeReference(typeNode)) {
+  else if (Node.isTypeReference(typeNode)) {
     const objectType = buildStructureForEntityName(typeNode.getTypeName());
 
     childTypeNodes = typeNode.getTypeArguments();

diff --git a/stage_2_fullset/snapshot/source/bootstrap/convertTypeNode.ts b/stage_2_fullset/snapshot/source/bootstrap/convertTypeNode.ts
@@ -81,10 +81,23 @@ export default function convertTypeNode(
         TupleTypeStructureImpl |
         TypeArgumentedTypeStructureImpl |
         undefined
-      ) = undefined;
+      );
+
+  if (Node.isUnionTypeNode(typeNode)) {
+    parentStructure = new UnionTypeStructureImpl;
+    childTypeNodes = typeNode.getTypeNodes();
+  }
+  else if (Node.isIntersectionTypeNode(typeNode)) {
+    parentStructure = new IntersectionTypeStructureImpl;
+    childTypeNodes = typeNode.getTypeNodes();
+  }
+  else if (Node.isTupleTypeNode(typeNode)) {
+    parentStructure = new TupleTypeStructureImpl;
+    childTypeNodes = typeNode.getElements();
+  }
 
   // identifiers, type-argumented type nodes
-  if (Node.isTypeReference(typeNode)) {
+  else if (Node.isTypeReference(typeNode)) {
     const objectType = buildStructureForEntityName(typeNode.getTypeName());
 
     childTypeNodes = typeNode.getTypeArguments();

diff --git a/stage_2_fullset/spec-snapshot/source/bootstrap/convertTypeNode.ts b/stage_2_fullset/spec-snapshot/source/bootstrap/convertTypeNode.ts
@@ -9,8 +9,12 @@ import {
 } from "ts-morph";
 
 import {
+  IntersectionTypeStructureImpl,
   ParenthesesTypeStructureImpl,
   StringTypeStructureImpl,
+  TupleTypeStructureImpl,
+  TypeArgumentedTypeStructureImpl,
+  UnionTypeStructureImpl,
   TypeStructures
 } from "#stage_two/snapshot/source/exports.js";
 
@@ -25,6 +29,7 @@ import type {
 } from "#stage_two/snapshot/source/bootstrap/types/conversions.js";
 
 describe("convertTypeNode generates correct type structures, with type", () => {
+  //#region set-up, tear-down
   let declaration: VariableDeclaration;
   let structure: string | TypeStructures | null;
 
@@ -84,6 +89,9 @@ const A: string;
       node => StructuresClassesMap.clone(node.getStructure())
     );
   }
+  //#endregion set-up, teardown
+
+  //#region literals
 
   describe("string keyword", () => {
     function stringSpec(s: string): void {
@@ -144,4 +152,62 @@ const A: string;
     expect(failMessage).toBeUndefined();
     expect(failNode).toBeNull();
   });
+
+  //#endregion literals
+
+  //#region complex types
+  it("Intersection: of string and number", () => {
+    setTypeStructure("string & number", failCallback);
+    expect(structure).toBeInstanceOf(IntersectionTypeStructureImpl);
+    if (structure instanceof IntersectionTypeStructureImpl) {
+      expect(structure.childTypes.length).toBe(2);
+      expect(structure.childTypes[0]).toBe("string");
+      expect(structure.childTypes[1]).toBe("number");
+    }
+    expect(failMessage).toBe(undefined);
+    expect(failNode).toBe(null);
+  });
+
+  it("Tuple: [string, number]", () => {
+    setTypeStructure("[string, number]", failCallback);
+    expect(structure).toBeInstanceOf(TupleTypeStructureImpl);
+    if (structure instanceof TupleTypeStructureImpl) {
+      expect(structure.childTypes.length).toBe(2);
+      expect(structure.childTypes[0]).toBe("string");
+      expect(structure.childTypes[1]).toBe("number");
+    }
+    expect(failMessage).toBe(undefined);
+    expect(failNode).toBe(null);
+  });
+
+  it(`TypeArgumented: Pick<NumberStringType, "repeatForward">`, () => {
+    setTypeStructure(`Pick<NumberStringType, "repeatForward">`, failCallback);
+    expect(structure).toBeInstanceOf(TypeArgumentedTypeStructureImpl);
+    if (structure instanceof TypeArgumentedTypeStructureImpl) {
+      expect(structure.objectType).toBe("Pick");
+      expect(structure.childTypes.length).toBe(2);
+      expect(structure.childTypes[0]).toBe("NumberStringType");
+      expect(structure.childTypes[1]).toBeInstanceOf(StringTypeStructureImpl);
+      expect((structure.childTypes[1] as StringTypeStructureImpl).stringValue).toBe("repeatForward");
+    }
+    expect(failMessage).toBe(undefined);
+    expect(failNode).toBe(null);
+  });
+
+  it(`Union: of string and number`, () => {
+    setTypeStructure("string | number", failCallback);
+    expect(structure).toBeInstanceOf(UnionTypeStructureImpl);
+    if (structure instanceof UnionTypeStructureImpl) {
+      expect(structure.childTypes.length).toBe(2);
+      expect(structure.childTypes[0]).toBe("string");
+      expect(structure.childTypes[1]).toBe("number");
+    }
+    expect(failMessage).toBe(undefined);
+    expect(failNode).toBe(null);
+  });
+
+  xit("Class implements, interface extends", () => {
+    expect(1).toBe(2);
+  });
+  //#region complex types
 });