Merge remote-tracking branch 'quicktype/master' into chore/repo/ts

Author: inferrinizzard

packages/quicktype-core/src/ConvenienceRenderer.ts

@@ -32,8 +32,8 @@ import {
     type TypeKind,
     UnionType
 } from "./Type";
-import { TypeAttributeStoreView } from "./TypeGraph";
-import { isNamedType, matchTypeExhaustive, nullableFromUnion, separateNamedTypes } from "./TypeUtils";
+import { TypeAttributeStoreView } from "./Type/TypeGraph";
+import { isNamedType, matchTypeExhaustive, nullableFromUnion, separateNamedTypes } from "./Type/TypeUtils";
 
 const wordWrap: (s: string) => string = _wordwrap(90);
 

packages/quicktype-core/src/DeclarationIR.ts

@@ -3,8 +3,8 @@ import { iterableFirst, setFilter, setIntersect, setSubtract, setUnionInto } fro
 import { Graph } from "./Graph";
 import { messageError } from "./Messages";
 import { assert, defined, panic } from "./support/Support";
-import { type Type } from "./Type";
-import { type TypeGraph } from "./TypeGraph";
+import { type Type } from "./Type/Type";
+import { type TypeGraph } from "./Type/TypeGraph";
 
 export type DeclarationKind = "forward" | "define";
 

packages/quicktype-core/src/GatherNames.ts

@@ -4,9 +4,9 @@ import * as pluralize from "pluralize";
 import { TooManyTypeNames, TypeNames, namesTypeAttributeKind, tooManyNamesThreshold } from "./attributes/TypeNames";
 import { assert, defined, panic } from "./support/Support";
 import { transformationForType } from "./Transformers";
-import { ObjectType, type Type } from "./Type";
-import { type TypeGraph } from "./TypeGraph";
-import { matchCompoundType, nullableFromUnion } from "./TypeUtils";
+import { ObjectType, type Type } from "./Type/Type";
+import { type TypeGraph } from "./Type/TypeGraph";
+import { matchCompoundType, nullableFromUnion } from "./Type/TypeUtils";
 
 class UniqueQueue<T> {
     private readonly _present = new Set<T>();

packages/quicktype-core/src/GraphRewriting.ts

@@ -3,18 +3,18 @@ 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 } from "./Type";
-// eslint-disable-next-line import/no-cycle
-import { type StringTypeMapping, TypeBuilder } from "./TypeBuilder";
+import { TypeBuilder } from "./Type/TypeBuilder";
+import { type StringTypeMapping } from "./Type/TypeBuilderUtils";
+import { type TypeGraph } from "./Type/TypeGraph";
 import {
-    type TypeGraph,
     type TypeRef,
     assertTypeRefGraph,
     derefTypeRef,
     isTypeRef,
     typeAndAttributesForTypeRef,
     typeRefIndex
-} from "./TypeGraph";
-import { combineTypeAttributesOfTypes } from "./TypeUtils";
+} from "./Type/TypeRef";
+import { combineTypeAttributesOfTypes } from "./Type/TypeUtils";
 
 export interface TypeLookerUp {
     lookupTypeRefs: (typeRefs: TypeRef[], forwardingRef?: TypeRef) => TypeRef | undefined;
@@ -229,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/MakeTransformations.ts

@@ -34,7 +34,8 @@ import {
     isPrimitiveStringTypeKind,
     targetTypeKindForTransformedStringTypeKind
 } from "./Type";
-import { type TypeGraph, type TypeRef, typeRefIndex } from "./TypeGraph";
+import { type TypeGraph } from "./Type/TypeGraph";
+import { type TypeRef, typeRefIndex } from "./Type/TypeRef";
 
 function transformationAttributes(
     graph: TypeGraph,

packages/quicktype-core/src/Renderer.ts

@@ -6,7 +6,7 @@ import { type NewlineSource, type Source, type Sourcelike, annotated, newline, s
 import { type Comment } from "./support/Comments";
 import { assert, panic } from "./support/Support";
 import { type TargetLanguage } from "./TargetLanguage";
-import { type TypeGraph } from "./TypeGraph";
+import { type TypeGraph } from "./Type/TypeGraph";
 
 export interface RenderResult {
     names: ReadonlyMap<Name, string>;

packages/quicktype-core/src/RendererOptions/types.ts

@@ -2,9 +2,10 @@ import type { EnumOption, Option } from "./index";
 
 /**
  * Primary options show up in the web UI in the "Language" settings tab,
- * secondary options in "Other".
+ * Secondary options in "Other".
+ * CLI is only for cli
  */
-export type OptionKind = "primary" | "secondary";
+export type OptionKind = "primary" | "secondary" | "cli";
 
 export interface OptionDefinition<Name extends string = string, T = unknown> {
     alias?: string;

packages/quicktype-core/src/Run.ts

@@ -16,14 +16,16 @@ import { type Comment } from "./support/Comments";
 import { assert } from "./support/Support";
 
 import { gatherNames } from "./GatherNames";
-import { defaultInferenceFlags, inferenceFlagNames, inferenceFlags, InferenceFlags } from "./Inference";
+import { type InferenceFlags, defaultInferenceFlags, inferenceFlagNames, inferenceFlags } from "./Inference";
 import { makeTransformations } from "./MakeTransformations";
 import { messageError } from "./Messages";
 import { type Annotation, type Location, type SerializedRenderResult, type Span } from "./Source";
 import { type MultiFileRenderResult, type TargetLanguage } from "./TargetLanguage";
-import { type StringTypeMapping, TypeBuilder } from "./TypeBuilder";
-import { type TypeGraph, noneToAny, optionalToNullable, removeIndirectionIntersections } from "./TypeGraph";
-import type { FixMeOptionsType } from "./types";
+import { TypeBuilder } from "./Type/TypeBuilder";
+import { type StringTypeMapping } from "./Type/TypeBuilderUtils";
+import { TypeGraph } from "./Type/TypeGraph";
+import { noneToAny, optionalToNullable, removeIndirectionIntersections } from "./Type/TypeGraphUtils";
+import { type FixMeOptionsType } from "./types";
 
 export function getTargetLanguage(nameOrInstance: LanguageName | TargetLanguage): TargetLanguage {
     if (typeof nameOrInstance === "object") {
@@ -200,13 +202,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/TargetLanguage.ts

@@ -7,9 +7,9 @@ import { type Option, type OptionDefinition } from "./RendererOptions";
 import { type SerializedRenderResult, serializeRenderResult } from "./Source";
 import { type Comment } from "./support/Comments";
 import { defined } from "./support/Support";
-import { type Type } from "./Type";
-import { type StringTypeMapping } from "./TypeBuilder";
-import { type TypeGraph } from "./TypeGraph";
+import { type Type } from "./Type/Type";
+import { type StringTypeMapping } from "./Type/TypeBuilderUtils";
+import { type TypeGraph } from "./Type/TypeGraph";
 import { type FixMeOptionsType } from "./types";
 
 export type MultiFileRenderResult = ReadonlyMap<string, SerializedRenderResult>;

packages/quicktype-core/src/Transformers.ts

@@ -13,7 +13,8 @@ import { TypeAttributeKind } from "./attributes/TypeAttributes";
 import { type BaseGraphRewriteBuilder } from "./GraphRewriting";
 import { assert, indentationString, panic } from "./support/Support";
 import { EnumType, PrimitiveType, type Type, type TypeKind, UnionType } from "./Type";
-import { type TypeGraph, type TypeRef, derefTypeRef } from "./TypeGraph";
+import { type TypeGraph } from "./Type/TypeGraph";
+import { type TypeRef, derefTypeRef } from "./Type/TypeRef";
 
 function debugStringForType(t: Type): string {
     const target = followTargetType(t);