quicktype-core 23.0.170 → 23.0.172

package/dist/Run.d.ts

@@ -35,7 +35,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Whether to assume that JSON strings that look like dates are dates */
@@ -43,7 +43,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Whether to convert stringified integers to integers */
@@ -51,7 +51,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "date" | "time" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
         order: number;
     };
     /** Whether to convert stringified booleans to boolean values */
@@ -59,7 +59,7 @@ export declare const inferenceFlagsObject: {
         description: string;
         negationDescription: string;
         explanation: string;
-        stringType: "time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string";
+        stringType: "date" | "time" | "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<"time" | "date" | "date-time" | "uuid" | "uri" | "integer-string" | "bool-string">;
+export declare const transformedStringTypeKinds: ReadonlySet<"date" | "time" | "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

@@ -40,15 +40,13 @@ exports.readFromFileOrURL = exports.readableFromFileOrURL = void 0;
 const fs = __importStar(require("fs"));
 const ts_necessities_1 = require("@glideapps/ts-necessities");
 const browser_or_node_1 = require("browser-or-node");
-const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const is_url_1 = __importDefault(require("is-url"));
 const Messages_1 = require("../../Messages");
 const Support_1 = require("../../support/Support");
 const get_stream_1 = require("./get-stream");
-// Only use cross-fetch in CI
-// FIXME: type global
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const fetch = process.env.CI ? cross_fetch_1.default : (_a = global.fetch) !== null && _a !== void 0 ? _a : cross_fetch_1.default;
+// We need to use cross-fetch in CI or if fetch is not available in the global scope
+// We use a dynamic import to avoid punycode deprecated dependency warning on node > 20
+const fetch = process.env.CI ? require("cross-fetch").default : (_a = global.fetch) !== null && _a !== void 0 ? _a : require("cross-fetch").default;
 function parseHeaders(httpHeaders) {
     if (!Array.isArray(httpHeaders)) {
         return {};

package/dist/language/Python/PythonRenderer.js

@@ -99,7 +99,9 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             const memberTypes = Array.from(nonNulls).map(m => this.pythonType(m));
             if (hasNull !== null) {
                 let rest = [];
-                if (!this.getAlphabetizeProperties() && this.pyOptions.features.dataClasses && _isRootTypeDef) {
+                if (!this.getAlphabetizeProperties() &&
+                    (this.pyOptions.features.dataClasses || this.pyOptions.pydanticBaseModel) &&
+                    _isRootTypeDef) {
                     // Only push "= None" if this is a root level type def
                     //   otherwise we may get type defs like List[Optional[int] = None]
                     //   which are invalid
@@ -134,6 +136,9 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     declarationLine(t) {
         if (t instanceof Type_1.ClassType) {
+            if (this.pyOptions.pydanticBaseModel) {
+                return ["class ", this.nameForNamedType(t), "(", this.withImport("pydantic", "BaseModel"), "):"];
+            }
             return ["class ", this.nameForNamedType(t), ":"];
         }
         if (t instanceof Type_1.EnumType) {
@@ -149,7 +154,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.declaredTypes.add(t);
     }
     emitClassMembers(t) {
-        if (this.pyOptions.features.dataClasses)
+        if (this.pyOptions.features.dataClasses || this.pyOptions.pydanticBaseModel)
             return;
         const args = [];
         this.forEachClassProperty(t, "none", (name, _, cp) => {
@@ -179,7 +184,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return this.typeHint(" -> ", this.withTyping(type));
     }
     sortClassProperties(properties, propertyNames) {
-        if (this.pyOptions.features.dataClasses) {
+        if (this.pyOptions.features.dataClasses || this.pyOptions.pydanticBaseModel) {
             return (0, collection_utils_1.mapSortBy)(properties, (p) => {
                 return (p.type instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(p.type) != null) || p.isOptional ? 1 : 0;
             });
@@ -189,7 +194,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     emitClass(t) {
-        if (this.pyOptions.features.dataClasses) {
+        if (this.pyOptions.features.dataClasses && !this.pyOptions.pydanticBaseModel) {
             this.emitLine("@", this.withImport("dataclasses", "dataclass"));
         }
         this.declareType(t, () => {

package/dist/language/Python/language.d.ts

@@ -13,6 +13,7 @@ export declare const pythonOptions: {
     features: EnumOption<PythonFeatures>;
     justTypes: BooleanOption;
     nicePropertyNames: BooleanOption;
+    pydanticBaseModel: BooleanOption;
 };
 export declare class PythonTargetLanguage extends TargetLanguage {
     protected getOptions(): Array<Option<FixMeOptionsAnyType>>;

package/dist/language/Python/language.js

@@ -14,11 +14,17 @@ exports.pythonOptions = {
         ["3.7", { typeHints: true, dataClasses: true }]
     ], "3.6"),
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Classes only", false),
-    nicePropertyNames: new RendererOptions_1.BooleanOption("nice-property-names", "Transform property names to be Pythonic", true)
+    nicePropertyNames: new RendererOptions_1.BooleanOption("nice-property-names", "Transform property names to be Pythonic", true),
+    pydanticBaseModel: new RendererOptions_1.BooleanOption("pydantic-base-model", "Uses pydantic BaseModel", false)
 };
 class PythonTargetLanguage extends TargetLanguage_1.TargetLanguage {
     getOptions() {
-        return [exports.pythonOptions.features, exports.pythonOptions.justTypes, exports.pythonOptions.nicePropertyNames];
+        return [
+            exports.pythonOptions.features,
+            exports.pythonOptions.justTypes,
+            exports.pythonOptions.nicePropertyNames,
+            exports.pythonOptions.pydanticBaseModel
+        ];
     }
     get stringTypeMapping() {
         const mapping = new Map();

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

@@ -3,7 +3,7 @@ export declare enum Strictness {
     Coercible = "Coercible::",
     None = "Types::"
 }
-export declare const forbiddenForObjectProperties: ("type" | "optional" | "default" | "module" | "end" | "display" | "meta" | "method" | "options" | "next" | "self" | "false" | "alias" | "clone" | "then" | "class" | "enum" | "true" | "and" | "break" | "case" | "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: ("default" | "false" | "next" | "alias" | "type" | "clone" | "then" | "class" | "enum" | "true" | "end" | "and" | "break" | "case" | "do" | "else" | "for" | "if" | "module" | "not" | "or" | "return" | "try" | "while" | "optional" | "begin" | "def" | "elsif" | "ensure" | "extend" | "in" | "nil" | "rescue" | "self" | "super" | "unless" | "until" | "when" | "with" | "yield" | "method" | "options" | "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" | "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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "23.0.170",
+    "version": "23.0.172",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",