quicktype-core 23.3.1 → 23.3.3

package/dist/language/CPlusPlus/CPlusPlusRenderer.js

@@ -767,33 +767,43 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 return;
             const { minMax, minMaxLength, pattern } = constraints;
             // TODO is there a better way to check if property.type is an integer or a number?
+            // We only generate this to classify the underlying type, so we
+            // always pass `false` for `isOptional` — otherwise `cppType`
+            // wraps the type in the optional<> container and the comparisons
+            // below never match.
             const cppType = this.cppType(property.type, {
                 needsForwardIndirection: true,
                 needsOptionalIndirection: true,
                 inJsonNamespace: false,
-            }, true, false, property.isOptional);
+            }, true, false, false);
+            // Compare bounds against `undefined` explicitly, since 0 is a
+            // valid constraint value too.
             res.set(jsonName, [
                 this.constraintMember(jsonName),
                 "(",
-                (minMax === null || minMax === void 0 ? void 0 : minMax[0]) && cppType === "int64_t"
+                (minMax === null || minMax === void 0 ? void 0 : minMax[0]) !== undefined && cppType === "int64_t"
                     ? String(minMax[0])
                     : this._nulloptType,
                 ", ",
-                (minMax === null || minMax === void 0 ? void 0 : minMax[1]) && cppType === "int64_t"
+                (minMax === null || minMax === void 0 ? void 0 : minMax[1]) !== undefined && cppType === "int64_t"
                     ? String(minMax[1])
                     : this._nulloptType,
                 ", ",
-                (minMax === null || minMax === void 0 ? void 0 : minMax[0]) && cppType === "double"
+                (minMax === null || minMax === void 0 ? void 0 : minMax[0]) !== undefined && cppType === "double"
                     ? String(minMax[0])
                     : this._nulloptType,
                 ", ",
-                (minMax === null || minMax === void 0 ? void 0 : minMax[1]) && cppType === "double"
+                (minMax === null || minMax === void 0 ? void 0 : minMax[1]) !== undefined && cppType === "double"
                     ? String(minMax[1])
                     : this._nulloptType,
                 ", ",
-                (minMaxLength === null || minMaxLength === void 0 ? void 0 : minMaxLength[0]) ? String(minMaxLength[0]) : this._nulloptType,
+                (minMaxLength === null || minMaxLength === void 0 ? void 0 : minMaxLength[0]) !== undefined
+                    ? String(minMaxLength[0])
+                    : this._nulloptType,
                 ", ",
-                (minMaxLength === null || minMaxLength === void 0 ? void 0 : minMaxLength[1]) ? String(minMaxLength[1]) : this._nulloptType,
+                (minMaxLength === null || minMaxLength === void 0 ? void 0 : minMaxLength[1]) !== undefined
+                    ? String(minMaxLength[1])
+                    : this._nulloptType,
                 ", ",
                 pattern === undefined
                     ? this._nulloptType

package/dist/language/Php/PhpRenderer.js

@@ -168,9 +168,6 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (transformedStringType.kind === "date-time") {
                 return "DateTime";
             }
-            if (transformedStringType.kind === "uuid") {
-                throw Error('transformedStringType.kind === "uuid"');
-            }
             return "string";
         });
     }
@@ -191,6 +188,9 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (transformedStringType.kind === "date-time") {
                 return "DateTime";
             }
+            if (transformedStringType.kind === "uuid") {
+                return "string";
+            }
             throw Error('transformedStringType.kind === "unknown"');
         });
     }
@@ -206,6 +206,9 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (transformedStringType.kind === "date-time") {
                 return "string";
             }
+            if (transformedStringType.kind === "uuid") {
+                return "string";
+            }
             throw Error('transformedStringType.kind === "unknown"');
         });
     }
@@ -242,6 +245,10 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine(...lhs, ...args, "->format(DateTimeInterface::ISO8601);");
                 return;
             }
+            if (transformedStringType.kind === "uuid") {
+                this.emitLine(...lhs, ...args, "; /*uuid*/");
+                return;
+            }
             throw Error('transformedStringType.kind === "unknown"');
         });
     }
@@ -286,6 +293,10 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("return $tmp;");
                 return;
             }
+            if (transformedStringType.kind === "uuid") {
+                this.emitLine(...lhs, ...args, "; /*uuid*/");
+                return;
+            }
             throw Error('transformedStringType.kind === "unknown"');
         });
     }
@@ -317,6 +328,10 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 // this.emitLine("return sample();");
                 return;
             }
+            if (transformedStringType.kind === "uuid") {
+                this.emitLine(...lhs, "'9277b8fb-2a65-4663-a36c-8d417e2d284b'", suffix, " /*", `${idx}`, ":", args, "*/");
+                return;
+            }
             throw Error('transformedStringType.kind === "unknown"');
         });
     }
@@ -357,6 +372,15 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 ]);
                 return;
             }
+            if (transformedStringType.kind === "uuid") {
+                is("is_string");
+                this.emitBlock([
+                    "if (!preg_match('/^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/', ",
+                    scopeAttrName,
+                    "))",
+                ], () => this.emitLine('throw new Exception("Attribute Error:', className, "::", attrName, '");'));
+                return;
+            }
             throw Error(`transformedStringType.kind === ${transformedStringType.kind}`);
         });
     }

package/dist/language/Php/language.js

@@ -35,7 +35,7 @@ class PhpTargetLanguage extends TargetLanguage_1.TargetLanguage {
         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("uuid", "uuid");
         mapping.set("date-time", "date-time");
         return mapping;
     }

package/package.json

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