1.0.72

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -19,11 +19,37 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
+
 # ====================
 # test stage
 # ====================
@@ -37,9 +63,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -50,9 +74,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -72,6 +94,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.snyk

@@ -1,54 +0,0 @@
-# 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'
-    - 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/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('./dist/index');
+const cliTool = await import('./dist_ts/index.js');
+cliTool.runCli();

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
+
-require('./ts/index');
+import * as tsrun from '@gitzone/tsrun';
+tsrun.runPath('./cli.child.js', import.meta.url);

dist_ts/index.d.ts

@@ -1,2 +1,2 @@
-export * from './tswatch.classes.tswatch';
+export * from './tswatch.classes.tswatch.js';
-import './tswatch.cli';
+export * from './tswatch.cli.js';

dist_ts/index.js

@@ -1,18 +1,6 @@
-"use strict";
+import * as early from '@pushrocks/early';
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const early = __importStar(require("@pushrocks/early"));
 early.start('tswatch');
-__export(require("./tswatch.classes.tswatch"));
+export * from './tswatch.classes.tswatch.js';
-require("./tswatch.cli");
+export * from './tswatch.cli.js';
 early.stop();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSx3REFBMEM7QUFDMUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUN2QiwrQ0FBMEM7QUFDMUMseUJBQXVCO0FBQ3ZCLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBQzFDLEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDdkIsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyJ9

dist_ts/interfaces/index.d.ts

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

dist_ts/interfaces/index.js

@@ -1,3 +1,2 @@
-"use strict";
+export * from './interfaces.watchmodes.js';
-Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbnRlcmZhY2VzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsNEJBQTRCLENBQUMifQ==
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbnRlcmZhY2VzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

dist_ts/interfaces/interfaces.watchmodes.js

@@ -1,3 +1,2 @@
-"use strict";
+export {};
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy53YXRjaG1vZGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvaW50ZXJmYWNlcy9pbnRlcmZhY2VzLndhdGNobW9kZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

dist_ts/tswatch.classes.tswatch.d.ts

@@ -1,6 +1,6 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
-import { Watcher } from './tswatch.classes.watcher';
+import { Watcher } from './tswatch.classes.watcher.js';
 export declare class TsWatch {
     watchmode: interfaces.TWatchModes;
     watcherMap: plugins.lik.ObjectMap<Watcher>;

dist_ts/tswatch.classes.tswatch.js

@@ -1,17 +1,8 @@
-"use strict";
+import * as plugins from './tswatch.plugins.js';
-var __importStar = (this && this.__importStar) || function (mod) {
+import * as paths from './tswatch.paths.js';
-    if (mod && mod.__esModule) return mod;
+import './interfaces/index.js';
-    var result = {};
+import { Watcher } from './tswatch.classes.watcher.js';
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+export class TsWatch {
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = __importStar(require("./tswatch.plugins"));
-const paths = __importStar(require("./tswatch.paths"));
-const tswatch_classes_watcher_1 = require("./tswatch.classes.watcher");
-const tswatch_classes_parcel_1 = require("./tswatch.classes.parcel");
-class TsWatch {
     constructor(watchmodeArg) {
         this.watcherMap = new plugins.lik.ObjectMap();
         this.watchmode = watchmodeArg;
@@ -22,50 +13,80 @@ class TsWatch {
     async start() {
         switch (this.watchmode) {
             case 'test':
-                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                this.watcherMap.add(new Watcher({
                     filePathToWatch: paths.cwd,
                     commandToExecute: 'npm run test2',
-                    timeout: null
+                    timeout: null,
                 }));
                 break;
             case 'gitzone_npm':
-                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                this.watcherMap.add(new Watcher({
                     filePathToWatch: paths.cwd,
                     commandToExecute: 'npm run test',
-                    timeout: null
+                    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!');
-                const parcel = new tswatch_classes_parcel_1.Parcel();
+                const smartserve = new plugins.smartserve.SmartServe({
-                await parcel.start();
+                    injectReload: true,
+                    serveDir: plugins.path.join(paths.cwd, './dist_watch/'),
+                    port: 3002,
+                });
+                const tsbundle = new plugins.tsbundle.TsBundle();
+                const bundleAndReload = async () => {
+                    await tsbundle.build(paths.cwd, './ts_web/index.ts', './dist_watch/bundle.js', {
+                        bundler: 'esbuild'
+                    });
+                    await smartserve.reload();
+                };
+                this.watcherMap.add(new Watcher({
+                    filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+                    functionToCall: async () => {
+                        await bundleAndReload();
+                    },
+                    timeout: null,
+                }));
+                await smartserve.start();
+                /* const parcel = new plugins.smartparcel.Parcel(
+                  plugins.path.join(process.cwd(), './html/index.html'),
+                  plugins.path.join(process.cwd(), './dist_watch'),
+                  'index.html'
+                );
+                await parcel.watchAndServe(); */
                 break;
             case 'gitzone_website':
-                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                this.watcherMap.add(new Watcher({
                     filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
                     commandToExecute: 'npm run startTs',
-                    timeout: null
+                    timeout: null,
+                }));
+                this.watcherMap.add(new Watcher({
+                    filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+                    commandToExecute: 'npm run bundle',
+                    timeout: null,
                 }));
                 // client directory
-                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                /* const parcelWebsite = new plugins.smartparcel.Parcel(
-                    filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+                  plugins.path.join(process.cwd(), './html/index.html'),
-                    commandToExecute: 'npm run build',
+                  plugins.path.join(process.cwd(), './dist_serve'),
-                    timeout: null
+                  'bundle.js'
-                }));
+                );
+                await parcelWebsite.watchAndServe(); */
                 break;
             case 'gitzone_service':
-                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                this.watcherMap.add(new Watcher({
                     filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
                     commandToExecute: 'npm run startTs',
-                    timeout: null
+                    timeout: null,
                 }));
                 break;
             case 'echoSomething':
-                const tsWatchInstanceEchoSomething = new tswatch_classes_watcher_1.Watcher({
+                const tsWatchInstanceEchoSomething = new Watcher({
                     filePathToWatch: plugins.path.join(paths.cwd, './ts'),
                     commandToExecute: 'npm -v',
-                    timeout: null
+                    timeout: null,
                 });
                 this.watcherMap.add(tsWatchInstanceEchoSomething);
                 break;
@@ -91,5 +112,4 @@ class TsWatch {
         });
     }
 }
-exports.TsWatch = TsWatch;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLnRzd2F0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMudHN3YXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxLQUFLLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBNEIsdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRXZELE1BQU0sT0FBTyxPQUFPO0lBS2xCLFlBQVksWUFBb0M7UUFIekMsZUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQVcsQ0FBQztRQUl2RCxJQUFJLENBQUMsU0FBUyxHQUFHLFlBQVksQ0FBQztJQUNoQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixRQUFRLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDdEIsS0FBSyxNQUFNO2dCQUNULElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLE9BQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsS0FBSyxDQUFDLEdBQUc7b0JBQzFCLGdCQUFnQixFQUFFLGVBQWU7b0JBQ2pDLE9BQU8sRUFBRSxJQUFJO2lCQUNkLENBQUMsQ0FDSCxDQUFDO2dCQUNGLE1BQU07WUFDUixLQUFLLGFBQWE7Z0JBQ2hCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLE9BQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsS0FBSyxDQUFDLEdBQUc7b0JBQzFCLGdCQUFnQixFQUFFLGNBQWM7b0JBQ2hDLE9BQU8sRUFBRSxJQUFJO2lCQUNkLENBQUMsQ0FDSCxDQUFDO2dCQUNGLE1BQU07WUFDUixLQUFLLGlCQUFpQjtnQkFDcEIsZ0NBQWdDO2dCQUNoQyxPQUFPLENBQUMsR0FBRyxDQUNULCtFQUErRSxDQUNoRixDQUFDO2dCQUNGLE1BQU0sVUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7b0JBQ25ELFlBQVksRUFBRSxJQUFJO29CQUNsQixRQUFRLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxlQUFlLENBQUM7b0JBQ3ZELElBQUksRUFBRSxJQUFJO2lCQUNYLENBQUMsQ0FBQztnQkFDSCxNQUFNLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQ2pELE1BQU0sZUFBZSxHQUFHLEtBQUssSUFBSSxFQUFFO29CQUNqQyxNQUFNLFFBQVEsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRTt3QkFDN0UsT0FBTyxFQUFFLFNBQVM7cUJBQ25CLENBQUMsQ0FBQztvQkFDSCxNQUFNLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDNUIsQ0FBQyxDQUFBO2dCQUNELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLE9BQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxXQUFXLENBQUM7b0JBQzFELGNBQWMsRUFBRSxLQUFLLElBQUksRUFBRTt3QkFDekIsTUFBTSxlQUFlLEVBQUUsQ0FBQztvQkFDMUIsQ0FBQztvQkFDRCxPQUFPLEVBQUUsSUFBSTtpQkFDZCxDQUFDLENBQ0gsQ0FBQztnQkFDRixNQUFNLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDekI7Ozs7O2dEQUtnQztnQkFDaEMsTUFBTTtZQUNSLEtBQUssaUJBQWlCO2dCQUNwQixJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FDakIsSUFBSSxPQUFPLENBQUM7b0JBQ1YsZUFBZSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDO29CQUN0RCxnQkFBZ0IsRUFBRSxpQkFBaUI7b0JBQ25DLE9BQU8sRUFBRSxJQUFJO2lCQUNkLENBQUMsQ0FDSCxDQUFDO2dCQUNGLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLE9BQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxXQUFXLENBQUM7b0JBQzFELGdCQUFnQixFQUFFLGdCQUFnQjtvQkFDbEMsT0FBTyxFQUFFLElBQUk7aUJBQ2QsQ0FBQyxDQUNILENBQUM7Z0JBRUYsbUJBQW1CO2dCQUNuQjs7Ozs7dURBS3VDO2dCQUN2QyxNQUFNO1lBQ1IsS0FBSyxpQkFBaUI7Z0JBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLE9BQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUM7b0JBQ3RELGdCQUFnQixFQUFFLGlCQUFpQjtvQkFDbkMsT0FBTyxFQUFFLElBQUk7aUJBQ2QsQ0FBQyxDQUNILENBQUM7Z0JBQ0YsTUFBTTtZQUNSLEtBQUssZUFBZTtnQkFDbEIsTUFBTSw0QkFBNEIsR0FBRyxJQUFJLE9BQU8sQ0FBQztvQkFDL0MsZUFBZSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDO29CQUNyRCxnQkFBZ0IsRUFBRSxRQUFRO29CQUMxQixPQUFPLEVBQUUsSUFBSTtpQkFDZCxDQUFDLENBQUM7Z0JBQ0gsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztnQkFDbEQsTUFBTTtZQUNSO2dCQUNFLE1BQU07U0FDVDtRQUNELElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUN4QyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN4QixDQUFDLENBQUMsQ0FBQztRQUNILElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNuQixNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7U0FDL0I7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNuQixNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7U0FDOUI7UUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7WUFDeEMsTUFBTSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdkIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YifQ==
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLnRzd2F0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMudHN3YXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSwyREFBNkM7QUFDN0MsdURBQXlDO0FBR3pDLHVFQUFvRDtBQUNwRCxxRUFBa0Q7QUFFbEQsTUFBYSxPQUFPO0lBS2xCLFlBQVksWUFBb0M7UUFIekMsZUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQVcsQ0FBQztRQUl2RCxJQUFJLENBQUMsU0FBUyxHQUFHLFlBQVksQ0FBQztJQUNoQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixRQUFRLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDdEIsS0FBSyxNQUFNO2dCQUNULElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLGlDQUFPLENBQUM7b0JBQ1YsZUFBZSxFQUFFLEtBQUssQ0FBQyxHQUFHO29CQUMxQixnQkFBZ0IsRUFBRSxlQUFlO29CQUNqQyxPQUFPLEVBQUUsSUFBSTtpQkFDZCxDQUFDLENBQ0gsQ0FBQztnQkFDRixNQUFNO1lBQ1IsS0FBSyxhQUFhO2dCQUNoQixJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FDakIsSUFBSSxpQ0FBTyxDQUFDO29CQUNWLGVBQWUsRUFBRSxLQUFLLENBQUMsR0FBRztvQkFDMUIsZ0JBQWdCLEVBQUUsY0FBYztvQkFDaEMsT0FBTyxFQUFFLElBQUk7aUJBQ2QsQ0FBQyxDQUNILENBQUM7Z0JBQ0YsTUFBTTtZQUNSLEtBQUssaUJBQWlCO2dCQUNwQixnQ0FBZ0M7Z0JBQ2hDLE9BQU8sQ0FBQyxHQUFHLENBQ1QsK0VBQStFLENBQ2hGLENBQUM7Z0JBQ0YsTUFBTSxNQUFNLEdBQUcsSUFBSSwrQkFBTSxFQUFFLENBQUM7Z0JBQzVCLE1BQU0sTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUNyQixNQUFNO1lBQ1IsS0FBSyxpQkFBaUI7Z0JBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLGlDQUFPLENBQUM7b0JBQ1YsZUFBZSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDO29CQUN0RCxnQkFBZ0IsRUFBRSxpQkFBaUI7b0JBQ25DLE9BQU8sRUFBRSxJQUFJO2lCQUNkLENBQUMsQ0FDSCxDQUFDO2dCQUVGLG1CQUFtQjtnQkFDbkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQ2pCLElBQUksaUNBQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxXQUFXLENBQUM7b0JBQzFELGdCQUFnQixFQUFFLGVBQWU7b0JBQ2pDLE9BQU8sRUFBRSxJQUFJO2lCQUNkLENBQUMsQ0FDSCxDQUFDO2dCQUNGLE1BQU07WUFDUixLQUFLLGlCQUFpQjtnQkFDcEIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQ2pCLElBQUksaUNBQU8sQ0FBQztvQkFDVixlQUFlLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUM7b0JBQ3RELGdCQUFnQixFQUFFLGlCQUFpQjtvQkFDbkMsT0FBTyxFQUFFLElBQUk7aUJBQ2QsQ0FBQyxDQUNILENBQUM7Z0JBQ0YsTUFBTTtZQUNSLEtBQUssZUFBZTtnQkFDbEIsTUFBTSw0QkFBNEIsR0FBRyxJQUFJLGlDQUFPLENBQUM7b0JBQy9DLGVBQWUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQztvQkFDckQsZ0JBQWdCLEVBQUUsUUFBUTtvQkFDMUIsT0FBTyxFQUFFLElBQUk7aUJBQ2QsQ0FBQyxDQUFDO2dCQUNILElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLENBQUM7Z0JBQ2xELE1BQU07WUFDUjtnQkFDRSxNQUFNO1NBQ1Q7UUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7WUFDdEMsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUU7WUFDbkIsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO1NBQy9CO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLElBQUk7UUFDZixJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUU7WUFDbkIsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1NBQzlCO1FBQ0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFDLE9BQU8sRUFBQyxFQUFFO1lBQ3RDLE1BQU0sT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBakdELDBCQWlHQyJ9

dist_ts/tswatch.classes.watcher.d.ts

@@ -1,7 +1,7 @@
-export declare type TCommandFunction = () => Promise<void>;
 export interface IWatcherConstructorOptions {
     filePathToWatch: string;
-    commandToExecute: string | TCommandFunction;
+    commandToExecute?: string;
+    functionToCall?: () => Promise<any>;
     timeout?: number;
 }
 /**

dist_ts/tswatch.classes.watcher.js

@@ -1,24 +1,15 @@
-"use strict";
+import * as plugins from './tswatch.plugins.js';
-var __importStar = (this && this.__importStar) || function (mod) {
+import { logger } from './tswatch.logging.js';
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = __importStar(require("./tswatch.plugins"));
-const tswatch_logging_1 = require("./tswatch.logging");
 /**
  * A watcher keeps track of one child execution
  */
-class Watcher {
+export class Watcher {
     constructor(optionsArg) {
         /**
          * used to execute shell commands
          */
         this.smartshellInstance = new plugins.smartshell.Smartshell({
-            executor: 'bash'
+            executor: 'bash',
         });
         this.smartchokWatcher = new plugins.smartchok.Smartchok([], {});
         this.options = optionsArg;
@@ -41,46 +32,47 @@ class Watcher {
      * updates the current execution
      */
     async updateCurrentExecution() {
-        if (typeof this.options.commandToExecute === 'string') {
+        if (this.options.commandToExecute) {
             if (this.currentExecution) {
-                tswatch_logging_1.logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
+                logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
                 this.currentExecution.kill();
             }
             else {
-                tswatch_logging_1.logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
+                logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
             }
             this.currentExecution = await this.smartshellInstance.execStreaming(this.options.commandToExecute);
         }
         else {
-            console.log('cannot run execution task');
+            console.log('no executionCommand set');
+        }
+        if (this.options.functionToCall) {
+            this.options.functionToCall();
+        }
+        else {
+            console.log('no functionToCall set.');
         }
     }
     /**
      * this method sets up a clean exit strategy
      */
     async setupCleanup() {
-        const cleanup = () => {
-            if (this.currentExecution) {
-                process.kill(-this.currentExecution.childProcess.pid);
-            }
-        };
         process.on('exit', () => {
             console.log('');
             console.log('now exiting!');
-            cleanup();
+            this.stop();
             process.exit(0);
         });
         process.on('SIGINT', () => {
             console.log('');
             console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
-            cleanup();
+            this.stop();
             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();
+                this.stop();
                 process.exit(0);
             });
         }
@@ -91,9 +83,8 @@ class Watcher {
     async stop() {
         await this.smartchokWatcher.stop();
         if (this.currentExecution && !this.currentExecution.childProcess.killed) {
-            process.kill(-this.currentExecution.childProcess.pid);
+            this.currentExecution.kill();
         }
     }
 }
-exports.Watcher = Watcher;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLndhdGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMud2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQVM5Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxPQUFPO0lBWWxCLFlBQVksVUFBc0M7UUFYbEQ7O1dBRUc7UUFDSyx1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO1lBQzdELFFBQVEsRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQztRQUdLLHFCQUFnQixHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBSWpFLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQzVCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLE1BQU0sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsY0FBYyxDQUFDLENBQUM7UUFDdEUsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLHNEQUFzRDtRQUNqSCxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNwQyxNQUFNLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hGLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxDQUFD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
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLndhdGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMud2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSwyREFBNkM7QUFDN0MsdURBQTJDO0FBVTNDOztHQUVHO0FBQ0gsTUFBYSxPQUFPO0lBWWxCLFlBQVksVUFBc0M7UUFYbEQ7O1dBRUc7UUFDSyx1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO1lBQzdELFFBQVEsRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQztRQUdLLHFCQUFnQixHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBSWpFLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQzVCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLE1BQU0sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsY0FBYyxDQUFDLENBQUM7UUFDdEUsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLHNEQUFzRDtRQUNqSCxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNwQyxNQUFNLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hGLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxDQUFDLHNCQUFzQixFQUFFLENBQUM7UUFDaEMsQ0FBQyxDQUFDLENBQUM7UUFDSCxNQUFNLElB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

dist_ts/tswatch.cli.d.ts

@@ -1 +1 @@
-export {};
+export declare const runCli: () => Promise<void>;

dist_ts/tswatch.cli.js

@@ -1,41 +1,35 @@
-"use strict";
+import * as plugins from './tswatch.plugins.js';
-var __importStar = (this && this.__importStar) || function (mod) {
+import './tswatch.paths.js';
-    if (mod && mod.__esModule) return mod;
+import { logger } from './tswatch.logging.js';
-    var result = {};
+import { TsWatch } from './tswatch.classes.tswatch.js';
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = __importStar(require("./tswatch.plugins"));
-const tswatch_logging_1 = require("./tswatch.logging");
-const tswatch_classes_tswatch_1 = require("./tswatch.classes.tswatch");
 const tswatchCli = new plugins.smartcli.Smartcli();
 // standard behaviour will assume gitzone setup
 tswatchCli.addCommand('element').subscribe(async (argvArg) => {
-    tswatch_logging_1.logger.log('info', `running watch task for a gitzone element project`);
+    logger.log('info', `running watch task for a gitzone element project`);
-    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_element');
+    const tsWatch = new TsWatch('gitzone_element');
     await tsWatch.start();
 });
 tswatchCli.addCommand('npm').subscribe(async (argvArg) => {
-    tswatch_logging_1.logger.log('info', `running watch task for a gitzone element project`);
+    logger.log('info', `running watch task for a gitzone element project`);
-    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_npm');
+    const tsWatch = new TsWatch('gitzone_npm');
     await tsWatch.start();
 });
 tswatchCli.addCommand('service').subscribe(async (argvArg) => {
-    tswatch_logging_1.logger.log('info', `running test task`);
+    logger.log('info', `running test task`);
-    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_service');
+    const tsWatch = new TsWatch('gitzone_service');
     await tsWatch.start();
 });
 tswatchCli.addCommand('test').subscribe(async (argvArg) => {
-    tswatch_logging_1.logger.log('info', `running test task`);
+    logger.log('info', `running test task`);
-    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('test');
+    const tsWatch = new TsWatch('test');
     await tsWatch.start();
 });
 tswatchCli.addCommand('website').subscribe(async (argvArg) => {
-    tswatch_logging_1.logger.log('info', `running watch task for a gitzone website project`);
+    logger.log('info', `running watch task for a gitzone website project`);
-    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_website');
+    const tsWatch = new TsWatch('gitzone_website');
     await tsWatch.start();
 });
-tswatchCli.startParse();
+export const runCli = async () => {
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSwyREFBNkM7QUFFN0MsdURBQTJDO0FBRTNDLHVFQUFvRDtBQUVwRCxNQUFNLFVBQVUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFFbkQsK0NBQStDO0FBRS9DLFVBQVUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBQyxPQUFPLEVBQUMsRUFBRTtJQUN6RCx3QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0RBQWtELENBQUMsQ0FBQztJQUN2RSxNQUFNLE9BQU8sR0FBRyxJQUFJLGlDQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUMvQyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN4QixDQUFDLENBQUMsQ0FBQztBQUVILFVBQVUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBQyxPQUFPLEVBQUMsRUFBRTtJQUNyRCx3QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0RBQWtELENBQUMsQ0FBQztJQUN2RSxNQUFNLE9BQU8sR0FBRyxJQUFJLGlDQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDM0MsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7QUFDeEIsQ0FBQyxDQUFDLENBQUM7QUFFSCxVQUFVLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7SUFDekQsd0JBQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLG1CQUFtQixDQUFDLENBQUM7SUFDeEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxpQ0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDL0MsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7QUFDeEIsQ0FBQyxDQUFDLENBQUM7QUFFSCxVQUFVLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7SUFDdEQsd0JBQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLG1CQUFtQixDQUFDLENBQUM7SUFDeEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxpQ0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFDLE9BQU8sRUFBQyxFQUFFO0lBQ3pELHdCQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxrREFBa0QsQ0FBQyxDQUFDO0lBQ3ZFLE1BQU0sT0FBTyxHQUFHLElBQUksaUNBQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsRUFBRSxDQUFDIn0=
+    tswatchCli.startParse();
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQXVCLG9CQUFvQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUU5QyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFdkQsTUFBTSxVQUFVLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0FBRW5ELCtDQUErQztBQUUvQyxVQUFVLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDM0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0RBQWtELENBQUMsQ0FBQztJQUN2RSxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQ3ZELE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGtEQUFrRCxDQUFDLENBQUM7SUFDdkUsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDM0MsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7QUFDeEIsQ0FBQyxDQUFDLENBQUM7QUFFSCxVQUFVLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDM0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztJQUN4QyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQ3hELE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLG1CQUFtQixDQUFDLENBQUM7SUFDeEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEMsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7QUFDeEIsQ0FBQyxDQUFDLENBQUM7QUFFSCxVQUFVLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDM0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0RBQWtELENBQUMsQ0FBQztJQUN2RSxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQy9CLFVBQVUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztBQUMxQixDQUFDLENBQUMifQ==

dist_ts/tswatch.logging.d.ts

@@ -1,2 +1,2 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
 export declare const logger: plugins.smartlog.Smartlog;

dist_ts/tswatch.logging.js

@@ -1,23 +1,14 @@
-"use strict";
+import * as plugins from './tswatch.plugins.js';
-var __importStar = (this && this.__importStar) || function (mod) {
+export const logger = new plugins.smartlog.Smartlog({
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = __importStar(require("./tswatch.plugins"));
-exports.logger = new plugins.smartlog.Smartlog({
     logContext: {
         company: 'Some Company',
         companyunit: 'Some CompanyUnit',
         containerName: 'Some Containername',
         environment: 'local',
         runtime: 'node',
-        zone: 'gitzone'
+        zone: 'gitzone',
     },
-    minimumLogLevel: 'silly'
+    minimumLogLevel: 'silly',
 });
-exports.logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
+logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5sb2dnaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLDJEQUE2QztBQUVoQyxRQUFBLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO0lBQ2xELFVBQVUsRUFBRTtRQUNWLE9BQU8sRUFBRSxjQUFjO1FBQ3ZCLFdBQVcsRUFBRSxrQkFBa0I7UUFDL0IsYUFBYSxFQUFFLG9CQUFvQjtRQUNuQyxXQUFXLEVBQUUsT0FBTztRQUNwQixPQUFPLEVBQUUsTUFBTTtRQUNmLElBQUksRUFBRSxTQUFTO0tBQ2hCO0lBQ0QsZUFBZSxFQUFFLE9BQU87Q0FDekIsQ0FBQyxDQUFDO0FBRUgsY0FBTSxDQUFDLGlCQUFpQixDQUFDLElBQUksT0FBTyxDQUFDLHdCQUF3QixDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5sb2dnaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sc0JBQXNCLENBQUM7QUFFaEQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUM7SUFDbEQsVUFBVSxFQUFFO1FBQ1YsT0FBTyxFQUFFLGNBQWM7UUFDdkIsV0FBVyxFQUFFLGtCQUFrQjtRQUMvQixhQUFhLEVBQUUsb0JBQW9CO1FBQ25DLFdBQVcsRUFBRSxPQUFPO1FBQ3BCLE9BQU8sRUFBRSxNQUFNO1FBQ2YsSUFBSSxFQUFFLFNBQVM7S0FDaEI7SUFDRCxlQUFlLEVBQUUsT0FBTztDQUN6QixDQUFDLENBQUM7QUFFSCxNQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBSSxPQUFPLENBQUMsd0JBQXdCLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDIn0=

dist_ts/tswatch.paths.js

@@ -1,4 +1,3 @@
-"use strict";
+import './tswatch.plugins.js';
-Object.defineProperty(exports, "__esModule", { value: true });
+export const cwd = process.cwd();
-exports.cwd = process.cwd();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rzd2F0Y2gucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBeUIsc0JBQXNCLENBQUM7QUFFaEQsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyJ9
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rzd2F0Y2gucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFYSxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMifQ==

dist_ts/tswatch.plugins.d.ts

@@ -1,14 +1,15 @@
 import * as path from 'path';
 export { path };
+import * as tsbundle from '@gitzone/tsbundle';
+export { tsbundle };
 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 smartparcel from '@pushrocks/smartparcel';
 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, smartparcel, smartserve, smartshell, taskbuffer, };
-import parcel from 'parcel-bundler';
-export { parcel };

dist_ts/tswatch.plugins.js

@@ -1,37 +1,19 @@
-"use strict";
+// node native scope
-var __importStar = (this && this.__importStar) || function (mod) {
+import * as path from 'path';
-    if (mod && mod.__esModule) return mod;
+export { path };
-    var result = {};
+// @gitzone scope
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+import * as tsbundle from '@gitzone/tsbundle';
-    result["default"] = mod;
+export { tsbundle };
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __importStar(require("path"));
-exports.path = path;
 // @pushrocks scope
-const lik = __importStar(require("@pushrocks/lik"));
+import * as lik from '@pushrocks/lik';
-exports.lik = lik;
+import * as smartchok from '@pushrocks/smartchok';
-const smartchok = __importStar(require("@pushrocks/smartchok"));
+import * as smartcli from '@pushrocks/smartcli';
-exports.smartchok = smartchok;
+import * as smartdelay from '@pushrocks/smartdelay';
-const smartcli = __importStar(require("@pushrocks/smartcli"));
+import * as smartlog from '@pushrocks/smartlog';
-exports.smartcli = smartcli;
+import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
-const smartdelay = __importStar(require("@pushrocks/smartdelay"));
+import * as smartparcel from '@pushrocks/smartparcel';
-exports.smartdelay = smartdelay;
+import * as smartserve from '@pushrocks/smartserve';
-const smartlog = __importStar(require("@pushrocks/smartlog"));
+import * as smartshell from '@pushrocks/smartshell';
-exports.smartlog = smartlog;
+import * as taskbuffer from '@pushrocks/taskbuffer';
-const smartlogDestinationLocal = __importStar(require("@pushrocks/smartlog-destination-local"));
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartparcel, smartserve, smartshell, taskbuffer, };
-exports.smartlogDestinationLocal = smartlogDestinationLocal;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFFaEIsaUJBQWlCO0FBQ2pCLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxFQUNMLFFBQVEsRUFDVCxDQUFBO0FBRUQsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0sZ0JBQWdCLENBQUM7QUFDdEMsT0FBTyxLQUFLLFNBQVMsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEtBQUssUUFBUSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFFBQVEsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sdUNBQXVDLENBQUM7QUFDbEYsT0FBTyxLQUFLLFdBQVcsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFVBQVUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQ0wsR0FBRyxFQUNILFNBQVMsRUFDVCxRQUFRLEVBQ1IsVUFBVSxFQUNWLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsV0FBVyxFQUNYLFVBQVUsRUFDVixVQUFVLEVBQ1YsVUFBVSxHQUNYLENBQUMifQ==
-const smartserve = __importStar(require("@pushrocks/smartserve"));
-exports.smartserve = smartserve;
-const smartshell = __importStar(require("@pushrocks/smartshell"));
-exports.smartshell = smartshell;
-const taskbuffer = __importStar(require("@pushrocks/taskbuffer"));
-exports.taskbuffer = taskbuffer;
-// third party scope
-const parcel_bundler_1 = __importDefault(require("parcel-bundler"));
-exports.parcel = parcel_bundler_1.default;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLDJDQUE2QjtBQUNwQixvQkFBSTtBQUViLG1CQUFtQjtBQUNuQixvREFBc0M7QUFXcEMsa0JBQUc7QUFWTCxnRUFBa0Q7QUFXaEQsOEJBQVM7QUFWWCw4REFBZ0Q7QUFXOUMsNEJBQVE7QUFWVixrRUFBb0Q7QUFXbEQsZ0NBQVU7QUFWWiw4REFBZ0Q7QUFXOUMsNEJBQVE7QUFWVixnR0FBa0Y7QUFXaEYsNERBQXdCO0FBVjFCLGtFQUFvRDtBQVdsRCxnQ0FBVTtBQVZaLGtFQUFvRDtBQVdsRCxnQ0FBVTtBQVZaLGtFQUFvRDtBQVdsRCxnQ0FBVTtBQUdaLG9CQUFvQjtBQUNwQixvRUFBb0M7QUFFM0IsaUJBRkYsd0JBQU0sQ0FFRSJ9

package.json

@@ -1,51 +1,53 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.43",
+  "version": "1.0.72",
   "private": false,
   "description": "watch typescript projects during development",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
     "tswatch": "cli.js"
   },
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "(tstest test/ --web)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web --skiplibcheck --allowimplicitany)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.59",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tstest": "^1.0.69",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^5.0.2",
-    "@types/node": "^14.0.5",
+    "@types/node": "^17.0.21"
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsbundle": "^1.0.100",
+    "@gitzone/tsrun": "^1.2.31",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^4.0.0",
+    "@pushrocks/lik": "^5.0.4",
     "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartcli": "^3.0.11",
+    "@pushrocks/smartcli": "^3.0.14",
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartlog": "^2.0.44",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
-    "@pushrocks/smartserve": "^1.1.39",
+    "@pushrocks/smartserve": "^2.0.2",
-    "@pushrocks/smartshell": "^2.0.26",
+    "@pushrocks/smartshell": "^2.0.30",
-    "@pushrocks/taskbuffer": "^2.1.1",
+    "@pushrocks/taskbuffer": "^2.1.17"
-    "@types/parcel-bundler": "^1.12.1",
-    "parcel-bundler": "^1.12.4"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,16 +8,24 @@ watch typescript projects during development
 * [docs (typedoc)](https://gitzone.gitlab.io/tswatch/)
 
 ## Status for 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)
+Status Category | Status Badge
-[![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)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tswatch/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tswatch/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tswatch)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tswatch)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tswatch)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tswatch)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tswatch)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
+Use TypeScript for best in class intellisense
 
 ## Contribution
 

test/test.ts

@@ -1,6 +1,6 @@
 // tslint:disable-next-line: no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
-import * as tswatch from '../ts/index';
+import * as tswatch from '../ts/index.js';
 
 let testTsWatchInstance: tswatch.TsWatch;
 
@@ -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/index.ts

@@ -1,5 +1,5 @@
 import * as early from '@pushrocks/early';
 early.start('tswatch');
-export * from './tswatch.classes.tswatch';
+export * from './tswatch.classes.tswatch.js';
-import './tswatch.cli';
+export * from './tswatch.cli.js';
 early.stop();

ts/interfaces/index.ts

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

ts/tswatch.classes.parcel.ts

@@ -1,37 +0,0 @@
-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

@@ -1,9 +1,8 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import * as paths from './tswatch.paths';
+import * as paths from './tswatch.paths.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { Watcher } from './tswatch.classes.watcher';
+import { Watcher } from './tswatch.classes.watcher.js';
-import { Parcel } from './tswatch.classes.parcel';
 
 export class TsWatch {
   public watchmode: interfaces.TWatchModes;
@@ -18,13 +17,15 @@ export class TsWatch {
    * starts the TsWatch instance
    */
   public async start() {
+    const tsbundle = new plugins.tsbundle.TsBundle();
+    const htmlHandler = new plugins.tsbundle.HtmlHandler();
     switch (this.watchmode) {
       case 'test':
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test2',
-            timeout: null
+            timeout: null,
           })
         );
         break;
@@ -33,7 +34,7 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test',
-            timeout: null
+            timeout: null,
           })
         );
         break;
@@ -42,33 +43,110 @@ export class TsWatch {
         console.log(
           'bundling TypeScript files to "dist_watch" Note: This is for development only!'
         );
-        const parcel = new Parcel();
+        const smartserve = new plugins.smartserve.SmartServe({
-        await parcel.start();
+          injectReload: true,
+          serveDir: plugins.path.join(paths.cwd, './dist_watch/'),
+          port: 3002,
+        });
+        
+        const bundleAndReloadElement = async () => {
+          await tsbundle.build(paths.cwd, './html/index.ts', './dist_watch/bundle.js', {
+            bundler: 'esbuild'
+          });
+          await smartserve.reload();
+        }
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+            functionToCall: async () => {
+              await bundleAndReloadElement();
+            },
+            timeout: null,
+          })
+        );
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './html/'),
+            functionToCall: async () => {
+              await htmlHandler.copyHtml(
+                plugins.path.join(
+                  paths.cwd,
+                  './html/index.html'
+                ),
+                plugins.path.join(
+                  paths.cwd,
+                  './dist_watch/index.html'
+                )
+              );
+              await bundleAndReloadElement();
+            },
+            timeout: null,
+          })
+        );
+        await smartserve.start();
+        /* const parcel = new plugins.smartparcel.Parcel(
+          plugins.path.join(process.cwd(), './html/index.html'),
+          plugins.path.join(process.cwd(), './dist_watch'),
+          'index.html'
+        );
+        await parcel.watchAndServe(); */
         break;
       case 'gitzone_website':
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
             commandToExecute: 'npm run startTs',
-            timeout: null
+            timeout: null,
+          })
+        );
+        const bundleAndReloadWebsite = async () => {
+          await tsbundle.build(paths.cwd, './ts_web/index.ts', './dist_serve/bundle.js', {
+            bundler: 'esbuild'
+          });
+        }
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+            functionToCall: async () => {
+              await bundleAndReloadWebsite();
+            },
+            timeout: null,
+          })
+        );
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './html/'),
+            functionToCall: async () => {
+              await htmlHandler.copyHtml(
+                plugins.path.join(
+                  paths.cwd,
+                  './html/index.html'
+                ),
+                plugins.path.join(
+                  paths.cwd,
+                  './dist_watch/index.html'
+                )
+              );
+              await bundleAndReloadWebsite();
+            },
+            timeout: null,
           })
         );
 
         // client directory
-        this.watcherMap.add(
+        /* const parcelWebsite = new plugins.smartparcel.Parcel(
-          new Watcher({
+          plugins.path.join(process.cwd(), './html/index.html'),
-            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+          plugins.path.join(process.cwd(), './dist_serve'),
-            commandToExecute: 'npm run build',
+          'bundle.js'
-            timeout: null
-          })
         );
+        await parcelWebsite.watchAndServe(); */
         break;
       case 'gitzone_service':
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
             commandToExecute: 'npm run startTs',
-            timeout: null
+            timeout: null,
           })
         );
         break;
@@ -76,14 +154,14 @@ export class TsWatch {
         const tsWatchInstanceEchoSomething = new Watcher({
           filePathToWatch: plugins.path.join(paths.cwd, './ts'),
           commandToExecute: 'npm -v',
-          timeout: null
+          timeout: null,
         });
         this.watcherMap.add(tsWatchInstanceEchoSomething);
         break;
       default:
         break;
     }
-    this.watcherMap.forEach(async watcher => {
+    this.watcherMap.forEach(async (watcher) => {
       await watcher.start();
     });
     if (this.smartserve) {
@@ -98,7 +176,7 @@ export class TsWatch {
     if (this.smartserve) {
       await this.smartserve.stop();
     }
-    this.watcherMap.forEach(async watcher => {
+    this.watcherMap.forEach(async (watcher) => {
       await watcher.stop();
     });
   }

ts/tswatch.classes.watcher.ts

@@ -1,11 +1,10 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import { logger } from './tswatch.logging';
+import { logger } from './tswatch.logging.js';
-
-export type TCommandFunction = () => Promise<void>;
 
 export interface IWatcherConstructorOptions {
   filePathToWatch: string;
-  commandToExecute: string | TCommandFunction;
+  commandToExecute?: string;
+  functionToCall?: () => Promise<any>;
   timeout?: number;
 }
 
@@ -17,7 +16,7 @@ export class Watcher {
    * used to execute shell commands
    */
   private smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash'
+    executor: 'bash',
   });
 
   private currentExecution: plugins.smartshell.IExecResultStreaming;
@@ -47,7 +46,7 @@ export class Watcher {
    * updates the current execution
    */
   private async updateCurrentExecution() {
-    if (typeof this.options.commandToExecute === 'string') {
+    if (this.options.commandToExecute) {
       if (this.currentExecution) {
         logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
         this.currentExecution.kill();
@@ -58,7 +57,12 @@ export class Watcher {
         this.options.commandToExecute
       );
     } else {
-      console.log('cannot run execution task');
+      console.log('no executionCommand set');
+    }
+    if (this.options.functionToCall) {
+      this.options.functionToCall();
+    } else {
+      console.log('no functionToCall set.')
     }
   }
 
@@ -66,21 +70,16 @@ export class Watcher {
    * 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();
+      this.stop();
       process.exit(0);
     });
     process.on('SIGINT', () => {
       console.log('');
       console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
-      cleanup();
+      this.stop();
       process.exit(0);
     });
 
@@ -88,7 +87,7 @@ export class Watcher {
     if (this.options.timeout) {
       plugins.smartdelay.delayFor(this.options.timeout).then(() => {
         console.log(`timed out afer ${this.options.timeout} milliseconds! exiting!`);
-        cleanup();
+        this.stop();
         process.exit(0);
       });
     }
@@ -100,7 +99,7 @@ export class Watcher {
   public async stop() {
     await this.smartchokWatcher.stop();
     if (this.currentExecution && !this.currentExecution.childProcess.killed) {
-      process.kill(-this.currentExecution.childProcess.pid);
+      this.currentExecution.kill();
     }
   }
 }

ts/tswatch.cli.ts

@@ -1,41 +1,43 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import * as paths from './tswatch.paths';
+import * as paths from './tswatch.paths.js';
-import { logger } from './tswatch.logging';
+import { logger } from './tswatch.logging.js';
 
-import { TsWatch } from './tswatch.classes.tswatch';
+import { TsWatch } from './tswatch.classes.tswatch.js';
 
 const tswatchCli = new plugins.smartcli.Smartcli();
 
 // standard behaviour will assume gitzone setup
 
-tswatchCli.addCommand('element').subscribe(async argvArg => {
+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 => {
+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 => {
+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 => {
+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 => {
+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();
+export const runCli = async () => {
+  tswatchCli.startParse();
+};

ts/tswatch.logging.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
 
 export const logger = new plugins.smartlog.Smartlog({
   logContext: {
@@ -7,9 +7,9 @@ export const logger = new plugins.smartlog.Smartlog({
     containerName: 'Some Containername',
     environment: 'local',
     runtime: 'node',
-    zone: 'gitzone'
+    zone: 'gitzone',
   },
-  minimumLogLevel: 'silly'
+  minimumLogLevel: 'silly',
 });
 
 logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

ts/tswatch.paths.ts

@@ -1,3 +1,3 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
 
 export const cwd = process.cwd();

ts/tswatch.plugins.ts

@@ -1,6 +1,13 @@
+// node native scope
 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,7 @@ 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 smartparcel from '@pushrocks/smartparcel';
 import * as smartserve from '@pushrocks/smartserve';
 import * as smartshell from '@pushrocks/smartshell';
 import * as taskbuffer from '@pushrocks/taskbuffer';
@@ -19,12 +27,8 @@ export {
   smartdelay,
   smartlog,
   smartlogDestinationLocal,
+  smartparcel,
   smartserve,
   smartshell,
-  taskbuffer
+  taskbuffer,
 };
-
-// third party scope
-import parcel from 'parcel-bundler';
-
-export { parcel };

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}