quicktype-core 20.0.12 → 20.0.14

package/dist/Run.d.ts

@@ -34,7 +34,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Whether to assume that JSON strings that look like dates are dates */
@@ -42,7 +42,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Whether to convert stringified integers to integers */
@@ -50,7 +50,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Whether to convert stringified booleans to boolean values */
@@ -58,7 +58,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Combine similar classes.  This doesn't apply to classes from a schema, only from inference. */

package/dist/Type.d.ts

@@ -55,7 +55,7 @@ export type PrimitiveTypeKind = PrimitiveNonStringTypeKind | PrimitiveStringType
 export type NamedTypeKind = "class" | "enum" | "union";
 export type TypeKind = PrimitiveTypeKind | NamedTypeKind | "array" | "object" | "map" | "intersection";
 export type ObjectTypeKind = "object" | "map" | "class";
-export declare const transformedStringTypeKinds: ReadonlySet<"date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string">;
+export declare const transformedStringTypeKinds: ReadonlySet<"time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string">;
 export declare function isPrimitiveStringTypeKind(kind: string): kind is PrimitiveStringTypeKind;
 export declare function targetTypeKindForTransformedStringTypeKind(kind: PrimitiveStringTypeKind): PrimitiveNonStringTypeKind | undefined;
 export declare function isNumberTypeKind(kind: TypeKind): kind is "integer" | "double";

package/dist/input/io/NodeIO.js

@@ -31,6 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFromFileOrURL = exports.readableFromFileOrURL = void 0;
 const fs = __importStar(require("fs"));
@@ -38,9 +41,8 @@ const browser_or_node_1 = require("browser-or-node");
 const get_stream_1 = require("./get-stream");
 const ts_necessities_1 = require("@glideapps/ts-necessities");
 const index_1 = require("../../index");
-// The typings for this module are screwy
 const isURL = require("is-url");
-const fetch = require("isomorphic-fetch");
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 function parseHeaders(httpHeaders) {
     if (!Array.isArray(httpHeaders)) {
         return {};
@@ -62,10 +64,10 @@ function readableFromFileOrURL(fileOrURL, httpHeaders) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             if (isURL(fileOrURL)) {
-                const response = yield fetch(fileOrURL, {
+                const response = yield (0, cross_fetch_1.default)(fileOrURL, {
                     headers: parseHeaders(httpHeaders)
                 });
-                return response.body;
+                return (0, ts_necessities_1.defined)(response.body);
             }
             else if (browser_or_node_1.isNode) {
                 if (fileOrURL === "-") {

package/dist/language/CSharp.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemTextJsonCSharpRenderer = exports.systemTextJsonCSharpOptions = exports.NewtonsoftCSharpRenderer = exports.newtonsoftCSharpOptions = exports.CSharpRenderer = exports.CSharpTargetLanguage = exports.cSharpOptions = exports.AccessModifier = exports.Framework = void 0;
 const collection_utils_1 = require("collection-utils");
@@ -14,12 +17,12 @@ const RendererOptions_1 = require("../RendererOptions");
 const Annotation_1 = require("../Annotation");
 const Transformers_1 = require("../Transformers");
 const Constraints_1 = require("../attributes/Constraints");
+const unicode_properties_1 = __importDefault(require("unicode-properties"));
 var Framework;
 (function (Framework) {
     Framework[Framework["Newtonsoft"] = 0] = "Newtonsoft";
     Framework[Framework["SystemTextJson"] = 1] = "SystemTextJson";
 })(Framework = exports.Framework || (exports.Framework = {}));
-const unicode = require("unicode-properties");
 var AccessModifier;
 (function (AccessModifier) {
     AccessModifier[AccessModifier["None"] = 0] = "None";
@@ -177,13 +180,13 @@ const denseJsonPropertyName = "J";
 const denseRequiredEnumName = "R";
 const denseNullValueHandlingEnumName = "N";
 function isStartCharacter(utf16Unit) {
-    if (unicode.isAlphabetic(utf16Unit)) {
+    if (unicode_properties_1.default.isAlphabetic(utf16Unit)) {
         return true;
     }
     return utf16Unit === 0x5f; // underscore
 }
 function isPartCharacter(utf16Unit) {
-    const category = unicode.getCategory(utf16Unit);
+    const category = unicode_properties_1.default.getCategory(utf16Unit);
     if (["Nd", "Pc", "Mn", "Mc"].indexOf(category) >= 0) {
         return true;
     }

package/dist/language/Objective-C.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectiveCRenderer = exports.ObjectiveCTargetLanguage = exports.objcOptions = void 0;
 const collection_utils_1 = require("collection-utils");
@@ -11,7 +14,7 @@ const Strings_1 = require("../support/Strings");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
 const RendererOptions_1 = require("../RendererOptions");
 const Support_1 = require("../support/Support");
-const unicode = require("unicode-properties");
+const unicode_properties_1 = __importDefault(require("unicode-properties"));
 const DEBUG = false;
 const DEFAULT_CLASS_PREFIX = "QT";
 exports.objcOptions = {
@@ -151,10 +154,10 @@ const booleanPrefixes = [
     "need"
 ];
 function isStartCharacter(utf16Unit) {
-    return unicode.isAlphabetic(utf16Unit) || utf16Unit === 0x5f; // underscore
+    return unicode_properties_1.default.isAlphabetic(utf16Unit) || utf16Unit === 0x5f; // underscore
 }
 function isPartCharacter(utf16Unit) {
-    const category = unicode.getCategory(utf16Unit);
+    const category = unicode_properties_1.default.getCategory(utf16Unit);
     return ["Nd", "Pc", "Mn", "Mc"].indexOf(category) >= 0 || isStartCharacter(utf16Unit);
 }
 const legalizeName = (0, Strings_1.utf16LegalizeCharacters)(isPartCharacter);

package/dist/language/Python.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSONPythonRenderer = exports.PythonRenderer = exports.PythonTargetLanguage = exports.pythonOptions = void 0;
 const TargetLanguage_1 = require("../TargetLanguage");
@@ -12,7 +15,7 @@ const Source_1 = require("../Source");
 const TypeUtils_1 = require("../TypeUtils");
 const Transformers_1 = require("../Transformers");
 const collection_utils_1 = require("collection-utils");
-const unicode = require("unicode-properties");
+const unicode_properties_1 = __importDefault(require("unicode-properties"));
 const forbiddenTypeNames = [
     "Any",
     "True",
@@ -120,14 +123,14 @@ class PythonTargetLanguage extends TargetLanguage_1.TargetLanguage {
 exports.PythonTargetLanguage = PythonTargetLanguage;
 function isNormalizedStartCharacter3(utf16Unit) {
     // FIXME: add Other_ID_Start - https://docs.python.org/3/reference/lexical_analysis.html#identifiers
-    const category = unicode.getCategory(utf16Unit);
+    const category = unicode_properties_1.default.getCategory(utf16Unit);
     return ["Lu", "Ll", "Lt", "Lm", "Lo", "Nl"].indexOf(category) >= 0;
 }
 function isNormalizedPartCharacter3(utf16Unit) {
     // FIXME: add Other_ID_Continue - https://docs.python.org/3/reference/lexical_analysis.html#identifiers
     if (isNormalizedStartCharacter3(utf16Unit))
         return true;
-    const category = unicode.getCategory(utf16Unit);
+    const category = unicode_properties_1.default.getCategory(utf16Unit);
     return ["Mn", "Mc", "Nd", "Pc"].indexOf(category) >= 0;
 }
 function isStartCharacter3(utf16Unit) {

package/dist/language/ruby/index.js

@@ -22,9 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RubyRenderer = exports.RubyTargetLanguage = exports.rubyOptions = exports.Strictness = void 0;
-const unicode = require("unicode-properties");
+const unicode_properties_1 = __importDefault(require("unicode-properties"));
 const Source_1 = require("../../Source");
 const Naming_1 = require("../../Naming");
 const ConvenienceRenderer_1 = require("../../ConvenienceRenderer");
@@ -74,7 +77,7 @@ class RubyTargetLanguage extends TargetLanguage_1.TargetLanguage {
 exports.RubyTargetLanguage = RubyTargetLanguage;
 const isStartCharacter = Strings_1.isLetterOrUnderscore;
 function isPartCharacter(utf16Unit) {
-    const category = unicode.getCategory(utf16Unit);
+    const category = unicode_properties_1.default.getCategory(utf16Unit);
     return ["Nd", "Pc", "Mn", "Mc"].indexOf(category) >= 0 || isStartCharacter(utf16Unit);
 }
 const legalizeName = (0, Strings_1.legalizeCharacters)(isPartCharacter);

package/dist/support/Strings.js

@@ -1,10 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeNameStyle = exports.addPrefixIfNecessary = exports.combineWords = exports.allLowerWordStyle = exports.originalWord = exports.allUpperWordStyle = exports.firstUpperWordStyle = exports.splitIntoWords = exports.fastIsUpperCase = exports.startWithLetter = exports.snakeCase = exports.camelCase = exports.pascalCase = exports.decapitalize = exports.capitalize = exports.trimEnd = exports.isWordCharacter = exports.isLetterOrUnderscoreOrDigit = exports.isLetterOrUnderscore = exports.isLetterOrDigit = exports.isNumeric = exports.isDigit = exports.isLetter = exports.isAscii = exports.isPrintable = exports.stringEscape = exports.utf16StringEscape = exports.escapeNonPrintableMapper = exports.standardUnicodeHexEscape = exports.intToHex = exports.repeatString = exports.legalizeCharacters = exports.utf16LegalizeCharacters = exports.utf32ConcatMap = exports.utf16ConcatMap = void 0;
 const Support_1 = require("./Support");
 const Acronyms_1 = require("./Acronyms");
 const Messages_1 = require("../Messages");
-const unicode = require("unicode-properties");
+const unicode_properties_1 = __importDefault(require("unicode-properties"));
 function computeAsciiMap(mapper) {
     const charStringMap = [];
     const charNoEscapeMap = [];
@@ -174,7 +177,7 @@ exports.stringEscape = utf32ConcatMap(escapeNonPrintableMapper(isPrintable, stan
 function isPrintable(codePoint) {
     if (codePoint > 0xffff)
         return false;
-    const category = unicode.getCategory(codePoint);
+    const category = unicode_properties_1.default.getCategory(codePoint);
     return ([
         "Mc",
         "No",
@@ -207,18 +210,18 @@ function isAscii(codePoint) {
 }
 exports.isAscii = isAscii;
 function isLetter(codePoint) {
-    const category = unicode.getCategory(codePoint);
+    const category = unicode_properties_1.default.getCategory(codePoint);
     // FIXME: Include Letter, modifier (Lm)?
     return ["Lu", "Ll", "Lt", "Lo"].indexOf(category) >= 0;
 }
 exports.isLetter = isLetter;
 function isDigit(codePoint) {
-    const category = unicode.getCategory(codePoint);
+    const category = unicode_properties_1.default.getCategory(codePoint);
     return ["Nd"].indexOf(category) >= 0;
 }
 exports.isDigit = isDigit;
 function isNumeric(codePoint) {
-    const category = unicode.getCategory(codePoint);
+    const category = unicode_properties_1.default.getCategory(codePoint);
     return ["No", "Nd", "Nl"].indexOf(category) >= 0;
 }
 exports.isNumeric = isNumeric;
@@ -242,7 +245,7 @@ function trimEnd(str) {
     const l = str.length;
     let firstWS = l;
     for (let i = l - 1; i >= 0; i--) {
-        if (!unicode.isWhiteSpace(str.charCodeAt(i)))
+        if (!unicode_properties_1.default.isWhiteSpace(str.charCodeAt(i)))
             break;
         firstWS = i;
     }
@@ -292,9 +295,9 @@ exports.startWithLetter = startWithLetter;
 const knownAcronyms = new Set(Acronyms_1.acronyms);
 const fastIsWordCharacter = precomputedCodePointPredicate(isWordCharacter);
 const fastIsNonWordCharacter = precomputedCodePointPredicate(cp => !isWordCharacter(cp));
-const fastIsLowerCase = precomputedCodePointPredicate(cp => unicode.isLowerCase(cp));
-exports.fastIsUpperCase = precomputedCodePointPredicate(cp => unicode.isUpperCase(cp));
-const fastNonLetter = precomputedCodePointPredicate(cp => !unicode.isLowerCase(cp) && !unicode.isUpperCase(cp));
+const fastIsLowerCase = precomputedCodePointPredicate(cp => unicode_properties_1.default.isLowerCase(cp));
+exports.fastIsUpperCase = precomputedCodePointPredicate(cp => unicode_properties_1.default.isUpperCase(cp));
+const fastNonLetter = precomputedCodePointPredicate(cp => !unicode_properties_1.default.isLowerCase(cp) && !unicode_properties_1.default.isUpperCase(cp));
 const fastIsDigit = precomputedCodePointPredicate(isDigit);
 function splitIntoWords(s) {
     // [start, end, allUpper]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "20.0.12",
+    "version": "20.0.14",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -14,30 +14,31 @@
     "dependencies": {
         "@glideapps/ts-necessities": "2.1.2",
         "@types/urijs": "^1.19.19",
-        "unicode-properties": "^1.4.1",
         "browser-or-node": "^1.2.1",
         "collection-utils": "^1.0.1",
         "is-url": "^1.2.4",
-        "isomorphic-fetch": "^2.2.1",
+        "cross-fetch": "^3.1.5",
         "js-base64": "^2.4.3",
+        "lodash": "^4.17.21",
         "pako": "^1.0.6",
         "pluralize": "^7.0.0",
         "readable-stream": "4.3.0",
+        "unicode-properties": "^1.4.1",
         "urijs": "^1.19.1",
         "wordwrap": "^1.0.0",
-        "lodash": "^4.17.21",
         "yaml": "^2.2.1"
     },
     "devDependencies": {
+        "@types/browser-or-node": "^1.2.0",
         "@types/js-base64": "^2.3.1",
         "@types/node": "18.11.18",
         "@types/pako": "^1.0.0",
         "@types/pluralize": "0.0.28",
+        "@types/readable-stream": "2.3.15",
+        "@types/unicode-properties": "^1.3.0",
         "@types/yaml": "^1.9.7",
-        "typescript": "4.9.4",
         "tslint": "^5.11.0",
-        "@types/readable-stream": "2.3.15",
-        "@types/browser-or-node": "^1.2.0"
+        "typescript": "4.9.4"
     },
     "files": [
         "dist"