1.0.35

.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

.snyk

@@ -0,0 +1,24 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-MINIMIST-559764:
+    - parcel-bundler > @babel/core > json5 > minimist:
+        reason: None given
+        expires: '2020-04-12T17:46:49.672Z'
+    - parcel-bundler > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T17:46:49.672Z'
+    - parcel-bundler > @parcel/fs > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T17:46:49.672Z'
+    - parcel-bundler > htmlnano > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T17:46:49.672Z'
+    - parcel-bundler > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T17:46:49.672Z'
+    - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-12T17:46:49.672Z'
+patch: {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.17",
+  "version": "1.0.35",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist/index.js",
@@ -12,26 +12,40 @@
   },
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild)"
-    "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.23",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^12.0.2",
+    "@types/node": "^13.9.0",
-    "tslint": "^5.16.0",
+    "tslint": "^6.0.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.19",
-    "@pushrocks/smartchok": "^1.0.18",
+    "@pushrocks/smartchok": "^1.0.23",
     "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartshell": "^2.0.22"
+    "@pushrocks/smartserve": "^1.1.39",
-  }
+    "@pushrocks/smartshell": "^2.0.25",
+    "@pushrocks/taskbuffer": "^2.1.1",
+    "@types/parcel-bundler": "^1.12.1",
+    "parcel-bundler": "^1.12.4"
+  },
+  "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.parcel.ts

@@ -0,0 +1,37 @@
+import * as plugins from './tswatch.plugins';
+import * as paths from './tswatch.paths';
+
+export class Parcel {
+  public async start() {
+    const entryFiles = plugins.path.join(paths.cwd, './html/index.html');
+
+    // Bundler options
+    const options: plugins.parcel.ParcelOptions = {
+      outDir: './dist_watch', // The out directory to put the build files in, defaults to dist
+      outFile: 'index.html', // The name of the outputFile
+      publicUrl: '/', // The url to serve on, defaults to '/'
+      watch: true, // Whether to watch the files and rebuild them on change, defaults to process.env.NODE_ENV !== 'production'
+      cache: true, // Enabled or disables caching, defaults to true
+      cacheDir: '.nogit/.parcelcache', // The directory cache gets put in, defaults to .cache
+      contentHash: false, // Disable content hash from being included on the filename
+      global: 'moduleName', // Expose modules as UMD under this name, disabled by default
+      minify: false, // Minify files, enabled if process.env.NODE_ENV === 'production'
+      scopeHoist: false, // Turn on experimental scope hoisting/tree shaking flag, for smaller production bundles
+      target: 'browser', // Browser/node/electron, defaults to browser
+      bundleNodeModules: true, // By default, package.json dependencies are not included when using 'node' or 'electron' with 'target' option above. Set to true to adds them to the bundle, false by default
+      https: null,
+      logLevel: 3, // 5 = save everything to a file, 4 = like 3, but with timestamps and additionally log http requests to dev server, 3 = log info, warnings & errors, 2 = log warnings & errors, 1 = log errors, 0 = log nothing
+      hmr: true, // Enable or disable HMR while watching
+      hmrPort: 3003, // The port the HMR socket runs on, defaults to a random free port (0 in node.js resolves to a random free port)
+      sourceMaps: true, // Enable or disable sourcemaps, defaults to enabled (minified builds currently always create sourcemaps)
+      hmrHostname: '', // A hostname for hot module reload, default to ''
+      detailedReport: false // Prints a detailed report of the bundles, assets, filesizes and times, defaults to false, reports are only printed if watch is disabled
+    };
+
+    const bundler = new plugins.parcel(entryFiles, options);
+
+    // Run the bundler, this returns the main bundle
+    // Use the events if you're using watch mode as this promise will only trigger once and not for every rebuild
+    const bundle = await bundler.serve(3002);
+  }
+}

ts/tswatch.classes.tswatch.ts

@@ -3,10 +3,12 @@ import * as paths from './tswatch.paths';
 import * as interfaces from './interfaces';
 
 import { Watcher } from './tswatch.classes.watcher';
+import { Parcel } from './tswatch.classes.parcel';
 
 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;
@@ -18,39 +20,64 @@ export class TsWatch {
   public async start() {
     switch (this.watchmode) {
       case 'test':
-        this.watcherMap.add(new Watcher({
+        this.watcherMap.add(
-          filePathToWatch: paths.cwd,
+          new Watcher({
-          commandToExecute: 'npm run test2',
+            filePathToWatch: paths.cwd,
-          timeout: null
+            commandToExecute: 'npm run test2',
-        }));
+            timeout: null
+          })
+        );
         break;
       case 'gitzone_npm':
-        this.watcherMap.add(new Watcher({
+        this.watcherMap.add(
-          filePathToWatch: paths.cwd,
+          new Watcher({
-          commandToExecute: 'npm run test',
+            filePathToWatch: paths.cwd,
-          timeout: null
+            commandToExecute: 'npm run test',
-        }));
+            timeout: null
+          })
+        );
+        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/')
+        });
+        const parcel = new Parcel();
+        await parcel.start();
         break;
       case 'gitzone_website':
-        // server directory
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
-            commandToExecute: 'npm run start',
+            commandToExecute: 'npm run startTs',
             timeout: null
           })
         );
 
         // client directory
-        this.watcherMap.add(new Watcher({
+        this.watcherMap.add(
-          filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+          new Watcher({
-          commandToExecute: 'npm run build',
+            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
-          timeout: null
+            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: paths.cwd,
+          filePathToWatch: plugins.path.join(paths.cwd, './ts'),
           commandToExecute: 'npm -v',
           timeout: null
         });
@@ -62,12 +89,19 @@ 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;
@@ -26,7 +47,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();
@@ -34,23 +55,27 @@ export class Watcher {
     changeObservable.subscribe(() => {
       this.updateCurrentExecution();
     });
-    this.updateCurrentExecution();
+    await this.updateCurrentExecution();
   }
 
   /**
    * updates the current execution
    */
   private async updateCurrentExecution() {
-    if (this.currentExecution) {
+    if (typeof this.options.commandToExecute === 'string') {
-      logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
+      if (this.currentExecution) {
-      process.kill(-this.currentExecution.childProcess.pid);
+        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 {
-      logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
+      await this.executionTask.trigger();
     }
-    this.currentExecution = await this.smartshellInstance.execStreaming(
-      this.options.commandToExecute
-    );
-    this.currentExecution = null;
   }
 
   /**

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');

ts/tswatch.plugins.ts

@@ -8,6 +8,16 @@ 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 };
+
+
+// third party scope
+import parcel from 'parcel-bundler';
+
+export {
+  parcel
+};