keri-ts 0.2.0 → 0.2.1

package/esm/app/cli/annotate.js

@@ -1,4 +1,5 @@
 import * as dntShim from "../../_dnt.shims.js";
+import { spawnSync } from "node:child_process";
 import { AppError } from "../../core/errors.js";
 function readAllStdinSync() {
     const chunks = [];
@@ -21,16 +22,15 @@ function readAllStdinSync() {
     }
     return output;
 }
-function buildAnnotateArgs(options) {
+function buildDenoAnnotateArgs(options) {
     const args = [
         "run",
         "--allow-read",
         "--allow-write",
         "packages/cesr/src/annotate/cli-deno.ts",
+        "--in",
+        options.inPath,
     ];
-    if (options.inPath) {
-        args.push("--in", options.inPath);
-    }
     if (options.outPath) {
         args.push("--out", options.outPath);
     }
@@ -42,6 +42,60 @@ function buildAnnotateArgs(options) {
     }
     return args;
 }
+function buildNodeAnnotateArgs(options) {
+    const nodeScript = [
+        "import { annotate } from 'cesr-ts';",
+        "import fs from 'node:fs';",
+        "const [inPath, outPath, qb2, pretty] = process.argv.slice(1);",
+        "const input = fs.readFileSync(inPath);",
+        "const output = qb2 === '1'",
+        "  ? annotate(new Uint8Array(input), { domainHint: 'bny', pretty: pretty === '1' })",
+        "  : annotate(input.toString('utf8'), { domainHint: 'txt', pretty: pretty === '1' });",
+        "if (outPath) {",
+        "  fs.writeFileSync(outPath, output, 'utf8');",
+        "} else {",
+        "  process.stdout.write(output + '\\n');",
+        "}",
+    ].join("\n");
+    return [
+        "--input-type=module",
+        "--eval",
+        nodeScript,
+        options.inPath,
+        options.outPath ?? "",
+        options.qb2 ? "1" : "0",
+        options.pretty ? "1" : "0",
+    ];
+}
+function forwardChildOutput(output) {
+    if (output.stdout.length > 0) {
+        dntShim.Deno.stdout.writeSync(output.stdout);
+    }
+    if (output.stderr.length > 0) {
+        dntShim.Deno.stderr.writeSync(output.stderr);
+    }
+}
+function runDenoAnnotator(options) {
+    const child = new dntShim.Deno.Command(dntShim.Deno.execPath(), {
+        args: buildDenoAnnotateArgs(options),
+        stdout: "piped",
+        stderr: "piped",
+    });
+    return child.outputSync();
+}
+function runNodeAnnotator(options) {
+    const maybeProcess = dntShim.dntGlobalThis;
+    const executable = maybeProcess.process?.execPath || "node";
+    const output = spawnSync(executable, buildNodeAnnotateArgs(options), {
+        stdio: "pipe",
+    });
+    return {
+        success: output.status === 0,
+        code: output.status ?? 1,
+        stdout: output.stdout ? new Uint8Array(output.stdout) : new Uint8Array(),
+        stderr: output.stderr ? new Uint8Array(output.stderr) : new Uint8Array(),
+    };
+}
 // deno-lint-ignore require-yield
 export function* annotateCommand(args) {
     const options = {
@@ -57,18 +111,21 @@ export function* annotateCommand(args) {
         options.inPath = tempInPath;
     }
     try {
-        const child = new dntShim.Deno.Command(dntShim.Deno.execPath(), {
-            args: buildAnnotateArgs(options),
-            stdout: "piped",
-            stderr: "piped",
-        });
-        const output = child.outputSync();
-        if (output.stdout.length > 0) {
-            dntShim.Deno.stdout.writeSync(output.stdout);
+        let output;
+        try {
+            output = runDenoAnnotator(options);
         }
-        if (output.stderr.length > 0) {
-            dntShim.Deno.stderr.writeSync(output.stderr);
+        catch (error) {
+            const isDenoMissing = error instanceof Error &&
+                (error.message.includes("not found: deno") ||
+                    (typeof error.code === "string" &&
+                        error.code === "ENOENT"));
+            if (!isDenoMissing) {
+                throw error;
+            }
+            output = runNodeAnnotator(options);
         }
+        forwardChildOutput(output);
         if (!output.success) {
             throw new AppError(`annotate command failed with exit code ${output.code}`);
         }
@@ -79,7 +136,7 @@ export function* annotateCommand(args) {
                 dntShim.Deno.removeSync(tempInPath);
             }
             catch {
-                // no-op cleanup best effort
+                // best-effort cleanup
             }
         }
     }

package/esm/app/version.js

@@ -2,7 +2,7 @@
  * Generated by scripts/generate_versions.ts.
  * Do not edit by hand.
  */
-export const PACKAGE_VERSION = "0.2.0";
+export const PACKAGE_VERSION = "0.2.1";
 export const BUILD_METADATA = "";
 export const DISPLAY_VERSION = BUILD_METADATA
     ? `${PACKAGE_VERSION}+${BUILD_METADATA}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keri-ts",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "KERI TypeScript package with database primitives and CLI runtime",
   "homepage": "https://github.com/kentbull/keri-ts",
   "repository": {
@@ -48,7 +48,8 @@
     "commander": "^10.0.1",
     "effection": "^3.6.0",
     "lmdb": "^3.4.4",
-    "@deno/shim-deno": "~0.18.0"
+    "@deno/shim-deno": "~0.18.0",
+    "cesr-ts": ">=0.2.0 <0.3.0"
   },
   "devDependencies": {
     "@types/node": "^20.9.0"

package/types/app/cli/annotate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotate.d.ts","sourceRoot":"","sources":["../../../src/app/cli/annotate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AA6D3C,wBAAiB,eAAe,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,SAAS,CAAC,IAAI,CAAC,CA4CjB"}
+{"version":3,"file":"annotate.d.ts","sourceRoot":"","sources":["../../../src/app/cli/annotate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAkI3C,wBAAiB,eAAe,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,SAAS,CAAC,IAAI,CAAC,CA+CjB"}

package/types/app/version.d.ts

@@ -2,7 +2,7 @@
  * Generated by scripts/generate_versions.ts.
  * Do not edit by hand.
  */
-export declare const PACKAGE_VERSION = "0.2.0";
+export declare const PACKAGE_VERSION = "0.2.1";
 export declare const BUILD_METADATA = "";
 export declare const DISPLAY_VERSION: string;
 //# sourceMappingURL=version.d.ts.map