@thi.ng/tangle 1.1.38 → 1.1.40

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2025-09-01T16:38:35Z
+- **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.1.39](https://github.com/thi-ng/umbrella/tree/@thi.ng/tangle@1.1.39) (2025-09-25)
+
+#### ♻️ Refactoring
+
+- simplify CLI impl via cliApp() wrapper ([f6ae3be](https://github.com/thi-ng/umbrella/commit/f6ae3be))
+
 ### [1.1.34](https://github.com/thi-ng/umbrella/tree/@thi.ng/tangle@1.1.34) (2025-08-06)
 
 #### ♻️ Refactoring

package/cli.js

@@ -1,21 +1,14 @@
 import {
   ARG_DRY_RUN,
   ARG_VERBOSE,
-  ParseError,
   THING_HEADER,
-  flag,
-  parse,
-  usage
+  cliApp,
+  configureLogLevel,
+  flag
 } from "@thi.ng/args";
 import { readJSON, writeText } from "@thi.ng/file-io";
-import { ConsoleLogger } from "@thi.ng/logger";
 import { join } from "node:path";
 import { tangleFile } from "./tangle.js";
-const argOpts = {
-  ...ARG_DRY_RUN,
-  ...ARG_VERBOSE,
-  noComments: flag({ default: false, desc: "don't generate comments" })
-};
 const PKG = readJSON(join(process.argv[2], "package.json"));
 const APP_NAME = PKG.name.split("/")[1];
 const HEADER = THING_HEADER(
@@ -23,42 +16,51 @@ const HEADER = THING_HEADER(
   PKG.version,
   "Literate programming code block tangling"
 );
-const usageOpts = {
-  lineWidth: process.stdout.columns,
-  prefix: `${HEADER}
+const CMD = {
+  desc: "",
+  opts: {},
+  inputs: [1, Infinity],
+  fn: async ({ opts, inputs, logger }) => {
+    let ctx = {
+      logger,
+      opts: {
+        comments: opts.noComments !== true
+      }
+    };
+    for (let file of inputs) {
+      ctx = tangleFile(file, ctx);
+    }
+    for (let out in ctx.outputs) {
+      writeText(out, ctx.outputs[out], ctx.logger, opts.dryRun);
+    }
+  }
+};
+cliApp({
+  name: "tangle",
+  start: 3,
+  opts: {
+    ...ARG_DRY_RUN,
+    ...ARG_VERBOSE,
+    noComments: flag({ default: false, desc: "don't generate comments" })
+  },
+  commands: { CMD },
+  single: true,
+  usage: {
+    lineWidth: process.stdout.columns,
+    prefix: `${HEADER}
 
 usage: ${APP_NAME} [OPTS] SOURCE-FILES(S) ...
        ${APP_NAME} --help
 
 `,
-  showGroupNames: true,
-  paramWidth: 20
-};
-const showUsage = () => {
-  process.stderr.write(usage(argOpts, usageOpts));
-  process.exit(1);
-};
-try {
-  const result = parse(argOpts, process.argv, { start: 3, usageOpts });
-  if (!result) process.exit(1);
-  const { result: opts, rest } = result;
-  if (!rest.length) showUsage();
-  let ctx = {
-    logger: new ConsoleLogger("tangle", opts.verbose ? "DEBUG" : "INFO"),
-    opts: {
-      comments: opts.noComments !== true
-    }
-  };
-  for (let file of rest) {
-    ctx = tangleFile(file, ctx);
-  }
-  for (let out in ctx.outputs) {
-    writeText(out, ctx.outputs[out], ctx.logger, opts.dryRun);
+    showGroupNames: true,
+    paramWidth: 20
+  },
+  ctx: async (ctx) => {
+    configureLogLevel(ctx.logger, ctx.opts.verbose);
+    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/tangle",
-  "version": "1.1.38",
+  "version": "1.1.40",
   "description": "Literate programming code block tangling / codegen utility, inspired by org-mode & noweb",
   "type": "module",
   "module": "./index.js",
@@ -41,15 +41,15 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.12.2",
-    "@thi.ng/args": "^2.10.0",
+    "@thi.ng/args": "^2.10.2",
     "@thi.ng/checks": "^3.7.18",
     "@thi.ng/compare": "^2.4.28",
     "@thi.ng/date": "^2.7.64",
     "@thi.ng/errors": "^2.5.42",
-    "@thi.ng/file-io": "^2.2.9",
-    "@thi.ng/logger": "^3.1.17",
+    "@thi.ng/file-io": "^2.2.10",
+    "@thi.ng/logger": "^3.2.0",
     "@thi.ng/strings": "^3.9.22",
-    "@thi.ng/transducers": "^9.6.9"
+    "@thi.ng/transducers": "^9.6.10"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",
@@ -103,5 +103,5 @@
   "thi.ng": {
     "year": 2022
   },
-  "gitHead": "5bda911600ff3c98232d0382a45c60ed0bd1a380\n"
+  "gitHead": "3c3531350eec56011982583c694aeb1a2e0d0ff4\n"
 }