3.0.13

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -19,22 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

docs/index.md

@@ -23,45 +23,6 @@ nodejs wrapper for CLI related tasks
 
 ## Usage
 
-this plugin tries to establish some logic in which CLI tools work.
-
-take the following commandline input:
-
-```
-mytool command argument1 argument2 --option1 -o2 option2Value
-```
-
-- `mytool` obviously is the tool (like git)
-- `command` is the main thing the tool shall do (like commit)
-- `argument1` and `argument2` are arguments
-- `option1` is a longform option you can add (like --message for message)
-- `optionValue` is the referenced option value (like a commit message)
-
-When there is no command and no option specified the standardTask applied.
-When there is a option specified but no command, standardTask applies,
-except when of the options is -v, --version or --help.
-
-```javascript
-import { Smartcli } from 'smartcli';
-mySmartcli = new Smartcli();
-mySmartcli.standardTask().then(argvArg => {
-  // do something if program is called without an command
-});
-
-mySmartcli.addCommand({ commandname: 'install' }).then(argvArg => {
-  // do something if program is called with command "install"
-});
-
-mySmartcli.addVersion('1.0.0'); // -v and --version options will display the specified version in the terminal
-
-mySmartCli.addHelp({
-  // is triggered by help command and --help option
-  helpText: 'some help text to print' // the helpText to display
-});
-
-mySmartcli.startParse(); // starts the evaluation and fullfills or rejects promises.
-```
-
 For further information read the linked docs at the top of this README.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@pushrocks/smartcli",
   "private": false,
-  "version": "3.0.8",
+  "version": "3.0.13",
-  "description": "nodejs wrapper for CLI related tasks",
+  "description": "easy observable cli tasks",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild)"
@@ -26,32 +26,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartcli",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.19",
+    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartlog": "^2.0.39",
     "@pushrocks/smartparam": "^1.1.6",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^3.1.3",
-    "@types/yargs": "^15.0.4",
+    "@types/yargs": "^16.0.1",
-    "rxjs": "^6.5.4",
+    "rxjs": "^6.6.7",
-    "yargs": "^15.3.0"
+    "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.20",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^13.9.0",
+    "@types/node": "^14.14.37",
-    "tslint": "^6.1.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -0,0 +1,76 @@
+# @pushrocks/smartcli
+easy observable cli tasks
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartcli)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartcli)
+* [github.com (source mirror)](https://github.com/pushrocks/smartcli)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartcli/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartcli/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartcli/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartcli)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartcli)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartcli)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartcli)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartcli)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
+
+## Usage
+
+this plugin tries to establish some logic in which CLI tools work.
+
+take the following commandline input:
+
+```
+mytool command argument1 argument2 --option1 -o2 option2Value
+```
+
+- `mytool` obviously is the tool (like git)
+- `command` is the main thing the tool shall do (like commit)
+- `argument1` and `argument2` are arguments
+- `option1` is a longform option you can add (like --message for message)
+- `optionValue` is the referenced option value (like a commit message)
+
+When there is no command and no option specified the standardTask applied.
+When there is a option specified but no command, standardTask applies,
+except when of the options is -v, --version or --help.
+
+```javascript
+import { Smartcli } from 'smartcli';
+mySmartcli = new Smartcli();
+mySmartcli.standardTask().then((argvArg) => {
+  // do something if program is called without an command
+});
+
+mySmartcli.addCommand({ commandname: 'install' }).then((argvArg) => {
+  // do something if program is called with command "install"
+});
+
+mySmartcli.addVersion('1.0.0'); // -v and --version options will display the specified version in the terminal
+
+mySmartCli.addHelp({
+  // is triggered by help command and --help option
+  helpText: 'some help text to print', // the helpText to display
+});
+
+mySmartcli.startParse(); // starts the evaluation and fullfills or rejects promises.
+```
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/smartcli.classes.smartcli.ts

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import * as plugins from './smartcli.plugins';
 
 // import classes
-import { Objectmap } from '@pushrocks/lik';
+import { ObjectMap } from '@pushrocks/lik';
 
 // interfaces
 export interface ICommandPromiseObject {
@@ -17,6 +17,8 @@ export interface ITriggerObservableObject {
   subject: Subject<any>;
 }
 
+const logger = new plugins.smartlog.ConsoleLog();
+
 /**
  * class to create a new instance of Smartcli. Handles parsing of command line arguments.
  */
@@ -27,12 +29,12 @@ export class Smartcli {
   commands;
   questions;
   version: string;
-  private onlyOnProcessEnvCliCall = false;
+  private checkForEnvCliCall = true;
 
   /**
    * map of all Trigger/Observable objects to keep track
    */
-  allTriggerObservablesMap = new Objectmap<ITriggerObservableObject>();
+  allTriggerObservablesMap = new ObjectMap<ITriggerObservableObject>();
 
   /**
    * The constructor of Smartcli
@@ -46,8 +48,8 @@ export class Smartcli {
   /**
    * halts any execution of commands if (process.env.CLI_CALL === false)
    */
-  onlyTriggerOnProcessEnvCliCall() {
+  disableEnvCliCall() {
-    this.onlyOnProcessEnvCliCall = true;
+    this.checkForEnvCliCall = false;
   }
 
   /**
@@ -63,7 +65,7 @@ export class Smartcli {
    * Note: in e.g. "npm install something" the "install" is considered the command.
    */
   addCommand(commandNameArg: string): Subject<any> {
-    let triggerSubject = this.addTrigger(commandNameArg);
+    const triggerSubject = this.addTrigger(commandNameArg);
     this.parseStarted.promise.then(() => {
       if (this.argv._.indexOf(commandNameArg) === 0) {
         this.trigger(commandNameArg);
@@ -76,11 +78,11 @@ export class Smartcli {
    * adds a Trigger. Like addCommand(), but returns an subscribable observable
    */
   addTrigger(triggerNameArg: string) {
-    let triggerSubject = new Subject<any>();
+    const triggerSubject = new Subject<any>();
     if (!this.getTriggerSubject(triggerNameArg)) {
       this.allTriggerObservablesMap.add({
         triggerName: triggerNameArg,
-        subject: triggerSubject
+        subject: triggerSubject,
       });
     } else {
       throw new Error(`you can't add a trigger twice`);
@@ -93,14 +95,14 @@ export class Smartcli {
    * @param commandNameArg - the name of the command to trigger
    */
   trigger(triggerName: string) {
-    let triggerSubject = this.getTriggerSubject(triggerName);
+    const triggerSubject = this.getTriggerSubject(triggerName);
     triggerSubject.next(this.argv);
     return triggerSubject;
   }
 
   getTriggerSubject(triggerName: string) {
     const triggerObservableObject = this.allTriggerObservablesMap.find(
-      triggerObservableObjectArg => {
+      (triggerObservableObjectArg) => {
         return triggerObservableObjectArg.triggerName === triggerName;
       }
     );
@@ -115,8 +117,8 @@ export class Smartcli {
    * allows to specify help text to be printed above the rest of the help text
    */
   addHelp(optionsArg: { helpText: string }) {
-    this.addCommand('help').subscribe(argvArg => {
+    this.addCommand('help').subscribe((argvArg) => {
-      plugins.smartlog.defaultLogger.log('info', optionsArg.helpText);
+      logger.log('info', optionsArg.helpText);
     });
   }
 
@@ -137,18 +139,14 @@ export class Smartcli {
    * adds a trigger that is called when no command is specified
    */
   standardTask(): Subject<any> {
-    let standardSubject = this.addTrigger('standardTask');
+    const standardSubject = this.addTrigger('standardTask');
     this.parseStarted.promise.then(() => {
-      if (this.argv._.length === 0 && !this.argv.v) {
+      if (
-        if (this.onlyOnProcessEnvCliCall) {
+        (this.argv._.length === 0 ||
-          if (process.env.CLI_CALL === 'true') {
+          (this.argv._.length === 1 && this.argv._[0].startsWith('test/'))) &&
+        !this.argv.v
+      ) {
         this.trigger('standardTask');
-          } else {
-            return;
-          }
-        } else {
-          this.trigger('standardTask');
-        }
       }
     });
     return standardSubject;
@@ -158,6 +156,12 @@ export class Smartcli {
    * start the process of evaluating commands
    */
   startParse(): void {
+    if (!process.env.CLI_CALL && this.checkForEnvCliCall) {
+      console.log(
+        `note: @pushrocks/smartcli: You called .startParse() on a SmartCli instance. However process.env.CLI_CALL being absent prevented parsing.`
+      );
+      return;
+    }
     this.argv = this.argv.argv;
     this.parseStarted.resolve();
     return;