1.0.30

.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,50 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.7",
+  "version": "1.0.30",
   "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": "node ./cli.ts.js test --timeout 10000",
+    "test": "(tstest test/)",
-    "test2": "(tstest test/)",
+    "build": "(tsbuild)"
-    "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/tsbundle": "^1.0.47",
+    "@gitzone/tsrun": "^1.2.8",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/smartchok": "^1.0.18",
+    "@pushrocks/lik": "^3.0.11",
+    "@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/smartserve": "^1.1.37",
-  }
+    "@pushrocks/smartshell": "^2.0.25",
+    "@pushrocks/taskbuffer": "^2.0.15"
+  },
+  "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

@@ -1,21 +1,20 @@
+// tslint:disable-next-line: no-implicit-dependencies
 import { expect, tap } from '@pushrocks/tapbundle';
 import * as tswatch from '../ts/index';
 
 let testTsWatchInstance: tswatch.TsWatch;
 
 tap.test('should create a valid TsWatch instance', async () => {
-  testTsWatchInstance = new tswatch.TsWatch({
+  testTsWatchInstance = new tswatch.TsWatch('echoSomething');
-    filePathToWatch: process.cwd(),
-    commandToExecute: 'npm -v',
-    timeout: 1000
-  });
 });
 
 tap.test('should start the tswatch instance', async () => {
-  testTsWatchInstance.start();
+  await testTsWatchInstance.start();
-  console.log('test executed');
 });
 
-tap.test('should run abitrary commands', async () => {});
+tap.test('should stop the instance', async tools => {
+  tools.delayFor(2000);
+  testTsWatchInstance.stop();
+});
 
 tap.start();

ts/interfaces/index.ts

@@ -0,0 +1 @@
+export * from './interfaces.watchmodes';

ts/interfaces/interfaces.watchmodes.ts

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

ts/tswatch.classes.tswatch.ts

@@ -1,79 +1,116 @@
 import * as plugins from './tswatch.plugins';
+import * as paths from './tswatch.paths';
+import * as interfaces from './interfaces';
 
-export interface ITsWatchConstructorOptions {
+import { Watcher } from './tswatch.classes.watcher';
-  filePathToWatch: string;
-  commandToExecute: string;
-  timeout?: number;
-}
 
-/**
- * handles the management of watching for foes
- */
 export class TsWatch {
-  private smartshellInstance = new plugins.smartshell.Smartshell({
+  public watchmode: interfaces.TWatchModes;
-    executor: 'bash'
+  public watcherMap = new plugins.lik.Objectmap<Watcher>();
-  });
+  public smartserve: plugins.smartserve.SmartServe;
-  private currentExecution: plugins.smartshell.IExecResultStreaming;
-  private watcher = new plugins.smartchok.Smartchok([], {});
-  private options: ITsWatchConstructorOptions;
 
-  constructor(optionsArg: ITsWatchConstructorOptions) {
+  constructor(watchmodeArg: interfaces.TWatchModes) {
-    this.options = optionsArg;
+    this.watchmode = watchmodeArg;
   }
 
   /**
-   * start the file
+   * starts the TsWatch instance
    */
   public async start() {
-    this.setupCleanup();
+    switch (this.watchmode) {
-    console.log(`Looking at ${this.options.filePathToWatch} for changes`);
+      case 'test':
-    this.watcher.add([this.options.filePathToWatch]); // __dirname refers to the directory of this very file
+        this.watcherMap.add(
-    const changeObservable = await this.watcher.getObservableFor('change');
+          new Watcher({
-    changeObservable.subscribe(() => {
+            filePathToWatch: paths.cwd,
-      this.updateCurrentExecution();
+            commandToExecute: 'npm run test2',
-    });
+            timeout: null
-    this.updateCurrentExecution();
+          })
-  }
-
-  private async updateCurrentExecution() {
-    if (this.currentExecution) {
-      process.kill(-this.currentExecution.childProcess.pid);
-    }
-    this.currentExecution = await this.smartshellInstance.execStreaming(
-      this.options.commandToExecute
         );
-    this.currentExecution = null;
+        break;
+      case 'gitzone_npm':
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: paths.cwd,
+            commandToExecute: 'npm run test',
+            timeout: null
+          })
+        );
+        break;
+      case 'gitzone_element':
+        // lets create a standard server
+        this.smartserve = new plugins.smartserve.SmartServe({
+          port: 3001,
+          injectReload: true,
+          serveDir: plugins.path.join(paths.cwd, './dist_web/')
+        });
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+            commandToExecute: async () => {
+              const tsbundle = new plugins.tsbundle.TsBundle();
+              const htmlHandler = new plugins.tsbundle.HtmlHandler();
+              await tsbundle.buildProduction('./ts_web/index.ts', './dist_web/bundle.js');
+              await htmlHandler.copyHtml();
+            },
+            timeout: null
+          })
+        );
+        break;
+      case 'gitzone_website':
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
+            commandToExecute: 'npm run startTs',
+            timeout: null
+          })
+        );
+
+        // client directory
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+            commandToExecute: 'npm run build',
+            timeout: null
+          })
+        );
+        break;
+      case 'gitzone_service':
+          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'),
+          commandToExecute: 'npm -v',
+          timeout: null
+        });
+        this.watcherMap.add(tsWatchInstanceEchoSomething);
+        break;
+      default:
+        break;
+    }
+    this.watcherMap.forEach(async watcher => {
+      await watcher.start();
+    });
+    if (this.smartserve) {
+      await this.smartserve.start();
+    }
   }
 
   /**
-   * this method sets up a clean exit strategy
+   * stops the execution of any active Watchers
    */
-  private async setupCleanup() {
+  public async stop() {
-    const cleanup = () => {
+    if (this.smartserve) {
-      if (this.currentExecution) {
+      await this.smartserve.stop();
-        process.kill(-this.currentExecution.childProcess.pid);
     }
-    };
+    this.watcherMap.forEach(async watcher => {
-    process.on('exit', () => {
+      await watcher.stop();
-      console.log('');
-      console.log('now exiting!');
-      cleanup();
-      process.exit(0);
-    });
-    process.on('SIGINT', () => {
-      console.log('');
-      console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
-      cleanup();
-      process.exit(0);
-    });
-
-    // handle timeout
-    if (this.options.timeout) {
-      plugins.smartdelay.delayFor(this.options.timeout).then(() => {
-        console.log(`timed out afer ${this.options.timeout} milliseconds! exiting!`);
-        cleanup();
-        process.exit(0);
     });
   }
 }
-}

ts/tswatch.classes.watcher.ts

@@ -0,0 +1,122 @@
+import * as plugins from './tswatch.plugins';
+import { logger } from './tswatch.logging';
+
+export type TCommandFunction = () => Promise<void>;
+
+export interface IWatcherConstructorOptions {
+  filePathToWatch: string;
+  commandToExecute: string | TCommandFunction;
+  timeout?: number;
+}
+
+/**
+ * A watcher keeps track of one child execution
+ */
+export class Watcher {
+  /**
+   * used to execute shell commands
+   */
+  private smartshellInstance = new plugins.smartshell.Smartshell({
+    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;
+
+  constructor(optionsArg: IWatcherConstructorOptions) {
+    this.options = optionsArg;
+  }
+
+  /**
+   * start the file
+   */
+  public async start() {
+    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();
+    const changeObservable = await this.smartchokWatcher.getObservableFor('change');
+    changeObservable.subscribe(() => {
+      this.updateCurrentExecution();
+    });
+    await this.updateCurrentExecution();
+  }
+
+  /**
+   * updates the current execution
+   */
+  private async updateCurrentExecution() {
+    if (typeof this.options.commandToExecute === 'string') {
+      if (this.currentExecution) {
+        logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
+        process.kill(-this.currentExecution.childProcess.pid);
+      } 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();
+    }
+  }
+
+  /**
+   * this method sets up a clean exit strategy
+   */
+  private async setupCleanup() {
+    const cleanup = () => {
+      if (this.currentExecution) {
+        process.kill(-this.currentExecution.childProcess.pid);
+      }
+    };
+    process.on('exit', () => {
+      console.log('');
+      console.log('now exiting!');
+      cleanup();
+      process.exit(0);
+    });
+    process.on('SIGINT', () => {
+      console.log('');
+      console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
+      cleanup();
+      process.exit(0);
+    });
+
+    // handle timeout
+    if (this.options.timeout) {
+      plugins.smartdelay.delayFor(this.options.timeout).then(() => {
+        console.log(`timed out afer ${this.options.timeout} milliseconds! exiting!`);
+        cleanup();
+        process.exit(0);
+      });
+    }
+  }
+
+  /**
+   * stops the watcher
+   */
+  public async stop() {
+    await this.smartchokWatcher.stop();
+    if (this.currentExecution && !this.currentExecution.childProcess.killed) {
+      process.kill(-this.currentExecution.childProcess.pid);
+    }
+  }
+}

ts/tswatch.cli.ts

@@ -8,21 +8,34 @@ const tswatchCli = new plugins.smartcli.Smartcli();
 
 // standard behaviour will assume gitzone setup
 
-tswatchCli.addCommand('test').subscribe(argvArg => {
+tswatchCli.addCommand('element').subscribe(async argvArg => {
-  logger.log('info', `running test task`);
+  logger.log('info', `running watch task for a gitzone element project`);
-  const tsWatch = new TsWatch({
+  const tsWatch = new TsWatch('gitzone_element');
-    filePathToWatch: paths.cwd,
+  await tsWatch.start();
-    commandToExecute: 'npm run test2',
-    timeout: (() => {
-      if (argvArg.timeout) {
-        console.log(`timeing out after ${argvArg.timeout}`);
-        return argvArg.timeout;
-      } else {
-        return null;
-      }
-    })()
 });
-  tsWatch.start();
+
+tswatchCli.addCommand('npm').subscribe(async argvArg => {
+  logger.log('info', `running watch task for a gitzone element project`);
+  const tsWatch = new TsWatch('gitzone_npm');
+  await tsWatch.start();
+});
+
+tswatchCli.addCommand('service').subscribe(async argvArg => {
+  logger.log('info', `running test task`);
+  const tsWatch = new TsWatch('gitzone_service');
+  await tsWatch.start();
+});
+
+tswatchCli.addCommand('test').subscribe(async argvArg => {
+  logger.log('info', `running test task`);
+  const tsWatch = new TsWatch('test');
+  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.startParse();

ts/tswatch.plugins.ts

@@ -1,12 +1,22 @@
 import * as path from 'path';
 export { path };
 
+// @gitzone scope
+import * as tsbundle from '@gitzone/tsbundle';
+
+export {
+  tsbundle
+};
+
 // @pushrocks scope
+import * as lik from '@pushrocks/lik';
 import * as smartchok from '@pushrocks/smartchok';
 import * as smartcli from '@pushrocks/smartcli';
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartlog from '@pushrocks/smartlog';
 import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
+import * as smartserve from '@pushrocks/smartserve';
 import * as smartshell from '@pushrocks/smartshell';
+import * as taskbuffer from '@pushrocks/taskbuffer';
 
-export { smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartshell };
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer };