fix(core): update

2021-07-26 21:24:13 +02:00 · 2021-07-26 21:24:13 +02:00 · db712b2223
commit db712b2223
parent 0199160013
11 changed files with 24581 additions and 712 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,8 +15,6 @@ node_modules/

 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/

 # custom
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
  paths:
    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'

 stages:
  - security
@ -19,20 +19,36 @@ mirror:
  stage: security
  script:
    - npmci git mirror
+  only:
+    - tags
  tags:
+    - lossless
    - docker
    - notpriv

-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
  stage: security
  script:
    - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - 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
-  - notpriv
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true

 # ====================
 # test stage
@ -48,28 +64,27 @@ testStable:
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
    - docker
-  - priv

 testBuild:
  stage: test
  script:
    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm install
    - npmci command npm run build
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
    - docker
-  - notpriv

 release:
  stage: release
  script:
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm publish
  only:
    - tags
  tags:
+    - lossless
    - docker
    - notpriv

@ -79,11 +94,15 @@ release:
 codequality:
  stage: metadata
  allow_failure: true
+  only:
+    - tags
  script:
    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
    - npmci npm install
    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
  tags:
+    - lossless
    - docker
    - priv

@ -94,20 +113,20 @@ trigger:
  only:
    - tags
  tags:
+    - lossless
    - docker
    - notpriv

 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
  stage: metadata
  script:
+    - npmci node install lts
    - npmci command npm install -g @gitzone/tsdoc
    - npmci npm prepare
    - npmci npm install
    - npmci command tsdoc
  tags:
+    - lossless
    - docker
    - notpriv
  only:
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}
--- a/README.md
+++ b/README.md
@ -1,28 +0,0 @@
-# @pushrocks/smartshell
-shell actions designed as promises
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartshell)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartshell)
-* [github.com (source mirror)](https://github.com/pushrocks/smartshell)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartshell/)
-
-## Status for master
-[![build status](https://gitlab.com/pushrocks/smartshell/badges/master/build.svg)](https://gitlab.com/pushrocks/smartshell/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartshell/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartshell/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartshell.svg)](https://www.npmjs.com/package/@pushrocks/smartshell)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartshell/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartshell)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-For further information read the linked docs at the top of this readme.
-
-> MIT licensed | **&copy;** [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)
--- a/npmextra.json
+++ b/npmextra.json
@ -5,6 +5,7 @@
    "npmRegistryUrl": "registry.npmjs.org"
  },
  "gitzone": {
+    "projectType": "npm",
    "module": {
      "githost": "gitlab.com",
      "gitscope": "pushrocks",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -3,11 +3,11 @@
  "private": false,
  "version": "2.0.26",
  "description": "shell actions designed as promises",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
  "scripts": {
    "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
  },
  "repository": {
    "type": "git",
@ -24,31 +24,35 @@
  },
  "homepage": "https://gitlab.com/pushrocks/smartshell#README",
  "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.2",
-    "tslint": "^5.19.0",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsrun": "^1.2.17",
+    "@gitzone/tstest": "^1.0.54",
+    "@pushrocks/tapbundle": "^3.2.14",
+    "@types/node": "^16.4.3",
+    "tslint": "^6.1.3",
    "tslint-config-prettier": "^1.18.0"
  },
  "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartdelay": "^2.0.13",
    "@pushrocks/smartexit": "^1.0.15",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "@types/which": "^1.3.1",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@types/which": "^2.0.1",
    "tree-kill": "^1.2.2",
-    "which": "^1.3.1"
+    "which": "^2.0.2"
  },
  "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
    "cli.js",
    "npmextra.json",
    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
  ]
 }
--- a/test/test.ts
+++ b/test/test.ts
@ -8,7 +8,7 @@ let testSmartshell: smartshell.Smartshell;
 tap.test('smartshell should create a Smartshell instance', async () => {
  testSmartshell = new smartshell.Smartshell({
    executor: 'bash',
-    sourceFilePaths: []
+    sourceFilePaths: [],
  });
  expect(testSmartshell).to.be.instanceof(smartshell.Smartshell);
 });
@ -26,7 +26,7 @@ tap.test('smartshell should run async and silent', async () => {
 tap.test('smartshell should stream a shell execution', async () => {
  let done = smartpromise.defer();
  let execStreamingResponse = await testSmartshell.execStreaming('npm -v');
-  execStreamingResponse.childProcess.stdout.on('data', data => {
+  execStreamingResponse.childProcess.stdout.on('data', (data) => {
    done.resolve(data);
  });
  let data = await done.promise;
@ -39,7 +39,7 @@ tap.test('it should execute and wait for a line in the output', async () => {
 });

 tap.test('smartshell should run async', async () => {
-  return testSmartshell.execSilent('sleep 1 && npm -v').then(async execResult => {
+  return testSmartshell.execSilent('sleep 1 && npm -v').then(async (execResult) => {
    console.log(execResult.stdout);
  });
 });
@ -53,5 +53,5 @@ tap.test('should spawn an interactive cli', async () => {
 });

 tap.start({
-  throwOnError: true
+  throwOnError: true,
 });
--- a/ts/smartshell.classes.shellenv.ts
+++ b/ts/smartshell.classes.shellenv.ts
@ -31,7 +31,7 @@ export class ShellEnv {
  /**
   * imports path into the shell from env if available and returns it with
   */
-  private _setPath(commandStringArg): string {
+  private _setPath(commandStringArg: string): string {
    let commandResult = commandStringArg;
    let commandPaths: string[] = [];
    commandPaths = commandPaths.concat(process.env.PATH.split(':'));
@ -41,7 +41,7 @@ export class ShellEnv {

    // lets filter for unwanted paths
    // Windows WSL
-    commandPaths = commandPaths.filter(commandPathArg => {
+    commandPaths = commandPaths.filter((commandPathArg) => {
      const filterResult =
        !commandPathArg.startsWith('/mnt/c/') &&
        !commandPathArg.startsWith('Files/1E') &&
--- a/ts/smartshell.classes.smartshell.ts
+++ b/ts/smartshell.classes.smartshell.ts
@ -71,18 +71,6 @@ export class Smartshell {
      spawnlogInstance.addToBuffer(data);
    });

-    if (streamingArg) {
-      done.resolve({
-        childProcess: execChildProcess,
-        finalPromise: childProcessEnded.promise,
-        kill: () => {
-          // this notation with the - kills the whole process group
-          console.log(`running tree kill on process ${execChildProcess.pid}`);
-          plugins.treeKill(execChildProcess.pid);
-        },
-      });
-    }
-
    execChildProcess.on('exit', (code, signal) => {
      this.smartexit.removeProcess(execChildProcess);
      if (strictArg && code === 1) {
@ -100,6 +88,18 @@ export class Smartshell {
      childProcessEnded.resolve(execResult);
    });

+    if (streamingArg) {
+      done.resolve({
+        childProcess: execChildProcess,
+        finalPromise: childProcessEnded.promise,
+        kill: () => {
+          // this notation with the - kills the whole process group
+          console.log(`running tree kill on process ${execChildProcess.pid}`);
+          plugins.treeKill(execChildProcess.pid);
+        },
+      });
+    }
+
    const result = await done.promise;
    return result;
  }