@gmb/bitmark-parser 6.2.0 → 6.3.1

package/dist/index.js

@@ -10,7 +10,7 @@ import { createRequire } from "module";
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser",
-  "version": "6.2.0",
+  "version": "6.3.1",
   "author": "Get More Brain Ltd <info@getmorebrain.com>",
   "license": "ISC",
   "description": "A parser for bitmark text, powered by WebAssembly."
@@ -316,16 +316,14 @@ function validateVersionOptions(opts) {
 }
 function validateBitmarkOptions(o) {
   if (o.explicitTextFormat) unsupportedOption("bitmarkOptions.explicitTextFormat");
-  if (o.prettifyJson !== void 0 && o.prettifyJson !== false) {
-    unsupportedOption("bitmarkOptions.prettifyJson", "embedded-JSON body prettification is not supported");
+  if (o.cardSetVersion === 1) {
+    unsupportedOption("bitmarkOptions.cardSetVersion: 1", V3_ONLY);
   }
-  if (o.cardSetVersion === 1) unsupportedOption("bitmarkOptions.cardSetVersion: 1", V3_ONLY);
   if (o.debugGenerationInline) unsupportedOption("bitmarkOptions.debugGenerationInline");
   if (o.noBreakscaping) unsupportedOption("bitmarkOptions.noBreakscaping");
 }
 function validateJsonOptions(o) {
   if (o.textAsPlainText) unsupportedOption("jsonOptions.textAsPlainText", V3_ONLY);
-  if (o.excludeUnknownProperties) unsupportedOption("jsonOptions.excludeUnknownProperties");
   if (o.debugGenerationInline) unsupportedOption("jsonOptions.debugGenerationInline");
 }
 function prettyIndent(prettify) {
@@ -361,6 +359,14 @@ function isPseudoAst(v) {
   return v !== null && typeof v === "object" && (PSEUDO_AST_MARKER in v || Array.isArray(v.bits));
 }
 
+// src/legacy/generated/resource-collection-keys.ts
+var RESOURCE_COLLECTION_KEYS = {
+  "extractor-image": { key: "images", resourceType: "image" },
+  "extractor-image-collapsible": { key: "images", resourceType: "image" },
+  "images-logo-grave": { key: "logos", resourceType: "image" },
+  "prototype-images": { key: "images", resourceType: "image" }
+};
+
 // src/legacy/builder.ts
 var BUILT_BIT_PARSER = /* @__PURE__ */ Symbol.for("@gmb/bitmark-parser/legacy-built-bit-parser");
 var DATA_KEY_TO_JSON_KEY = {
@@ -373,6 +379,13 @@ var DEPRECATED_TEXT_FORMATS = {
   "bitmark--": "bitmark++",
   "bitmark+": "bitmark++"
 };
+var CONFIG_BODY_FORMAT_TO_TEXT_FORMAT = {
+  bitmark: "bitmark++",
+  text: "text",
+  json: "json",
+  latex: "latex",
+  xml: "xml"
+};
 var TAG_TEXT_KEYS = [
   "title",
   "subtitle",
@@ -405,16 +418,20 @@ var Builder = class {
    * NOTE (documented divergences from bpg):
    * - the return value is bit JSON, not bpg's internal AST node model;
    * - `resourceType` (an inference hint in bpg) is not carried into the
-   *   JSON — the attached `resource` object is authoritative;
-   * - more than one entry in `resources` passes through under a
-   *   `resources` key (kept visible, not silently dropped) — the canonical
-   *   single attachment is `resource`.
+   *   JSON — the attached `resource` object is authoritative.
+   *
+   * `resources` follows bpg's JsonGenerator routing: on a bit whose config
+   * maps a repeatable resource tag group onto a collection key (e.g.
+   * `images` / `logos` — see the generated RESOURCE_COLLECTION_KEYS), the
+   * matching-type entries land under that key; on every other bit the first
+   * entry becomes the canonical single `resource` (as bpg: "if there is
+   * more than one resource, use the first one").
    */
   buildBit(data, _options) {
     const wasm2 = getLegacyWasm();
     const src = { ...data };
     const bitType = src.bitType;
-    this.assertKnownBitType(bitType);
+    const bitConfig = this.getBitConfig(bitType);
     const bit = {};
     bit.type = bitType;
     if (src.isCommented) {
@@ -427,6 +444,8 @@ var Builder = class {
     if (textFormat !== void 0) {
       bit.format = DEPRECATED_TEXT_FORMATS[textFormat] ?? textFormat;
       delete src.textFormat;
+    } else {
+      bit.format = CONFIG_BODY_FORMAT_TO_TEXT_FORMAT[bitConfig.bodyFormat ?? ""] ?? "bitmark++";
     }
     delete src.resourceType;
     const body = src.body;
@@ -444,12 +463,15 @@ var Builder = class {
       delete src.__isDefaultExample;
     }
     const resources = src.resources;
-    if (resources !== void 0) {
-      if (Array.isArray(resources)) {
-        if (resources.length === 1) bit.resource = resources[0];
-        else if (resources.length > 1) bit.resources = resources;
-      } else {
-        bit.resource = resources;
+    if (resources !== void 0 && bitType !== void 0) {
+      const list = Array.isArray(resources) ? resources : [resources];
+      const collection = RESOURCE_COLLECTION_KEYS[bitType];
+      if (collection) {
+        bit[collection.key] = list.filter(
+          (r) => r !== null && typeof r === "object" && r.type === collection.resourceType
+        );
+      } else if (list.length >= 1) {
+        bit.resource = list[0];
       }
       delete src.resources;
     }
@@ -467,7 +489,7 @@ var Builder = class {
       }
     }
     this.parseStringTexts(bit);
-    const out = wasm2.convert(JSON.stringify([{ bit }]), "json", "json", "optimized", false, 2, 1);
+    const out = wasm2.convert(JSON.stringify([{ bit }]), "json", "json", "optimized", false, 2, 1, false);
     if (out.startsWith("error:")) {
       throw new Error(out.slice("error:".length).trim());
     }
@@ -515,6 +537,12 @@ var Builder = class {
    * (inline marks become TextAst marks); the composer would otherwise treat
    * them as literal text. Converts top-level JsonText fields in place.
    * Nested (card-content) strings are left literal — documented divergence.
+   *
+   * A string body is dispatched on the bit's resolved text format, as bpg's
+   * buildBody: bitmark text is parsed to TextAst, `json` is JSON.parsed
+   * (unparseable → null), and plain-text formats (text/latex/xml) stay
+   * verbatim. Tag texts are always bitmark text, independent of body format
+   * (bpg TextParser.toAst ignores format; only location matters).
    */
   parseStringTexts(bit) {
     const wasm2 = getLegacyWasm();
@@ -529,29 +557,36 @@ var Builder = class {
     };
     const format = bit.format;
     const bitmarkBody = format === void 0 || format === "bitmark++" || format === "bitmark+";
-    if (typeof bit.body === "string" && bitmarkBody) {
-      bit.body = toAst(bit.body, "body");
+    if (typeof bit.body === "string") {
+      if (format === "json") {
+        try {
+          bit.body = JSON.parse(bit.body);
+        } catch {
+          bit.body = null;
+        }
+      } else if (bitmarkBody) {
+        bit.body = toAst(bit.body, "body");
+      }
     }
     for (const key of TAG_TEXT_KEYS) {
       const v = bit[key];
       if (typeof v === "string") bit[key] = toAst(v, "tag");
     }
   }
-  /** Throw bpg's exact unknown-bit-type error (`Config.getBitConfig` parity). */
-  assertKnownBitType(bitType) {
+  /**
+   * Look up the bit's config (`wasm.info`); throws bpg's exact
+   * unknown-bit-type error (`Config.getBitConfig` parity).
+   */
+  getBitConfig(bitType) {
     const wasm2 = getLegacyWasm();
-    let known = false;
     if (bitType !== void 0) {
       try {
         const info2 = JSON.parse(wasm2.info("bit", "json", bitType, false, 2));
-        known = info2.error === void 0;
+        if (info2.error === void 0) return info2;
       } catch {
-        known = false;
       }
     }
-    if (!known) {
-      throw new Error(`No config found for bit: ${bitType}`);
-    }
+    throw new Error(`No config found for bit: ${bitType}`);
   }
 };
 function stripUndefined(src, exclude) {
@@ -591,8 +626,10 @@ var BitmarkParserGenerator = class {
     const outputFormat = opts.outputFormat ?? (isBitmark ? "json" : "bitmark");
     const coreFormat = outputFormat === "ast" ? "json" : outputFormat;
     const { pretty, indent } = prettyIndent(jsonOptions.prettify);
+    const emit = coreFormat === "bitmark" ? prettyIndent(bitmarkOptions.prettifyJson) : { pretty, indent };
     const spaces = spacesAround(bitmarkOptions.spacesAroundValues);
-    const out = wasm2.convert(source, isBitmark ? "bitmark" : "json", coreFormat, "optimized", pretty, indent, spaces);
+    const includeUnknown = !jsonOptions.excludeUnknownProperties;
+    const out = wasm2.convert(source, isBitmark ? "bitmark" : "json", coreFormat, "optimized", emit.pretty, emit.indent, spaces, includeUnknown);
     this.throwOnError(out);
     if (outputFormat === "bitmark" || outputFormat === "text") {
       return this.deliver(out, opts.outputFile, opts.fileOptions);
@@ -622,7 +659,9 @@ var BitmarkParserGenerator = class {
     this.checkBrowserFileWrite(opts.outputFile);
     const wasm2 = getLegacyWasm();
     const { source, isBitmark } = this.resolveInput(input, opts.inputFormat);
-    const { pretty, indent } = prettyIndent(jsonOptions.prettify);
+    const { pretty, indent } = prettyIndent(
+      isBitmark ? bitmarkOptions.prettifyJson : jsonOptions.prettify
+    );
     const spaces = spacesAround(bitmarkOptions.spacesAroundValues);
     const out = wasm2.canonicalize(source, isBitmark ? "bitmark" : "json", "optimized", pretty, indent, spaces);
     this.throwOnError(out);
@@ -674,7 +713,7 @@ var BitmarkParserGenerator = class {
     const isHtmlInput = opts.inputFormat === "html" || opts.inputFormat === void 0 && typeof input === "string" && /<table[\s>]/iu.test(inStr);
     if (!isHtmlInput) {
       const { source, isBitmark } = this.resolveInput(input, void 0);
-      const out2 = wasm2.convert(source, isBitmark ? "bitmark" : "json", "html", "optimized", false, 2, 1);
+      const out2 = wasm2.convert(source, isBitmark ? "bitmark" : "json", "html", "optimized", false, 2, 1, false);
       this.throwOnError(out2);
       return this.deliver(extractHtmlTables(out2).join("\n"), opts.outputFile, opts.fileOptions);
     }
@@ -684,12 +723,12 @@ var BitmarkParserGenerator = class {
     const { pretty, indent } = prettyIndent(jsonOptions.prettify);
     const spaces = spacesAround(bitmarkOptions.spacesAroundValues);
     if (outputFormat === "html") {
-      const out2 = wasm2.convert(wrapped, "html", "html", "optimized", false, 2, 1);
+      const out2 = wasm2.convert(wrapped, "html", "html", "optimized", false, 2, 1, false);
       this.throwOnError(out2);
       return this.deliver(extractHtmlTables(out2).join("\n"), opts.outputFile, opts.fileOptions);
     }
     const coreFormat = outputFormat === "ast" ? "json" : outputFormat;
-    const out = wasm2.convert(wrapped, "html", coreFormat, "optimized", pretty, indent, spaces);
+    const out = wasm2.convert(wrapped, "html", coreFormat, "optimized", pretty, indent, spaces, false);
     this.throwOnError(out);
     if (outputFormat === "bitmark" || outputFormat === "text") {
       return this.deliver(out, opts.outputFile, opts.fileOptions);
@@ -714,7 +753,7 @@ var BitmarkParserGenerator = class {
     const opts = Object.assign({}, options);
     const wasm2 = getLegacyWasm();
     const { source, isBitmark } = this.resolveInput(input, opts.inputFormat);
-    const out = wasm2.convert(source, isBitmark ? "bitmark" : "json", "json", "optimized", false, 2, 1);
+    const out = wasm2.convert(source, isBitmark ? "bitmark" : "json", "json", "optimized", false, 2, 1, true);
     this.throwOnError(out);
     return makePseudoAst(JSON.parse(out));
   }
@@ -821,7 +860,7 @@ var BitmarkParserGenerator = class {
       }
     }
     const { source, isBitmark } = this.resolveInput(input, void 0);
-    const out = wasm2.convert(source, isBitmark ? "bitmark" : "json", "text", "optimized", false, 2, 1);
+    const out = wasm2.convert(source, isBitmark ? "bitmark" : "json", "text", "optimized", false, 2, 1, false);
     this.throwOnError(out);
     return out;
   }
@@ -1306,19 +1345,25 @@ function version() {
 function lex(input, options = {}) {
   return wasm.lex(input, options.stage ?? "lex");
 }
-function parse(input, options = {}) {
-  return wasm.parse(input, options.mode ?? "optimized");
-}
-function parseBits(input, options = {}) {
-  const out = wasm.convert(input, "auto", "json", options.mode ?? "optimized", false, 2, 1);
+function bitmarkToObjects(input, options = {}) {
+  const out = wasm.convert(
+    input,
+    "bitmark",
+    "json",
+    options.mode ?? "optimized",
+    false,
+    2,
+    1,
+    options.includeUnknownProperties ?? false
+  );
   if (out.startsWith("error:")) throw new Error(out.slice("error:".length).trim());
   return JSON.parse(out);
 }
-function generateBits(bits, options = {}) {
+function objectsToBitmark(bits, options = {}) {
   const entries = bits.map(
     (b) => b !== null && typeof b === "object" && "bit" in b && typeof b.bit === "object" ? b : { bit: b }
   );
-  const out = wasm.convert(JSON.stringify(entries), "json", "bitmark", options.mode ?? "optimized", false, 2, 1);
+  const out = wasm.convert(JSON.stringify(entries), "json", "bitmark", options.mode ?? "optimized", false, 2, 1, false);
   if (out.startsWith("error:")) throw new Error(out.slice("error:".length).trim());
   return out;
 }
@@ -1330,16 +1375,10 @@ function convert(input, options = {}) {
     options.mode ?? "optimized",
     options.pretty ?? false,
     options.indent ?? 2,
-    options.spacesAroundValues ?? 1
+    options.spacesAroundValues ?? 1,
+    options.includeUnknownProperties ?? false
   );
 }
-function optimize(input, options = {}) {
-  return wasm.optimize(input, options.inputFormat ?? "auto", options.pretty ?? false, options.indent ?? 2);
-}
-function fullize(input, options = {}) {
-  return wasm.fullize(input, options.inputFormat ?? "auto", options.pretty ?? false, options.indent ?? 2);
-}
-var expand = fullize;
 function canonicalize(input, options = {}) {
   return wasm.canonicalize(
     input,
@@ -1395,24 +1434,16 @@ function info(options = {}) {
   const indent = options.indent ?? 2;
   return wasm.info(infoType, format, bit, pretty, indent);
 }
-function generate(input, options = {}) {
-  return wasm.convert(input, "json", "bitmark", options.mode ?? "optimized", false, 2, 1);
-}
 export {
+  bitmarkToObjects,
   breakscapeText,
   canonicalize,
   convert,
   countBits,
-  expand,
-  fullize,
-  generate,
-  generateBits,
   info,
   legacy_exports as legacy,
   lex,
-  optimize,
-  parse,
-  parseBits,
+  objectsToBitmark,
   patchEntry,
   splitBits,
   transform,