quicktype-core 20.0.22 → 20.0.23

package/dist/language/CPlusPlus.js

@@ -698,10 +698,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
         let typeSource = (0, TypeUtils_1.matchType)(t, _anyType => {
             isOptional = false;
-            return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, [this.jsonQualifier(inJsonNamespace), "json"]);
+            return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, [
+                this.jsonQualifier(inJsonNamespace),
+                "json"
+            ]);
         }, _nullType => {
             isOptional = false;
-            return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, [this.jsonQualifier(inJsonNamespace), "json"]);
+            return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, [
+                this.jsonQualifier(inJsonNamespace),
+                "json"
+            ]);
         }, _boolType => "bool", _integerType => "int64_t", _doubleType => "double", _stringType => {
             if (forceNarrowString) {
                 return "std::string";
@@ -950,7 +956,17 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             const ourQualifier = this.ourQualifier(true);
             let cppType;
             let toType;
-            this.emitBlock(["inline void adl_serializer<", ourQualifier, className, ">::from_json(", this.withConst("json"), " & j, ", ourQualifier, className, "& x)"], false, () => {
+            this.emitBlock([
+                "inline void adl_serializer<",
+                ourQualifier,
+                className,
+                ">::from_json(",
+                this.withConst("json"),
+                " & j, ",
+                ourQualifier,
+                className,
+                "& x)"
+            ], false, () => {
                 cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
                 toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
                 this.emitLine([
@@ -963,7 +979,14 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     ";"
                 ]);
             });
-            this.emitBlock(["inline void adl_serializer<", ourQualifier, className, ">::to_json(json & j, ", this.withConst([ourQualifier, className]), " & x)"], false, () => {
+            this.emitBlock([
+                "inline void adl_serializer<",
+                ourQualifier,
+                className,
+                ">::to_json(json & j, ",
+                this.withConst([ourQualifier, className]),
+                " & x)"
+            ], false, () => {
                 cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
                 toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
                 this.emitLine([
@@ -1131,7 +1154,15 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         ];
         const nonNulls = (0, TypeUtils_1.removeNullFromUnion)(u, true)[1];
         const variantType = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false);
-        this.emitBlock(["inline void adl_serializer<", variantType, ">::from_json(", this.withConst("json"), " & j, ", variantType, " & x)"], false, () => {
+        this.emitBlock([
+            "inline void adl_serializer<",
+            variantType,
+            ">::from_json(",
+            this.withConst("json"),
+            " & j, ",
+            variantType,
+            " & x)"
+        ], false, () => {
             let onFirst = true;
             for (const [kind, func] of functionForKind) {
                 const typeForKind = (0, collection_utils_1.iterableFind)(nonNulls, t => t.kind === kind);

package/dist/language/Php.js

@@ -58,9 +58,9 @@ class PhpTargetLanguage extends TargetLanguage_1.TargetLanguage {
     }
     get stringTypeMapping() {
         const mapping = new Map();
-        mapping.set("date", "date"); // TODO is not implemented yet 
-        mapping.set("time", "time"); // TODO is not implemented yet 
-        mapping.set("uuid", "uuid"); // TODO is not implemented yet 
+        mapping.set("date", "date"); // TODO is not implemented yet
+        mapping.set("time", "time"); // TODO is not implemented yet
+        mapping.set("uuid", "uuid"); // TODO is not implemented yet
         mapping.set("date-time", "date-time");
         return mapping;
     }
@@ -69,7 +69,7 @@ exports.PhpTargetLanguage = PhpTargetLanguage;
 exports.stringEscape = (0, Strings_1.utf16ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isAscii, Strings_1.standardUnicodeHexEscape));
 function isStartCharacter(codePoint) {
     if (codePoint === 0x5f)
-        return true; // underscore 
+        return true; // underscore
     return (0, Strings_1.isAscii)(codePoint) && (0, Strings_1.isLetter)(codePoint);
 }
 function isPartCharacter(codePoint) {
@@ -156,7 +156,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     finishFile() {
-        // empty 
+        // empty
     }
     emitFileHeader(fileName, _imports) {
         this.startFile(fileName);
@@ -211,8 +211,8 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     phpConvertType(className, t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => "any", _nullType => "null", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "string", _arrayType => "array", _classType => "stdClass", _mapType => "stdClass", _enumType => "string", // TODO number this.nameForNamedType(enumType), 
-        // TODO number this.nameForNamedType(enumType), 
+        return (0, TypeUtils_1.matchType)(t, _anyType => "any", _nullType => "null", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "string", _arrayType => "array", _classType => "stdClass", _mapType => "stdClass", _enumType => "string", // TODO number this.nameForNamedType(enumType),
+        // TODO number this.nameForNamedType(enumType),
         unionType => {
             const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (nullable !== null) {
@@ -231,7 +231,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine(...lhs, "array_map(function ($value) {");
             this.indent(() => {
                 this.phpToObjConvert(className, arrayType.items, ["return "], ["$value"]);
-                // this.emitLine("return $tmp;"); 
+                // this.emitLine("return $tmp;");
             });
             this.emitLine("}, ", ...args, ");");
         }, _classType => this.emitLine(...lhs, ...args, "->to(); ", "/*class*/"), mapType => {
@@ -264,16 +264,16 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     transformDateTime(className, attrName, scopeAttrName) {
         this.emitBlock(["if (!is_a(", scopeAttrName, ", 'DateTime'))"], () => this.emitLine("throw new Exception('Attribute Error:", className, "::", attrName, "');"));
-        // if (lhs !== undefined) { 
-        //     this.emitLine(lhs, "$tmp;"); 
-        // } 
+        // if (lhs !== undefined) {
+        //     this.emitLine(lhs, "$tmp;");
+        // }
     }
     phpFromObjConvert(className, t, lhs, args) {
         return (0, TypeUtils_1.matchType)(t, _anyType => this.emitLine(...lhs, ...args, "; /*any*/"), _nullType => this.emitLine(...lhs, ...args, "; /*null*/"), _boolType => this.emitLine(...lhs, ...args, "; /*bool*/"), _integerType => this.emitLine(...lhs, ...args, "; /*int*/"), _doubleType => this.emitLine(...lhs, ...args, "; /*float*/"), _stringType => this.emitLine(...lhs, ...args, "; /*string*/"), arrayType => {
             this.emitLine(...lhs, " array_map(function ($value) {");
             this.indent(() => {
                 this.phpFromObjConvert(className, arrayType.items, ["return "], ["$value"]);
-                // this.emitLine("return $tmp;"); 
+                // this.emitLine("return $tmp;");
             });
             this.emitLine("}, ", ...args, ");");
         }, classType => this.emitLine(...lhs, this.nameForNamedType(classType), "::from(", ...args, "); ", "/*class*/"), mapType => {
@@ -331,7 +331,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (transformedStringType.kind === "date-time") {
                 const x = _.pad("" + (1 + (idx % 31)), 2, "0");
                 this.emitLine(...lhs, "DateTime::createFromFormat(DateTimeInterface::ISO8601, '", `2020-12-${x}T12:${x}:${x}+00:00`, "')", suffix);
-                // this.emitLine("return sample();"); 
+                // this.emitLine("return sample();");
                 return;
             }
             throw Error('transformedStringType.kind === "unknown"');
@@ -381,7 +381,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine(" * ", desc);
             this.emitLine(" *");
         }
-        // this.emitLine(" * @param ", this.phpType(false, p.type, false, "", "|null")); 
+        // this.emitLine(" * @param ", this.phpType(false, p.type, false, "", "|null"));
         this.emitLine(" * @param ", this.phpConvertType(className, p.type), " $value");
         this.emitLine(" * @throws Exception");
         this.emitLine(" * @return ", this.phpType(false, p.type));
@@ -395,7 +395,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.phpType(false, p.type)
         ], () => {
             this.phpFromObjConvert(className, p.type, ["return "], [`$value`]);
-            // this.emitLine("return $ret;"); 
+            // this.emitLine("return $ret;");
         });
     }
     emitToMethod(names, p, className, name, desc) {
@@ -594,19 +594,19 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.finishFile();
     }
     emitUnionAttributes(_u, _unionName) {
-        // empty 
+        // empty
     }
     emitUnionSerializer(_u, _unionName) {
-        // empty 
+        // empty
     }
     emitUnionDefinition(_u, _unionName) {
         throw Error("emitUnionDefinition not implemented");
     }
     emitEnumSerializationAttributes(_e) {
-        // Empty 
+        // Empty
     }
     emitEnumDeserializationAttributes(_e) {
-        // Empty 
+        // Empty
     }
     emitEnumDefinition(e, enumName) {
         this.emitFileHeader(enumName, []);
@@ -647,7 +647,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("switch ($obj->enum) {");
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (name, jsonName) => {
-                        // Todo String or Number 
+                        // Todo String or Number
                         this.emitLine("case ", enumName, "::$", name, "->enum: return '", (0, exports.stringEscape)(jsonName), "';");
                     });
                 });
@@ -670,7 +670,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("switch ($obj) {");
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (name, jsonName) => {
-                        // Todo String or Enum 
+                        // Todo String or Enum
                         this.emitLine("case '", (0, exports.stringEscape)(jsonName), "': return ", enumName, "::$", name, ";");
                     });
                 });

package/package.json

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