@gmb/bitmark-parser 6.11.0 → 6.11.1

package/dist/browser/cjs/index.cjs

@@ -31,6 +31,8 @@ __export(index_exports, {
   canonicalize: () => canonicalize4,
   convert: () => convert4,
   countBits: () => countBits,
+  diff: () => diff3,
+  diffBits: () => diffBits,
   info: () => info4,
   init: () => init,
   initSync: () => initSync4,
@@ -61,12 +63,14 @@ __export(bitmark_wasm_exports, {
   convert_text: () => convert_text,
   count_bits: () => count_bits,
   default: () => bitmark_wasm_default,
+  diff: () => diff,
   info: () => info,
   initSync: () => initSync,
   is_bitmark: () => is_bitmark,
   lex: () => lex,
   prettify: () => prettify,
   register: () => register,
+  resolve_patch_document: () => resolve_patch_document,
   split_bits: () => split_bits,
   split_json_bits: () => split_json_bits,
   transform: () => transform,
@@ -279,6 +283,50 @@ function transform(input, input_format_sel, output_format_sel, mode, patch_json,
     wasm.__wbindgen_export_2(deferred6_0, deferred6_1, 1);
   }
 }
+function resolve_patch_document(input, patch_json) {
+  let deferred3_0;
+  let deferred3_1;
+  try {
+    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+    const ptr0 = passStringToWasm0(input, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passStringToWasm0(patch_json, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN;
+    wasm.resolve_patch_document(retptr, ptr0, len0, ptr1, len1);
+    var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+    var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+    deferred3_0 = r0;
+    deferred3_1 = r1;
+    return getStringFromWasm0(r0, r1);
+  } finally {
+    wasm.__wbindgen_add_to_stack_pointer(16);
+    wasm.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
+  }
+}
+function diff(a, b, input_format_sel, output_format_sel, context, locate, similarity, bbox_tolerance, spaces_around_values) {
+  let deferred5_0;
+  let deferred5_1;
+  try {
+    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+    const ptr0 = passStringToWasm0(a, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passStringToWasm0(b, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN;
+    const ptr2 = passStringToWasm0(input_format_sel, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len2 = WASM_VECTOR_LEN;
+    const ptr3 = passStringToWasm0(output_format_sel, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len3 = WASM_VECTOR_LEN;
+    wasm.diff(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, context, locate, similarity, bbox_tolerance, spaces_around_values);
+    var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+    var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+    deferred5_0 = r0;
+    deferred5_1 = r1;
+    return getStringFromWasm0(r0, r1);
+  } finally {
+    wasm.__wbindgen_add_to_stack_pointer(16);
+    wasm.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
+  }
+}
 function register(data_type, data) {
   let deferred3_0;
   let deferred3_1;
@@ -509,12 +557,14 @@ __export(bitmark_browser_full_wasm_exports, {
   convert_text: () => convert_text2,
   count_bits: () => count_bits2,
   default: () => bitmark_browser_full_wasm_default,
+  diff: () => diff2,
   info: () => info2,
   initSync: () => initSync2,
   is_bitmark: () => is_bitmark2,
   lex: () => lex2,
   prettify: () => prettify2,
   register: () => register2,
+  resolve_patch_document: () => resolve_patch_document2,
   split_bits: () => split_bits2,
   split_json_bits: () => split_json_bits2,
   transform: () => transform2,
@@ -727,6 +777,50 @@ function transform2(input, input_format_sel, output_format_sel, mode, patch_json
     wasm2.__wbindgen_export_2(deferred6_0, deferred6_1, 1);
   }
 }
+function resolve_patch_document2(input, patch_json) {
+  let deferred3_0;
+  let deferred3_1;
+  try {
+    const retptr = wasm2.__wbindgen_add_to_stack_pointer(-16);
+    const ptr0 = passStringToWasm02(input, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    const len0 = WASM_VECTOR_LEN2;
+    const ptr1 = passStringToWasm02(patch_json, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN2;
+    wasm2.resolve_patch_document(retptr, ptr0, len0, ptr1, len1);
+    var r0 = getDataViewMemory02().getInt32(retptr + 4 * 0, true);
+    var r1 = getDataViewMemory02().getInt32(retptr + 4 * 1, true);
+    deferred3_0 = r0;
+    deferred3_1 = r1;
+    return getStringFromWasm02(r0, r1);
+  } finally {
+    wasm2.__wbindgen_add_to_stack_pointer(16);
+    wasm2.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
+  }
+}
+function diff2(a, b, input_format_sel, output_format_sel, context, locate, similarity, bbox_tolerance, spaces_around_values) {
+  let deferred5_0;
+  let deferred5_1;
+  try {
+    const retptr = wasm2.__wbindgen_add_to_stack_pointer(-16);
+    const ptr0 = passStringToWasm02(a, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    const len0 = WASM_VECTOR_LEN2;
+    const ptr1 = passStringToWasm02(b, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN2;
+    const ptr2 = passStringToWasm02(input_format_sel, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    const len2 = WASM_VECTOR_LEN2;
+    const ptr3 = passStringToWasm02(output_format_sel, wasm2.__wbindgen_export_0, wasm2.__wbindgen_export_1);
+    const len3 = WASM_VECTOR_LEN2;
+    wasm2.diff(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, context, locate, similarity, bbox_tolerance, spaces_around_values);
+    var r0 = getDataViewMemory02().getInt32(retptr + 4 * 0, true);
+    var r1 = getDataViewMemory02().getInt32(retptr + 4 * 1, true);
+    deferred5_0 = r0;
+    deferred5_1 = r1;
+    return getStringFromWasm02(r0, r1);
+  } finally {
+    wasm2.__wbindgen_add_to_stack_pointer(16);
+    wasm2.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
+  }
+}
 function register2(data_type, data) {
   let deferred3_0;
   let deferred3_1;
@@ -962,6 +1056,7 @@ __export(bitmark_json_wasm_exports, {
   is_bitmark: () => is_bitmark3,
   prettify: () => prettify3,
   register: () => register3,
+  resolve_patch_document: () => resolve_patch_document3,
   split_bits: () => split_bits3,
   split_json_bits: () => split_json_bits3,
   transform: () => transform3,
@@ -1150,6 +1245,26 @@ function transform3(input, input_format_sel, output_format_sel, mode, patch_json
     wasm3.__wbindgen_export_2(deferred6_0, deferred6_1, 1);
   }
 }
+function resolve_patch_document3(input, patch_json) {
+  let deferred3_0;
+  let deferred3_1;
+  try {
+    const retptr = wasm3.__wbindgen_add_to_stack_pointer(-16);
+    const ptr0 = passStringToWasm03(input, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
+    const len0 = WASM_VECTOR_LEN3;
+    const ptr1 = passStringToWasm03(patch_json, wasm3.__wbindgen_export_0, wasm3.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN3;
+    wasm3.resolve_patch_document(retptr, ptr0, len0, ptr1, len1);
+    var r0 = getDataViewMemory03().getInt32(retptr + 4 * 0, true);
+    var r1 = getDataViewMemory03().getInt32(retptr + 4 * 1, true);
+    deferred3_0 = r0;
+    deferred3_1 = r1;
+    return getStringFromWasm03(r0, r1);
+  } finally {
+    wasm3.__wbindgen_add_to_stack_pointer(16);
+    wasm3.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
+  }
+}
 function convert3(input, input_format_sel, output_format_sel, mode, pretty, indent, spaces_around_values, include_unknown_properties, mapping_report) {
   let deferred5_0;
   let deferred5_1;
@@ -1378,7 +1493,7 @@ var bitmark_json_wasm_default = __wbg_init3;
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "author": "Get More Brain Ltd <info@getmorebrain.com>",
   "license": "ISC",
   "description": "A parser for bitmark text, powered by WebAssembly."
@@ -1442,13 +1557,10 @@ function stripArray(doc) {
   const t = doc.trim();
   return t.startsWith("[") && t.endsWith("]") ? t.slice(1, -1) : doc;
 }
-function normalisePatch(patch) {
-  if (patch === void 0) return [];
-  if (typeof patch === "string") {
-    const trimmed = patch.trim();
-    return trimmed === "" ? [] : JSON.parse(trimmed);
-  }
-  return patch;
+function patchJsonOf(patch) {
+  if (patch === void 0) return "";
+  if (typeof patch === "string") return patch.trim();
+  return JSON.stringify(patch);
 }
 function buildUnits(wasm4, input, inputIsBitmark) {
   if (inputIsBitmark) {
@@ -1478,28 +1590,56 @@ function planTransform(wasm4, input, options) {
   const sel = options.inputFormat ?? "auto";
   const inputIsBitmark = sel === "bitmark" || sel !== "json" && wasm4.is_bitmark(input);
   const inputFormat = inputIsBitmark ? "bitmark" : "json";
-  const staticPatch = normalisePatch(options.patch);
   const units = buildUnits(wasm4, input, inputIsBitmark);
   const total = units.length;
-  const jobs = [];
-  const views = [];
+  const hooked = [];
   for (let index = 0; index < total; index++) {
-    const { view, source } = units[index];
+    const { view } = units[index];
     view.index = index;
     view.total = total;
     const result = options.preHook ? options.preHook(view) || {} : {};
-    if (result.drop) continue;
-    const patches = result.patches ? [...staticPatch, ...result.patches] : staticPatch;
-    jobs.push({
-      index,
-      source,
-      inputFormat,
-      outputFormat: result.outputFormat ?? output,
-      mode,
-      patchJson: JSON.stringify(patches),
-      spacesAroundValues
-    });
-    views.push(view);
+    hooked.push(result.drop ? null : { patches: result.patches ?? [], outputFormat: result.outputFormat ?? output });
+  }
+  const patchJson = patchJsonOf(options.patch);
+  let resolved;
+  if (patchJson === "") {
+    resolved = units.map((_, index) => ({ source: index, bit: null, patch: [] }));
+  } else {
+    const out = wasm4.resolve_patch_document(input, patchJson);
+    if (isError(out)) throw new Error(out);
+    resolved = JSON.parse(out);
+  }
+  const jobs = [];
+  const views = [];
+  for (const item of resolved) {
+    if (item.source !== null) {
+      const hook = hooked[item.source];
+      if (!hook) continue;
+      jobs.push({
+        index: item.source,
+        source: units[item.source].source,
+        inputFormat,
+        outputFormat: hook.outputFormat,
+        mode,
+        // The document's patches first, the hook's after (the hook contract).
+        patchJson: JSON.stringify([...item.patch, ...hook.patches]),
+        spacesAroundValues
+      });
+      views.push(units[item.source].view);
+    } else {
+      const bit = item.bit ?? {};
+      const index = jobs.length;
+      jobs.push({
+        index,
+        source: JSON.stringify([{ bit }]),
+        inputFormat: "json",
+        outputFormat: output,
+        mode,
+        patchJson: JSON.stringify(item.patch),
+        spacesAroundValues
+      });
+      views.push({ format: "json", index, total, bit });
+    }
   }
   return { jobs, views, output, pretty, indent };
 }
@@ -2803,6 +2943,26 @@ function transform4(input, options = {}) {
     options.spacesAroundValues ?? 1
   );
 }
+function diff3(a, b, options = {}) {
+  const wasm4 = getActive();
+  if (typeof wasm4.diff !== "function") throw new UnsupportedFeatureError("diff", variant());
+  const out = wasm4.diff(
+    a,
+    b,
+    options.inputFormat ?? "auto",
+    options.outputFormat ?? "bitmark",
+    options.context ?? 3,
+    options.locate ?? false,
+    options.similarity ?? 0.6,
+    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 = {}) {
+  return JSON.parse(diff3(a, b, { ...options, outputFormat: "json" }));
+}
 function breakscapeText(input, options = {}) {
   const format = options.format ?? "bitmark++";
   const location = options.location ?? "body";
@@ -2939,6 +3099,8 @@ function transformParallel(input, options = {}) {
   canonicalize,
   convert,
   countBits,
+  diff,
+  diffBits,
   info,
   init,
   initSync,