1.0.31

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.19",
+  "version": "1.0.31",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist/index.js",
@@ -12,27 +12,29 @@
   },
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
-    "format": "(gitzone format)"
+    "build": "(tsbuild)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
     "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.12",
-    "tslint": "^5.20.0",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "@types/node": "^13.7.7",
+    "tslint": "^6.0.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
+    "@gitzone/tsbundle": "^1.0.50",
     "@gitzone/tsrun": "^1.2.8",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^3.0.11",
+    "@pushrocks/lik": "^3.0.19",
     "@pushrocks/smartchok": "^1.0.23",
     "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartdelay": "^2.0.3",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartlog": "^2.0.21",
     "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartshell": "^2.0.25"
+    "@pushrocks/smartserve": "^1.1.39",
+    "@pushrocks/smartshell": "^2.0.25",
+    "@pushrocks/taskbuffer": "^2.1.1"
   },
   "files": [
     "ts/**/*",

ts/tswatch.classes.tswatch.ts

@@ -7,6 +7,7 @@ import { Watcher } from './tswatch.classes.watcher';
 export class TsWatch {
   public watchmode: interfaces.TWatchModes;
   public watcherMap = new plugins.lik.Objectmap<Watcher>();
+  public smartserve: plugins.smartserve.SmartServe;
 
   constructor(watchmodeArg: interfaces.TWatchModes) {
     this.watchmode = watchmodeArg;
@@ -36,10 +37,21 @@ export class TsWatch {
         );
         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: 'npm run build',
+            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
           })
         );
@@ -62,9 +74,18 @@ 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;
       case 'echoSomething':
         const tsWatchInstanceEchoSomething = new Watcher({
-          filePathToWatch: paths.cwd,
+          filePathToWatch: plugins.path.join(paths.cwd, './ts'),
           commandToExecute: 'npm -v',
           timeout: null
         });
@@ -76,12 +97,18 @@ export class TsWatch {
     this.watcherMap.forEach(async watcher => {
       await watcher.start();
     });
+    if (this.smartserve) {
+      await this.smartserve.start();
+    }
   }
 
   /**
    * stops the execution of any active Watchers
    */
   public async stop() {
+    if (this.smartserve) {
+      await this.smartserve.stop();
+    }
     this.watcherMap.forEach(async watcher => {
       await watcher.stop();
     });

ts/tswatch.classes.watcher.ts

@@ -1,9 +1,11 @@
 import * as plugins from './tswatch.plugins';
 import { logger } from './tswatch.logging';
 
+export type TCommandFunction = () => Promise<void>;
+
 export interface IWatcherConstructorOptions {
   filePathToWatch: string;
-  commandToExecute: string;
+  commandToExecute: string | TCommandFunction;
   timeout?: number;
 }
 
@@ -11,9 +13,28 @@ export interface IWatcherConstructorOptions {
  * 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;
@@ -34,13 +55,14 @@ export class Watcher {
     changeObservable.subscribe(() => {
       this.updateCurrentExecution();
     });
-    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);
@@ -51,6 +73,9 @@ export class Watcher {
         this.options.commandToExecute
       );
       this.currentExecution = null;
+    } else {
+      await this.executionTask.trigger();
+    }
   }
 
   /**

ts/tswatch.cli.ts

@@ -8,6 +8,24 @@ const tswatchCli = new plugins.smartcli.Smartcli();
 
 // standard behaviour will assume gitzone setup
 
+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.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');
@@ -20,10 +38,4 @@ tswatchCli.addCommand('website').subscribe(async argvArg => {
   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();

ts/tswatch.plugins.ts

@@ -1,6 +1,13 @@
 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';
@@ -8,6 +15,8 @@ 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 { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartshell };
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer };