@gmb/bitmark-parser 6.1.2 → 6.1.3

package/wasm/bitmark_wasm.js

@@ -394,83 +394,101 @@ module.exports.convert = function(input, input_format_sel, output_format_sel, mo
 
 /**
  * Re-emit input in its own format at optimized mode (omit natural defaults).
+ *
+ * `input_format`: `"auto"` (default) | `"bitmark"` | `"json"` | any config
+ * mapping id (`html`, `xml`, …). The output is re-emitted in this same format.
  * @param {string} input
+ * @param {string} input_format_sel
  * @param {boolean} pretty
  * @param {number} indent
  * @returns {string}
  */
-module.exports.optimize = function(input, pretty, indent) {
-    let deferred2_0;
-    let deferred2_1;
+module.exports.optimize = function(input, input_format_sel, pretty, indent) {
+    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;
-        wasm.optimize(retptr, ptr0, len0, pretty, indent);
+        const ptr1 = passStringToWasm0(input_format_sel, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len1 = WASM_VECTOR_LEN;
+        wasm.optimize(retptr, ptr0, len0, ptr1, len1, pretty, indent);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        deferred2_0 = r0;
-        deferred2_1 = r1;
+        deferred3_0 = r0;
+        deferred3_1 = r1;
         return getStringFromWasm0(r0, r1);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred2_0, deferred2_1, 1);
+        wasm.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
     }
 };
 
 /**
  * Re-emit input in its own format at full mode (all keys).
+ *
+ * `input_format`: `"auto"` (default) | `"bitmark"` | `"json"` | any config
+ * mapping id (`html`, `xml`, …). The output is re-emitted in this same format.
  * @param {string} input
+ * @param {string} input_format_sel
  * @param {boolean} pretty
  * @param {number} indent
  * @returns {string}
  */
-module.exports.fullize = function(input, pretty, indent) {
-    let deferred2_0;
-    let deferred2_1;
+module.exports.fullize = function(input, input_format_sel, pretty, indent) {
+    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;
-        wasm.fullize(retptr, ptr0, len0, pretty, indent);
+        const ptr1 = passStringToWasm0(input_format_sel, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len1 = WASM_VECTOR_LEN;
+        wasm.fullize(retptr, ptr0, len0, ptr1, len1, pretty, indent);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        deferred2_0 = r0;
-        deferred2_1 = r1;
+        deferred3_0 = r0;
+        deferred3_1 = r1;
         return getStringFromWasm0(r0, r1);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred2_0, deferred2_1, 1);
+        wasm.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
     }
 };
 
 /**
  * Re-emit input in its own format in canonical form at `mode`.
+ *
+ * `input_format`: `"auto"` (default) | `"bitmark"` | `"json"` | any config
+ * mapping id (`html`, `xml`, …). The output is re-emitted in this same format.
  * @param {string} input
+ * @param {string} input_format_sel
  * @param {string} mode
  * @param {boolean} pretty
  * @param {number} indent
  * @param {number} spaces_around_values
  * @returns {string}
  */
-module.exports.canonicalize = function(input, mode, pretty, indent, spaces_around_values) {
-    let deferred3_0;
-    let deferred3_1;
+module.exports.canonicalize = function(input, input_format_sel, mode, pretty, indent, spaces_around_values) {
+    let deferred4_0;
+    let deferred4_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(mode, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const ptr1 = passStringToWasm0(input_format_sel, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
         const len1 = WASM_VECTOR_LEN;
-        wasm.canonicalize(retptr, ptr0, len0, ptr1, len1, pretty, indent, spaces_around_values);
+        const ptr2 = passStringToWasm0(mode, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len2 = WASM_VECTOR_LEN;
+        wasm.canonicalize(retptr, ptr0, len0, ptr1, len1, ptr2, len2, pretty, indent, spaces_around_values);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        deferred3_0 = r0;
-        deferred3_1 = r1;
+        deferred4_0 = r0;
+        deferred4_1 = r1;
         return getStringFromWasm0(r0, r1);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
+        wasm.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
     }
 };
 

package/wasm/bitmark_wasm_bg.wasm.d.ts

@@ -2,14 +2,14 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const breakscape_text: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const canonicalize: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => void;
+export const canonicalize: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => void;
 export const convert: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number) => void;
 export const count_bits: (a: number, b: number, c: number) => void;
-export const fullize: (a: number, b: number, c: number, d: number, e: number) => void;
+export const fullize: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
 export const info: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
 export const is_bitmark: (a: number, b: number) => number;
 export const lex: (a: number, b: number, c: number, d: number, e: number) => void;
-export const optimize: (a: number, b: number, c: number, d: number, e: number) => void;
+export const optimize: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
 export const parse: (a: number, b: number, c: number, d: number, e: number) => void;
 export const prettify: (a: number, b: number, c: number, d: number) => void;
 export const split_bits: (a: number, b: number, c: number) => void;

package/wasm/package.json

@@ -4,7 +4,7 @@
     "Get More Brain Ltd <info@getmorebrain.com>"
   ],
   "description": "WebAssembly bindings for the bitmark parser",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "license": "ISC",
   "repository": {
     "type": "git",

package/bin/bitmark-parser.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-// @zen-component: NCLI-Launcher
-
-// Thin launcher: resolve the prebuilt native `bitmark` binary for this platform
-// and run it, forwarding arguments, stdio, and the exit code. PLAN-111 T1.
-
-import { spawnSync } from "node:child_process";
-import { resolveBinary } from "../lib/binary.js";
-
-let binary;
-try {
-  binary = resolveBinary(process.platform, process.arch);
-} catch (err) {
-  process.stderr.write(`${err.message}\n`);
-  process.exit(1);
-}
-
-const result = spawnSync(binary, process.argv.slice(2), { stdio: "inherit" });
-
-if (result.error) {
-  process.stderr.write(`failed to run bitmark: ${result.error.message}\n`);
-  process.exit(1);
-}
-
-process.exit(result.status === null ? 1 : result.status);

package/lib/binary.js

@@ -1,61 +0,0 @@
-// @zen-component: NCLI-Launcher
-
-// Maps the host platform to its prebuilt-binary package and resolves the binary
-// path. Logic is dependency-injected (platform, arch, requireResolve) so it is
-// unit-testable without the platform packages actually being installed.
-// PLAN-111 T1.
-
-import { createRequire } from "node:module";
-
-const require = createRequire(import.meta.url);
-
-/** Host `${process.platform} ${process.arch}` → optional-dependency package. */
-const PACKAGES = {
-  "linux x64": "@gmb/bitmark-parser-linux-x64",
-  "linux arm64": "@gmb/bitmark-parser-linux-arm64",
-  "darwin x64": "@gmb/bitmark-parser-darwin-x64",
-  "darwin arm64": "@gmb/bitmark-parser-darwin-arm64",
-  "win32 x64": "@gmb/bitmark-parser-win32-x64",
-};
-
-const SUPPORTED = Object.keys(PACKAGES)
-  .map((k) => k.replace(" ", "-"))
-  .join(", ");
-
-/** The platform package name for a platform/arch, or null if unsupported. */
-function selectPackage(platform, arch) {
-  return PACKAGES[`${platform} ${arch}`] || null;
-}
-
-/** The binary file name inside a platform package (`.exe` only on Windows). */
-function binaryName(platform) {
-  return platform === "win32" ? "bitmark.exe" : "bitmark";
-}
-
-/**
- * Resolve the absolute path to the prebuilt binary for the given platform/arch.
- * Throws a clear, actionable error when the platform is unsupported or the
- * platform package was not installed. `requireResolve` defaults to the real
- * ESM `require.resolve` (via `createRequire`).
- */
-function resolveBinary(platform, arch, requireResolve = require.resolve) {
-  const pkg = selectPackage(platform, arch);
-  if (!pkg) {
-    throw new Error(
-      `No prebuilt bitmark binary for ${platform}-${arch}.\n` +
-        `Supported platforms: ${SUPPORTED}.\n` +
-        `Install from source instead: cargo install bitmark`,
-    );
-  }
-  try {
-    return requireResolve(`${pkg}/bin/${binaryName(platform)}`);
-  } catch {
-    throw new Error(
-      `The bitmark platform package "${pkg}" is not installed.\n` +
-        `This usually means an npm install issue (optional dependencies were skipped).\n` +
-        `Try reinstalling, or install from source: cargo install bitmark`,
-    );
-  }
-}
-
-export { selectPackage, binaryName, resolveBinary, PACKAGES, SUPPORTED };