@nu-art/commando 0.400.4 → 0.400.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/commando",
-  "version": "0.400.4",
+  "version": "0.400.6",
   "description": "",
   "type": "module",
   "keywords": [
@@ -29,7 +29,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@nu-art/ts-common": "0.400.4"
+    "@nu-art/ts-common": "0.400.6"
   },
   "unitConfig": {
     "type": "typescript-lib"

package/shell/plugins/basic.d.ts

@@ -38,6 +38,7 @@ export declare class Commando_Basic extends BaseCommando {
      */
     ls(params?: string): this;
     mkdir(dirName: string): this;
+    rm(dirPath: string, options?: Cli_RmdirOptions): this;
     rmdir(dirPath: string, options?: Cli_RmdirOptions): this;
     cpdir(srcPath: string, destPath: string, options?: Cli_CpdirOptions): this;
     cat(fileName: string): this;

package/shell/plugins/basic.js

@@ -44,12 +44,17 @@ export class Commando_Basic extends BaseCommando {
         this.append(`mkdir -p ${dirName}`);
         return this;
     }
-    rmdir(dirPath, options) {
+    rm(dirPath, options) {
         let command = 'rm';
         if (options?.force)
-            command += ' -rf';
-        if (options?.recursive)
-            command += ' -r';
+            command += ' -f';
+        this.append(`${command} ${dirPath}`);
+        return this;
+    }
+    rmdir(dirPath, options) {
+        let command = 'rm -r';
+        if (options?.force)
+            command += ' -f';
         this.append(`${command} ${dirPath}`);
         return this;
     }

package/shell/plugins/git.d.ts

@@ -14,7 +14,7 @@ type GitPushParams = {
     force?: boolean;
 };
 export declare class Commando_Git extends Super {
-    git: {
+    git(): {
         clone: (url: string, options?: GitCloneParams) => this;
         checkout: (branch: string) => this;
         createTag: (tagName: string) => this;
@@ -34,21 +34,21 @@ export declare class Commando_Git extends Super {
         status: () => this;
     };
     git_clone(url: string, options?: GitCloneParams): this;
-    private git_checkout;
-    private git_createTag;
-    private git_gitCommit;
-    private git_add;
-    private git_addAll;
-    private git_addAndCommit;
-    private git_push;
-    private git_pushTags;
-    private git_fetch;
-    private git_resetHard;
-    private git_getCurrentBranch;
-    private git_pull;
-    private git_merge;
-    private git_createBranch;
-    private git_gsui;
-    private git_status;
+    git_checkout(branch: string): this;
+    git_createTag(tagName: string): this;
+    git_gitCommit(commitMessage: string): this;
+    git_add(file: string): this;
+    git_addAll(): this;
+    git_addAndCommit(commitMessage: string): this;
+    git_push(options?: GitPushParams): this;
+    git_pushTags(): this;
+    git_fetch(): this;
+    git_resetHard(tag?: string): this;
+    git_getCurrentBranch(): this;
+    git_pull(params: string): this;
+    git_merge(mergeFrom: string): this;
+    git_createBranch(branch: string): this;
+    git_gsui(modules?: string): this;
+    git_status(): this;
 }
 export {};

package/shell/plugins/git.js

@@ -4,32 +4,34 @@ import { MergeClass } from '../core/class-merger.js';
 import { BaseCommando } from '../core/BaseCommando.js';
 const Super = MergeClass(BaseCommando, Commando_Programming, Commando_Basic);
 export class Commando_Git extends Super {
-    git = {
-        clone: this.git_clone,
-        checkout: this.git_checkout,
-        createTag: this.git_createTag,
-        gitCommit: this.git_gitCommit,
-        add: this.git_add,
-        addAll: this.git_addAll,
-        addAndCommit: this.git_addAndCommit,
-        push: this.git_push,
-        pushTags: this.git_pushTags,
-        fetch: this.git_fetch,
-        resetHard: this.git_resetHard,
-        getCurrentBranch: this.git_getCurrentBranch,
-        pull: this.git_pull,
-        merge: this.git_merge,
-        createBranch: this.git_createBranch,
-        gsui: this.git_gsui,
-        status: this.git_status,
-    };
+    git() {
+        return {
+            clone: this.git_clone,
+            checkout: this.git_checkout,
+            createTag: this.git_createTag,
+            gitCommit: this.git_gitCommit,
+            add: this.git_add,
+            addAll: this.git_addAll,
+            addAndCommit: this.git_addAndCommit,
+            push: this.git_push,
+            pushTags: this.git_pushTags,
+            fetch: this.git_fetch,
+            resetHard: this.git_resetHard,
+            getCurrentBranch: this.git_getCurrentBranch,
+            pull: this.git_pull,
+            merge: this.git_merge,
+            createBranch: this.git_createBranch,
+            gsui: this.git_gsui,
+            status: this.git_status,
+        };
+    }
+    ;
     git_clone(url, options) {
         const branch = `${options?.branch ? ` -b ${options?.branch}` : ''}`;
         const recursive = `${options?.recursive ? ` --recursive` : ''}`;
         const outputFolder = `${options?.outputFolder ? ` ${options.outputFolder}` : ''}`;
         const command = `git clone${recursive}${branch} ${url}${outputFolder}`;
-        this.append(command);
-        return this;
+        return this.append(command);
     }
     // git_cloneAssert(url: string, options?: GitCloneParams) {
     // 	return new Promise<void>((resolve, reject) => {
@@ -51,68 +53,52 @@ export class Commando_Git extends Super {
     // 	});
     // }
     git_checkout(branch) {
-        this.append(`git checkout ${branch}`);
-        return this;
+        return this.append(`git checkout ${branch}`);
     }
     git_createTag(tagName) {
-        this.append(`git tag -f ${tagName}`);
-        return this;
+        return this.append(`git tag -f ${tagName}`);
     }
     git_gitCommit(commitMessage) {
-        this.append(`git commit -m "${commitMessage}"`);
-        return this;
+        return this.append(`git commit -m "${commitMessage}"`);
     }
     git_add(file) {
-        this.append(`git add "${file}"`);
-        return this;
+        return this.append(`git add "${file}"`);
     }
     git_addAll() {
-        this.append(`git add .`);
-        return this;
+        return this.append(`git add .`);
     }
     git_addAndCommit(commitMessage) {
-        this.append(`git commit -am "${commitMessage}"`);
-        return this;
+        return this.append(`git commit -am "${commitMessage}"`);
     }
     git_push(options) {
-        this.append(`git push ${options?.remote} ${options?.branch}`);
-        return this;
+        return this.append(`git push ${options?.remote ?? ''} ${options?.branch ?? ''}`);
     }
     git_pushTags() {
-        this.append('git push --tags --force');
-        return this;
+        return this.append('git push --tags --force');
     }
     git_fetch() {
-        this.append('git fetch');
-        return this;
+        return this.append('git fetch');
     }
     git_resetHard(tag = '') {
-        this.append('git reset --hard ${tag}');
-        return this;
+        return this.append('git reset --hard ${tag}');
     }
     git_getCurrentBranch() {
-        this.append('git status | grep "On branch" | sed -E "s');
-        return this;
+        return this.append('git status | grep "On branch" | sed -E "s');
     }
     git_pull(params) {
-        this.append('git pull ${params}');
-        return this;
+        return this.append('git pull ${params}');
     }
     git_merge(mergeFrom) {
-        this.append(`git merge ${mergeFrom}`);
-        return this;
+        return this.append(`git merge ${mergeFrom}`);
     }
     git_createBranch(branch) {
-        this.append(`git checkout - b ${branch}`);
-        this.append(`git push-- set -upstream origin ${branch}`);
-        return this;
+        return this.append(`git checkout - b ${branch}`)
+            .append(`git push-- set -upstream origin ${branch}`);
     }
     git_gsui(modules = '') {
-        this.append('git submodule update --recursive --init ${modules}');
-        return this;
+        return this.append('git submodule update --recursive --init ${modules}');
     }
     git_status() {
-        this.append('git status');
-        return this;
+        return this.append('git status');
     }
 }