@gmb/bitmark-parser 6.11.1 → 7.1.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": "6.11.1",
+  "version": "7.1.0",
   "author": "Get More Brain Ltd <info@getmorebrain.com>",
   "license": "ISC",
   "description": "A parser for bitmark text, powered by WebAssembly."
@@ -49,8 +49,11 @@ function getActive() {
 }
 function setActive(feature, module) {
   for (const [type, data] of registrations) {
-    const error = module.register(type, data);
-    if (error) throw new RegisterError(error.replace(/^error:\s*/, ""));
+    try {
+      module.register(type, data);
+    } catch (e) {
+      throw new RegisterError(e instanceof Error ? e.message : String(e));
+    }
   }
   active = module;
   activeFeature = feature;
@@ -66,13 +69,6 @@ function variant() {
 }
 
 // src/core/hooked-transform.ts
-function isError(s) {
-  return s.startsWith("error:");
-}
-function errorString(e) {
-  const m = e instanceof Error ? e.message : String(e);
-  return m.startsWith("error:") ? m : `error: ${m}`;
-}
 function stripArray(doc) {
   const t = doc.trim();
   return t.startsWith("[") && t.endsWith("]") ? t.slice(1, -1) : doc;
@@ -84,17 +80,13 @@ function patchJsonOf(patch) {
 }
 function buildUnits(wasm, input, inputIsBitmark) {
   if (inputIsBitmark) {
-    const out2 = wasm.split_bits(input);
-    if (isError(out2)) throw new Error(out2);
-    const slices = JSON.parse(out2);
+    const slices = JSON.parse(wasm.split_bits(input));
     return slices.map((s) => ({
       view: { format: "bitmark", index: s.index, total: slices.length, source: s.source },
       source: s.source
     }));
   }
-  const out = wasm.split_json_bits(input);
-  if (isError(out)) throw new Error(out);
-  const envelopes = JSON.parse(out);
+  const envelopes = JSON.parse(wasm.split_json_bits(input));
   return envelopes.map((env, index) => ({
     view: { format: "json", index, total: envelopes.length, bit: env.bit ?? {} },
     // Per-bit transform consumes a one-bit JSON document.
@@ -110,6 +102,7 @@ function planTransform(wasm, input, options) {
   const sel = options.inputFormat ?? "auto";
   const inputIsBitmark = sel === "bitmark" || sel !== "json" && wasm.is_bitmark(input);
   const inputFormat = inputIsBitmark ? "bitmark" : "json";
+  wasm.transform("", "bitmark", output, mode, "", false, indent, spacesAroundValues);
   const units = buildUnits(wasm, input, inputIsBitmark);
   const total = units.length;
   const hooked = [];
@@ -125,9 +118,9 @@ function planTransform(wasm, input, options) {
   if (patchJson === "") {
     resolved = units.map((_, index) => ({ source: index, bit: null, patch: [] }));
   } else {
-    const out = wasm.resolve_patch_document(input, patchJson);
-    if (isError(out)) throw new Error(out);
-    resolved = JSON.parse(out);
+    resolved = JSON.parse(
+      wasm.resolve_patch_document(input, inputFormat, patchJson)
+    );
   }
   const jobs = [];
   const views = [];
@@ -174,25 +167,18 @@ function computeBit(wasm, job) {
     2,
     job.spacesAroundValues
   );
-  if (isError(out)) return out;
   return job.outputFormat === "json" ? stripArray(out) : out;
 }
 function recombine(wasm, elements, output, pretty, indent) {
-  if (output === "bitmark" || output === "text") return elements.join("\n");
+  if (output !== "json") return elements.join("\n");
   const arr = `[${elements.join(",")}]`;
   return pretty ? wasm.prettify(arr, indent) : arr;
 }
 function runHookedTransform(wasm, input, options) {
-  let plan;
-  try {
-    plan = planTransform(wasm, input, options);
-  } catch (e) {
-    return errorString(e);
-  }
+  const plan = planTransform(wasm, input, options);
   const rendered = [];
   for (let i = 0; i < plan.jobs.length; i++) {
     const element = computeBit(wasm, plan.jobs[i]);
-    if (isError(element)) return element;
     options.postHook?.(plan.views[i], element);
     rendered.push(element);
   }
@@ -201,20 +187,9 @@ function runHookedTransform(wasm, input, options) {
 
 // src/core/parallel.ts
 async function orchestrateParallel(wasm, input, options, runJobs) {
-  let plan;
-  try {
-    plan = planTransform(wasm, input, options);
-  } catch (e) {
-    return errorString(e);
-  }
-  let elements;
-  try {
-    elements = await runJobs(plan.jobs, options.workers ?? 4);
-  } catch (e) {
-    return errorString(e);
-  }
+  const plan = planTransform(wasm, input, options);
+  const elements = await runJobs(plan.jobs, options.workers ?? 4);
   for (let i = 0; i < elements.length; i++) {
-    if (isError(elements[i])) return elements[i];
     options.postHook?.(plan.views[i], elements[i]);
   }
   return recombine(wasm, elements, plan.output, plan.pretty, plan.indent);
@@ -223,62 +198,57 @@ async function orchestrateParallel(wasm, input, options, runJobs) {
 // src/node/pool.ts
 import { fileURLToPath } from "url";
 import { Worker } from "worker_threads";
-function workerPath() {
-  return fileURLToPath(new URL("./worker-entry.cjs", import.meta.url));
-}
-function runJobsParallel(jobs, workers, feature) {
+
+// src/core/pool.ts
+function runJobsWithPool(jobs, workers, spawn) {
   if (jobs.length === 0) return Promise.resolve([]);
   const poolSize = Math.max(1, Math.min(workers, jobs.length));
-  const path2 = workerPath();
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const results = new Array(jobs.length);
     let next = 0;
     let settled = 0;
     let done = false;
     const pool = [];
-    const shutdown = () => {
-      for (const w of pool) void w.terminate();
-    };
-    const fail = (err) => {
+    const finish = (err) => {
       if (done) return;
       done = true;
-      shutdown();
-      reject(err);
+      for (const w of pool) w.terminate();
+      if (err) reject(err);
+      else resolve2(results);
     };
     const dispatch = (w) => {
-      if (done) return;
-      if (next >= jobs.length) return;
+      if (done || next >= jobs.length) return;
       const id = next++;
-      w.postMessage({ id, job: jobs[id] });
+      w.post({ id, job: jobs[id] });
     };
     for (let i = 0; i < poolSize; i++) {
-      const w = new Worker(path2, { workerData: { feature } });
-      pool.push(w);
-      w.on("message", (res) => {
+      const w = spawn((res) => {
         if (done) return;
-        if (!res.ok) {
-          fail(new Error(res.error ?? "worker job failed"));
-          return;
-        }
+        if (!res.ok) return finish(new Error(res.error ?? "worker job failed"));
         results[res.id] = res.element;
-        settled++;
-        if (settled === jobs.length) {
-          done = true;
-          shutdown();
-          resolve(results);
-          return;
-        }
-        dispatch(w);
-      });
-      w.on("error", fail);
-      w.on("exit", (code) => {
-        if (!done && code !== 0) fail(new Error(`worker exited with code ${code}`));
-      });
+        if (++settled === jobs.length) finish();
+        else dispatch(w);
+      }, finish);
+      pool.push(w);
     }
     for (const w of pool) dispatch(w);
   });
 }
 
+// src/node/pool.ts
+function runJobsParallel(jobs, workers, feature) {
+  const path2 = fileURLToPath(new URL("./worker-entry.cjs", import.meta.url));
+  return runJobsWithPool(jobs, workers, (onResult, onError) => {
+    const w = new Worker(path2, { workerData: { feature } });
+    w.on("message", (res) => onResult(res));
+    w.on("error", onError);
+    w.on("exit", (code) => {
+      if (code !== 0) onError(new Error(`worker exited with code ${code}`));
+    });
+    return { post: (msg) => w.postMessage(msg), terminate: () => void w.terminate() };
+  });
+}
+
 // src/node/transform-parallel.ts
 function runParallelTransform(wasm, input, options) {
   const feature = variant() ?? "full";
@@ -569,10 +539,7 @@ var Builder = class {
       }
     }
     this.parseStringTexts(bit);
-    const out = wasm.convert(JSON.stringify([{ bit }]), "json", "json", "optimized", false, 2, 1, false, false);
-    if (out.startsWith("error:")) {
-      throw new Error(out.slice("error:".length).trim());
-    }
+    const out = wasm.convert(JSON.stringify([{ bit }]), "json", "json", "optimized", false, 2, 1, false, false, "", "");
     const entries = JSON.parse(out);
     const built = entries[0]?.bit ?? bit;
     for (const [key, value] of Object.entries(bit)) {
@@ -709,8 +676,7 @@ var BitmarkParserGenerator = class {
     const emit = coreFormat === "bitmark" ? prettyIndent(bitmarkOptions.prettifyJson) : { pretty, indent };
     const spaces = spacesAround(bitmarkOptions.spacesAroundValues);
     const includeUnknown = !jsonOptions.excludeUnknownProperties;
-    const out = wasm.convert(source, isBitmark ? "bitmark" : "json", coreFormat, "optimized", emit.pretty, emit.indent, spaces, includeUnknown, false);
-    this.throwOnError(out);
+    const out = wasm.convert(source, isBitmark ? "bitmark" : "json", coreFormat, "optimized", emit.pretty, emit.indent, spaces, includeUnknown, false, "", "");
     if (outputFormat === "bitmark" || outputFormat === "text") {
       return this.deliver(out, opts.outputFile, opts.fileOptions);
     }
@@ -744,7 +710,6 @@ var BitmarkParserGenerator = class {
     );
     const spaces = spacesAround(bitmarkOptions.spacesAroundValues);
     const out = wasm.canonicalize(source, isBitmark ? "bitmark" : "json", "optimized", pretty, indent, spaces);
-    this.throwOnError(out);
     if (isBitmark) return this.deliver(out, opts.outputFile, opts.fileOptions);
     if (opts.outputFile) return this.deliver(out, opts.outputFile, opts.fileOptions);
     if (pretty || jsonOptions.stringify) return out;
@@ -761,7 +726,6 @@ var BitmarkParserGenerator = class {
     const { pretty, indent } = prettyIndent(opts.prettify);
     const coreFormat = format === "pojo" ? "json" : format;
     const out = wasm.info(type, coreFormat, opts.bit ?? "", pretty, indent, false, false, true, "");
-    this.throwOnError(out);
     if (format === "pojo") return JSON.parse(out);
     return out;
   }
@@ -793,8 +757,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 = wasm.convert(source, isBitmark ? "bitmark" : "json", "html", "optimized", false, 2, 1, false, false);
-      this.throwOnError(out2);
+      const out2 = wasm.convert(source, isBitmark ? "bitmark" : "json", "html", "optimized", false, 2, 1, false, false, "", "");
       return this.deliver(extractHtmlTables(out2).join("\n"), opts.outputFile, opts.fileOptions);
     }
     const bitType = opts.tableFormat === "table" ? "table" : "table-extended";
@@ -803,13 +766,11 @@ var BitmarkParserGenerator = class {
     const { pretty, indent } = prettyIndent(jsonOptions.prettify);
     const spaces = spacesAround(bitmarkOptions.spacesAroundValues);
     if (outputFormat === "html") {
-      const out2 = wasm.convert(wrapped, "html", "html", "optimized", false, 2, 1, false, false);
-      this.throwOnError(out2);
+      const out2 = wasm.convert(wrapped, "html", "html", "optimized", false, 2, 1, false, false, "", "");
       return this.deliver(extractHtmlTables(out2).join("\n"), opts.outputFile, opts.fileOptions);
     }
     const coreFormat = outputFormat === "ast" ? "json" : outputFormat;
-    const out = wasm.convert(wrapped, "html", coreFormat, "optimized", pretty, indent, spaces, false, false);
-    this.throwOnError(out);
+    const out = wasm.convert(wrapped, "html", coreFormat, "optimized", pretty, indent, spaces, false, false, "", "");
     if (outputFormat === "bitmark" || outputFormat === "text") {
       return this.deliver(out, opts.outputFile, opts.fileOptions);
     }
@@ -833,8 +794,7 @@ var BitmarkParserGenerator = class {
     const opts = Object.assign({}, options);
     const wasm = getLegacyWasm();
     const { source, isBitmark } = this.resolveInput(input, opts.inputFormat);
-    const out = wasm.convert(source, isBitmark ? "bitmark" : "json", "json", "optimized", false, 2, 1, true, false);
-    this.throwOnError(out);
+    const out = wasm.convert(source, isBitmark ? "bitmark" : "json", "json", "optimized", false, 2, 1, true, false, "", "");
     return makePseudoAst(JSON.parse(out));
   }
   /**
@@ -886,11 +846,9 @@ var BitmarkParserGenerator = class {
     }
     if (ast !== void 0) {
       const out2 = isBitmarkText ? wasm.convert_text(JSON.stringify(ast), "astToText", "bitmark++", textLocation) : wasm.convert_text(JSON.stringify(ast), "astToPlainText", "plainText", textLocation);
-      this.throwOnError(out2);
       return this.deliver(out2, opts.outputFile, opts.fileOptions);
     }
     const out = wasm.convert_text(inStr, "textToAst", isBitmarkText ? "bitmark++" : "plainText", "body");
-    this.throwOnError(out);
     const { pretty, indent } = prettyIndent(jsonOptions.prettify);
     const outStr = pretty ? wasm.prettify(out, indent) : out;
     if (opts.outputFile) return this.deliver(outStr, opts.outputFile, opts.fileOptions);
@@ -908,7 +866,6 @@ var BitmarkParserGenerator = class {
       "bitmark++",
       "body"
     );
-    this.throwOnError(out);
     return out;
   }
   /**
@@ -923,7 +880,6 @@ var BitmarkParserGenerator = class {
     if (inputFormat === "bitmarkText") {
       const ast = wasm.convert_text(String(input), "textToAst", "bitmark++", "body");
       const out2 = wasm.convert_text(ast, "astToPlainText", "bitmark++", "body");
-      this.throwOnError(out2);
       return out2;
     }
     if (typeof input === "string" && this.parseTextAstString(input) === void 0 && !wasm.is_bitmark(input)) {
@@ -940,8 +896,7 @@ var BitmarkParserGenerator = class {
       }
     }
     const { source, isBitmark } = this.resolveInput(input, void 0);
-    const out = wasm.convert(source, isBitmark ? "bitmark" : "json", "text", "optimized", false, 2, 1, false, false);
-    this.throwOnError(out);
+    const out = wasm.convert(source, isBitmark ? "bitmark" : "json", "text", "optimized", false, 2, 1, false, false, "", "");
     return out;
   }
   /** If `s` parses as a TextAst JSON array, return it. */
@@ -1045,12 +1000,6 @@ var BitmarkParserGenerator = class {
       encoding: fileOptions?.encoding ?? "utf8"
     });
   }
-  /** The core reports failures as `error:`-prefixed strings; bpg throws. */
-  throwOnError(out) {
-    if (out.startsWith("error:")) {
-      throw new Error(out.slice("error:".length).trim());
-    }
-  }
 };
 function extractHtmlTables(html) {
   const tables = [];
@@ -1087,7 +1036,6 @@ function extractHtmlTables(html) {
 }
 function bitmarkTextParse(text) {
   const out = getLegacyWasm().convert_text(text, "textToAst", "bitmark++", "body");
-  if (out.startsWith("error:")) throw new Error(out.slice("error:".length).trim());
   return JSON.parse(out);
 }
 
@@ -1410,6 +1358,24 @@ var StringWriter = stubClass("StringWriter", INTERNAL_REASON);
 var FileWriter = stubClass("FileWriter", INTERNAL_REASON);
 var StreamWriter = stubClass("StreamWriter", INTERNAL_REASON);
 
+// src/editor-types.ts
+var DiagnosticSeverity = {
+  Error: 1,
+  Warning: 2,
+  Information: 3,
+  Hint: 4
+};
+var CompletionItemKind = {
+  Class: 7,
+  Property: 10,
+  Value: 12,
+  Keyword: 14,
+  Snippet: 15,
+  EnumMember: 20,
+  TypeParameter: 25
+};
+var CompletionItemTag = { Deprecated: 1 };
+
 // src/types.ts
 function patchEntry(path2, op, value) {
   return value === void 0 ? { path: path2, op } : { path: path2, op, value };
@@ -1417,11 +1383,6 @@ function patchEntry(path2, op, value) {
 var ALL_LANGUAGES = "all";
 
 // src/core/api.ts
-function lex(input, options = {}) {
-  const wasm = getActive();
-  if (typeof wasm.lex !== "function") throw new UnsupportedFeatureError("lex", variant());
-  return wasm.lex(input, options.stage ?? "lex");
-}
 function bitmarkToObjects(input, options = {}) {
   const out = getActive().convert(
     input,
@@ -1432,9 +1393,10 @@ function bitmarkToObjects(input, options = {}) {
     2,
     1,
     options.includeUnknownProperties ?? false,
-    false
+    false,
+    "",
+    ""
   );
-  if (out.startsWith("error:")) throw new Error(out.slice("error:".length).trim());
   return JSON.parse(out);
 }
 function objectsToBitmark(bits, options = {}) {
@@ -1450,9 +1412,10 @@ function objectsToBitmark(bits, options = {}) {
     2,
     1,
     false,
-    false
+    false,
+    "",
+    ""
   );
-  if (out.startsWith("error:")) throw new Error(out.slice("error:".length).trim());
   return out;
 }
 function convert(input, options = {}) {
@@ -1465,7 +1428,65 @@ function convert(input, options = {}) {
     options.indent ?? 2,
     options.spacesAroundValues ?? 1,
     options.includeUnknownProperties ?? false,
-    options.mappingReport ?? false
+    options.mappingReport ?? false,
+    options.positionEncoding ?? "",
+    options.tokensLayout ?? ""
+  );
+}
+function semanticTokens(input, options = {}) {
+  return JSON.parse(
+    convert(input, {
+      inputFormat: "bitmark",
+      outputFormat: "semantic-tokens",
+      positionEncoding: options.positionEncoding,
+      tokensLayout: options.tokensLayout
+    })
+  );
+}
+function diagnostics(input, options = {}) {
+  return JSON.parse(
+    convert(input, {
+      inputFormat: "bitmark",
+      outputFormat: "diagnostics",
+      positionEncoding: options.positionEncoding
+    })
+  );
+}
+function complete(input, position, options = {}) {
+  const wasm = getActive();
+  if (typeof wasm.complete !== "function") throw new UnsupportedFeatureError("complete", variant());
+  return JSON.parse(
+    wasm.complete(
+      input,
+      position.line,
+      position.character,
+      options.positionEncoding ?? "",
+      options.includeDeprecated ?? false,
+      options.triggerCharacter ?? ""
+    )
+  );
+}
+function resolve(input, position, item, options = {}) {
+  const wasm = getActive();
+  if (typeof wasm.resolve !== "function") throw new UnsupportedFeatureError("resolve", variant());
+  const resolved = JSON.parse(
+    wasm.resolve(
+      input,
+      position.line,
+      position.character,
+      options.positionEncoding ?? "",
+      options.includeDeprecated ?? false,
+      item.label,
+      item.kind
+    )
+  );
+  return resolved ?? item;
+}
+function hover(input, position, options = {}) {
+  const wasm = getActive();
+  if (typeof wasm.hover !== "function") throw new UnsupportedFeatureError("hover", variant());
+  return JSON.parse(
+    wasm.hover(input, position.line, position.character, options.positionEncoding ?? "")
   );
 }
 function canonicalize(input, options = {}) {
@@ -1479,9 +1500,7 @@ function canonicalize(input, options = {}) {
   );
 }
 function countBits(input) {
-  const out = getActive().count_bits(input);
-  if (out.startsWith("error:")) throw new Error(out);
-  return Number.parseInt(out, 10);
+  return Number.parseInt(getActive().count_bits(input), 10);
 }
 function splitBits(input) {
   return JSON.parse(getActive().split_bits(input));
@@ -1517,7 +1536,6 @@ function diff(a, b, options = {}) {
     options.bboxTolerance ?? 8,
     options.spacesAroundValues ?? 0
   );
-  if (out.startsWith("error:")) throw new Error(out.slice("error:".length).trim());
   return out;
 }
 function diffBits(a, b, options = {}) {
@@ -1543,7 +1561,11 @@ function info(options = {}) {
   const onlyDeprecated = options.onlyDeprecated ?? false;
   const full = options.full ?? false;
   const language = typeof options.language === "string" ? options.language : options.language?.join(",") ?? "";
-  return getActive().info(
+  const wasm = getActive();
+  if (format !== "json" && typeof wasm.info_text_supported !== "function") {
+    throw new UnsupportedFeatureError('info (format: "text")', variant());
+  }
+  return wasm.info(
     infoType,
     format,
     bit,
@@ -1556,8 +1578,11 @@ function info(options = {}) {
   );
 }
 function register(options) {
-  const result = getActive().register(options.type, options.data);
-  if (result) throw new RegisterError(result.replace(/^error:\s*/, ""));
+  try {
+    getActive().register(options.type, options.data);
+  } catch (e) {
+    throw new RegisterError(e instanceof Error ? e.message : String(e));
+  }
   rememberRegistration(options.type, options.data);
 }
 
@@ -1592,24 +1617,31 @@ function transformParallel(input, options = {}) {
 }
 export {
   ALL_LANGUAGES,
+  CompletionItemKind,
+  CompletionItemTag,
+  DiagnosticSeverity,
   NotInitializedError,
   RegisterError,
   UnsupportedFeatureError,
   bitmarkToObjects,
   breakscapeText,
   canonicalize,
+  complete,
   convert,
   countBits,
+  diagnostics,
   diff,
   diffBits,
+  hover,
   info,
   init,
   initSync,
   legacy_exports as legacy,
-  lex,
   objectsToBitmark,
   patchEntry,
   register,
+  resolve,
+  semanticTokens,
   splitBits,
   transform,
   transformParallel,