@contextual-io/cli 0.2.1 → 0.2.2

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @contextual-io/cli
 $ ctxl COMMAND
 running command...
 $ ctxl (--version)
-@contextual-io/cli/0.2.1 linux-x64 node-v25.2.1
+@contextual-io/cli/0.2.2 linux-x64 node-v25.2.1
 $ ctxl --help [COMMAND]
 USAGE
   $ ctxl COMMAND
@@ -29,7 +29,7 @@ USAGE
 <!-- usagestop -->
 # Commands
 <!-- commands -->
-* [`ctxl config`](#ctxl-config)
+* [`ctxl config <COMMAND>`](#ctxl-config-command)
 * [`ctxl config add CONFIG-ID`](#ctxl-config-add-config-id)
 * [`ctxl config current`](#ctxl-config-current)
 * [`ctxl config delete CONFIG-ID`](#ctxl-config-delete-config-id)
@@ -38,7 +38,7 @@ USAGE
 * [`ctxl config login`](#ctxl-config-login)
 * [`ctxl config use CONFIG-ID`](#ctxl-config-use-config-id)
 * [`ctxl help [COMMAND]`](#ctxl-help-command)
-* [`ctxl records`](#ctxl-records)
+* [`ctxl records <COMMAND>`](#ctxl-records-command)
 * [`ctxl records add [URI]`](#ctxl-records-add-uri)
 * [`ctxl records create [URI]`](#ctxl-records-create-uri)
 * [`ctxl records delete [URI]`](#ctxl-records-delete-uri)
@@ -48,13 +48,13 @@ USAGE
 * [`ctxl records query [URI]`](#ctxl-records-query-uri)
 * [`ctxl records replace [URI]`](#ctxl-records-replace-uri)
 
-## `ctxl config`
+## `ctxl config <COMMAND>`
 
 manage configs
 
 ```
 USAGE
-  $ ctxl config
+  $ ctxl config <COMMAND>
 
 DESCRIPTION
   manage configs
@@ -213,13 +213,13 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.36/src/commands/help.ts)_
 
-## `ctxl records`
+## `ctxl records <COMMAND>`
 
 manage records
 
 ```
 USAGE
-  $ ctxl records
+  $ ctxl records <COMMAND>
 
 DESCRIPTION
   manage records

package/dist/base.d.ts

@@ -25,9 +25,10 @@ export declare abstract class BaseConfigCommand<T extends typeof Command> extend
     protected userConfig: CommandConfig;
     protected catch(err: Error & {
         exitCode?: number;
-    }): Promise<unknown>;
+    }): Promise<void>;
     protected finally(_: Error | undefined): Promise<unknown>;
     init(): Promise<void>;
+    protected showHelp(argv?: string[]): Promise<void>;
 }
 export declare abstract class BaseCommand<T extends typeof Command> extends BaseConfigCommand<T> {
     static baseFlags: {

package/dist/base.js

@@ -1,7 +1,10 @@
-import { Command, Flags } from "@oclif/core";
+import { Command, Flags, loadHelpClass } from "@oclif/core";
+// eslint-disable-next-line unicorn/import-style
+import { chalkStderr } from "chalk";
 import fetch from "cross-fetch";
 import fs from "node:fs";
 import path from "node:path";
+import { z, ZodError } from "zod";
 import { HttpError } from "./models/errors.js";
 import { UserConfig } from "./models/user-config.js";
 import { rehydrateToken } from "./utils/auth.js";
@@ -97,9 +100,23 @@ export class BaseConfigCommand extends Command {
     flags;
     userConfig;
     async catch(err) {
-        // add any custom logic to handle errors from the command
-        // or simply return the parent class error handling
-        return super.catch(err);
+        const exitCode = err.exitCode ?? process.exitCode ?? 1;
+        if (this.jsonEnabled()) {
+            this.logJson(this.toErrorJson(err));
+        }
+        else {
+            if (!err.message)
+                throw err;
+            let { message } = err;
+            if (err instanceof ZodError) {
+                const flattened = z.flattenError(err);
+                message = flattened.formErrors.join("\n");
+            }
+            this.logToStderr(chalkStderr.red(chalkStderr.bold("    Error: ") + message));
+            this.logToStderr();
+            await this.showHelp();
+        }
+        this.exit(exitCode);
     }
     async finally(_) {
         // called after run and catch regardless of whether or not the command errored
@@ -118,6 +135,13 @@ export class BaseConfigCommand extends Command {
         this.args = args;
         this.userConfig = new CommandConfig(this.config.configDir);
     }
+    async showHelp(argv) {
+        const toShow = argv ?? this.id ? [this.id] : undefined;
+        if (!toShow)
+            return;
+        const help = new (await loadHelpClass(this.config))(this.config);
+        await help.showHelp(toShow);
+    }
 }
 export class BaseCommand extends BaseConfigCommand {
     // define flags that can be inherited by any command that extends BaseCommand

package/dist/commands/config/index.d.ts

@@ -4,5 +4,6 @@ export default class Config extends BaseConfigCommand<typeof Config> {
     static description: string;
     static examples: never[];
     static flags: {};
+    static usage: string[];
     run(): Promise<void>;
 }

package/dist/commands/config/index.js

@@ -1,11 +1,13 @@
-import { loadHelpClass } from "@oclif/core";
 import { BaseConfigCommand } from "../../base.js";
 export default class Config extends BaseConfigCommand {
     static args = {};
     static description = "manage configs";
     static examples = [];
     static flags = {};
+    static usage = [
+        "<%= command.id %> <COMMAND>",
+    ];
     async run() {
-        await new (await loadHelpClass(this.config))(this.config).showHelp([Config.id]);
+        await this.showHelp();
     }
 }

package/dist/commands/records/index.d.ts

@@ -4,5 +4,6 @@ export default class Records extends BaseConfigCommand<typeof Records> {
     static description: string;
     static examples: never[];
     static flags: {};
+    static usage: string[];
     run(): Promise<void>;
 }

package/dist/commands/records/index.js

@@ -1,11 +1,13 @@
-import { loadHelpClass } from "@oclif/core";
 import { BaseConfigCommand } from "../../base.js";
 export default class Records extends BaseConfigCommand {
     static args = {};
     static description = "manage records";
     static examples = [];
     static flags = {};
+    static usage = [
+        "<%= command.id %> <COMMAND>",
+    ];
     async run() {
-        await new (await loadHelpClass(this.config))(this.config).showHelp([Records.id]);
+        await this.showHelp();
     }
 }

package/dist/models/uri.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-export const Uri = z.string().regex(/^native-object:[a-z0-9-]+(\/.+)?/);
+export const Uri = z.string().regex(/^native-object:[a-z0-9-]+(\/.+)?/, { error: "URI must match one of the following formats: 'native-object:<type-id>' or 'native-object:<type-id>/<instance-id>'" });
 export const parseUri = (uri) => {
     const parsed = Uri.parse(uri);
     const [type, id] = parsed.replace(/^native-object:/, "").split("/");

package/oclif.manifest.json

@@ -166,6 +166,9 @@
       "pluginName": "@contextual-io/cli",
       "pluginType": "core",
       "strict": true,
+      "usage": [
+        "<%= command.id %> <COMMAND>"
+      ],
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
@@ -452,6 +455,9 @@
       "pluginName": "@contextual-io/cli",
       "pluginType": "core",
       "strict": true,
+      "usage": [
+        "<%= command.id %> <COMMAND>"
+      ],
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
@@ -753,5 +759,5 @@
       ]
     }
   },
-  "version": "0.2.1"
+  "version": "0.2.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contextual-io/cli",
   "description": "Contextual CLI",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": "Nasser Oloumi",
   "bin": {
     "ctxl": "./bin/run.js"
@@ -9,6 +9,7 @@
   "dependencies": {
     "@oclif/core": "^4",
     "@oclif/plugin-help": "^6",
+    "@oclif/plugin-not-found": "^3.2.73",
     "@oclif/table": "^0.5.1",
     "chalk": "^5.6.2",
     "cross-fetch": "^4.1.0",
@@ -56,7 +57,8 @@
     "dirname": "ctxl",
     "commands": "./dist/commands",
     "plugins": [
-      "@oclif/plugin-help"
+      "@oclif/plugin-help",
+      "@oclif/plugin-not-found"
     ],
     "topicSeparator": " ",
     "topics": {