assign TypeGraph to TypeBuilder after init

Author: inferrinizzard

packages/quicktype-core/src/GraphRewriting.ts

@@ -2,7 +2,8 @@ import { EqualityMap, mapMap } from "collection-utils";
 
 import { type TypeAttributes, combineTypeAttributes, emptyTypeAttributes } from "./attributes/TypeAttributes";
 import { assert, indentationString, panic } from "./support/Support";
-import { type ClassProperty, type MaybeTypeIdentity, type PrimitiveTypeKind, type Type, TypeBuilder } from "./Type";
+import { type ClassProperty, type MaybeTypeIdentity, type PrimitiveTypeKind, type Type } from "./Type";
+import { TypeBuilder } from "./Type/TypeBuilder";
 import { type StringTypeMapping } from "./Type/TypeBuilderUtils";
 import { type TypeGraph } from "./Type/TypeGraph";
 import {
@@ -228,7 +229,6 @@ export abstract class BaseGraphRewriteBuilder extends TypeBuilder implements Typ
         protected readonly debugPrint: boolean
     ) {
         super(
-            originalGraph.serial + 1,
             stringTypeMapping,
             alphabetizeProperties,
             false,

packages/quicktype-core/src/Run.ts

@@ -22,7 +22,7 @@ import { type MultiFileRenderResult, type TargetLanguage } from "./TargetLanguag
 import { type TransformedStringTypeKind } from "./Type";
 import { TypeBuilder } from "./Type/TypeBuilder";
 import { type StringTypeMapping } from "./Type/TypeBuilderUtils";
-import { type TypeGraph } from "./Type/TypeGraph";
+import { TypeGraph } from "./Type/TypeGraph";
 import { noneToAny, optionalToNullable, removeIndirectionIntersections } from "./Type/TypeGraphUtils";
 import { type FixMeOptionsType } from "./types";
 
@@ -291,13 +291,13 @@ class Run implements RunContext {
         const stringTypeMapping = this.stringTypeMapping;
         const conflateNumbers = !targetLanguage.supportsUnionsWithBothNumberTypes;
         const typeBuilder = new TypeBuilder(
-            0,
             stringTypeMapping,
             this._options.alphabetizeProperties,
             this._options.allPropertiesOptional,
             this._options.checkProvenance,
             false
         );
+				typeBuilder.typeGraph = new TypeGraph(typeBuilder, 0, this._options.checkProvenance);
 
         return { targetLanguage, stringTypeMapping, conflateNumbers, typeBuilder };
     }

packages/quicktype-core/src/Type/TypeBuilder.ts

@@ -11,11 +11,7 @@ import {
 } from "collection-utils";
 
 import { StringTypes, stringTypesTypeAttributeKind } from "../attributes/StringTypes";
-import {
-    type TypeAttributes,
-    combineTypeAttributes,
-    emptyTypeAttributes
-} from "../attributes/TypeAttributes";
+import { type TypeAttributes, combineTypeAttributes, emptyTypeAttributes } from "../attributes/TypeAttributes";
 import { assert, defined, panic } from "../support/Support";
 
 import { provenanceTypeAttributeKind } from "./ProvenanceTypeAttributeKind";
@@ -42,11 +38,12 @@ import {
     unionTypeIdentity
 } from "./Type";
 import { type StringTypeMapping, stringTypeMappingGet } from "./TypeBuilderUtils";
-import { TypeGraph } from "./TypeGraph";
+import { type TypeGraph } from "./TypeGraph";
 import { type TypeRef, assertTypeRefGraph, derefTypeRef, makeTypeRef, typeRefIndex } from "./TypeRef";
 
 export class TypeBuilder {
-    public readonly typeGraph: TypeGraph;
+    // @ts-expect-error must manually set TypeGraph
+    private _typeGraph: TypeGraph;
 
     protected readonly topLevels: Map<string, TypeRef> = new Map();
 
@@ -57,7 +54,6 @@ export class TypeBuilder {
     private _addedForwardingIntersection = false;
 
     public constructor(
-        typeGraphSerial: number,
         private readonly _stringTypeMapping: StringTypeMapping,
         public readonly canonicalOrder: boolean,
         private readonly _allPropertiesOptional: boolean,
@@ -68,7 +64,16 @@ export class TypeBuilder {
             !_addProvenanceAttributes || !inheritsProvenanceAttributes,
             "We can't both inherit as well as add provenance"
         );
-        this.typeGraph = new TypeGraph(this, typeGraphSerial, _addProvenanceAttributes || inheritsProvenanceAttributes);
+    }
+
+    public get typeGraph(): TypeGraph {
+        assert(!!this._typeGraph, "TypeBuilder must have a TypeGraph");
+        return this._typeGraph;
+    }
+
+		/** typeGraph must be set externally to prevent import cycle of TypeGraph constructor */
+    public set typeGraph(typeGraph: TypeGraph) {
+        this._typeGraph = typeGraph;
     }
 
     public addTopLevel(name: string, tref: TypeRef): void {

packages/quicktype-core/src/Type/TypeGraph.ts

@@ -295,6 +295,7 @@ export class TypeGraph {
             debugPrintReconstitution,
             replacer
         );
+				builder.typeGraph = new TypeGraph(builder, this.serial + 1, this._haveProvenanceAttributes);
         const newGraph = builder.finish();
 
         this.checkLostTypeAttributes(builder, newGraph);
@@ -333,6 +334,7 @@ export class TypeGraph {
             map,
             debugPrintRemapping
         );
+				builder.typeGraph = new TypeGraph(builder, this.serial + 1, this._haveProvenanceAttributes);
         const newGraph = builder.finish();
 
         this.checkLostTypeAttributes(builder, newGraph);