1.0.19

.Trash-1000/files/8ba64226-9d16-4f28-a568-49c1ea3aa1e7

@@ -1,7 +0,0 @@
-{
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "lib": ["es2015"],
-    "target": "ES2017"
-  }
-}

.Trash-1000/info/8ba64226-9d16-4f28-a568-49c1ea3aa1e7.trashinfo

@@ -1,3 +0,0 @@
-[Trash Info]
-Path=/home/coder/project/tsconfig.json
-DeletionDate=2019-05-08T21:54:46.502Z

.gitignore

@@ -8,9 +8,12 @@ pages/
 # installs
 node_modules/
 
-# caches and builds
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
 dist_web/
 dist_serve/

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -38,19 +38,7 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
+testStable:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
   stage: test
   script:
   - npmci npm prepare
@@ -60,6 +48,18 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
@@ -78,19 +78,12 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --volume "$PWD":/code
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
   - docker
   - priv
@@ -106,13 +99,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

package.json

@@ -1,34 +1,48 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.8",
+  "version": "1.0.19",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
+  "bin": {
+    "tswatch": "cli.js"
+  },
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.20",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.0.0",
+    "@types/node": "^12.7.12",
-    "tslint": "^5.16.0",
+    "tslint": "^5.20.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tsrun": "^1.2.8",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^3.0.5",
+    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartchok": "^1.0.18",
+    "@pushrocks/smartchok": "^1.0.23",
     "@pushrocks/smartcli": "^3.0.7",
     "@pushrocks/smartdelay": "^2.0.3",
     "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartshell": "^2.0.13"
+    "@pushrocks/smartshell": "^2.0.25"
-  }
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -21,6 +21,6 @@ watch typescript projects during development
 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.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -12,7 +12,7 @@ tap.test('should start the tswatch instance', async () => {
   await testTsWatchInstance.start();
 });
 
-tap.test('should stop the instance', async (tools) => {
+tap.test('should stop the instance', async tools => {
   tools.delayFor(2000);
   testTsWatchInstance.stop();
 });

ts/interfaces/interfaces.watchmodes.ts

@@ -1 +1,7 @@
-export type TWatchModes = 'test' | 'gitzone_npm' | 'gitzone_service' | 'gitzone_website' | 'echoSomething';
+export type TWatchModes =
+  | 'test'
+  | 'gitzone_npm'
+  | 'gitzone_service'
+  | 'gitzone_element'
+  | 'gitzone_website'
+  | 'echoSomething';

ts/tswatch.classes.tswatch.ts

@@ -15,31 +15,52 @@ export class TsWatch {
   /**
    * starts the TsWatch instance
    */
-  public async start () {
+  public async start() {
     switch (this.watchmode) {
       case 'test':
-        const tsWatchInstanceTest = new Watcher({
+        this.watcherMap.add(
+          new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test2',
             timeout: null
-        });
+          })
-        this.watcherMap.add(tsWatchInstanceTest);
+        );
         break;
       case 'gitzone_npm':
-        const tsWatchInstanceGitzoneNpm = new Watcher({
+        this.watcherMap.add(
+          new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test',
             timeout: null
-        });
+          })
-        this.watcherMap.add(tsWatchInstanceGitzoneNpm);
+        );
+        break;
+      case 'gitzone_element':
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, 'ts_web'),
+            commandToExecute: 'npm run build',
+            timeout: null
+          })
+        );
         break;
       case 'gitzone_website':
-        const tsWatchInstanceGitzoneWebsite = new Watcher({
+        this.watcherMap.add(
-          filePathToWatch: paths.cwd,
+          new Watcher({
-          commandToExecute: 'npm run test',
+            filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
+            commandToExecute: 'npm run startTs',
             timeout: null
-        });
+          })
-        this.watcherMap.add(tsWatchInstanceGitzoneWebsite);
+        );
+
+        // client directory
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+            commandToExecute: 'npm run build',
+            timeout: null
+          })
+        );
         break;
       case 'echoSomething':
         const tsWatchInstanceEchoSomething = new Watcher({
@@ -60,9 +81,9 @@ export class TsWatch {
   /**
    * stops the execution of any active Watchers
    */
-  public async stop () {
+  public async stop() {
     this.watcherMap.forEach(async watcher => {
       await watcher.stop();
-    })
+    });
   }
 }

ts/tswatch.classes.watcher.ts

@@ -26,7 +26,7 @@ export class Watcher {
    * start the file
    */
   public async start() {
-    this.setupCleanup();
+    await this.setupCleanup();
     console.log(`Looking at ${this.options.filePathToWatch} for changes`);
     this.smartchokWatcher.add([this.options.filePathToWatch]); // __dirname refers to the directory of this very file
     await this.smartchokWatcher.start();
@@ -90,7 +90,7 @@ export class Watcher {
    */
   public async stop() {
     await this.smartchokWatcher.stop();
-    if (this.currentExecution) {
+    if (this.currentExecution && !this.currentExecution.childProcess.killed) {
       process.kill(-this.currentExecution.childProcess.pid);
     }
   }

ts/tswatch.cli.ts

@@ -14,4 +14,16 @@ tswatchCli.addCommand('test').subscribe(async argvArg => {
   await tsWatch.start();
 });
 
+tswatchCli.addCommand('website').subscribe(async argvArg => {
+  logger.log('info', `running watch task for a gitzone website project`);
+  const tsWatch = new TsWatch('gitzone_website');
+  await tsWatch.start();
+});
+
+tswatchCli.addCommand('element').subscribe(async argvArg => {
+  logger.log('info', `running watch task for a gitzone element project`);
+  const tsWatch = new TsWatch('gitzone_element');
+  await tsWatch.start();
+});
+
 tswatchCli.startParse();