quicktype 18.0.6 → 19.0.4

package/README.md

@@ -1,4 +1,4 @@
-![](https://raw.githubusercontent.com/quicktype/quicktype/master/quicktype-logo.svg?sanitize=true)
+![](https://raw.githubusercontent.com/quicktype/quicktype/master/media/quicktype-logo.svg?sanitize=true)
 
 [![npm version](https://badge.fury.io/js/quicktype.svg)](https://badge.fury.io/js/quicktype)
 ![Build status](https://github.com/quicktype/quicktype/actions/workflows/master.yaml/badge.svg)

package/dist/{cli/CompressedJSONFromStream.d.ts → CompressedJSONFromStream.d.ts}

@@ -1,5 +1,5 @@
 import { Readable } from "readable-stream";
-import { CompressedJSON, Value } from "../quicktype-core/input/CompressedJSON";
+import { CompressedJSON, Value } from "quicktype-core";
 export declare class CompressedJSONFromStream extends CompressedJSON<Readable> {
     parse(readStream: Readable): Promise<Value>;
     protected handleStartNumber: () => void;

package/dist/{cli/CompressedJSONFromStream.js → CompressedJSONFromStream.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompressedJSONFromStream = void 0;
-const CompressedJSON_1 = require("../quicktype-core/input/CompressedJSON");
+const quicktype_core_1 = require("quicktype-core");
 const { Parser } = require("stream-json");
 const methodMap = {
     startObject: "pushObjectContext",
@@ -17,7 +17,7 @@ const methodMap = {
     trueValue: "handleTrueValue",
     falseValue: "handleFalseValue"
 };
-class CompressedJSONFromStream extends CompressedJSON_1.CompressedJSON {
+class CompressedJSONFromStream extends quicktype_core_1.CompressedJSON {
     async parse(readStream) {
         const combo = new Parser({ packKeys: true, packStrings: true });
         combo.on("data", (item) => {

package/dist/{cli/GraphQLIntrospection.js → GraphQLIntrospection.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.introspectServer = void 0;
-const quicktype_core_1 = require("../quicktype-core");
+const quicktype_core_1 = require("quicktype-core");
 const graphql_1 = require("graphql");
 const ts_necessities_1 = require("@glideapps/ts-necessities");
 const fetch = require("node-fetch");

package/dist/{cli/TypeSource.d.ts → TypeSource.d.ts}

@@ -1,6 +1,6 @@
 import { Readable } from "readable-stream";
-import { JSONSourceData, JSONSchemaSourceData } from "../quicktype-core";
-import { GraphQLSourceData } from "../quicktype-graphql-input";
+import { JSONSourceData, JSONSchemaSourceData } from "quicktype-core";
+import { GraphQLSourceData } from "quicktype-graphql-input";
 export interface JSONTypeSource extends JSONSourceData<Readable> {
     kind: "json";
 }

package/dist/{cli/URLGrammar.js → URLGrammar.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.urlsFromURLGrammar = void 0;
-const quicktype_core_1 = require("../quicktype-core");
+const quicktype_core_1 = require("quicktype-core");
 function expand(json) {
     if (typeof json === "string") {
         return [json];

package/dist/{cli/index.d.ts → index.d.ts}

@@ -1,5 +1,5 @@
 import { Readable } from "readable-stream";
-import { Options, RendererOptions, SerializedRenderResult, TargetLanguage, JSONInput } from "../quicktype-core";
+import { Options, RendererOptions, SerializedRenderResult, TargetLanguage, JSONInput } from "quicktype-core";
 export interface CLIOptions {
     lang: string;
     topLevel: string;

package/dist/{cli/index.js → index.js}

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -30,9 +29,9 @@ const path = __importStar(require("path"));
 const _ = __importStar(require("lodash"));
 const collection_utils_1 = require("collection-utils");
 const ts_necessities_1 = require("@glideapps/ts-necessities");
-const quicktype_core_1 = require("../quicktype-core");
-const quicktype_typescript_input_1 = require("../quicktype-typescript-input");
-const quicktype_graphql_input_1 = require("../quicktype-graphql-input");
+const quicktype_core_1 = require("quicktype-core");
+const quicktype_typescript_input_1 = require("quicktype-typescript-input");
+const quicktype_graphql_input_1 = require("quicktype-graphql-input");
 const URLGrammar_1 = require("./URLGrammar");
 const GraphQLIntrospection_1 = require("./GraphQLIntrospection");
 const CompressedJSONFromStream_1 = require("./CompressedJSONFromStream");
@@ -41,7 +40,7 @@ const commandLineArgs = require("command-line-args");
 const getUsage = require("command-line-usage");
 const chalk = require("chalk");
 const wordWrap = require("wordwrap")(90);
-const packageJSON = require("../../package.json");
+const packageJSON = require("../package.json");
 const defaultDefaultTargetLanguageName = "go";
 async function sourceFromFileOrUrlArray(name, filesOrUrls, httpHeaders) {
     const samples = await Promise.all(filesOrUrls.map(file => (0, quicktype_core_1.readableFromFileOrURL)(file, httpHeaders)));

package/package.json

@@ -1,79 +1,63 @@
 {
-    "name": "quicktype",
-    "version": "18.0.6",
-    "license": "Apache-2.0",
-    "main": "dist/cli/index.js",
-    "types": "dist/cli/index.d.ts",
-    "repository": "https://github.com/quicktype/quicktype",
-    "engines": {
-        "node": ">=18.13.0"
-    },
-    "scripts": {
-        "pub": "script/publish.sh",
-        "build": "script/build.ts",
-        "test": "script/test",
-        "start": "script/watch",
-        "pkg": "script/make-pkgs.sh",
-        "tslint": "tslint --project src/cli --exclude 'src/__tests__/**' --exclude 'src/quicktype-core/input/io/get-stream/**'",
-        "clean": "rm -rf dist node_modules *~",
-        "debug": "node --inspect-brk --max-old-space-size=4096 ./dist/cli/index.js"
-    },
-    "dependencies": {
-        "@glideapps/ts-necessities": "2.1.2",
-        "@mark.probst/typescript-json-schema": "0.55.0",
-        "browser-or-node": "^1.2.1",
-        "chalk": "^2.4.1",
-        "collection-utils": "^1.0.1",
-        "command-line-args": "^4.0.6",
-        "command-line-usage": "^5.0.5",
-        "graphql": "^0.11.7",
-        "is-url": "^1.2.4",
-        "isomorphic-fetch": "^3.0.0",
-        "js-base64": "^2.4.3",
-        "lodash": "^4.17.21",
-        "moment": "^2.22.1",
-        "node-fetch": "^2.6.1",
-        "pako": "^1.0.6",
-        "pluralize": "^7.0.0",
-        "readable-stream": "2.3.7",
-        "stream-json": "1.1.3",
-        "string-to-stream": "^1.1.0",
-        "typescript": "4.9.4",
-        "unicode-properties": "^1.4.1",
-        "urijs": "^1.19.11",
-        "uuid": "^9.0.0",
-        "wordwrap": "^1.0.0",
-        "yaml": "^1.5.0"
-    },
-    "devDependencies": {
-        "@tsconfig/node18": "^1.0.1",
-        "@types/browser-or-node": "^1.2.0",
-        "@types/graphql": "^0.11.7",
-        "@types/is-url": "^1.2.28",
-        "@types/js-base64": "^2.3.1",
-        "@types/lodash": "^4.14.108",
-        "@types/node": "18.11.18",
-        "@types/pako": "^1.0.0",
-        "@types/pluralize": "0.0.28",
-        "@types/readable-stream": "2.3.15",
-        "@types/semver": "^5.5.0",
-        "@types/shelljs": "^0.7.8",
-        "@types/urijs": "^1.19.8",
-        "@types/yaml": "^1.0.2",
-        "ajv": "^5.5.2",
-        "deep-equal": "^1.0.1",
-        "exit": "^0.1.2",
-        "prettier": "^2.8.1",
-        "promise-timeout": "^1.3.0",
-        "semver": "^5.5.0",
-        "shelljs": "^0.8.5",
-        "ts-node": "^10.9.1",
-        "tslint": "^5.11.0",
-        "uglify-js": "^3.3.22",
-        "watch": "^1.0.2"
-    },
-    "files": [
-        "dist/**"
-    ],
-    "bin": "dist/cli/index.js"
+  "name": "quicktype",
+  "version": "19.0.4",
+  "license": "Apache-2.0",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "repository": "https://github.com/quicktype/quicktype",
+  "engines": {
+    "node": ">=18.13.0"
+  },
+  "scripts": {
+    "pub": "script/publish.sh",
+    "build": "npm run build --workspaces --if-present && tsc",
+    "test": "script/test",
+    "start": "script/watch",
+    "clean": "rm -rf dist node_modules *~ packages/*/{dist,node_modules}",
+    "debug": "node --inspect-brk --max-old-space-size=4096 ./dist/index.js"
+  },
+  "workspaces": [
+    "./packages/quicktype-core",
+    "./packages/quicktype-graphql-input",
+    "./packages/quicktype-typescript-input"
+  ],
+  "dependencies": {
+    "readable-stream": "^4.3.0",
+    "stream-json": "1.1.3",
+    "graphql": "^0.11.7",
+    "@glideapps/ts-necessities": "^2.1.2",
+    "chalk": "^2.4.1",
+    "command-line-args": "^4.0.6",
+    "command-line-usage": "^5.0.5",
+    "lodash": "^4.17.21",
+    "moment": "^2.22.1",
+    "node-fetch": "^2.6.1",
+    "string-to-stream": "^1.1.0",
+    "typescript": "4.9.4",
+    "quicktype-core": "v19.0.4",
+    "quicktype-graphql-input": "v19.0.4",
+    "quicktype-typescript-input": "v19.0.4"
+  },
+  "devDependencies": {
+    "@tsconfig/node18": "^1.0.1",
+    "@types/graphql": "^0.11.7",
+    "@types/is-url": "^1.2.28",
+    "@types/lodash": "^4.14.108",
+    "@types/shelljs": "^0.7.8",
+    "@types/urijs": "^1.19.8",
+    "ajv": "^5.5.2",
+    "deep-equal": "^1.0.1",
+    "exit": "^0.1.2",
+    "prettier": "^2.8.1",
+    "promise-timeout": "^1.3.0",
+    "shelljs": "^0.8.5",
+    "ts-node": "^10.9.1",
+    "tslint": "^5.11.0",
+    "uglify-js": "^3.3.22",
+    "watch": "^1.0.2"
+  },
+  "files": [
+    "dist"
+  ],
+  "bin": "dist/index.js"
 }

package/dist/quicktype-core/Annotation.d.ts

@@ -1,8 +0,0 @@
-export declare class AnnotationData {
-}
-export declare class IssueAnnotationData extends AnnotationData {
-    readonly message: string;
-    constructor(message: string);
-}
-export declare const anyTypeIssueAnnotation: IssueAnnotationData;
-export declare const nullTypeIssueAnnotation: IssueAnnotationData;

package/dist/quicktype-core/Annotation.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullTypeIssueAnnotation = exports.anyTypeIssueAnnotation = exports.IssueAnnotationData = exports.AnnotationData = void 0;
-class AnnotationData {
-}
-exports.AnnotationData = AnnotationData;
-class IssueAnnotationData extends AnnotationData {
-    message;
-    constructor(message) {
-        super();
-        this.message = message;
-    }
-}
-exports.IssueAnnotationData = IssueAnnotationData;
-exports.anyTypeIssueAnnotation = new IssueAnnotationData("quicktype cannot infer this type because there is no data about it in the input.");
-exports.nullTypeIssueAnnotation = new IssueAnnotationData("The only value for this in the input is null, which means you probably need a more complete input sample.");

package/dist/quicktype-core/ConvenienceRenderer.d.ts

@@ -1,138 +0,0 @@
-import { Type, ClassType, EnumType, UnionType, TypeKind, ClassProperty, ObjectType } from "./Type";
-import { Namespace, Name, Namer, DependencyName } from "./Naming";
-import { Renderer, BlankLineConfig, RenderContext, ForEachPosition } from "./Renderer";
-import { Sourcelike } from "./Source";
-import { Declaration } from "./DeclarationIR";
-import { Transformation } from "./Transformers";
-import { TargetLanguage } from "./TargetLanguage";
-export declare const topLevelNameOrder = 1;
-export declare const inferredNameOrder = 30;
-export type ForbiddenWordsInfo = {
-    names: (Name | string)[];
-    includeGlobalForbidden: boolean;
-};
-export declare abstract class ConvenienceRenderer extends Renderer {
-    private _globalForbiddenNamespace;
-    private _otherForbiddenNamespaces;
-    private _globalNamespace;
-    private _nameStoreView;
-    private _propertyNamesStoreView;
-    private _memberNamesStoreView;
-    private _caseNamesStoreView;
-    private _namesForTransformations;
-    private _namedTypeNamer;
-    private _unionMemberNamer;
-    private _enumCaseNamer;
-    private _declarationIR;
-    private _namedTypes;
-    private _namedObjects;
-    private _namedEnums;
-    private _namedUnions;
-    private _haveUnions;
-    private _haveMaps;
-    private _haveOptionalProperties;
-    private _cycleBreakerTypes?;
-    private _alphabetizeProperties;
-    constructor(targetLanguage: TargetLanguage, renderContext: RenderContext);
-    get topLevels(): ReadonlyMap<string, Type>;
-    /**
-     * Return an array of strings which are not allowed as names in the global
-     * namespace.  Since names of generated types are in the global namespace,
-     * this will include anything built into the language or default libraries
-     * that can conflict with that, such as reserved keywords or common type
-     * names.
-     */
-    protected forbiddenNamesForGlobalNamespace(): string[];
-    /**
-     * Returns which names are forbidden for the property names of an object
-     * type.  `names` can contain strings as well as `Name`s.  In some
-     * languages, the class name can't be used as the name for a property, for
-     * example, in which case `_className` would have to be return in `names`.
-     * If `includeGlobalForbidden` is set, then all names that are forbidden
-     * in the global namespace will also be forbidden for the properties.
-     * Note: That doesn't mean that the names in the global namespace will be
-     * forbidden, too!
-     */
-    protected forbiddenForObjectProperties(_o: ObjectType, _className: Name): ForbiddenWordsInfo;
-    protected forbiddenForUnionMembers(_u: UnionType, _unionName: Name): ForbiddenWordsInfo;
-    protected forbiddenForEnumCases(_e: EnumType, _enumName: Name): ForbiddenWordsInfo;
-    protected makeTopLevelDependencyNames(_t: Type, _topLevelName: Name): DependencyName[];
-    protected makeNamedTypeDependencyNames(_t: Type, _name: Name): DependencyName[];
-    protected abstract makeNamedTypeNamer(): Namer;
-    protected abstract namerForObjectProperty(o: ObjectType, p: ClassProperty): Namer | null;
-    protected abstract makeUnionMemberNamer(): Namer | null;
-    protected abstract makeEnumCaseNamer(): Namer | null;
-    protected abstract emitSourceStructure(givenOutputFilename: string): void;
-    protected makeNameForTransformation(_xf: Transformation, _typeName: Name | undefined): Name | undefined;
-    protected namedTypeToNameForTopLevel(type: Type): Type | undefined;
-    protected get unionMembersInGlobalNamespace(): boolean;
-    protected get enumCasesInGlobalNamespace(): boolean;
-    protected get needsTypeDeclarationBeforeUse(): boolean;
-    protected canBeForwardDeclared(_t: Type): boolean;
-    protected unionNeedsName(u: UnionType): boolean;
-    private get globalNamespace();
-    private get nameStoreView();
-    protected descriptionForType(t: Type): string[] | undefined;
-    protected descriptionForClassProperty(o: ObjectType, name: string): string[] | undefined;
-    protected setUpNaming(): ReadonlySet<Namespace>;
-    private addDependenciesForNamedType;
-    protected makeNameForTopLevel(_t: Type, givenName: string, _maybeNamedType: Type | undefined): Name;
-    private addNameForTopLevel;
-    private makeNameForType;
-    protected makeNameForNamedType(t: Type): Name;
-    private addNameForNamedType;
-    protected get typesWithNamedTransformations(): ReadonlyMap<Type, Name>;
-    protected nameForTransformation(t: Type): Name | undefined;
-    private addNameForTransformation;
-    private processForbiddenWordsInfo;
-    protected makeNameForProperty(o: ObjectType, _className: Name, p: ClassProperty, jsonName: string, assignedName: string | undefined): Name | undefined;
-    protected makePropertyDependencyNames(_o: ObjectType, _className: Name, _p: ClassProperty, _jsonName: string, _name: Name): Name[];
-    private addPropertyNames;
-    protected makeNameForUnionMember(u: UnionType, unionName: Name, t: Type): Name;
-    private addUnionMemberNames;
-    protected makeNameForEnumCase(e: EnumType, _enumName: Name, caseName: string, assignedName: string | undefined): Name;
-    private addEnumCaseNames;
-    private childrenOfType;
-    protected get namedUnions(): ReadonlySet<UnionType>;
-    protected get haveNamedUnions(): boolean;
-    protected get haveNamedTypes(): boolean;
-    protected get haveUnions(): boolean;
-    protected get haveMaps(): boolean;
-    protected get haveOptionalProperties(): boolean;
-    protected get enums(): ReadonlySet<EnumType>;
-    protected get haveEnums(): boolean;
-    protected proposedUnionMemberNameForTypeKind(_kind: TypeKind): string | null;
-    protected proposeUnionMemberName(_u: UnionType, _unionName: Name, fieldType: Type, lookup: (n: Name) => string): string;
-    protected nameForNamedType(t: Type): Name;
-    protected isForwardDeclaredType(t: Type): boolean;
-    protected isImplicitCycleBreaker(_t: Type): boolean;
-    protected canBreakCycles(_t: Type): boolean;
-    protected isCycleBreakerType(t: Type): boolean;
-    protected forEachTopLevel(blankLocations: BlankLineConfig, f: (t: Type, name: Name, position: ForEachPosition) => void, predicate?: (t: Type) => boolean): boolean;
-    protected forEachDeclaration(blankLocations: BlankLineConfig, f: (decl: Declaration, position: ForEachPosition) => void): void;
-    setAlphabetizeProperties(value: boolean): void;
-    protected getAlphabetizeProperties(): boolean;
-    protected propertyCount(o: ObjectType): number;
-    protected sortClassProperties(properties: ReadonlyMap<string, ClassProperty>, propertyNames: ReadonlyMap<string, Name>): ReadonlyMap<string, ClassProperty>;
-    protected forEachClassProperty(o: ObjectType, blankLocations: BlankLineConfig, f: (name: Name, jsonName: string, p: ClassProperty, position: ForEachPosition) => void): void;
-    protected nameForUnionMember(u: UnionType, t: Type): Name;
-    protected nameForEnumCase(e: EnumType, caseName: string): Name;
-    protected forEachUnionMember(u: UnionType, members: ReadonlySet<Type> | null, blankLocations: BlankLineConfig, sortOrder: ((n: Name, t: Type) => string) | null, f: (name: Name, t: Type, position: ForEachPosition) => void): void;
-    protected forEachEnumCase(e: EnumType, blankLocations: BlankLineConfig, f: (name: Name, jsonName: string, position: ForEachPosition) => void): void;
-    protected forEachTransformation(blankLocations: BlankLineConfig, f: (n: Name, t: Type, position: ForEachPosition) => void): void;
-    protected forEachSpecificNamedType<T extends Type>(blankLocations: BlankLineConfig, types: Iterable<[any, T]>, f: (t: T, name: Name, position: ForEachPosition) => void): void;
-    protected forEachObject(blankLocations: BlankLineConfig, f: ((c: ClassType, className: Name, position: ForEachPosition) => void) | ((o: ObjectType, objectName: Name, position: ForEachPosition) => void)): void;
-    protected forEachEnum(blankLocations: BlankLineConfig, f: (u: EnumType, enumName: Name, position: ForEachPosition) => void): void;
-    protected forEachUnion(blankLocations: BlankLineConfig, f: (u: UnionType, unionName: Name, position: ForEachPosition) => void): void;
-    protected forEachUniqueUnion<T>(blankLocations: BlankLineConfig, uniqueValue: (u: UnionType) => T, f: (firstUnion: UnionType, value: T, position: ForEachPosition) => void): void;
-    protected forEachNamedType(blankLocations: BlankLineConfig, objectFunc: ((c: ClassType, className: Name, position: ForEachPosition) => void) | ((o: ObjectType, objectName: Name, position: ForEachPosition) => void), enumFunc: (e: EnumType, enumName: Name, position: ForEachPosition) => void, unionFunc: (u: UnionType, unionName: Name, position: ForEachPosition) => void): void;
-    protected sourcelikeToString(src: Sourcelike): string;
-    protected get commentLineStart(): string;
-    protected emitCommentLines(lines: Sourcelike[], lineStart?: string, beforeLine?: string, afterLine?: string, firstLineStart?: string): void;
-    protected emitDescription(description: Sourcelike[] | undefined): void;
-    protected emitDescriptionBlock(lines: Sourcelike[]): void;
-    protected emitPropertyTable(c: ClassType, makePropertyRow: (name: Name, jsonName: string, p: ClassProperty) => Sourcelike[]): void;
-    private processGraph;
-    protected emitSource(givenOutputFilename: string): void;
-    protected forEachType<TResult>(process: (t: Type) => TResult): Set<TResult>;
-}