quicktype-core 23.3.25 → 24.0.0

package/dist/input/JSONSchemaInput.js

@@ -25,6 +25,7 @@ const TypeNames_1 = require("../attributes/TypeNames");
 const URIAttributes_1 = require("../attributes/URIAttributes");
 const Messages_1 = require("../Messages");
 const Support_1 = require("../support/Support");
+const WindowsPaths_1 = require("../support/WindowsPaths");
 const Type_1 = require("../Type");
 const JSONSchemaStore_1 = require("./JSONSchemaStore");
 const PathElement_1 = require("./PathElement");
@@ -78,13 +79,13 @@ function normalizeURI(uri) {
     // JSONSchemaStore should take a URI, not a string, and if it reads from
     // a file it can decode by itself.
     if (typeof uri === "string") {
-        uri = new urijs_1.default(uri);
+        uri = new urijs_1.default((0, WindowsPaths_1.fixWindowsPath)(uri));
     }
     return new urijs_1.default(urijs_1.default.decode(uri.clone().normalize().toString()));
 }
 class Ref {
     static root(address) {
-        const uri = (0, collection_utils_1.definedMap)(address, (a) => new urijs_1.default(a));
+        const uri = (0, collection_utils_1.definedMap)(address, (a) => new urijs_1.default((0, WindowsPaths_1.fixWindowsPath)(a)));
         return new Ref(uri, []);
     }
     static parsePath(path) {
@@ -112,7 +113,7 @@ class Ref {
         return new Ref(uri, elements);
     }
     static parse(ref) {
-        return Ref.parseURI(new urijs_1.default(ref), true);
+        return Ref.parseURI(new urijs_1.default((0, WindowsPaths_1.fixWindowsPath)(ref)), true);
     }
     constructor(addressURI, path) {
         this.path = path;

package/dist/input/io/NodeIO.js

@@ -68,8 +68,8 @@ const is_url_1 = __importDefault(require("is-url"));
 const readable_stream_1 = require("readable-stream");
 const Messages_1 = require("../../Messages");
 const Support_1 = require("../../support/Support");
+const WindowsPaths_1 = require("../../support/WindowsPaths");
 const get_stream_1 = require("./get-stream");
-const _fetch_1 = require("./$fetch");
 function parseHeaders(httpHeaders) {
     if (!Array.isArray(httpHeaders)) {
         return {};
@@ -107,10 +107,8 @@ function webStreamChunks(stream) {
 // but @types/readable-stream doesn't declare it, hence this cast.
 const ReadableWithFrom = readable_stream_1.Readable;
 function readableFromResponseBody(body) {
-    // Native fetch (Node >= 18, browsers) returns a WHATWG ReadableStream,
-    // which lacks the Node stream API that our consumers rely on, so we have
-    // to wrap it.  The cross-fetch fallback (node-fetch) already returns a
-    // Node stream, which we pass through unchanged.
+    // Native fetch returns a WHATWG ReadableStream, which lacks the Node
+    // stream API that our consumers rely on, so we have to wrap it.
     if (typeof body.getReader === "function") {
         return ReadableWithFrom.from(webStreamChunks(body), { objectMode: false });
     }
@@ -129,8 +127,11 @@ function resolveSymbolicLink(filePath) {
 function readableFromFileOrURL(fileOrURL, httpHeaders) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            if ((0, is_url_1.default)(fileOrURL)) {
-                const response = yield (0, _fetch_1.fetch)(fileOrURL, {
+            if (fileOrURL.startsWith("file://")) {
+                fileOrURL = (0, WindowsPaths_1.filePathFromFileURI)(fileOrURL);
+            }
+            else if ((0, is_url_1.default)(fileOrURL)) {
+                const response = yield globalThis.fetch(fileOrURL, {
                     headers: parseHeaders(httpHeaders),
                 });
                 return readableFromResponseBody((0, ts_necessities_1.defined)(response.body));

package/dist/language/All.d.ts

@@ -28,5 +28,6 @@ import { FlowTargetLanguage, TypeScriptTargetLanguage } from "./TypeScriptFlow";
 import { TypeScriptZodTargetLanguage } from "./TypeScriptZod";
 export declare const all: readonly [CJSONTargetLanguage, CPlusPlusTargetLanguage, CrystalTargetLanguage, CSharpTargetLanguage, DartTargetLanguage, ElixirTargetLanguage, ElmTargetLanguage, FlowTargetLanguage, GoTargetLanguage, HaskellTargetLanguage, JavaTargetLanguage, JavaScriptTargetLanguage, JavaScriptPropTypesTargetLanguage, JSONSchemaTargetLanguage, KotlinTargetLanguage, ObjectiveCTargetLanguage, PhpTargetLanguage, PikeTargetLanguage, PythonTargetLanguage, RubyTargetLanguage, RustTargetLanguage, Scala3TargetLanguage, SmithyTargetLanguage, SwiftTargetLanguage, TypeScriptTargetLanguage, TypeScriptEffectSchemaTargetLanguage, TypeScriptZodTargetLanguage];
 export declare function languageNamed<Name extends LanguageName>(name: Name, targetLanguages?: readonly TargetLanguage[]): LanguageNameMap[Name];
+export declare function languageNamed(name: string, targetLanguages?: readonly TargetLanguage[]): TargetLanguage | undefined;
 export declare function isLanguageName(maybeName: string): maybeName is LanguageName;
 export declare function isLanguageDisplayName(maybeName: string): maybeName is LanguageDisplayName;

package/dist/language/All.js

@@ -61,17 +61,15 @@ exports.all = [
 ];
 exports.all;
 function languageNamed(name, targetLanguages = exports.all) {
-    const foundLanguage = targetLanguages.find((language) => language.names.includes(name));
-    if (!foundLanguage) {
-        throw new Error(`Unknown language name: ${name}`);
-    }
-    return foundLanguage;
+    // Names take precedence over extensions, so that e.g. "js" resolves
+    // to JavaScript, not to Flow (whose extension is "js").
+    const lowerName = name.toLowerCase();
+    const foundLanguage = targetLanguages.find((language) => language.names.includes(lowerName) ||
+        language.displayName.toLowerCase() === lowerName);
+    return (foundLanguage !== null && foundLanguage !== void 0 ? foundLanguage : targetLanguages.find((language) => language.extension.toLowerCase() === lowerName));
 }
 function isLanguageName(maybeName) {
-    if (exports.all.some((lang) => lang.names.includes(maybeName))) {
-        return true;
-    }
-    return false;
+    return languageNamed(maybeName) !== undefined;
 }
 function isLanguageDisplayName(maybeName) {
     if (exports.all.some((lang) => lang.displayName === maybeName)) {

package/dist/language/CSharp/language.d.ts

@@ -58,7 +58,7 @@ export declare const cSharpOptions: {
             readonly helpers: false;
             readonly attributes: false;
         };
-    }, "complete" | "just-types" | "attributes-only" | "just-types-and-namespace">;
+    }, "just-types" | "complete" | "attributes-only" | "just-types-and-namespace">;
     readonly baseclass: EnumOption<"base-class", {
         readonly EntityData: "EntityData";
         readonly Object: undefined;
@@ -114,7 +114,7 @@ export declare const newtonsoftCSharpOptions: {
             readonly helpers: false;
             readonly attributes: false;
         };
-    }, "complete" | "just-types" | "attributes-only" | "just-types-and-namespace">;
+    }, "just-types" | "complete" | "attributes-only" | "just-types-and-namespace">;
     readonly baseclass: EnumOption<"base-class", {
         readonly EntityData: "EntityData";
         readonly Object: undefined;
@@ -170,7 +170,7 @@ export declare const systemTextJsonCSharpOptions: {
             readonly helpers: false;
             readonly attributes: false;
         };
-    }, "complete" | "just-types" | "attributes-only" | "just-types-and-namespace">;
+    }, "just-types" | "complete" | "attributes-only" | "just-types-and-namespace">;
     readonly baseclass: EnumOption<"base-class", {
         readonly EntityData: "EntityData";
         readonly Object: undefined;

package/dist/language/JavaScript/language.d.ts

@@ -21,7 +21,7 @@ export declare const javaScriptOptions: {
     rawType: EnumOption<"raw-type", {
         readonly json: "json";
         readonly any: "any";
-    }, "json" | "any">;
+    }, "any" | "json">;
 };
 export declare const javaScriptLanguageConfig: {
     readonly displayName: "JavaScript";

package/dist/language/Ruby/utils.d.ts

@@ -3,7 +3,7 @@ export declare enum Strictness {
     Coercible = "Coercible::",
     None = "Types::"
 }
-export declare const forbiddenForObjectProperties: ("false" | "case" | "true" | "type" | "optional" | "default" | "module" | "end" | "display" | "meta" | "method" | "options" | "next" | "self" | "class" | "alias" | "clone" | "then" | "enum" | "and" | "break" | "do" | "else" | "for" | "if" | "not" | "or" | "return" | "try" | "while" | "begin" | "def" | "elsif" | "ensure" | "extend" | "in" | "nil" | "rescue" | "super" | "unless" | "until" | "when" | "with" | "yield" | "hash" | "__ENCODING__" | "__FILE__" | "__LINE__" | "BEGIN" | "defined?" | "END" | "redo" | "retry" | "undef" | "__id__" | "__send__" | "define_singleton_method" | "dup" | "enum_for" | "freeze" | "inspect" | "instance_eval" | "instance_exec" | "instance_variable_defined?" | "instance_variable_get" | "instance_variable_set" | "instance_variables" | "itself" | "methods" | "object_id" | "private_methods" | "protected_methods" | "public_method" | "public_methods" | "public_send" | "remove_instance_variable" | "send" | "singleton_class" | "singleton_method" | "singleton_methods" | "taint" | "tap" | "to_enum" | "to_s" | "trust" | "untaint" | "untrust" | "call" | "constrained_type" | "constrained?" | "constrained" | "constructor" | "gem" | "pristine" | "rule" | "safe" | "to_ast" | "to_json")[];
+export declare const forbiddenForObjectProperties: ("false" | "case" | "true" | "default" | "class" | "method" | "next" | "alias" | "type" | "clone" | "then" | "enum" | "end" | "module" | "and" | "break" | "do" | "else" | "for" | "if" | "not" | "or" | "return" | "try" | "while" | "optional" | "begin" | "def" | "elsif" | "ensure" | "extend" | "in" | "nil" | "rescue" | "self" | "super" | "unless" | "until" | "when" | "with" | "yield" | "hash" | "__ENCODING__" | "__FILE__" | "__LINE__" | "BEGIN" | "defined?" | "END" | "redo" | "retry" | "undef" | "__id__" | "__send__" | "define_singleton_method" | "display" | "dup" | "enum_for" | "freeze" | "inspect" | "instance_eval" | "instance_exec" | "instance_variable_defined?" | "instance_variable_get" | "instance_variable_set" | "instance_variables" | "itself" | "methods" | "object_id" | "private_methods" | "protected_methods" | "public_method" | "public_methods" | "public_send" | "remove_instance_variable" | "send" | "singleton_class" | "singleton_method" | "singleton_methods" | "taint" | "tap" | "to_enum" | "to_s" | "trust" | "untaint" | "untrust" | "call" | "constrained_type" | "constrained?" | "constrained" | "constructor" | "gem" | "meta" | "options" | "pristine" | "rule" | "safe" | "to_ast" | "to_json")[];
 export declare const stringEscape: (s: string) => string;
 export declare function simpleNameStyle(original: string, uppercase: boolean): string;
 export declare function memberNameStyle(original: string): string;

package/dist/language/Rust/language.d.ts

@@ -13,7 +13,7 @@ export declare const rustOptions: {
         readonly private: Visibility.Private;
         readonly crate: Visibility.Crate;
         readonly public: Visibility.Public;
-    }, "private" | "public" | "crate">;
+    }, "private" | "crate" | "public">;
     readonly deriveDebug: BooleanOption<"derive-debug">;
     readonly deriveClone: BooleanOption<"derive-clone">;
     readonly derivePartialEq: BooleanOption<"derive-partial-eq">;

package/dist/language/Swift/language.d.ts

@@ -37,7 +37,7 @@ export declare const swiftOptions: {
     accessLevel: EnumOption<"access-level", {
         readonly internal: "internal";
         readonly public: "public";
-    }, "internal" | "public">;
+    }, "public" | "internal">;
     protocol: EnumOption<"protocol", {
         readonly none: {
             readonly equatable: false;

package/dist/language/TypeScriptFlow/language.d.ts

@@ -21,7 +21,7 @@ export declare const tsFlowOptions: {
     rawType: import("../../RendererOptions").EnumOption<"raw-type", {
         readonly json: "json";
         readonly any: "any";
-    }, "json" | "any">;
+    }, "any" | "json">;
 } & {
     justTypes: BooleanOption<"just-types">;
     nicePropertyNames: BooleanOption<"nice-property-names">;

package/dist/support/WindowsPaths.d.ts

@@ -0,0 +1,2 @@
+export declare function fixWindowsPath(pathOrURI: string): string;
+export declare function filePathFromFileURI(fileURI: string): string;

package/dist/support/WindowsPaths.js

@@ -0,0 +1,42 @@
+"use strict";
+// Windows absolute paths given as schema addresses are carried through the
+// address machinery as "file:" URIs (issue #2869). These two functions are
+// the two halves of that protocol: JSONSchemaInput converts Windows paths to
+// "file:" URIs before urijs parses them, and NodeIO converts "file:" URIs
+// back to file paths when it reads them from disk.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixWindowsPath = fixWindowsPath;
+exports.filePathFromFileURI = filePathFromFileURI;
+// Windows absolute paths are not valid URIs: urijs parses the drive letter
+// of e.g. "C:\Users\me\top.schema.json" as a URI scheme (and lowercases it,
+// and treats the backslashes as an opaque path), so relative refs resolve to
+// bogus addresses (issue #2869). Convert drive-letter and UNC paths to
+// "file:" URIs, which NodeIO knows how to read.
+function fixWindowsPath(pathOrURI) {
+    if (/^[A-Za-z]:[/\\]/.test(pathOrURI)) {
+        // Drive-letter path, e.g. "C:\dir\x.json" -> "file:///C:/dir/x.json"
+        return `file:///${pathOrURI.replace(/\\/g, "/")}`;
+    }
+    if (pathOrURI.startsWith("\\\\")) {
+        // UNC path, e.g. "\\server\share\x.json" -> "file://server/share/x.json"
+        return `file:${pathOrURI.replace(/\\/g, "/")}`;
+    }
+    return pathOrURI;
+}
+// We don't use `url.fileURLToPath` because its result is platform-dependent:
+// drive-letter URIs must also be readable on POSIX (as paths relative to the
+// working directory), which is how the tests exercise this, and Node's fs
+// accepts forward slashes on Windows anyway. The addresses were URI-decoded
+// when they were normalized, so there's no percent-decoding to do here.
+function filePathFromFileURI(fileURI) {
+    const path = fileURI.slice("file://".length);
+    if (/^\/[A-Za-z]:\//.test(path)) {
+        // Drive-letter path, e.g. "file:///C:/dir/x.json" -> "C:/dir/x.json"
+        return path.slice(1);
+    }
+    if (!path.startsWith("/")) {
+        // UNC path, e.g. "file://server/share/x.json" -> "//server/share/x.json"
+        return `//${path}`;
+    }
+    return path;
+}

package/package.json

@@ -1,20 +1,22 @@
 {
     "name": "quicktype-core",
-    "version": "23.3.25",
+    "version": "24.0.0",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "repository": "https://github.com/glideapps/quicktype",
+    "engines": {
+        "node": ">=20.0.0"
+    },
     "scripts": {
         "clean": "rm -rf dist node_modules *~",
-        "build": "tsc"
+        "build": "node ../../node_modules/typescript/bin/tsc"
     },
     "dependencies": {
         "@glideapps/ts-necessities": "2.2.3",
         "browser-or-node": "^3.0.0",
         "collection-utils": "^1.0.1",
-        "cross-fetch": "^4.0.0",
         "is-url": "^1.2.4",
         "js-base64": "^3.7.7",
         "lodash": "^4.18.1",
@@ -29,7 +31,7 @@
     "devDependencies": {
         "@types/browser-or-node": "^1.3.2",
         "@types/is-url": "^1.2.32",
-        "@types/node": "~22.14.0",
+        "@types/node": "~20.19.0",
         "@types/pako": "^1.0.0",
         "@types/pluralize": "0.0.30",
         "@types/readable-stream": "4.0.10",
@@ -39,13 +41,6 @@
         "command-line-args": "^5.2.1",
         "typescript": "~5.8.3"
     },
-    "overrides": {
-        "cross-fetch": {
-            "node-fetch": {
-                "whatwg-url": "^13.0.0"
-            }
-        }
-    },
     "files": [
         "dist"
     ],

package/dist/input/io/$fetch.d.ts

@@ -1,3 +0,0 @@
-import type CrossFetch from "cross-fetch";
-declare let fetch: typeof CrossFetch;
-export { fetch };

package/dist/input/io/$fetch.js

@@ -1,11 +0,0 @@
-"use strict";
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetch = void 0;
-let fetch;
-try {
-    exports.fetch = fetch = (_a = global.fetch) !== null && _a !== void 0 ? _a : require("cross-fetch").default;
-}
-catch (_b) {
-    exports.fetch = fetch = require("cross-fetch").default;
-}