quicktype-core 23.3.6 → 23.3.8

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

@@ -1257,8 +1257,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     ]), ") x = ", ourQualifier, enumName, "::", name, ";");
                     onFirst = false;
                 });
-                this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
             }
+            this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
         });
         this.ensureBlankLine();
         this.emitBlock([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "23.3.6",
+    "version": "23.3.8",
     "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
     }
 }