@thi.ng/wasm-api-bindgen 1.2.40 → 1.2.42

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2025-09-02T13:15:31Z
+- **Last updated**: 2025-09-25T11:10:32Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -11,6 +11,12 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [1.2.42](https://github.com/thi-ng/umbrella/tree/@thi.ng/wasm-api-bindgen@1.2.42) (2025-09-25)
+
+#### ♻️ Refactoring
+
+- simplify CLI impl via cliApp() wrapper ([f0ca0a9](https://github.com/thi-ng/umbrella/commit/f0ca0a9))
+
 ### [1.2.40](https://github.com/thi-ng/umbrella/tree/@thi.ng/wasm-api-bindgen@1.2.40) (2025-09-02)
 
 #### 🩹 Bug fixes

package/cli.js

@@ -1,19 +1,17 @@
 import {
   ARG_DRY_RUN,
-  ParseError,
   THING_HEADER,
+  cliApp,
+  configureLogLevel,
   flag,
   oneOf,
   oneOfMulti,
-  parse,
   string,
-  strings,
-  usage
+  strings
 } from "@thi.ng/args";
 import { isArray, isPlainObject, isString } from "@thi.ng/checks";
 import { illegalArgs } from "@thi.ng/errors";
 import { readJSON, readText, writeJSON, writeText } from "@thi.ng/file-io";
-import { ConsoleLogger } from "@thi.ng/logger";
 import { mutIn } from "@thi.ng/paths";
 import { dirname, join, resolve } from "node:path";
 import { C11 } from "./c11.js";
@@ -29,36 +27,6 @@ import {
 import { TYPESCRIPT } from "./typescript.js";
 import { ZIG } from "./zig.js";
 const GENERATORS = { c11: C11, ts: TYPESCRIPT, zig: ZIG };
-const argOpts = {
-  ...ARG_DRY_RUN,
-  analytics: string({
-    alias: "a",
-    hint: "FILE",
-    desc: "output file path for raw codegen analytics"
-  }),
-  config: string({
-    alias: "c",
-    hint: "FILE",
-    desc: "JSON config file with codegen options"
-  }),
-  debug: flag({
-    alias: "d",
-    default: false,
-    desc: "enable debug output & functions"
-  }),
-  lang: oneOfMulti(Object.keys(GENERATORS), {
-    alias: "l",
-    desc: "target language",
-    default: ["ts", "zig"],
-    delim: ","
-  }),
-  out: strings({ alias: "o", hint: "FILE", desc: "output file path" }),
-  string: oneOf(["slice", "ptr"], {
-    alias: "s",
-    hint: "TYPE",
-    desc: "Force string type implementation"
-  })
-};
 const PKG = readJSON(join(process.argv[2], "package.json"));
 const APP_NAME = PKG.name.split("/")[1];
 const HEADER = THING_HEADER(
@@ -66,21 +34,6 @@ const HEADER = THING_HEADER(
   PKG.version,
   "Multi-language data bindings code generator"
 );
-const usageOpts = {
-  lineWidth: process.stdout.columns,
-  prefix: `${HEADER}
-
-usage: ${APP_NAME} [OPTS] JSON-INPUT-FILE(S) ...
-       ${APP_NAME} --help
-
-`,
-  showGroupNames: true,
-  paramWidth: 32
-};
-const showUsage = () => {
-  process.stderr.write(usage(argOpts, usageOpts));
-  process.exit(1);
-};
 const invalidSpec = (path, msg) => {
   throw new Error(`invalid typedef: ${path}${msg ? ` (${msg})` : ""}`);
 };
@@ -165,47 +118,95 @@ const resolveUserCode = (ctx, conf, key) => {
     }
   }
 };
-try {
-  const result = parse(argOpts, process.argv, { start: 3, usageOpts });
-  if (!result) process.exit(1);
-  const { result: opts, rest } = result;
-  if (!rest.length) showUsage();
-  if (opts.out && opts.lang.length != opts.out.length) {
-    illegalArgs(
-      `expected ${opts.lang.length} outputs, but got ${opts.out.length}`
-    );
-  }
-  const ctx = {
-    logger: new ConsoleLogger("wasm-api", opts.debug ? "DEBUG" : "INFO"),
-    config: { global: {} },
-    opts
-  };
-  if (opts.config) {
-    opts.config = resolve(opts.config);
-    ctx.config = readJSON(opts.config, ctx.logger);
-    for (let id in ctx.config) {
-      const conf = ctx.config[id];
-      resolveUserCode(ctx, conf, "pre");
-      resolveUserCode(ctx, conf, "post");
+const CMD = {
+  desc: "",
+  opts: {},
+  inputs: [1, Infinity],
+  fn: async ({ opts, inputs, logger }) => {
+    if (opts.out && opts.lang.length !== opts.out.length) {
+      illegalArgs(
+        `expected ${opts.lang.length} outputs, but got ${opts.out.length}`
+      );
+    }
+    const ctx = {
+      logger,
+      config: { global: {} },
+      opts
+    };
+    if (opts.config) {
+      opts.config = resolve(opts.config);
+      ctx.config = readJSON(opts.config, ctx.logger);
+      for (let id in ctx.config) {
+        const conf = ctx.config[id];
+        resolveUserCode(ctx, conf, "pre");
+        resolveUserCode(ctx, conf, "post");
+      }
+    }
+    opts.debug && mutIn(ctx, ["config", "global", "debug"], true);
+    opts.string && mutIn(ctx, ["config", "global", "stringType"], opts.string);
+    const types = parseTypeSpecs(ctx, inputs);
+    generateOutputs(ctx, types);
+    if (ctx.opts.analytics) {
+      writeJSON(
+        resolve(ctx.opts.analytics),
+        types,
+        void 0,
+        "	",
+        ctx.logger
+      );
     }
   }
-  opts.debug && mutIn(ctx, ["config", "global", "debug"], true);
-  opts.string && mutIn(ctx, ["config", "global", "stringType"], opts.string);
-  const types = parseTypeSpecs(ctx, rest);
-  generateOutputs(ctx, types);
-  if (ctx.opts.analytics) {
-    writeJSON(
-      resolve(ctx.opts.analytics),
-      types,
-      void 0,
-      "	",
-      ctx.logger
-    );
+};
+cliApp({
+  name: APP_NAME,
+  start: 3,
+  opts: {
+    ...ARG_DRY_RUN,
+    analytics: string({
+      alias: "a",
+      hint: "FILE",
+      desc: "output file path for raw codegen analytics"
+    }),
+    config: string({
+      alias: "c",
+      hint: "FILE",
+      desc: "JSON config file with codegen options"
+    }),
+    debug: flag({
+      alias: "d",
+      default: false,
+      desc: "enable debug output & functions"
+    }),
+    lang: oneOfMulti(Object.keys(GENERATORS), {
+      alias: "l",
+      desc: "target language",
+      default: ["ts", "zig"],
+      delim: ","
+    }),
+    out: strings({ alias: "o", hint: "FILE", desc: "output file path" }),
+    string: oneOf(["slice", "ptr"], {
+      alias: "s",
+      hint: "TYPE",
+      desc: "Force string type implementation"
+    })
+  },
+  commands: { CMD },
+  single: true,
+  usage: {
+    lineWidth: process.stdout.columns,
+    prefix: `${HEADER}
+
+usage: ${APP_NAME} [OPTS] JSON-INPUT-FILE(S) ...
+       ${APP_NAME} --help
+`,
+    showGroupNames: true,
+    paramWidth: 32
+  },
+  ctx: async (ctx) => {
+    configureLogLevel(ctx.logger, ctx.opts.debug);
+    return ctx;
   }
-} catch (e) {
-  if (!(e instanceof ParseError)) process.stderr.write(e.message);
-  process.exit(1);
-}
+});
 export {
   APP_NAME,
   HEADER,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/wasm-api-bindgen",
-  "version": "1.2.40",
+  "version": "1.2.42",
   "description": "Polyglot bindings code generators (TS/JS, Zig, C11) for hybrid WebAssembly projects",
   "type": "module",
   "module": "./index.js",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.12.2",
-    "@thi.ng/args": "^2.9.3",
+    "@thi.ng/args": "^2.10.1",
     "@thi.ng/arrays": "^2.13.11",
     "@thi.ng/binary": "^3.4.60",
     "@thi.ng/checks": "^3.7.18",
@@ -128,5 +128,5 @@
     "tag": "wasm",
     "year": 2022
   },
-  "gitHead": "4ebea5f30d4e2d28a12dfb01b39533fdfda0ab43\n"
+  "gitHead": "b7ede4f099767e0175ea8e09257208f73970b220\n"
 }