@gmb/bitmark-parser-generator 4.0.2 → 4.1.2

package/dist/index.cjs

@@ -8939,7 +8939,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "4.0.2",
+  "version": "4.1.2",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -20642,7 +20642,7 @@ var NodeValidator = class {
   }
   validateResource(resource) {
     if (!resource) return void 0;
-    let ret = resource;
+    const ret = resource;
     let valid = false;
     switch (resource.type) {
       case ResourceType.image:
@@ -20704,12 +20704,7 @@ var NodeValidator = class {
     }
     if (!valid) {
       if (resource.type) {
-        ret = {
-          type: resource.type,
-          __typeAlias: resource.type,
-          __configKey: resource.__configKey,
-          __invalid: true
-        };
+        resource.__invalid = true;
       }
     }
     return ret;
@@ -31251,7 +31246,6 @@ function buildResources(context, resourceTypeAttachment, resources) {
   const countsMax = resourcesConfig.getCountsMax();
   if (resources) {
     for (const r of resources.reverse()) {
-      if (r.__invalid) continue;
       const configKey = r.__configKey;
       let countMin = countsMin.get(configKey) ?? 0;
       let countMax = countsMax.get(configKey) ?? 0;
@@ -31266,6 +31260,9 @@ function buildResources(context, resourceTypeAttachment, resources) {
       }
       countsMin.set(configKey, countMin);
       countsMax.set(configKey, countMax);
+      if (r.__invalid) {
+        context.addWarning(`Resource type [&${r.type}] is not valid`);
+      }
     }
   }
   if (!resourceAttachmentAllowed && resourceTypeAttachment) {
@@ -35125,9 +35122,10 @@ var BitmarkParser = class {
 
 // src/BitmarkParserGenerator.ts
 var import_node_path4 = __toESM(require("path"), 1);
-var import_fs_extra6 = __toESM(require("fs-extra"), 1);
+var import_fs_extra4 = __toESM(require("fs-extra"), 1);
 
 // src/ast/writer/FileWriter.ts
+var import_node_fs = require("fs");
 var import_node_path = __toESM(require("path"), 1);
 var import_fs_extra = __toESM(require("fs-extra"), 1);
 
@@ -35266,9 +35264,10 @@ var FileWriter = class extends StreamWriter {
 };
 
 // src/generator/bitmark/BitmarkFileGenerator.ts
-var import_fs_extra3 = require("fs-extra");
+var import_node_fs3 = require("fs");
 
 // src/ast/writer/SyncFileWriter.ts
+var import_node_fs2 = require("fs");
 var import_node_path2 = __toESM(require("path"), 1);
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
 var import_os2 = __toESM(require("os"), 1);
@@ -35415,7 +35414,7 @@ var BitmarkFileGenerator = class {
 };
 
 // src/generator/json/JsonFileGenerator.ts
-var import_fs_extra4 = require("fs-extra");
+var import_node_fs4 = require("fs");
 var JsonFileGenerator = class {
   /**
    * Generate bitmark JSON from a bitmark AST as a file
@@ -35455,7 +35454,7 @@ var JsonFileGenerator = class {
 
 // src/info/ConfigBuilder.ts
 var import_node_path3 = __toESM(require("path"), 1);
-var import_fs_extra5 = __toESM(require("fs-extra"), 1);
+var import_fs_extra3 = __toESM(require("fs-extra"), 1);
 var ConfigBuilder = class {
   build(options) {
     const opts = Object.assign({}, options);
@@ -35471,7 +35470,7 @@ var ConfigBuilder = class {
     }
     const outputFolder = opts.outputDir ?? "assets/config";
     const outputFolderBits = import_node_path3.default.join(outputFolder, "bits_flat");
-    import_fs_extra5.default.ensureDirSync(outputFolderBits);
+    import_fs_extra3.default.ensureDirSync(outputFolderBits);
     for (const b of bitConfigs) {
       const inherits = [];
       const tags2 = [];
@@ -35606,7 +35605,7 @@ var ConfigBuilder = class {
       };
       const output = import_node_path3.default.join(outputFolderBits, `${b.bitType}.jsonc`);
       const str = JSON.stringify(bitJson, null, 2);
-      import_fs_extra5.default.writeFileSync(output, str);
+      import_fs_extra3.default.writeFileSync(output, str);
     }
   }
 };
@@ -35760,13 +35759,14 @@ var BitmarkParserGenerator = class {
     const outputAst = outputFormat === Output.ast;
     const bitmarkParserType = BitmarkParserType.peggy;
     let inStr = input;
+    const inputIsString = typeof input === "string";
     if (env.isBrowser && opts.outputFile) {
       throw new Error("Cannot write to file in browser environment");
     }
     if (!opts.inputFormat || opts.inputFormat === Input.file) {
       if (env.isNode) {
-        if (import_fs_extra6.default.existsSync(inStr)) {
-          inStr = import_fs_extra6.default.readFileSync(inStr, {
+        if (inputIsString && import_fs_extra4.default.existsSync(inStr)) {
+          inStr = import_fs_extra4.default.readFileSync(inStr, {
             encoding: "utf8"
           });
         }
@@ -35778,7 +35778,7 @@ var BitmarkParserGenerator = class {
       ast = this.jsonParser.toAst(inStr);
     }
     const isJson = !!ast?.bits;
-    const isBitmark = !isJson && !isAst;
+    const isBitmark = inputIsString && !isJson && !isAst;
     const bitmarkToBitmark = (bitmarkStr) => {
       bitmarkToAst(bitmarkStr);
       astToBitmark(res);
@@ -35857,7 +35857,7 @@ var BitmarkParserGenerator = class {
       } else {
         astToBitmark(ast);
       }
-    } else {
+    } else if (isJson) {
       ast = ast;
       if (outputJson) {
         jsonToJson(ast);
@@ -35866,6 +35866,8 @@ var BitmarkParserGenerator = class {
       } else {
         jsonToBitmark(ast);
       }
+    } else {
+      res = "";
     }
     return res;
   }
@@ -35900,13 +35902,14 @@ var BitmarkParserGenerator = class {
     const jsonOptions = Object.assign({}, opts.jsonOptions);
     const bitmarkParserType = opts.bitmarkParserType;
     let inStr = input;
+    const inputIsString = typeof input === "string";
     if (env.isBrowser && opts.outputFile) {
       throw new Error("Cannot write to file in browser environment");
     }
     if (!opts.inputFormat || opts.inputFormat === Input.file) {
       if (env.isNode) {
-        if (import_fs_extra6.default.existsSync(inStr)) {
-          inStr = import_fs_extra6.default.readFileSync(inStr, {
+        if (inputIsString && import_fs_extra4.default.existsSync(inStr)) {
+          inStr = import_fs_extra4.default.readFileSync(inStr, {
             encoding: "utf8"
           });
         }
@@ -35914,7 +35917,7 @@ var BitmarkParserGenerator = class {
     }
     let ast = this.jsonParser.toAst(inStr);
     const isJson = !!ast?.bits;
-    const isBitmark = !isJson;
+    const isBitmark = inputIsString && !isJson;
     const bitmarkToBitmark = (bitmarkStr) => {
       const astJson = this.bitmarkParser.toAst(bitmarkStr, {
         parserType: bitmarkParserType
@@ -35939,9 +35942,11 @@ var BitmarkParserGenerator = class {
     };
     if (isBitmark) {
       bitmarkToBitmark(inStr);
-    } else {
+    } else if (isJson) {
       ast = ast;
       jsonToJson(ast);
+    } else {
+      return;
     }
     return res;
   }
@@ -35958,11 +35963,12 @@ var BitmarkParserGenerator = class {
   createAst(input, options) {
     let res;
     let inStr = input;
+    const inputIsString = typeof input === "string";
     const opts = Object.assign({}, options);
     if (!opts.inputFormat || opts.inputFormat === Input.file) {
       if (env.isNode) {
-        if (import_fs_extra6.default.existsSync(inStr)) {
-          inStr = import_fs_extra6.default.readFileSync(inStr, {
+        if (inputIsString && import_fs_extra4.default.existsSync(inStr)) {
+          inStr = import_fs_extra4.default.readFileSync(inStr, {
             encoding: "utf8"
           });
         }
@@ -35974,11 +35980,13 @@ var BitmarkParserGenerator = class {
       ast = this.jsonParser.toAst(inStr);
     }
     const isJson = !!ast?.bits;
-    const isBitmark = !isJson && !isAst;
+    const isBitmark = inputIsString && !isJson && !isAst;
     if (isBitmark) {
       res = this.bitmarkParser.toAst(inStr);
-    } else {
+    } else if (isJson) {
       res = ast;
+    } else {
+      res = {};
     }
     return res;
   }
@@ -36014,13 +36022,14 @@ var BitmarkParserGenerator = class {
     const textFormat = TextFormat.fromValue(opts.textFormat) ?? TextFormat.bitmarkText;
     const textLocation = opts.textLocation ?? TextLocation.body;
     let inStr = input;
+    const inputIsString = typeof input === "string";
     if (env.isBrowser && opts.outputFile) {
       throw new Error("Cannot write to file in browser environment");
     }
     if (!opts.inputFormat || opts.inputFormat === Input.file) {
       if (env.isNode) {
-        if (import_fs_extra6.default.existsSync(inStr)) {
-          inStr = import_fs_extra6.default.readFileSync(inStr, {
+        if (inputIsString && import_fs_extra4.default.existsSync(inStr)) {
+          inStr = import_fs_extra4.default.readFileSync(inStr, {
             encoding: "utf8"
           });
         }
@@ -36043,8 +36052,8 @@ var BitmarkParserGenerator = class {
         strRes = this.jsonStringifyPrettify(preRes, jsonOptions, true);
       }
       const flag = fileOptions.append ? "a" : "w";
-      import_fs_extra6.default.ensureDirSync(import_node_path4.default.dirname(output));
-      import_fs_extra6.default.writeFileSync(output, strRes, {
+      import_fs_extra4.default.ensureDirSync(import_node_path4.default.dirname(output));
+      import_fs_extra4.default.writeFileSync(output, strRes, {
         flag
       });
     } else {
@@ -36081,13 +36090,14 @@ var BitmarkParserGenerator = class {
     const textFormat = TextFormat.fromValue(opts.textFormat) ?? TextFormat.bitmarkText;
     const textLocation = opts.textLocation ?? TextLocation.body;
     let inStr = input;
+    const inputIsString = typeof input === "string";
     if (env.isBrowser && opts.outputFile) {
       throw new Error("Cannot write to file in browser environment");
     }
     if (!opts.inputFormat || opts.inputFormat === Input.file) {
       if (env.isNode) {
-        if (import_fs_extra6.default.existsSync(inStr)) {
-          inStr = import_fs_extra6.default.readFileSync(inStr, {
+        if (inputIsString && import_fs_extra4.default.existsSync(inStr)) {
+          inStr = import_fs_extra4.default.readFileSync(inStr, {
             encoding: "utf8"
           });
         }
@@ -36100,8 +36110,8 @@ var BitmarkParserGenerator = class {
     if (opts.outputFile) {
       const output = opts.outputFile.toString();
       const flag = fileOptions.append ? "a" : "w";
-      import_fs_extra6.default.ensureDirSync(import_node_path4.default.dirname(output));
-      import_fs_extra6.default.writeFileSync(output, res, {
+      import_fs_extra4.default.ensureDirSync(import_node_path4.default.dirname(output));
+      import_fs_extra4.default.writeFileSync(output, res, {
         flag
       });
     } else {
@@ -36133,13 +36143,14 @@ var BitmarkParserGenerator = class {
     const textFormat = TextFormat.fromValue(opts.textFormat) ?? TextFormat.bitmarkText;
     const textLocation = opts.textLocation ?? TextLocation.body;
     let inStr = input;
+    const inputIsString = typeof input === "string";
     if (env.isBrowser && opts.outputFile) {
       throw new Error("Cannot write to file in browser environment");
     }
     if (!opts.inputFormat || opts.inputFormat === Input.file) {
       if (env.isNode) {
-        if (import_fs_extra6.default.existsSync(inStr)) {
-          inStr = import_fs_extra6.default.readFileSync(inStr, {
+        if (inputIsString && import_fs_extra4.default.existsSync(inStr)) {
+          inStr = import_fs_extra4.default.readFileSync(inStr, {
             encoding: "utf8"
           });
         }
@@ -36152,8 +36163,8 @@ var BitmarkParserGenerator = class {
     if (opts.outputFile) {
       const output = opts.outputFile.toString();
       const flag = fileOptions.append ? "a" : "w";
-      import_fs_extra6.default.ensureDirSync(import_node_path4.default.dirname(output));
-      import_fs_extra6.default.writeFileSync(output, res, {
+      import_fs_extra4.default.ensureDirSync(import_node_path4.default.dirname(output));
+      import_fs_extra4.default.writeFileSync(output, res, {
         flag
       });
     } else {