quicktype-core 23.0.63 → 23.0.65

package/dist/language/Dart.js

@@ -230,12 +230,14 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
         if (this._options.justTypes)
             return;
-        this.emitLine("// To parse this JSON data, do");
-        this.emitLine("//");
-        this.forEachTopLevel("none", (_t, name) => {
-            const { decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
-            this.emitLine("//     final ", (0, Source_1.modifySource)(Strings_1.decapitalize, name), " = ", decoder, "(jsonString);");
-        });
+        if (!this._options.codersInClass) {
+            this.emitLine("// To parse this JSON data, do");
+            this.emitLine("//");
+            this.forEachTopLevel("none", (_t, name) => {
+                const { decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
+                this.emitLine("//     final ", (0, Source_1.modifySource)(Strings_1.decapitalize, name), " = ", decoder, "(jsonString);");
+            });
+        }
         this.ensureBlankLine();
         if (this._options.requiredProperties) {
             this.emitLine("import 'package:meta/meta.dart';");
@@ -246,7 +248,8 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.useHive) {
             this.emitLine("import 'package:hive/hive.dart';");
         }
-        if (this._options.useJsonAnnotation) {
+        if (this._options.useJsonAnnotation && !this._options.useFreezed) {
+            // The freezed annotatation import already provides the import for json_annotation
             this.emitLine("import 'package:json_annotation/json_annotation.dart';");
         }
         this.emitLine("import 'dart:convert';");
@@ -416,7 +419,8 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine(className, "({");
         this.indent(() => {
             this.forEachClassProperty(c, "none", (name, _, prop) => {
-                const required = this._options.requiredProperties || (this._options.nullSafety && !prop.type.isNullable);
+                const required = this._options.requiredProperties ||
+                    (this._options.nullSafety && (!prop.type.isNullable || !prop.isOptional));
                 this.emitLine(required ? "required " : "", "this.", name, ",");
             });
         });
@@ -435,7 +439,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
             if (this._options.useJsonAnnotation) {
                 this.classPropertyCounter++;
-                this.emitLine(`@JsonKey(name:"${jsonName}")`);
+                this.emitLine(`@JsonKey(name: "${jsonName}")`);
             }
             this.emitLine(this._options.finalProperties ? "final " : "", this.dartType(p.type, true), " ", name, ";");
         });
@@ -535,8 +539,14 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             else {
                 this.emitLine("const factory ", className, "({");
                 this.indent(() => {
-                    this.forEachClassProperty(c, "none", (name, _, _p) => {
-                        this.emitLine(this._options.requiredProperties ? "required " : "", this.dartType(_p.type, true), this._options.requiredProperties ? "" : "?", " ", name, ",");
+                    this.forEachClassProperty(c, "none", (name, jsonName, prop) => {
+                        const required = this._options.requiredProperties ||
+                            (this._options.nullSafety && (!prop.type.isNullable || !prop.isOptional));
+                        if (this._options.useJsonAnnotation) {
+                            this.classPropertyCounter++;
+                            this.emitLine(`@JsonKey(name: "${jsonName}")`);
+                        }
+                        this.emitLine(required ? "required " : "", this.dartType(prop.type, true), " ", name, ",");
                     });
                 });
                 this.emitLine("}) = _", className, ";");

package/dist/language/TypeScriptZod.d.ts

@@ -1,16 +1,18 @@
-import { ClassProperty, Type } from "../Type";
+import { StringTypeMapping } from "TypeBuilder";
+import { ConvenienceRenderer } from "../ConvenienceRenderer";
 import { Namer } from "../Naming";
 import { RenderContext } from "../Renderer";
 import { BooleanOption, Option, OptionValues } from "../RendererOptions";
-import { TargetLanguage } from "../TargetLanguage";
 import { Sourcelike } from "../Source";
-import { ConvenienceRenderer } from "../ConvenienceRenderer";
+import { TargetLanguage } from "../TargetLanguage";
+import { ClassProperty, Type } from "../Type";
 export declare const typeScriptZodOptions: {
     justSchema: BooleanOption;
 };
 export declare class TypeScriptZodTargetLanguage extends TargetLanguage {
     protected getOptions(): Option<any>[];
     constructor(displayName?: string, names?: string[], extension?: string);
+    get stringTypeMapping(): StringTypeMapping;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): TypeScriptZodRenderer;

package/dist/language/TypeScriptZod.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptZodRenderer = exports.TypeScriptZodTargetLanguage = exports.typeScriptZodOptions = void 0;
 const collection_utils_1 = require("collection-utils");
-const TypeUtils_1 = require("../TypeUtils");
+const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
 const Naming_1 = require("../Naming");
 const RendererOptions_1 = require("../RendererOptions");
+const TargetLanguage_1 = require("../TargetLanguage");
+const TypeUtils_1 = require("../TypeUtils");
 const Acronyms_1 = require("../support/Acronyms");
 const Strings_1 = require("../support/Strings");
-const TargetLanguage_1 = require("../TargetLanguage");
-const JavaScript_1 = require("./JavaScript");
 const Support_1 = require("../support/Support");
-const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
+const JavaScript_1 = require("./JavaScript");
 exports.typeScriptZodOptions = {
     justSchema: new RendererOptions_1.BooleanOption("just-schema", "Schema only", false)
 };
@@ -21,6 +21,12 @@ class TypeScriptZodTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor(displayName = "TypeScript Zod", names = ["typescript-zod"], extension = "ts") {
         super(displayName, names, extension);
     }
+    get stringTypeMapping() {
+        const mapping = new Map();
+        const dateTimeType = "date-time";
+        mapping.set("date-time", dateTimeType);
+        return mapping;
+    }
     makeRenderer(renderContext, untypedOptionValues) {
         return new TypeScriptZodRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.typeScriptZodOptions, untypedOptionValues));
     }
@@ -70,6 +76,9 @@ class TypeScriptZodRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             const children = Array.from(unionType.getChildren()).map((type) => this.typeMapTypeFor(type, false));
             return ["z.union([", ...(0, collection_utils_1.arrayIntercalate)(", ", children), "])"];
         }, _transformedStringType => {
+            if (_transformedStringType.kind === "date-time") {
+                return "z.coerce.date()";
+            }
             return "z.string()";
         });
         if (required) {

package/package.json

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