quicktype-core 22.0.0 → 23.0.1

package/dist/language/Java.d.ts

@@ -8,12 +8,12 @@ import { TargetLanguage } from "../TargetLanguage";
 import { ClassProperty, ClassType, EnumType, Type, UnionType } from "../Type";
 import { StringTypeMapping } from "..";
 export declare const javaOptions: {
-    classStyle: EnumOption<"java" | "java-record" | "lombok">;
     useList: EnumOption<boolean>;
     justTypes: BooleanOption;
-    dateTimeProvider: EnumOption<"java8" | "legacy">;
+    dateTimeProvider: EnumOption<string>;
     acronymStyle: EnumOption<AcronymStyleOptions>;
     packageName: StringOption;
+    lombok: BooleanOption;
     lombokCopyAnnotations: BooleanOption;
 };
 export declare class JavaTargetLanguage extends TargetLanguage {
@@ -96,7 +96,6 @@ export declare class JavaRenderer extends ConvenienceRenderer {
     protected importsForClass(c: ClassType): string[];
     protected importsForUnionMembers(u: UnionType): string[];
     protected emitClassDefinition(c: ClassType, className: Name): void;
-    private emitClassRecordDefinition;
     protected unionField(u: UnionType, t: Type, withIssues?: boolean): {
         fieldType: Sourcelike;
         fieldName: Sourcelike;

package/dist/language/Java.js

@@ -13,11 +13,6 @@ const TargetLanguage_1 = require("../TargetLanguage");
 const Type_1 = require("../Type");
 const TypeUtils_1 = require("../TypeUtils");
 exports.javaOptions = {
-    classStyle: new RendererOptions_1.EnumOption("class-style", "Style of generated Java classes", [
-        ["java", "java"],
-        ["java-record", "java-record"],
-        ["lombok", "lombok"]
-    ], "java"),
     useList: new RendererOptions_1.EnumOption("array-type", "Use T[] or List<T>", [
         ["array", false],
         ["list", true]
@@ -30,6 +25,7 @@ exports.javaOptions = {
     acronymStyle: (0, Acronyms_1.acronymOption)(Acronyms_1.AcronymStyleOptions.Pascal),
     // FIXME: Do this via a configurable named eventually.
     packageName: new RendererOptions_1.StringOption("package", "Generated package name", "NAME", "io.quicktype"),
+    lombok: new RendererOptions_1.BooleanOption("lombok", "Use lombok", false, "primary"),
     lombokCopyAnnotations: new RendererOptions_1.BooleanOption("lombok-copy-annotations", "Copy accessor annotations", true, "secondary")
 };
 class JavaTargetLanguage extends TargetLanguage_1.TargetLanguage {
@@ -38,12 +34,12 @@ class JavaTargetLanguage extends TargetLanguage_1.TargetLanguage {
     }
     getOptions() {
         return [
-            exports.javaOptions.classStyle,
             exports.javaOptions.useList,
             exports.javaOptions.justTypes,
             exports.javaOptions.dateTimeProvider,
             exports.javaOptions.acronymStyle,
             exports.javaOptions.packageName,
+            exports.javaOptions.lombok,
             exports.javaOptions.lombokCopyAnnotations
         ];
     }
@@ -68,6 +64,7 @@ class JavaTargetLanguage extends TargetLanguage_1.TargetLanguage {
 }
 exports.JavaTargetLanguage = JavaTargetLanguage;
 const javaKeywords = [
+    "_",
     "Object",
     "Class",
     "System",
@@ -540,7 +537,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     emitClassAttributes(_c, _className) {
-        if (this._options.classStyle === "lombok") {
+        if (this._options.lombok) {
             this.emitLine("@lombok.Data");
         }
     }
@@ -581,12 +578,9 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitFileHeader(className, imports);
         this.emitDescription(this.descriptionForType(c));
         this.emitClassAttributes(c, className);
-        if (this._options.classStyle === "java-record") {
-            return this.emitClassRecordDefinition(c, className);
-        }
         this.emitBlock(["public class ", className], () => {
             this.forEachClassProperty(c, "none", (name, jsonName, p) => {
-                if (this._options.classStyle === "lombok" && this._options.lombokCopyAnnotations) {
+                if (this._options.lombok && this._options.lombokCopyAnnotations) {
                     const getter = this.annotationsForAccessor(c, className, name, jsonName, p, false);
                     const setter = this.annotationsForAccessor(c, className, name, jsonName, p, true);
                     if (getter.length !== 0) {
@@ -598,7 +592,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 }
                 this.emitLine("private ", this.javaType(false, p.type, true), " ", name, ";");
             });
-            if (this._options.classStyle !== "lombok") {
+            if (!this._options.lombok) {
                 this.forEachClassProperty(c, "leading-and-interposing", (name, jsonName, p) => {
                     this.emitDescription(this.descriptionForClassProperty(c, jsonName));
                     const [getterName, setterName] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
@@ -612,19 +606,6 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
         this.finishFile();
     }
-    emitClassRecordDefinition(c, className) {
-        this.emitLine("public record ", className, " (");
-        this.indent(() => {
-            this.forEachClassProperty(c, "leading-and-interposing", (name, jsonName, p, position) => {
-                this.annotationsForAccessor(c, className, name, jsonName, p, false).forEach(annotation => this.emitLine(annotation));
-                const rendered = this.javaType(false, p.type);
-                const comma = position === "first" || position === "middle" ? "," : [];
-                this.emitLine(rendered, " ", name, comma);
-            });
-        });
-        this.emitLine(") {}");
-        this.finishFile();
-    }
     unionField(u, t, withIssues = false) {
         const fieldType = this.javaType(true, t, withIssues);
         // FIXME: "Value" should be part of the name.
@@ -1011,7 +992,7 @@ class JacksonRenderer extends JavaRenderer {
         this.emitCommentLines([
             "To use this code, add the following Maven dependency to your project:",
             "",
-            this._options.classStyle === "lombok" ? "    org.projectlombok : lombok : 1.18.2" : "",
+            this._options.lombok ? "    org.projectlombok : lombok : 1.18.2" : "",
             "    com.fasterxml.jackson.core     : jackson-databind          : 2.9.0",
             this._options.dateTimeProvider === "java8"
                 ? "    com.fasterxml.jackson.datatype : jackson-datatype-jsr310   : 2.9.0"

package/package.json

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