1.0.41

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,21 +18,11 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
-
-snyk:
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -41,37 +31,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -85,30 +78,31 @@ codequality:
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - 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:
@@ -116,5 +110,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.snyk

@@ -21,4 +21,34 @@ ignore:
     - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
         reason: None given
         expires: '2020-04-12T17:46:49.672Z'
+    - parcel-bundler > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:01:44.139Z'
+    - parcel-bundler > @parcel/fs > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:01:44.139Z'
+    - parcel-bundler > htmlnano > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:01:44.139Z'
+    - parcel-bundler > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:01:44.139Z'
+    - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:01:44.139Z'
+    - parcel-bundler > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:07:10.923Z'
+    - parcel-bundler > @parcel/fs > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:07:10.923Z'
+    - parcel-bundler > htmlnano > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:07:10.923Z'
+    - parcel-bundler > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:07:10.923Z'
+    - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T18:07:10.923Z'
 patch: {}

.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"
+    }
+  ]
+}

.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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -4,6 +4,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.35",
+  "version": "1.0.41",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist/index.js",

readme.md

@@ -8,7 +8,7 @@ watch typescript projects during development
 * [docs (typedoc)](https://gitzone.gitlab.io/tswatch/)
 
 ## Status for master
-[![build status](https://gitlab.com/gitzone/tswatch/badges/master/build.svg)](https://gitlab.com/gitzone/tswatch/commits/master)
+[![pipeline status](https://gitlab.com/gitzone/tswatch/badges/master/pipeline.svg)](https://gitlab.com/gitzone/tswatch/commits/master)
 [![coverage report](https://gitlab.com/gitzone/tswatch/badges/master/coverage.svg)](https://gitlab.com/gitzone/tswatch/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tswatch.svg)](https://www.npmjs.com/package/@gitzone/tswatch)
 [![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tswatch/badge.svg)](https://snyk.io/test/npm/@gitzone/tswatch)
@@ -18,6 +18,11 @@ watch typescript projects during development
 
 ## Usage
 
+
+## 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)

ts/tswatch.classes.tswatch.ts

@@ -39,12 +39,9 @@ export class TsWatch {
         break;
       case 'gitzone_element':
         // lets create a standard server
-        console.log('bundling TypeScript files to "dist_watch" Note: This is for development only!');
-        this.smartserve = new plugins.smartserve.SmartServe({
-          port: 3001,
-          injectReload: true,
-          serveDir: plugins.path.join(paths.cwd, './dist_watch/')
-        });
+        console.log(
+          'bundling TypeScript files to "dist_watch" Note: This is for development only!'
+        );
         const parcel = new Parcel();
         await parcel.start();
         break;
@@ -67,14 +64,14 @@ export class TsWatch {
         );
         break;
       case 'gitzone_service':
-          this.watcherMap.add(
-            new Watcher({
-              filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
-              commandToExecute: 'npm run startTs',
-              timeout: null
-            })
-          );
-          break;
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
+            commandToExecute: 'npm run startTs',
+            timeout: null
+          })
+        );
+        break;
       case 'echoSomething':
         const tsWatchInstanceEchoSomething = new Watcher({
           filePathToWatch: plugins.path.join(paths.cwd, './ts'),
@@ -90,7 +87,6 @@ export class TsWatch {
       await watcher.start();
     });
     if (this.smartserve) {
-
       await this.smartserve.start();
     }
   }

ts/tswatch.classes.watcher.ts

@@ -20,21 +20,6 @@ export class Watcher {
     executor: 'bash'
   });
 
-  /**
-   * used to execute 
-   */
-  private executionTask: plugins.taskbuffer.Task = new plugins.taskbuffer.Task({
-    name: 'watcherCommandFunctionTask',
-    taskFunction: async () => {
-      if (typeof this.options.commandToExecute === 'string') {
-        throw new Error('cannot execute string as task');
-      }
-      await this.options.commandToExecute();
-    },
-    buffered: true,
-    bufferMax: 1
-  });
-
   private currentExecution: plugins.smartshell.IExecResultStreaming;
   private smartchokWatcher = new plugins.smartchok.Smartchok([], {});
   private options: IWatcherConstructorOptions;
@@ -65,16 +50,15 @@ export class Watcher {
     if (typeof this.options.commandToExecute === 'string') {
       if (this.currentExecution) {
         logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
-        process.kill(-this.currentExecution.childProcess.pid);
+        process.kill(this.currentExecution.childProcess.pid, 'SIGINT');
       } else {
         logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
       }
       this.currentExecution = await this.smartshellInstance.execStreaming(
         this.options.commandToExecute
       );
-      this.currentExecution = null;
     } else {
-      await this.executionTask.trigger();
+      console.log('cannot run execution task');
     }
   }
 

ts/tswatch.plugins.ts

@@ -12,12 +12,19 @@ import * as smartserve from '@pushrocks/smartserve';
 import * as smartshell from '@pushrocks/smartshell';
 import * as taskbuffer from '@pushrocks/taskbuffer';
 
-export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer };
-
+export {
+  lik,
+  smartchok,
+  smartcli,
+  smartdelay,
+  smartlog,
+  smartlogDestinationLocal,
+  smartserve,
+  smartshell,
+  taskbuffer
+};
 
 // third party scope
 import parcel from 'parcel-bundler';
 
-export {
-  parcel
-};
+export { parcel };