@gmb/bitmark-parser 7.2.0 → 7.3.0

package/dist/browser/cjs/index.cjs

@@ -27,6 +27,7 @@ __export(index_exports, {
   CompletionItemTag: () => CompletionItemTag,
   DiagnosticSeverity: () => DiagnosticSeverity,
   NotInitializedError: () => NotInitializedError,
+  PatchError: () => PatchError,
   RegisterError: () => RegisterError,
   UnsupportedFeatureError: () => UnsupportedFeatureError,
   bitmarkToObjects: () => bitmarkToObjects,
@@ -158,6 +159,9 @@ function passStringToWasm0(arg, malloc, realloc) {
   WASM_VECTOR_LEN = offset;
   return ptr;
 }
+function isLikeNone(x) {
+  return x === void 0 || x === null;
+}
 var cachedDataViewMemory0 = null;
 function getDataViewMemory0() {
   if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || cachedDataViewMemory0.buffer.detached === void 0 && cachedDataViewMemory0.buffer !== wasm.memory.buffer) {
@@ -165,9 +169,9 @@ function getDataViewMemory0() {
   }
   return cachedDataViewMemory0;
 }
-function breakscape_text(input, format, location) {
-  let deferred4_0;
-  let deferred4_1;
+function breakscape_text(input, format, location, sub_location) {
+  let deferred5_0;
+  let deferred5_1;
   try {
     const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
     const ptr0 = passStringToWasm0(input, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
@@ -176,20 +180,22 @@ function breakscape_text(input, format, location) {
     const len1 = WASM_VECTOR_LEN;
     const ptr2 = passStringToWasm0(location, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
     const len2 = WASM_VECTOR_LEN;
-    wasm.breakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone(sub_location) ? 0 : passStringToWasm0(sub_location, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    var len3 = WASM_VECTOR_LEN;
+    wasm.breakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-    deferred4_0 = r0;
-    deferred4_1 = r1;
+    deferred5_0 = r0;
+    deferred5_1 = r1;
     return getStringFromWasm0(r0, r1);
   } finally {
     wasm.__wbindgen_add_to_stack_pointer(16);
-    wasm.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+    wasm.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
   }
 }
-function unbreakscape_text(input, format, location) {
-  let deferred4_0;
-  let deferred4_1;
+function unbreakscape_text(input, format, location, sub_location) {
+  let deferred5_0;
+  let deferred5_1;
   try {
     const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
     const ptr0 = passStringToWasm0(input, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
@@ -198,15 +204,17 @@ function unbreakscape_text(input, format, location) {
     const len1 = WASM_VECTOR_LEN;
     const ptr2 = passStringToWasm0(location, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
     const len2 = WASM_VECTOR_LEN;
-    wasm.unbreakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone(sub_location) ? 0 : passStringToWasm0(sub_location, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    var len3 = WASM_VECTOR_LEN;
+    wasm.unbreakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-    deferred4_0 = r0;
-    deferred4_1 = r1;
+    deferred5_0 = r0;
+    deferred5_1 = r1;
     return getStringFromWasm0(r0, r1);
   } finally {
     wasm.__wbindgen_add_to_stack_pointer(16);
-    wasm.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+    wasm.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
   }
 }
 function info(info_type, format, bit, pretty, indent, include_deprecated, only_deprecated, full, language) {
@@ -832,6 +840,9 @@ function passStringToWasm02(arg, malloc, realloc) {
   WASM_VECTOR_LEN2 = offset;
   return ptr;
 }
+function isLikeNone2(x) {
+  return x === void 0 || x === null;
+}
 var cachedDataViewMemory02 = null;
 function getDataViewMemory02() {
   if (cachedDataViewMemory02 === null || cachedDataViewMemory02.buffer.detached === true || cachedDataViewMemory02.buffer.detached === void 0 && cachedDataViewMemory02.buffer !== wasm2.memory.buffer) {
@@ -839,9 +850,9 @@ function getDataViewMemory02() {
   }
   return cachedDataViewMemory02;
 }
-function breakscape_text2(input, format, location) {
-  let deferred4_0;
-  let deferred4_1;
+function breakscape_text2(input, format, location, sub_location) {
+  let deferred5_0;
+  let deferred5_1;
   try {
     const retptr = wasm2.__wbindgen_add_to_stack_pointer(-16);
     const ptr0 = passStringToWasm02(input, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
@@ -850,20 +861,22 @@ function breakscape_text2(input, format, location) {
     const len1 = WASM_VECTOR_LEN2;
     const ptr2 = passStringToWasm02(location, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
     const len2 = WASM_VECTOR_LEN2;
-    wasm2.breakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone2(sub_location) ? 0 : passStringToWasm02(sub_location, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    var len3 = WASM_VECTOR_LEN2;
+    wasm2.breakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     var r0 = getDataViewMemory02().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory02().getInt32(retptr + 4 * 1, true);
-    deferred4_0 = r0;
-    deferred4_1 = r1;
+    deferred5_0 = r0;
+    deferred5_1 = r1;
     return getStringFromWasm02(r0, r1);
   } finally {
     wasm2.__wbindgen_add_to_stack_pointer(16);
-    wasm2.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+    wasm2.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
   }
 }
-function unbreakscape_text2(input, format, location) {
-  let deferred4_0;
-  let deferred4_1;
+function unbreakscape_text2(input, format, location, sub_location) {
+  let deferred5_0;
+  let deferred5_1;
   try {
     const retptr = wasm2.__wbindgen_add_to_stack_pointer(-16);
     const ptr0 = passStringToWasm02(input, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
@@ -872,15 +885,17 @@ function unbreakscape_text2(input, format, location) {
     const len1 = WASM_VECTOR_LEN2;
     const ptr2 = passStringToWasm02(location, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
     const len2 = WASM_VECTOR_LEN2;
-    wasm2.unbreakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone2(sub_location) ? 0 : passStringToWasm02(sub_location, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    var len3 = WASM_VECTOR_LEN2;
+    wasm2.unbreakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     var r0 = getDataViewMemory02().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory02().getInt32(retptr + 4 * 1, true);
-    deferred4_0 = r0;
-    deferred4_1 = r1;
+    deferred5_0 = r0;
+    deferred5_1 = r1;
     return getStringFromWasm02(r0, r1);
   } finally {
     wasm2.__wbindgen_add_to_stack_pointer(16);
-    wasm2.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+    wasm2.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
   }
 }
 function info2(info_type, format, bit, pretty, indent, include_deprecated, only_deprecated, full, language) {
@@ -1504,6 +1519,9 @@ function passStringToWasm03(arg, malloc, realloc) {
   WASM_VECTOR_LEN3 = offset;
   return ptr;
 }
+function isLikeNone3(x) {
+  return x === void 0 || x === null;
+}
 var cachedDataViewMemory03 = null;
 function getDataViewMemory03() {
   if (cachedDataViewMemory03 === null || cachedDataViewMemory03.buffer.detached === true || cachedDataViewMemory03.buffer.detached === void 0 && cachedDataViewMemory03.buffer !== wasm3.memory.buffer) {
@@ -1511,9 +1529,9 @@ function getDataViewMemory03() {
   }
   return cachedDataViewMemory03;
 }
-function breakscape_text3(input, format, location) {
-  let deferred4_0;
-  let deferred4_1;
+function breakscape_text3(input, format, location, sub_location) {
+  let deferred5_0;
+  let deferred5_1;
   try {
     const retptr = wasm3.__wbindgen_add_to_stack_pointer(-16);
     const ptr0 = passStringToWasm03(input, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
@@ -1522,20 +1540,22 @@ function breakscape_text3(input, format, location) {
     const len1 = WASM_VECTOR_LEN3;
     const ptr2 = passStringToWasm03(location, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
     const len2 = WASM_VECTOR_LEN3;
-    wasm3.breakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone3(sub_location) ? 0 : passStringToWasm03(sub_location, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
+    var len3 = WASM_VECTOR_LEN3;
+    wasm3.breakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     var r0 = getDataViewMemory03().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory03().getInt32(retptr + 4 * 1, true);
-    deferred4_0 = r0;
-    deferred4_1 = r1;
+    deferred5_0 = r0;
+    deferred5_1 = r1;
     return getStringFromWasm03(r0, r1);
   } finally {
     wasm3.__wbindgen_add_to_stack_pointer(16);
-    wasm3.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+    wasm3.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
   }
 }
-function unbreakscape_text3(input, format, location) {
-  let deferred4_0;
-  let deferred4_1;
+function unbreakscape_text3(input, format, location, sub_location) {
+  let deferred5_0;
+  let deferred5_1;
   try {
     const retptr = wasm3.__wbindgen_add_to_stack_pointer(-16);
     const ptr0 = passStringToWasm03(input, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
@@ -1544,15 +1564,17 @@ function unbreakscape_text3(input, format, location) {
     const len1 = WASM_VECTOR_LEN3;
     const ptr2 = passStringToWasm03(location, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
     const len2 = WASM_VECTOR_LEN3;
-    wasm3.unbreakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone3(sub_location) ? 0 : passStringToWasm03(sub_location, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
+    var len3 = WASM_VECTOR_LEN3;
+    wasm3.unbreakscape_text(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     var r0 = getDataViewMemory03().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory03().getInt32(retptr + 4 * 1, true);
-    deferred4_0 = r0;
-    deferred4_1 = r1;
+    deferred5_0 = r0;
+    deferred5_1 = r1;
     return getStringFromWasm03(r0, r1);
   } finally {
     wasm3.__wbindgen_add_to_stack_pointer(16);
-    wasm3.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+    wasm3.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
   }
 }
 function info3(info_type, format, bit, pretty, indent, include_deprecated, only_deprecated, full, language) {
@@ -2047,7 +2069,7 @@ var bitmark_json_wasm_default = __wbg_init3;
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "author": "Get More Brain Ltd <info@getmorebrain.com>",
   "license": "ISC",
   "description": "A parser for bitmark text, powered by WebAssembly."
@@ -2067,6 +2089,18 @@ var RegisterError = class extends Error {
     this.name = "RegisterError";
   }
 };
+var PatchError = class extends Error {
+  constructor(diagnostics2) {
+    const lines = diagnostics2.map((d) => `${d.kind} at ${d.path}: ${d.message}`);
+    super(
+      `${diagnostics2.length} patch ${diagnostics2.length === 1 ? "entry was" : "entries were"} skipped:
+` + lines.join("\n")
+    );
+    __publicField(this, "diagnostics");
+    this.name = "PatchError";
+    this.diagnostics = diagnostics2;
+  }
+};
 var UnsupportedFeatureError = class extends Error {
   constructor(what, active2) {
     super(
@@ -2173,6 +2207,18 @@ function planTransform(wasm4, input, options) {
         spacesAroundValues
       });
       views.push(units[item.source].view);
+    } else if (typeof item.bit === "string") {
+      const index = jobs.length;
+      jobs.push({
+        index,
+        source: item.bit,
+        inputFormat: "bitmark",
+        outputFormat: output,
+        mode,
+        patchJson: JSON.stringify(item.patch),
+        spacesAroundValues
+      });
+      views.push({ format: "bitmark", index, total, source: item.bit });
     } else {
       const bit = item.bit ?? {};
       const index = jobs.length;
@@ -2190,18 +2236,24 @@ function planTransform(wasm4, input, options) {
   }
   return { jobs, views, output, pretty, indent };
 }
+function bitOutput(envelopeJson, outputFormat) {
+  const { data, diagnostics: diagnostics2 } = JSON.parse(envelopeJson);
+  return { element: outputFormat === "json" ? stripArray(data) : data, diagnostics: diagnostics2 };
+}
 function computeBit(wasm4, job) {
-  const out = wasm4.transform(
-    job.source,
-    job.inputFormat,
-    job.outputFormat,
-    job.mode,
-    job.patchJson,
-    false,
-    2,
-    job.spacesAroundValues
+  return bitOutput(
+    wasm4.transform(
+      job.source,
+      job.inputFormat,
+      job.outputFormat,
+      job.mode,
+      job.patchJson,
+      false,
+      2,
+      job.spacesAroundValues
+    ),
+    job.outputFormat
   );
-  return job.outputFormat === "json" ? stripArray(out) : out;
 }
 function recombine(wasm4, elements, output, pretty, indent) {
   if (output !== "json") return elements.join("\n");
@@ -2211,21 +2263,29 @@ function recombine(wasm4, elements, output, pretty, indent) {
 function runHookedTransform(wasm4, input, options) {
   const plan = planTransform(wasm4, input, options);
   const rendered = [];
+  const skipped = [];
   for (let i = 0; i < plan.jobs.length; i++) {
-    const element = computeBit(wasm4, plan.jobs[i]);
+    const { element, diagnostics: diagnostics2 } = computeBit(wasm4, plan.jobs[i]);
+    skipped.push(...diagnostics2);
     options.postHook?.(plan.views[i], element);
     rendered.push(element);
   }
+  if (skipped.length > 0) throw new PatchError(skipped);
   return recombine(wasm4, rendered, plan.output, plan.pretty, plan.indent);
 }
 
 // src/core/parallel.ts
 async function orchestrateParallel(wasm4, input, options, runJobs) {
   const plan = planTransform(wasm4, input, options);
-  const elements = await runJobs(plan.jobs, options.workers ?? 4);
-  for (let i = 0; i < elements.length; i++) {
-    options.postHook?.(plan.views[i], elements[i]);
-  }
+  const outputs = await runJobs(plan.jobs, options.workers ?? 4);
+  const elements = [];
+  const skipped = [];
+  for (let i = 0; i < outputs.length; i++) {
+    elements.push(outputs[i].element);
+    skipped.push(...outputs[i].diagnostics);
+    options.postHook?.(plan.views[i], outputs[i].element);
+  }
+  if (skipped.length > 0) throw new PatchError(skipped);
   return recombine(wasm4, elements, plan.output, plan.pretty, plan.indent);
 }
 
@@ -2273,7 +2333,7 @@ function runJobsWithPool(jobs, workers, spawn) {
       const w = spawn((res) => {
         if (done) return;
         if (!res.ok) return finish(new Error(res.error ?? "worker job failed"));
-        results[res.id] = res.element;
+        results[res.id] = { element: res.element, diagnostics: res.diagnostics ?? [] };
         if (++settled === jobs.length) finish();
         else dispatch(w);
       }, finish);
@@ -2615,7 +2675,7 @@ var Builder = class {
   }
   /**
    * Look up the bit's config (`wasm.info`); throws bpg's exact
-   * unknown-bit-type error (`Config.getBitConfig` parity).
+   * bit-type-invalid error (`Config.getBitConfig` parity).
    */
   getBitConfig(bitType) {
     const wasm4 = getLegacyWasm();
@@ -3194,7 +3254,8 @@ var BodyTextFormat = {
 };
 var TextLocation = {
   tag: "tag",
-  body: "body"
+  body: "body",
+  cardBody: "cardBody"
 };
 
 // src/legacy/enums-extra.ts
@@ -3506,16 +3567,20 @@ function transform4(input, options = {}) {
     return runHookedTransform(wasm4, input, options);
   }
   const patchJson = options.patch === void 0 ? "" : typeof options.patch === "string" ? options.patch : JSON.stringify(options.patch);
-  return wasm4.transform(
-    input,
-    options.inputFormat ?? "auto",
-    options.outputFormat ?? "json",
-    options.mode ?? "optimized",
-    patchJson,
-    options.pretty ?? false,
-    options.indent ?? 2,
-    options.spacesAroundValues ?? 1
+  const { data, diagnostics: diagnostics2 } = JSON.parse(
+    wasm4.transform(
+      input,
+      options.inputFormat ?? "auto",
+      options.outputFormat ?? "json",
+      options.mode ?? "optimized",
+      patchJson,
+      options.pretty ?? false,
+      options.indent ?? 2,
+      options.spacesAroundValues ?? 1
+    )
   );
+  if (diagnostics2.length > 0) throw new PatchError(diagnostics2);
+  return data;
 }
 function diff3(a, b, options = {}) {
   const wasm4 = getActive();
@@ -3539,12 +3604,14 @@ function diffBits(a, b, options = {}) {
 function breakscapeText(input, options = {}) {
   const format = options.format ?? "bitmark++";
   const location = options.location ?? "body";
-  return getActive().breakscape_text(input, format, location);
+  const subLocation = options.subLocation ?? "text";
+  return getActive().breakscape_text(input, format, location, subLocation);
 }
 function unbreakscapeText(input, options = {}) {
   const format = options.format ?? "bitmark++";
   const location = options.location ?? "body";
-  return getActive().unbreakscape_text(input, format, location);
+  const subLocation = options.subLocation ?? "text";
+  return getActive().unbreakscape_text(input, format, location, subLocation);
 }
 function info4(options = {}) {
   const infoType = options.infoType ?? "list";
@@ -3682,6 +3749,7 @@ function transformParallel(input, options = {}) {
   CompletionItemTag,
   DiagnosticSeverity,
   NotInitializedError,
+  PatchError,
   RegisterError,
   UnsupportedFeatureError,
   bitmarkToObjects,