quicktype-core 23.0.44 → 23.0.46

package/dist/language/CPlusPlus.d.ts

@@ -51,21 +51,27 @@ export declare enum GlobalNames {
     CheckConstraint = 7
 }
 export declare enum MemberNames {
-    MinValue = 0,
-    GetMinValue = 1,
-    SetMinValue = 2,
-    MaxValue = 3,
-    GetMaxValue = 4,
-    SetMaxValue = 5,
-    MinLength = 6,
-    GetMinLength = 7,
-    SetMinLength = 8,
-    MaxLength = 9,
-    GetMaxLength = 10,
-    SetMaxLength = 11,
-    Pattern = 12,
-    GetPattern = 13,
-    SetPattern = 14
+    MinIntValue = 0,
+    GetMinIntValue = 1,
+    SetMinIntValue = 2,
+    MaxIntValue = 3,
+    GetMaxIntValue = 4,
+    SetMaxIntValue = 5,
+    MinDoubleValue = 6,
+    GetMinDoubleValue = 7,
+    SetMinDoubleValue = 8,
+    MaxDoubleValue = 9,
+    GetMaxDoubleValue = 10,
+    SetMaxDoubleValue = 11,
+    MinLength = 12,
+    GetMinLength = 13,
+    SetMinLength = 14,
+    MaxLength = 15,
+    GetMaxLength = 16,
+    SetMaxLength = 17,
+    Pattern = 18,
+    GetPattern = 19,
+    SetPattern = 20
 }
 type ConstraintMember = {
     name: MemberNames;
@@ -96,8 +102,8 @@ export type TypeContext = {
     inJsonNamespace: boolean;
 };
 declare class WrappingCode {
-    private _start;
-    private _end;
+    private readonly _start;
+    private readonly _end;
     constructor(start: Sourcelike[], end: Sourcelike[]);
     wrap(qualifier: Sourcelike, inner: Sourcelike): Sourcelike;
 }
@@ -106,24 +112,24 @@ export declare class CPlusPlusRenderer extends ConvenienceRenderer {
     /**
      * For forward declaration practically
      */
-    private _enumType;
-    private _generatedFiles;
+    private readonly _enumType;
+    private readonly _generatedFiles;
     private _currentFilename;
     private _allTypeNames;
     private readonly _gettersAndSettersForPropertyName;
     private readonly _namespaceNames;
-    private _memberNameStyle;
-    private _namedTypeNameStyle;
-    private _generatedGlobalNames;
-    private _generatedMemberNames;
-    private _forbiddenGlobalNames;
+    private readonly _memberNameStyle;
+    private readonly _namedTypeNameStyle;
+    private readonly _generatedGlobalNames;
+    private readonly _generatedMemberNames;
+    private readonly _forbiddenGlobalNames;
     private readonly _memberNamingFunction;
-    private _stringType;
-    private _optionalType;
-    private _optionalFactory;
-    private _nulloptType;
-    private _variantType;
-    private _variantIndexMethodName;
+    private readonly _stringType;
+    private readonly _optionalType;
+    private readonly _optionalFactory;
+    private readonly _nulloptType;
+    private readonly _variantType;
+    private readonly _variantIndexMethodName;
     protected readonly typeNamingStyle: NamingStyle;
     protected readonly enumeratorNamingStyle: NamingStyle;
     constructor(targetLanguage: TargetLanguage, renderContext: RenderContext, _options: OptionValues<typeof cPlusPlusOptions>);
@@ -193,6 +199,7 @@ export declare class CPlusPlusRenderer extends ConvenienceRenderer {
     protected emitOptionalHelpers(): void;
     protected emitDeclaration(decl: Declaration): void;
     protected emitGetterSetter(t: string, getterName: string, setterName: string, memberName: string): void;
+    protected emitNumericCheckConstraints(checkConst: string, classConstraint: string, getterMinValue: string, getterMaxValue: string, cppType: string): void;
     protected emitConstraintClasses(): void;
     protected emitHelperFunctions(): void;
     protected emitExtraIncludes(): void;

package/dist/language/CPlusPlus.js

@@ -243,21 +243,27 @@ var GlobalNames;
 })(GlobalNames = exports.GlobalNames || (exports.GlobalNames = {}));
 var MemberNames;
 (function (MemberNames) {
-    MemberNames[MemberNames["MinValue"] = 0] = "MinValue";
-    MemberNames[MemberNames["GetMinValue"] = 1] = "GetMinValue";
-    MemberNames[MemberNames["SetMinValue"] = 2] = "SetMinValue";
-    MemberNames[MemberNames["MaxValue"] = 3] = "MaxValue";
-    MemberNames[MemberNames["GetMaxValue"] = 4] = "GetMaxValue";
-    MemberNames[MemberNames["SetMaxValue"] = 5] = "SetMaxValue";
-    MemberNames[MemberNames["MinLength"] = 6] = "MinLength";
-    MemberNames[MemberNames["GetMinLength"] = 7] = "GetMinLength";
-    MemberNames[MemberNames["SetMinLength"] = 8] = "SetMinLength";
-    MemberNames[MemberNames["MaxLength"] = 9] = "MaxLength";
-    MemberNames[MemberNames["GetMaxLength"] = 10] = "GetMaxLength";
-    MemberNames[MemberNames["SetMaxLength"] = 11] = "SetMaxLength";
-    MemberNames[MemberNames["Pattern"] = 12] = "Pattern";
-    MemberNames[MemberNames["GetPattern"] = 13] = "GetPattern";
-    MemberNames[MemberNames["SetPattern"] = 14] = "SetPattern";
+    MemberNames[MemberNames["MinIntValue"] = 0] = "MinIntValue";
+    MemberNames[MemberNames["GetMinIntValue"] = 1] = "GetMinIntValue";
+    MemberNames[MemberNames["SetMinIntValue"] = 2] = "SetMinIntValue";
+    MemberNames[MemberNames["MaxIntValue"] = 3] = "MaxIntValue";
+    MemberNames[MemberNames["GetMaxIntValue"] = 4] = "GetMaxIntValue";
+    MemberNames[MemberNames["SetMaxIntValue"] = 5] = "SetMaxIntValue";
+    MemberNames[MemberNames["MinDoubleValue"] = 6] = "MinDoubleValue";
+    MemberNames[MemberNames["GetMinDoubleValue"] = 7] = "GetMinDoubleValue";
+    MemberNames[MemberNames["SetMinDoubleValue"] = 8] = "SetMinDoubleValue";
+    MemberNames[MemberNames["MaxDoubleValue"] = 9] = "MaxDoubleValue";
+    MemberNames[MemberNames["GetMaxDoubleValue"] = 10] = "GetMaxDoubleValue";
+    MemberNames[MemberNames["SetMaxDoubleValue"] = 11] = "SetMaxDoubleValue";
+    MemberNames[MemberNames["MinLength"] = 12] = "MinLength";
+    MemberNames[MemberNames["GetMinLength"] = 13] = "GetMinLength";
+    MemberNames[MemberNames["SetMinLength"] = 14] = "SetMinLength";
+    MemberNames[MemberNames["MaxLength"] = 15] = "MaxLength";
+    MemberNames[MemberNames["GetMaxLength"] = 16] = "GetMaxLength";
+    MemberNames[MemberNames["SetMaxLength"] = 17] = "SetMaxLength";
+    MemberNames[MemberNames["Pattern"] = 18] = "Pattern";
+    MemberNames[MemberNames["GetPattern"] = 19] = "GetPattern";
+    MemberNames[MemberNames["SetPattern"] = 20] = "SetPattern";
 })(MemberNames = exports.MemberNames || (exports.MemberNames = {}));
 function addQualifier(qualifier, qualified) {
     if (qualified.length === 0) {
@@ -546,17 +552,29 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     getConstraintMembers() {
         return [
             {
-                name: MemberNames.MinValue,
-                getter: MemberNames.GetMinValue,
-                setter: MemberNames.SetMinValue,
+                name: MemberNames.MinIntValue,
+                getter: MemberNames.GetMinIntValue,
+                setter: MemberNames.SetMinIntValue,
                 cppType: "int64_t"
             },
             {
-                name: MemberNames.MaxValue,
-                getter: MemberNames.GetMaxValue,
-                setter: MemberNames.SetMaxValue,
+                name: MemberNames.MaxIntValue,
+                getter: MemberNames.GetMaxIntValue,
+                setter: MemberNames.SetMaxIntValue,
                 cppType: "int64_t"
             },
+            {
+                name: MemberNames.MinDoubleValue,
+                getter: MemberNames.GetMinDoubleValue,
+                setter: MemberNames.SetMinDoubleValue,
+                cppType: "double"
+            },
+            {
+                name: MemberNames.MaxDoubleValue,
+                getter: MemberNames.GetMaxDoubleValue,
+                setter: MemberNames.SetMaxDoubleValue,
+                cppType: "double"
+            },
             {
                 name: MemberNames.MinLength,
                 getter: MemberNames.GetMinLength,
@@ -805,7 +823,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 }
             }
         }
-        let typeSource = (0, TypeUtils_1.matchType)(t, _anyType => {
+        const typeSource = (0, TypeUtils_1.matchType)(t, _anyType => {
             isOptional = false;
             return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, [
                 this.jsonQualifier(inJsonNamespace),
@@ -949,7 +967,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     needsOptionalIndirection: true,
                     inJsonNamespace: false
                 }, true, false, property.isOptional), name);
-                if (constraints !== undefined && constraints.has(jsonName)) {
+                if (constraints === null || constraints === void 0 ? void 0 : constraints.has(jsonName)) {
                     /** FIXME!!! NameStyle will/can collide with other Names */
                     const cnst = this.lookupGlobalName(GlobalNames.ClassMemberConstraints);
                     this.emitMember(cnst, this.constraintMember(jsonName));
@@ -983,7 +1001,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 if ((property.type instanceof Type_1.UnionType && property.type.findMember("null") !== undefined) ||
                     (property.isOptional && property.type.kind !== "null" && property.type.kind !== "any")) {
                     this.emitLine(rendered, " ", getterName, "() const { return ", name, "; }");
-                    if (constraints !== undefined && constraints.has(jsonName)) {
+                    if (constraints === null || constraints === void 0 ? void 0 : constraints.has(jsonName)) {
                         this.emitLine("void ", setterName, "(", rendered, " value) { if (value) ", checkConst, "(", this._stringType.createStringLiteral([name]), ", ", this.constraintMember(jsonName), ", *value); this->", name, " = value; }");
                     }
                     else {
@@ -993,7 +1011,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 else {
                     this.emitLine(this.withConst(rendered), " & ", getterName, "() const { return ", name, "; }");
                     this.emitLine(rendered, " & ", mutableGetterName, "() { return ", name, "; }");
-                    if (constraints !== undefined && constraints.has(jsonName)) {
+                    if (constraints === null || constraints === void 0 ? void 0 : constraints.has(jsonName)) {
                         this.emitLine("void ", setterName, "(", this.withConst(rendered), " & value) { ", checkConst, "(", this._stringType.createStringLiteral([name]), ", ", this.constraintMember(jsonName), ", value); this->", name, " = value; }");
                     }
                     else {
@@ -1005,26 +1023,32 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     generateClassConstraints(c) {
-        let res = new Map();
+        const res = new Map();
         this.forEachClassProperty(c, "none", (_name, jsonName, property) => {
             const constraints = constraintsForType(property.type);
             if (constraints === undefined)
                 return;
             const { minMax, minMaxLength, pattern } = constraints;
+            // TODO is there a better way to check if property.type is an interger or a number?
+            const cppType = this.cppType(property.type, {
+                needsForwardIndirection: true,
+                needsOptionalIndirection: true,
+                inJsonNamespace: false
+            }, true, false, property.isOptional);
             res.set(jsonName, [
                 this.constraintMember(jsonName),
                 "(",
-                minMax !== undefined && minMax[0] !== undefined ? String(minMax[0]) : this._nulloptType,
+                (minMax === null || minMax === void 0 ? void 0 : minMax[0]) && cppType === "int64_t" ? String(minMax[0]) : this._nulloptType,
                 ", ",
-                minMax !== undefined && minMax[1] !== undefined ? String(minMax[1]) : this._nulloptType,
+                (minMax === null || minMax === void 0 ? void 0 : minMax[1]) && cppType === "int64_t" ? String(minMax[1]) : this._nulloptType,
                 ", ",
-                minMaxLength !== undefined && minMaxLength[0] !== undefined
-                    ? String(minMaxLength[0])
-                    : this._nulloptType,
+                (minMax === null || minMax === void 0 ? void 0 : minMax[0]) && cppType === "double" ? String(minMax[0]) : this._nulloptType,
                 ", ",
-                minMaxLength !== undefined && minMaxLength[1] !== undefined
-                    ? String(minMaxLength[1])
-                    : this._nulloptType,
+                (minMax === null || minMax === void 0 ? void 0 : minMax[1]) && 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[1]) ? String(minMaxLength[1]) : this._nulloptType,
                 ", ",
                 pattern === undefined
                     ? this._nulloptType
@@ -1180,7 +1204,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                             return [maybeNull !== null || p.isOptional, nonNulls];
                         }
                         else {
-                            let set = new Set();
+                            const set = new Set();
                             set.add(t);
                             return [true, set];
                         }
@@ -1251,7 +1275,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 else {
                     getter = [name];
                 }
-                let assignment = [
+                const assignment = [
                     "j[",
                     this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(json)])),
                     "] = ",
@@ -1351,7 +1375,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         needsOptionalIndirection: true,
                         inJsonNamespace: true
                     }, false, true, false);
-                    let toType = this.cppType(typeForKind, {
+                    const toType = this.cppType(typeForKind, {
                         needsForwardIndirection: true,
                         needsOptionalIndirection: true,
                         inJsonNamespace: true
@@ -1522,17 +1546,42 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("void ", setterName, "(", t, " ", memberName, ") { this->", memberName, " = ", memberName, "; }");
         this.emitLine("auto ", getterName, "() const { return ", memberName, "; }");
     }
+    emitNumericCheckConstraints(checkConst, classConstraint, getterMinValue, getterMaxValue, cppType) {
+        this.emitBlock([
+            "inline void ",
+            checkConst,
+            "(",
+            this._stringType.getConstType(),
+            " name, ",
+            this.withConst(classConstraint),
+            " & c, ",
+            cppType,
+            " value)"
+        ], false, () => {
+            this.emitBlock(["if (c.", getterMinValue, "() != ", this._nulloptType, " && value < *c.", getterMinValue, "())"], false, () => {
+                this.emitLine("throw ", this.lookupGlobalName(GlobalNames.ValueTooLowException), " (", this._stringType.createStringLiteral(["Value too low for "]), " + name + ", this._stringType.createStringLiteral([" ("]), " + ", this._stringType.wrapToString(["value"]), " + ", this._stringType.createStringLiteral(["<"]), " + ", this._stringType.wrapToString(["*c.", getterMinValue, "()"]), " + ", this._stringType.createStringLiteral([")"]), ");");
+            });
+            this.ensureBlankLine();
+            this.emitBlock(["if (c.", getterMaxValue, "() != ", this._nulloptType, " && value > *c.", getterMaxValue, "())"], false, () => {
+                this.emitLine("throw ", this.lookupGlobalName(GlobalNames.ValueTooHighException), " (", this._stringType.createStringLiteral(["Value too high for "]), " + name + ", this._stringType.createStringLiteral([" ("]), " + ", this._stringType.wrapToString(["value"]), " + ", this._stringType.createStringLiteral([">"]), " + ", this._stringType.wrapToString(["*c.", getterMaxValue, "()"]), " + ", this._stringType.createStringLiteral([")"]), ");");
+            });
+            this.ensureBlankLine();
+        });
+        this.ensureBlankLine();
+    }
     emitConstraintClasses() {
         const ourQualifier = this.ourQualifier(false);
-        const getterMinValue = this.lookupMemberName(MemberNames.GetMinValue);
-        const getterMaxValue = this.lookupMemberName(MemberNames.GetMaxValue);
+        const getterMinIntValue = this.lookupMemberName(MemberNames.GetMinIntValue);
+        const getterMaxIntValue = this.lookupMemberName(MemberNames.GetMaxIntValue);
+        const getterMinDoubleValue = this.lookupMemberName(MemberNames.GetMinDoubleValue);
+        const getterMaxDoubleValue = this.lookupMemberName(MemberNames.GetMaxDoubleValue);
         const getterMinLength = this.lookupMemberName(MemberNames.GetMinLength);
         const getterMaxLength = this.lookupMemberName(MemberNames.GetMaxLength);
         const getterPattern = this.lookupMemberName(MemberNames.GetPattern);
         const classConstraint = this.lookupGlobalName(GlobalNames.ClassMemberConstraints);
         this.emitBlock(["class ", classConstraint], true, () => {
             this.emitLine("private:");
-            let constraintMembers = this.getConstraintMembers();
+            const constraintMembers = this.getConstraintMembers();
             for (const member of constraintMembers) {
                 this.emitMember([this._optionalType, "<", member.cppType, ">"], this.lookupMemberName(member.name));
             }
@@ -1580,25 +1629,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.ensureBlankLine();
         }
         const checkConst = this.lookupGlobalName(GlobalNames.CheckConstraint);
-        this.emitBlock([
-            "inline void ",
-            checkConst,
-            "(",
-            this._stringType.getConstType(),
-            " name, ",
-            this.withConst(classConstraint),
-            " & c, int64_t value)"
-        ], false, () => {
-            this.emitBlock(["if (c.", getterMinValue, "() != ", this._nulloptType, " && value < *c.", getterMinValue, "())"], false, () => {
-                this.emitLine("throw ", this.lookupGlobalName(GlobalNames.ValueTooLowException), " (", this._stringType.createStringLiteral(["Value too low for "]), " + name + ", this._stringType.createStringLiteral([" ("]), " + ", this._stringType.wrapToString(["value"]), " + ", this._stringType.createStringLiteral(["<"]), " + ", this._stringType.wrapToString(["*c.", getterMinValue, "()"]), " + ", this._stringType.createStringLiteral([")"]), ");");
-            });
-            this.ensureBlankLine();
-            this.emitBlock(["if (c.", getterMaxValue, "() != ", this._nulloptType, " && value > *c.", getterMaxValue, "())"], false, () => {
-                this.emitLine("throw ", this.lookupGlobalName(GlobalNames.ValueTooHighException), " (", this._stringType.createStringLiteral(["Value too high for "]), " + name + ", this._stringType.createStringLiteral([" ("]), " + ", this._stringType.wrapToString(["value"]), " + ", this._stringType.createStringLiteral([">"]), " + ", this._stringType.wrapToString(["*c.", getterMaxValue, "()"]), " + ", this._stringType.createStringLiteral([")"]), ");");
-            });
-            this.ensureBlankLine();
-        });
-        this.ensureBlankLine();
+        this.emitNumericCheckConstraints(checkConst, classConstraint, getterMinIntValue, getterMaxIntValue, "int64_t");
+        this.emitNumericCheckConstraints(checkConst, classConstraint, getterMinDoubleValue, getterMaxDoubleValue, "double");
         this.emitBlock([
             "inline void ",
             checkConst,
@@ -1799,8 +1831,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
         }
         else {
-            let userNamespaceForwardDecls = this.gatherUserNamespaceForwardDecls();
-            let nlohmannNamespaceForwardDecls = this.gatherNlohmannNamespaceForwardDecls();
+            const userNamespaceForwardDecls = this.gatherUserNamespaceForwardDecls();
+            const nlohmannNamespaceForwardDecls = this.gatherNlohmannNamespaceForwardDecls();
             if (userNamespaceForwardDecls.length == 0 && nlohmannNamespaceForwardDecls.length > 0) {
                 this.emitNamespaces(["nlohmann"], () => {
                     this.emitGatheredSource(nlohmannNamespaceForwardDecls);
@@ -1851,7 +1883,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const propTypes = this.generatedTypes(isClassMember, propertyType);
         for (const t of propTypes) {
             const typeName = this.sourcelikeToString(t.name);
-            let propRecord = { kind: undefined, typeKind: undefined };
+            const propRecord = { kind: undefined, typeKind: undefined };
             if (t.type instanceof Type_1.ClassType) {
                 /**
                  * Ok. We can NOT forward declare direct class members, e.g. a class type is included
@@ -1905,7 +1937,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
          * Need to generate "includes", in terms 'c' has members, which
          * are defined by others
          */
-        let includes = new Map();
+        const includes = new Map();
         if (c instanceof Type_1.UnionType) {
             this.updateIncludes(false, includes, c, defName);
         }
@@ -2048,12 +2080,12 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     isConversionRequired(t) {
-        let originalType = this.cppType(t, {
+        const originalType = this.cppType(t, {
             needsForwardIndirection: true,
             needsOptionalIndirection: true,
             inJsonNamespace: true
         }, false, false, false);
-        let newType = this.cppType(t, {
+        const newType = this.cppType(t, {
             needsForwardIndirection: true,
             needsOptionalIndirection: true,
             inJsonNamespace: true

package/package.json

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