@tkeron/commands 0.1.0 → 0.1.1

package/changelog.md

@@ -1,3 +1,7 @@
+# v0.1.1
+
+- fixed commands ordered arguments
+
 # v0.1.0
 
 - passes positioned arguments to the callback in the second parameter.

package/dist/index.d.ts

@@ -7,12 +7,16 @@ export interface CommandHandler {
 export type Options = {
     [key: string]: CommandHandler;
 };
-export type Callback = (options: Options, orderedArguments?: string[]) => void;
+export type parsedOptions = {
+    [key: string]: string;
+};
+export type Callback = (options: parsedOptions) => void;
 export interface Command {
     name: string;
     next: () => Commands;
     addAliases: (...alias: string[]) => Command;
     addOptions: (...options: string[]) => Command;
+    addPositionedArgument: (arg: string) => Command;
     setCallback: (callback: Callback) => Command;
 }
 export interface Commands {

package/dist/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommands = void 0;
 const _commands = {};
+const orderedArgumentNames = [];
 const run = () => {
     const currentCommands = process.argv.slice(2);
     const parsedOptions = currentCommands
@@ -17,17 +18,28 @@ const run = () => {
         orderedArguments.length &&
         Object.keys(_commands).includes(orderedArguments[0]))
         orderedArguments.shift();
+    const orderedOptions = {};
+    if (orderedArguments &&
+        orderedArguments.length > 0 &&
+        orderedArgumentNames.length === orderedArguments.length) {
+        orderedArgumentNames.forEach((key, n) => {
+            orderedOptions[key] = orderedArguments[n];
+        });
+    }
     for (const commandIndex of currentCommands) {
         const command = _commands[commandIndex];
         if (!command)
             continue;
-        const options = parsedOptions && command.options
-            ? command.options.reduce((p, c) => {
-                p[c] = parsedOptions[c];
-                return p;
-            }, {})
-            : {};
-        command.callback(options, orderedArguments);
+        const options = {
+            ...orderedOptions,
+            ...(parsedOptions && command.options
+                ? command.options.reduce((p, c) => {
+                    p[c] = parsedOptions[c];
+                    return p;
+                }, {})
+                : {}),
+        };
+        command.callback(options);
     }
 };
 const getCommands = () => {
@@ -40,6 +52,7 @@ const getCommands = () => {
             name,
             addAliases: undefined,
             addOptions: undefined,
+            addPositionedArgument: undefined,
             next: undefined,
             setCallback: undefined,
         };
@@ -67,6 +80,10 @@ const getCommands = () => {
             _commands[name].callback = callback;
             return command;
         };
+        command.addPositionedArgument = (arg) => {
+            orderedArgumentNames.push(arg);
+            return command;
+        };
         return command;
     };
     return commands;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tkeron/commands",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "node library for handling command line arguments",
   "main": "dist/index.js",
   "scripts": {