trm-client 7.0.2 → 7.1.0

package/changelog.txt

@@ -8,6 +8,14 @@ Legend
 + : added
 - : removed
 
+2025-11-10 v7.1.0
+-------------------
+* commands with subcommands
+
+2025-11-10 v7.0.3
+-------------------
+* commands with 2+ arguments
+
 2025-11-07 v7.0.2
 -------------------
 * deprecate typo

package/dist/command/AbstractCommand.d.ts

@@ -6,6 +6,7 @@ import { Package } from "trm-registry-types";
 export declare abstract class AbstractCommand {
     protected readonly name: string;
     protected readonly aliases?: string[];
+    protected readonly subcommand?: string;
     protected command: Command;
     protected registerOpts: RegisterCommandOpts;
     protected args: any;
@@ -15,7 +16,7 @@ export declare abstract class AbstractCommand {
     private registryAuthFailed;
     private systemPackages;
     private trmDependenciesCheck;
-    constructor(program: Command, name: string, aliases?: string[]);
+    constructor(program: Command, name: string, aliases?: string[], subcommand?: string);
     getCliVersionStatus(): Promise<CliVersionStatus>;
     getRegistry(): Core.AbstractRegistry;
     hasRegistryAuthData(): boolean;

package/dist/command/AbstractCommand.js

@@ -57,13 +57,28 @@ const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = require("./prompts");
 const fs_1 = require("fs");
 class AbstractCommand {
-    constructor(program, name, aliases) {
+    constructor(program, name, aliases, subcommand) {
         this.name = name;
         this.aliases = aliases;
+        this.subcommand = subcommand;
         this.registerOpts = {};
         this.args = {};
         this.registryAuthData = false;
-        this.command = program.command(this.name);
+        const index = program.commands.findIndex(c => c.name() === this.name);
+        if (index >= 0) {
+            if (subcommand) {
+                this.command = program.commands[index];
+            }
+            else {
+                throw new Error(`Command "${this.name}" declared multiple times without subcommand.`);
+            }
+        }
+        else {
+            this.command = program.command(this.name);
+        }
+        if (this.subcommand) {
+            this.command = this.command.command(this.subcommand);
+        }
         if (aliases) {
             this.command.aliases(aliases);
         }
@@ -209,28 +224,16 @@ class AbstractCommand {
             default: throw new Error(`Unknown inquirer type "${type}". Possible values are ${Object.keys(InquirerType_1.InquirerType).map(k => InquirerType_1.InquirerType[k]).join(', ')}.`);
         }
     }
-    parseCommandArgs(args1, args2) {
-        var args = this.command['_optionValues'] || {};
-        if (!args1) {
-            args1 = {};
-        }
-        if (!args2) {
-            args2 = {};
-        }
-        if (typeof (args1) === 'string') {
-            const oArg1 = this.command["_args"][0];
-            args[oArg1.name()] = args1;
-            if (typeof (args2) === 'string') {
-                const oArg2 = this.command["_args"][1];
-                args[oArg2.name()] = args2;
-            }
-            else {
-                args = Object.assign(Object.assign({}, args), args2);
+    parseCommandArgs(argsValues) {
+        var args = {};
+        const commandOpts = this.command['_optionValues'] || {};
+        const commandArgs = this.command["_args"] || [];
+        commandArgs.forEach((a, i) => {
+            if (typeof (argsValues[i]) === 'string') {
+                args[a.name()] = argsValues[i];
             }
-        }
-        else {
-            args = Object.assign(Object.assign({}, args), args1);
-        }
+        });
+        args = Object.assign(Object.assign({}, commandOpts), args);
         args = Object.entries(args).reduce((acc, [key, value]) => {
             const newKey = key.includes(" ") ? key.replace(/ (\w)/g, (_, char) => char.toUpperCase()) : key;
             acc[newKey] = value;
@@ -304,9 +307,9 @@ class AbstractCommand {
             catch (_a) { }
         }
     }
-    execute(args1, args2) {
+    execute(...args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.args = this.parseCommandArgs(args1, args2);
+            this.args = this.parseCommandArgs(args);
             this.onArgs();
             var exitCode;
             try {

package/dist/command/implementations/Alias.js

@@ -17,16 +17,16 @@ const systemAlias_1 = require("../../systemAlias");
 const utils_1 = require("../../utils");
 class Alias extends AbstractCommand_1.AbstractCommand {
     init() {
-        if (this.name.includes('create')) {
+        if (this.subcommand === 'create') {
             this.command.description(`Create a new system alias.`);
             this.command.argument(`<alias>`, `Alias name.`);
         }
-        else if (this.name.includes('delete')) {
+        else if (this.subcommand === 'delete') {
             this.command.description(`Delete a system alias.`);
             this.command.argument(`<alias>`, `Alias name.`);
         }
         else {
-            this.command.description(`List and manage aliases.`);
+            this.command.description(`Manage system aliases.`);
         }
     }
     view(alias) {
@@ -87,10 +87,10 @@ class Alias extends AbstractCommand_1.AbstractCommand {
     }
     handler() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.args.create && this.args.add.trim().toLowerCase() === 'create') {
+            if (this.subcommand === 'create') {
                 yield (0, prompts_1.createAlias)(this.args.alias);
             }
-            else if (this.args.delete && this.args.rm.trim().toLowerCase() === 'delete') {
+            else if (this.subcommand === 'delete') {
                 yield (0, prompts_1.deleteAlias)(this.args.alias);
             }
             else {

package/dist/command/implementations/DistTag.js

@@ -14,13 +14,13 @@ const AbstractCommand_1 = require("../AbstractCommand");
 class DistTag extends AbstractCommand_1.AbstractCommand {
     init() {
         this.registerOpts.requiresRegistry = true;
-        if (this.name.includes('add')) {
+        if (this.subcommand === 'add') {
             this.command.description(`Tag a release.`);
             this.command.argument(`<package>`, `Name of the package.`);
             this.command.argument(`<version>`, `Release version of the package.`);
             this.command.argument(`<tag>`, `Tag to assign to release.`);
         }
-        else if (this.name.includes('rm')) {
+        else if (this.subcommand === 'rm') {
             this.command.description(`Remove tag from a release.`);
             this.command.argument(`<package>`, `Name of the package.`);
             this.command.argument(`<tag>`, `Tag to remove.`);
@@ -28,20 +28,17 @@ class DistTag extends AbstractCommand_1.AbstractCommand {
     }
     handler() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.args.add && this.args.add.trim().toLowerCase() === 'add') {
+            if (this.subcommand === 'add') {
                 yield this.getRegistry().addDistTag(this.args.package, {
                     version: this.args.version,
                     tag: this.args.tag
                 });
             }
-            else if (this.args.rm && this.args.rm.trim().toLowerCase() === 'rm') {
+            else if (this.subcommand === 'rm') {
                 yield this.getRegistry().rmDistTag(this.args.package, {
                     tag: this.args.tag
                 });
             }
-            else {
-                throw new Error(`Unknown command.`);
-            }
         });
     }
 }

package/dist/command/implementations/Registry.js

@@ -17,11 +17,11 @@ const registryAlias_1 = require("../../registryAlias");
 class Registry extends AbstractCommand_1.AbstractCommand {
     init() {
         this.registerOpts.requiresRegistry = true;
-        if (this.name.includes('add')) {
+        if (this.subcommand === 'add') {
             this.command.description(`Add a new registry.`);
             this.command.argument(`<registry name>`, `Name of the registry to generate. Name "${trm_core_1.PUBLIC_RESERVED_KEYWORD}" and "${trm_core_1.LOCAL_RESERVED_KEYWORD}" are protected and cannot be used.`);
         }
-        else if (this.name.includes('rm')) {
+        else if (this.subcommand === 'rm') {
             this.command.description(`Remove a registry.`);
             this.command.argument(`<registry name>`, `Name of the registry to delete. Registries "${trm_core_1.PUBLIC_RESERVED_KEYWORD}" and "${trm_core_1.LOCAL_RESERVED_KEYWORD}" are protected and cannot be deleted.`);
         }
@@ -30,7 +30,7 @@ class Registry extends AbstractCommand_1.AbstractCommand {
     handler() {
         return __awaiter(this, void 0, void 0, function* () {
             const registryName = this.args.registryName.trim();
-            if (this.args.add && this.args.add.trim().toLowerCase() === 'add') {
+            if (this.subcommand === 'add') {
                 var endpoint = this.args.endpoint;
                 if (registryName.toLowerCase() === trm_core_1.PUBLIC_RESERVED_KEYWORD) {
                     throw new Error(`Registry name "${trm_core_1.PUBLIC_RESERVED_KEYWORD}" is a reserved keyword.`);
@@ -68,7 +68,7 @@ class Registry extends AbstractCommand_1.AbstractCommand {
                     }
                 }
             }
-            else if (this.args.rm && this.args.rm.trim().toLowerCase() === 'rm') {
+            else if (this.subcommand === 'rm') {
                 if (registryName.toLowerCase() === trm_core_1.PUBLIC_RESERVED_KEYWORD) {
                     throw new Error(`Registry "${trm_core_1.PUBLIC_RESERVED_KEYWORD}" is protected and cannot be deleted.`);
                 }
@@ -79,9 +79,6 @@ class Registry extends AbstractCommand_1.AbstractCommand {
                 registryAlias_1.RegistryAlias.delete(registryName);
                 trm_commons_1.Logger.success(`Registry "${registryName}" has been removed.`);
             }
-            else {
-                throw new Error(`Unknown command.`);
-            }
         });
     }
 }

package/dist/index.js

@@ -23,17 +23,17 @@ Public registry at https://trmregistry.com/
     .version((0, utils_1.getClientVersion)());
 new implementations_1.Ping(program, 'ping').register();
 new implementations_1.Info(program, 'info').register();
-new implementations_1.Registry(program, 'registry add').register();
-new implementations_1.Registry(program, 'registry rm').register();
+new implementations_1.Registry(program, 'registry', null, 'add').register();
+new implementations_1.Registry(program, 'registry', null, 'rm').register();
 new implementations_1.Login(program, 'login').register();
 new implementations_1.WhoAmI(program, 'whoami').register();
 new implementations_1.Logout(program, 'logout').register();
-new implementations_1.Alias(program, 'alias create').register();
-new implementations_1.Alias(program, 'alias delete').register();
 new implementations_1.Alias(program, 'alias').register();
+new implementations_1.Alias(program, 'alias', null, 'create').register();
+new implementations_1.Alias(program, 'alias', null, 'delete').register();
 new implementations_1.Publish(program, 'publish').register();
-new implementations_1.DistTag(program, 'dist-tag add').register();
-new implementations_1.DistTag(program, 'dist-tag rm').register();
+new implementations_1.DistTag(program, 'dist-tag', null, 'add').register();
+new implementations_1.DistTag(program, 'dist-tag', null, 'rm').register();
 new implementations_1.Publish(program, 'pack', ['export']).register();
 new implementations_1.Lock(program, 'lock', ['lock-file']).register();
 new implementations_1.Unpublish(program, 'unpublish').register();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-client",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "TRM (Transport Request Manager) Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",