quicktype-core 23.3.5 → 23.3.7

package/dist/input/io/NodeIO.js

@@ -47,7 +47,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readableFromFileOrURL = readableFromFileOrURL;
 exports.readFromFileOrURL = readFromFileOrURL;
-const fs = __importStar(require("node:fs"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const ts_necessities_1 = require("@glideapps/ts-necessities");
 const browser_or_node_1 = require("browser-or-node");
 const is_url_1 = __importDefault(require("is-url"));
@@ -72,6 +73,16 @@ function parseHeaders(httpHeaders) {
         return result;
     }, {});
 }
+function resolveSymbolicLink(filePath) {
+    if (!fs.lstatSync(filePath).isSymbolicLink()) {
+        return filePath;
+    }
+    const linkPath = fs.readlinkSync(filePath);
+    if (path.isAbsolute(linkPath)) {
+        return linkPath;
+    }
+    return path.join(path.dirname(filePath), linkPath);
+}
 function readableFromFileOrURL(fileOrURL, httpHeaders) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -86,9 +97,7 @@ function readableFromFileOrURL(fileOrURL, httpHeaders) {
                     // Cast node readable to isomorphic readable from readable-stream
                     return process.stdin;
                 }
-                const filePath = fs.lstatSync(fileOrURL).isSymbolicLink()
-                    ? fs.readlinkSync(fileOrURL)
-                    : fileOrURL;
+                const filePath = resolveSymbolicLink(fileOrURL);
                 if (fs.existsSync(filePath)) {
                     // Cast node readable to isomorphic readable from readable-stream
                     return fs.createReadStream(filePath, "utf8");

package/dist/language/CPlusPlus/CPlusPlusRenderer.js

@@ -732,11 +732,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                  * a member called 'value' value = value will screw up the compiler
                  */
                 const checkConst = this.lookupGlobalName(utils_1.GlobalNames.CheckConstraint);
-                if ((property.type instanceof Type_1.UnionType &&
-                    property.type.findMember("null") !== undefined) ||
-                    (property.isOptional &&
-                        property.type.kind !== "null" &&
-                        property.type.kind !== "any")) {
+                if (property.type instanceof Type_1.UnionType &&
+                    property.type.findMember("null") !== undefined) {
                     this.emitLine(rendered, " ", getterName, "() const { return ", name, "; }");
                     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; }");
@@ -1416,6 +1413,24 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.ensureBlankLine();
         });
         this.ensureBlankLine();
+        this.emitBlock([
+            "inline void ",
+            checkConst,
+            "(",
+            this._stringType.getConstType(),
+            " name, ",
+            this.withConst(classConstraint),
+            " & c, const ",
+            this._optionalType,
+            "<",
+            cppType,
+            "> & value)",
+        ], false, () => {
+            this.emitBlock(["if (value)"], false, () => {
+                this.emitLine(checkConst, "(name, c, *value);");
+            });
+        });
+        this.ensureBlankLine();
     }
     emitConstraintClasses() {
         const ourQualifier = this.ourQualifier(false);
@@ -1537,6 +1552,24 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.ensureBlankLine();
         });
+        this.ensureBlankLine();
+        this.emitBlock([
+            "inline void ",
+            checkConst,
+            "(",
+            this._stringType.getConstType(),
+            " name, ",
+            this.withConst(classConstraint),
+            " & c, const ",
+            this._optionalType,
+            "<",
+            this._stringType.getType(),
+            "> & value)",
+        ], false, () => {
+            this.emitBlock(["if (value)"], false, () => {
+                this.emitLine(checkConst, "(name, c, *value);");
+            });
+        });
     }
     emitHelperFunctions() {
         this._stringType.emitHelperFunctions();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "23.3.5",
+    "version": "23.3.7",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -50,6 +50,7 @@
         "dist"
     ],
     "browser": {
-        "fs": false
+        "fs": false,
+        "path": false
     }
 }