quicktype-core 23.0.67 → 23.0.69

package/dist/language/CJSON.d.ts

@@ -32,6 +32,8 @@ export declare const cJSONOptions: {
     typeSourceStyle: EnumOption<boolean>;
     typeIntegerSize: EnumOption<string>;
     hashtableSize: StringOption;
+    addTypedefAlias: EnumOption<boolean>;
+    printStyle: EnumOption<boolean>;
     typeNamingStyle: EnumOption<NamingStyle>;
     memberNamingStyle: EnumOption<NamingStyle>;
     enumeratorNamingStyle: EnumOption<NamingStyle>;
@@ -173,6 +175,12 @@ export declare class CJSONRenderer extends ConvenienceRenderer {
      * @return Proposed union member name
      */
     protected proposeUnionMemberName(unionType: UnionType, unionName: Name, fieldType: Type, lookup: (n: Name) => string): string;
+    /**
+     * Function called to emit typedef alias for a a given type
+     * @param fieldType: the variable type
+     * @param fieldName: name of the variable
+     */
+    protected emitTypdefAlias(fieldType: Type, fieldName: Name): void;
     /**
      * Function called to create header file(s)
      * @param proposedFilename: source filename provided from stdin

package/dist/language/CJSON.js

@@ -47,6 +47,8 @@ exports.cJSONOptions = {
     typeSourceStyle: new RendererOptions_1.EnumOption("source-style", "Source code generation type, whether to generate single or multiple source files", [["single-source", true], ["multi-source", false]], "single-source", "secondary"),
     typeIntegerSize: new RendererOptions_1.EnumOption("integer-size", "Integer code generation type (int64_t by default)", [["int8_t", "int8_t"], ["int16_t", "int16_t"], ["int32_t", "int32_t"], ["int64_t", "int64_t"]], "int64_t", "secondary"),
     hashtableSize: new RendererOptions_1.StringOption("hashtable-size", "Hashtable size, used when maps are created (64 by default)", "SIZE", "64"),
+    addTypedefAlias: new RendererOptions_1.EnumOption("typedef-alias", "Add typedef alias to unions, structs, and enums (no typedef by default)", [["no-typedef", false], ["add-typedef", true]], "no-typedef", "secondary"),
+    printStyle: new RendererOptions_1.EnumOption("print-style", "Which cJSON print should be used (formatted by default)", [["print-formatted", false], ["print-unformatted", true]], "print-formatted", "secondary"),
     typeNamingStyle: new RendererOptions_1.EnumOption("type-style", "Naming style for types", [pascalValue, underscoreValue, camelValue, upperUnderscoreValue, pascalUpperAcronymsValue, camelUpperAcronymsValue]),
     memberNamingStyle: new RendererOptions_1.EnumOption("member-style", "Naming style for members", [underscoreValue, pascalValue, camelValue, upperUnderscoreValue, pascalUpperAcronymsValue, camelUpperAcronymsValue]),
     enumeratorNamingStyle: new RendererOptions_1.EnumOption("enumerator-style", "Naming style for enumerators", [upperUnderscoreValue, underscoreValue, pascalValue, camelValue, pascalUpperAcronymsValue, camelUpperAcronymsValue])
@@ -70,6 +72,8 @@ class CJSONTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return [
             exports.cJSONOptions.typeSourceStyle,
             exports.cJSONOptions.typeIntegerSize,
+            exports.cJSONOptions.addTypedefAlias,
+            exports.cJSONOptions.printStyle,
             exports.cJSONOptions.hashtableSize,
             exports.cJSONOptions.typeNamingStyle,
             exports.cJSONOptions.memberNamingStyle,
@@ -340,6 +344,17 @@ class CJSONRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
         return fieldName;
     }
+    /**
+     * Function called to emit typedef alias for a a given type
+     * @param fieldType: the variable type
+     * @param fieldName: name of the variable
+     */
+    emitTypdefAlias(fieldType, fieldName) {
+        if (this._options.addTypedefAlias) {
+            this.emitLine("typedef ", this.quicktypeTypeToCJSON(fieldType, false).cType, " ", fieldName, ";");
+            this.ensureBlankLine();
+        }
+    }
     /**
      * Function called to create header file(s)
      * @param proposedFilename: source filename provided from stdin
@@ -471,6 +486,7 @@ class CJSONRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
         }, "", true);
         this.ensureBlankLine();
+        this.emitTypdefAlias(enumType, enumName);
     }
     /**
      * Function called to create enum prototypes
@@ -555,6 +571,7 @@ class CJSONRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }, "value", true);
         }, "", true);
         this.ensureBlankLine();
+        this.emitTypdefAlias(unionType, unionName);
     }
     /**
      * Function called to create union prototypes
@@ -945,6 +962,7 @@ class CJSONRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
         }, "", true);
         this.ensureBlankLine();
+        this.emitTypdefAlias(classType, className);
     }
     /**
      * Function called to create class prototypes
@@ -1403,7 +1421,7 @@ class CJSONRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitBlock(["if (NULL != x)"], () => {
                 this.emitLine("cJSON * j = cJSON_Create", className, "(x);");
                 this.emitBlock(["if (NULL != j)"], () => {
-                    this.emitLine("s = cJSON_Print(j);");
+                    this.emitLine(this._options.printStyle ? "s = cJSON_PrintUnformatted(j);" : "s = cJSON_Print(j);");
                     this.emitLine("cJSON_Delete(j);");
                 });
             });
@@ -1573,6 +1591,7 @@ class CJSONRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine(cJSON.cType, (cJSON.optionalQualifier !== "") ? " " : "", cJSON.optionalQualifier, " value;");
         }, "", true);
         this.ensureBlankLine();
+        this.emitTypdefAlias(type, className);
     }
     /**
      * Function called to create top level prototypes

package/dist/language/Python.js

@@ -335,7 +335,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     sortClassProperties(properties, propertyNames) {
         if (this.pyOptions.features.dataClasses) {
             return (0, collection_utils_1.mapSortBy)(properties, (p) => {
-                return p.type instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(p.type) != null ? 1 : 0;
+                return ((p.type instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(p.type) != null) || p.isOptional) ? 1 : 0;
             });
         }
         else {

package/package.json

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