@gmb/bitmark-parser 7.2.0 → 7.4.0

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": "7.2.0",
+  "version": "7.4.0",
   "author": "Get More Brain Ltd <info@getmorebrain.com>",
   "license": "ISC",
   "description": "A parser for bitmark text, powered by WebAssembly."
@@ -30,6 +30,18 @@ var RegisterError = class extends Error {
     this.name = "RegisterError";
   }
 };
+var PatchError = class extends Error {
+  diagnostics;
+  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")
+    );
+    this.name = "PatchError";
+    this.diagnostics = diagnostics2;
+  }
+};
 var UnsupportedFeatureError = class extends Error {
   constructor(what, active2) {
     super(
@@ -139,6 +151,18 @@ function planTransform(wasm, 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;
@@ -156,18 +180,24 @@ function planTransform(wasm, 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(wasm, job) {
-  const out = wasm.transform(
-    job.source,
-    job.inputFormat,
-    job.outputFormat,
-    job.mode,
-    job.patchJson,
-    false,
-    2,
-    job.spacesAroundValues
+  return bitOutput(
+    wasm.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(wasm, elements, output, pretty, indent) {
   if (output !== "json") return elements.join("\n");
@@ -177,21 +207,29 @@ function recombine(wasm, elements, output, pretty, indent) {
 function runHookedTransform(wasm, input, options) {
   const plan = planTransform(wasm, input, options);
   const rendered = [];
+  const skipped = [];
   for (let i = 0; i < plan.jobs.length; i++) {
-    const element = computeBit(wasm, plan.jobs[i]);
+    const { element, diagnostics: diagnostics2 } = computeBit(wasm, 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(wasm, rendered, plan.output, plan.pretty, plan.indent);
 }
 
 // src/core/parallel.ts
 async function orchestrateParallel(wasm, input, options, runJobs) {
   const plan = planTransform(wasm, 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(wasm, elements, plan.output, plan.pretty, plan.indent);
 }
 
@@ -225,7 +263,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);
@@ -622,7 +660,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 wasm = getLegacyWasm();
@@ -1199,7 +1237,8 @@ var BodyTextFormat = {
 };
 var TextLocation = {
   tag: "tag",
-  body: "body"
+  body: "body",
+  cardBody: "cardBody"
 };
 
 // src/legacy/enums-extra.ts
@@ -1511,16 +1550,20 @@ function transform(input, options = {}) {
     return runHookedTransform(wasm, input, options);
   }
   const patchJson = options.patch === void 0 ? "" : typeof options.patch === "string" ? options.patch : JSON.stringify(options.patch);
-  return wasm.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(
+    wasm.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 diff(a, b, options = {}) {
   const wasm = getActive();
@@ -1544,12 +1587,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 info(options = {}) {
   const infoType = options.infoType ?? "list";
@@ -1621,6 +1666,7 @@ export {
   CompletionItemTag,
   DiagnosticSeverity,
   NotInitializedError,
+  PatchError,
   RegisterError,
   UnsupportedFeatureError,
   bitmarkToObjects,