quicktype 23.0.158 → 23.0.159

package/dist/package.json

@@ -0,0 +1,81 @@
+{
+    "name": "quicktype",
+    "version": "23.0.0",
+    "license": "Apache-2.0",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "repository": "https://github.com/quicktype/quicktype",
+    "engines": {
+        "node": ">=18.12.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,out}",
+        "debug": "node --inspect-brk --max-old-space-size=4096 ./dist/index.js",
+        "lint": "eslint src/** packages/*/src/**",
+        "lint:fix": "eslint --fix src/** packages/*/src/**"
+    },
+    "workspaces": [
+        "./packages/quicktype-core",
+        "./packages/quicktype-graphql-input",
+        "./packages/quicktype-typescript-input",
+        "./packages/quicktype-vscode"
+    ],
+    "dependencies": {
+        "@glideapps/ts-necessities": "^2.2.3",
+        "chalk": "^4.1.2",
+        "collection-utils": "^1.0.1",
+        "command-line-args": "^5.2.1",
+        "command-line-usage": "^7.0.1",
+        "cross-fetch": "^4.0.0",
+        "graphql": "^0.11.7",
+        "lodash": "^4.17.21",
+        "moment": "^2.30.1",
+        "quicktype-core": "20.0.12",
+        "quicktype-graphql-input": "20.0.2",
+        "quicktype-typescript-input": "20.0.2",
+        "readable-stream": "^4.5.2",
+        "stream-json": "1.8.0",
+        "string-to-stream": "^3.0.1",
+        "typescript": "4.9.5"
+    },
+    "devDependencies": {
+        "@tsconfig/node18": "^1.0.1",
+        "@types/command-line-args": "^5.2.0",
+        "@types/command-line-usage": "^5.0.4",
+        "@types/graphql": "^0.11.7",
+        "@types/lodash": "^4.17.0",
+        "@types/semver": "^7.5.0",
+        "@types/shelljs": "^0.8.15",
+        "@types/stream-json": "^1.7.3",
+        "@types/urijs": "^1.19.25",
+        "@types/wordwrap": "^1.0.3",
+        "@typescript-eslint/eslint-plugin": "^6.3.0",
+        "@typescript-eslint/parser": "^6.3.0",
+        "ajv": "^5.5.2",
+        "deep-equal": "^2.2.3",
+        "esbuild": "^0.20.2",
+        "eslint": "^8.57.0",
+        "eslint-config-canonical": "^41.1.7",
+        "eslint-config-prettier": "^6.10.0",
+        "eslint-import-resolver-typescript": "^3.6.1",
+        "eslint-plugin-canonical": "^3.4.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-json": "^3.1.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "exit": "^0.1.2",
+        "prettier": "^3.2.5",
+        "promise-timeout": "^1.3.0",
+        "semver": "^7.5.4",
+        "shelljs": "^0.8.5",
+        "ts-node": "^10.9.2",
+        "watch": "^1.0.2"
+    },
+    "files": [
+        "dist"
+    ],
+    "bin": "dist/index.js"
+}

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

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

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompressedJSONFromStream = void 0;
-const quicktype_core_1 = require("quicktype-core");
 const stream_json_1 = require("stream-json");
+const quicktype_core_1 = require("quicktype-core");
 const methodMap = {
     startObject: "pushObjectContext",
     endObject: "finishObject",
@@ -22,6 +22,7 @@ class CompressedJSONFromStream extends quicktype_core_1.CompressedJSON {
         const combo = new stream_json_1.Parser({ packKeys: true, packStrings: true });
         combo.on("data", (item) => {
             if (typeof methodMap[item.name] === "string") {
+                // @ts-expect-error FIXME: strongly type this
                 this[methodMap[item.name]](item.value);
             }
         });
@@ -36,7 +37,7 @@ class CompressedJSONFromStream extends quicktype_core_1.CompressedJSON {
         readStream.setEncoding("utf8");
         readStream.pipe(combo);
         readStream.resume();
-        return promise;
+        return await promise;
     }
     handleStartNumber = () => {
         this.pushContext();
@@ -44,7 +45,7 @@ class CompressedJSONFromStream extends quicktype_core_1.CompressedJSON {
     };
     handleNumberChunk = (s) => {
         const ctx = this.context;
-        if (!ctx.currentNumberIsDouble && /[\.e]/i.test(s)) {
+        if (!ctx.currentNumberIsDouble && /[.e]/i.test(s)) {
             ctx.currentNumberIsDouble = true;
         }
     };

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

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.introspectServer = void 0;
-const quicktype_core_1 = require("quicktype-core");
-const graphql_1 = require("graphql");
 const ts_necessities_1 = require("@glideapps/ts-necessities");
 const cross_fetch_1 = __importDefault(require("cross-fetch"));
+const graphql_1 = require("graphql");
+const quicktype_core_1 = require("quicktype-core");
 // https://github.com/apollographql/apollo-codegen/blob/master/src/downloadSchema.ts
 const defaultHeaders = {
     Accept: "application/json",
@@ -20,7 +20,7 @@ async function introspectServer(url, method, headerStrings) {
         headers[name] = defaultHeaders[name];
     }
     for (const str of headerStrings) {
-        const matches = str.match(headerRegExp);
+        const matches = headerRegExp.exec(str);
         if (matches === null) {
             return (0, quicktype_core_1.panic)(`Not a valid HTTP header: "${str}"`);
         }

package/dist/{TypeSource.d.ts → src/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 { type Readable } from "readable-stream";
+import { type JSONSchemaSourceData, type JSONSourceData } from "quicktype-core";
+import { type GraphQLSourceData } from "quicktype-graphql-input";
 export interface JSONTypeSource extends JSONSourceData<Readable> {
     kind: "json";
 }

package/dist/src/URLGrammar.d.ts

@@ -0,0 +1,3 @@
+export declare function urlsFromURLGrammar(json: unknown): {
+    [name: string]: string[];
+};

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

@@ -20,7 +20,7 @@ function expand(json) {
         }
         return result;
     }
-    if (Object.prototype.hasOwnProperty.call(json, "oneOf")) {
+    if (typeof json === "object" && json && "oneOf" in json) {
         const options = (0, quicktype_core_1.checkArray)(json.oneOf);
         const result = [];
         for (const j of options) {

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

@@ -1,29 +1,29 @@
 #!/usr/bin/env node
-import { Readable } from "readable-stream";
-import { Options, RendererOptions, SerializedRenderResult, TargetLanguage, JSONInput } from "quicktype-core";
+import { type Readable } from "readable-stream";
+import { JSONInput, type Options, type RendererOptions, type SerializedRenderResult, type TargetLanguage } from "quicktype-core";
 export interface CLIOptions {
-    lang: string;
-    topLevel: string;
-    src: string[];
-    srcUrls?: string;
-    srcLang: string;
+    [option: string]: any;
     additionalSchema: string[];
-    graphqlSchema?: string;
+    allPropertiesOptional: boolean;
+    alphabetizeProperties: boolean;
+    buildMarkovChain?: string;
+    debug?: string;
     graphqlIntrospect?: string;
+    graphqlSchema?: string;
+    help: boolean;
     httpHeader?: string[];
     httpMethod?: string;
-    out?: string;
-    buildMarkovChain?: string;
-    alphabetizeProperties: boolean;
-    allPropertiesOptional: boolean;
+    lang: string;
     noRender: boolean;
-    rendererOptions: RendererOptions;
-    help: boolean;
+    out?: string;
     quiet: boolean;
-    version: boolean;
-    debug?: string;
+    rendererOptions: RendererOptions;
+    src: string[];
+    srcLang: string;
+    srcUrls?: string;
     telemetry?: string;
-    [option: string]: any;
+    topLevel: string;
+    version: boolean;
 }
 export declare function parseCLIOptions(argv: string[], targetLanguage?: TargetLanguage): CLIOptions;
 export declare function jsonInputForTargetLanguage(targetLanguage: string | TargetLanguage, languages?: TargetLanguage[], handleJSONRefs?: boolean): JSONInput<Readable>;

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

@@ -30,24 +30,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.writeOutput = exports.makeQuicktypeOptions = exports.jsonInputForTargetLanguage = exports.parseCLIOptions = void 0;
 const fs = __importStar(require("fs"));
 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 chalk_1 = __importDefault(require("chalk"));
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+const collection_utils_1 = require("collection-utils");
+const command_line_args_1 = __importDefault(require("command-line-args"));
+const command_line_usage_1 = __importDefault(require("command-line-usage"));
+const _ = __importStar(require("lodash"));
+const string_to_stream_1 = __importDefault(require("string-to-stream"));
+const wordwrap_1 = __importDefault(require("wordwrap"));
 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 quicktype_typescript_input_1 = require("quicktype-typescript-input");
+const package_json_1 = __importDefault(require("../package.json"));
 const CompressedJSONFromStream_1 = require("./CompressedJSONFromStream");
-const stringToStream = require("string-to-stream");
-const command_line_args_1 = __importDefault(require("command-line-args"));
-const command_line_usage_1 = __importDefault(require("command-line-usage"));
-const chalk_1 = __importDefault(require("chalk"));
-const wordWrap = require("wordwrap")(90);
-const packageJSON = require("../package.json");
+const GraphQLIntrospection_1 = require("./GraphQLIntrospection");
+const URLGrammar_1 = require("./URLGrammar");
+const wordWrap = (0, wordwrap_1.default)(90);
 const defaultDefaultTargetLanguageName = "go";
 async function sourceFromFileOrUrlArray(name, filesOrUrls, httpHeaders) {
-    const samples = await Promise.all(filesOrUrls.map(file => (0, quicktype_core_1.readableFromFileOrURL)(file, httpHeaders)));
+    const samples = await Promise.all(filesOrUrls.map(async (file) => await (0, quicktype_core_1.readableFromFileOrURL)(file, httpHeaders)));
     return { kind: "json", name, samples };
 }
 function typeNameFromFilename(filename) {
@@ -140,6 +142,7 @@ async function samplesFromDirectory(dataDir, httpHeaders) {
         if (jsonSamples.length > 0 && schemaSources.length + graphQLSources.length > 0) {
             return (0, quicktype_core_1.messageError)("DriverCannotMixJSONWithOtherSamples", { dir: dir });
         }
+        // FIXME: rewrite this to be clearer
         const oneUnlessEmpty = (xs) => Math.sign(xs.length);
         if (oneUnlessEmpty(schemaSources) + oneUnlessEmpty(graphQLSources) > 1) {
             return (0, quicktype_core_1.messageError)("DriverCannotMixNonJSONInputs", { dir: dir });
@@ -201,7 +204,7 @@ function inferCLIOptions(opts, targetLanguage) {
         language = targetLanguage;
     }
     else {
-        const languageName = opts.lang !== undefined ? opts.lang : inferLang(opts, defaultDefaultTargetLanguageName);
+        const languageName = opts.lang ?? inferLang(opts, defaultDefaultTargetLanguageName);
         const maybeLanguage = (0, quicktype_core_1.languageNamed)(languageName);
         if (maybeLanguage === undefined) {
             return (0, quicktype_core_1.messageError)("DriverUnknownOutputLanguage", { lang: languageName });
@@ -209,21 +212,21 @@ function inferCLIOptions(opts, targetLanguage) {
         language = maybeLanguage;
     }
     const options = {
-        src: opts.src || [],
+        src: opts.src ?? [],
         srcUrls: opts.srcUrls,
         srcLang: srcLang,
         lang: language.displayName,
-        topLevel: opts.topLevel || inferTopLevel(opts),
+        topLevel: opts.topLevel ?? inferTopLevel(opts),
         noRender: !!opts.noRender,
         alphabetizeProperties: !!opts.alphabetizeProperties,
         allPropertiesOptional: !!opts.allPropertiesOptional,
-        rendererOptions: opts.rendererOptions || {},
-        help: opts.help || false,
-        quiet: opts.quiet || false,
-        version: opts.version || false,
+        rendererOptions: opts.rendererOptions ?? {},
+        help: opts.help ?? false,
+        quiet: opts.quiet ?? false,
+        version: opts.version ?? false,
         out: opts.out,
         buildMarkovChain: opts.buildMarkovChain,
-        additionalSchema: opts.additionalSchema || [],
+        additionalSchema: opts.additionalSchema ?? [],
         graphqlSchema: opts.graphqlSchema,
         graphqlIntrospect: opts.graphqlIntrospect,
         httpMethod: opts.httpMethod,
@@ -259,7 +262,7 @@ function makeOptionDefinitions(targetLanguages) {
             name: "out",
             alias: "o",
             type: String,
-            typeLabel: `FILE`,
+            typeLabel: "FILE",
             description: "The output file. Determines --lang and --top-level."
         },
         {
@@ -485,6 +488,8 @@ exports.parseCLIOptions = parseCLIOptions;
 // according to each option definition's `renderer` field.  If `partial` is false this
 // will throw if it encounters an unknown option.
 function parseOptions(definitions, argv, partial) {
+    // FIXME: update this when options strongly typed
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let opts;
     try {
         opts = (0, command_line_args_1.default)(definitions, { argv, partial });
@@ -500,6 +505,7 @@ function parseOptions(definitions, argv, partial) {
             });
         }
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const options = { rendererOptions: {} };
     for (const o of definitions) {
         if (!(0, collection_utils_1.hasOwnProperty)(opts, o.name))
@@ -601,15 +607,19 @@ async function makeInputData(sources, targetLanguage, additionalSchemaAddresses,
     return inputData;
 }
 function stringSourceDataToStreamSourceData(src) {
-    return { name: src.name, description: src.description, samples: src.samples.map(stringToStream) };
+    return {
+        name: src.name,
+        description: src.description,
+        samples: src.samples.map(sample => (0, string_to_stream_1.default)(sample))
+    };
 }
 async function makeQuicktypeOptions(options, targetLanguages) {
     if (options.help) {
-        usage(targetLanguages === undefined ? quicktype_core_1.defaultTargetLanguages : targetLanguages);
+        usage(targetLanguages ?? quicktype_core_1.defaultTargetLanguages);
         return undefined;
     }
     if (options.version) {
-        console.log(`quicktype version ${packageJSON.version}`);
+        console.log(`quicktype version ${package_json_1.default.version}`);
         console.log("Visit quicktype.io for more info.");
         return undefined;
     }
@@ -688,7 +698,7 @@ async function makeQuicktypeOptions(options, targetLanguages) {
             return (0, quicktype_core_1.messageError)("DriverUnknownSourceLanguage", { lang: options.srcLang });
     }
     const components = (0, collection_utils_1.definedMap)(options.debug, d => d.split(","));
-    const debugAll = components !== undefined && components.indexOf("all") >= 0;
+    const debugAll = components !== undefined && components.includes("all");
     let debugPrintGraph = debugAll;
     let checkProvenance = debugAll;
     let debugPrintReconstitution = debugAll;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quicktype",
-  "version": "23.0.158",
+  "version": "23.0.159",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,9 +34,9 @@
     "graphql": "^0.11.7",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "quicktype-core": "23.0.158",
-    "quicktype-graphql-input": "23.0.158",
-    "quicktype-typescript-input": "23.0.158",
+    "quicktype-core": "23.0.159",
+    "quicktype-graphql-input": "23.0.159",
+    "quicktype-typescript-input": "23.0.159",
     "readable-stream": "^4.5.2",
     "stream-json": "1.8.0",
     "string-to-stream": "^3.0.1",
@@ -52,6 +52,7 @@
     "@types/shelljs": "^0.8.15",
     "@types/stream-json": "^1.7.3",
     "@types/urijs": "^1.19.25",
+    "@types/wordwrap": "^1.0.3",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
     "ajv": "^5.5.2",

package/dist/URLGrammar.d.ts

@@ -1,3 +0,0 @@
-export declare function urlsFromURLGrammar(json: any): {
-    [name: string]: string[];
-};