1.0.53

.gitignore

@@ -8,12 +8,13 @@ pages/
 # installs
 node_modules/
 
-# caches and builds
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,102 +18,115 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - 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
-  - notpriv
+    - 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
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+    - docker
+
+testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
+  only:
+    - tags
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - 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:
+    - lossless
     - docker
     - notpriv
   only:
@@ -121,5 +134,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

cli.js

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

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
 require('@gitzone/tsrun');
-require('./ts/index');
+const cliTool = require('./ts/index');
+cliTool.runCli();

dist_ts/index.d.ts

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

dist_ts/index.js

@@ -0,0 +1,30 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const early = __importStar(require("@pushrocks/early"));
+early.start('tswatch');
+__exportStar(require("./tswatch.classes.tswatch"), exports);
+__exportStar(require("./tswatch.cli"), exports);
+early.stop();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3REFBMEM7QUFDMUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUN2Qiw0REFBMEM7QUFDMUMsZ0RBQThCO0FBQzlCLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyJ9

dist_ts/interfaces/index.d.ts

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

dist_ts/interfaces/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./interfaces.watchmodes"), exports);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbnRlcmZhY2VzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLDBEQUF3QyJ9

dist_ts/interfaces/interfaces.watchmodes.d.ts

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

dist_ts/interfaces/interfaces.watchmodes.js

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

dist_ts/tswatch.classes.parcel.d.ts

@@ -0,0 +1,3 @@
+export declare class Parcel {
+    start(): Promise<void>;
+}

dist_ts/tswatch.classes.parcel.js

@@ -0,0 +1,44 @@
+"use strict";
+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 plugins = __importStar(require("./tswatch.plugins"));
+const paths = __importStar(require("./tswatch.paths"));
+class Parcel {
+    async start() {
+        const entryFiles = plugins.path.join(paths.cwd, './html/index.html');
+        // Bundler options
+        const options = {
+            outDir: './dist_watch',
+            outFile: 'index.html',
+            publicUrl: '/',
+            watch: true,
+            cache: true,
+            cacheDir: '.nogit/.parcelcache',
+            contentHash: false,
+            global: 'moduleName',
+            minify: false,
+            scopeHoist: false,
+            target: 'browser',
+            bundleNodeModules: true,
+            https: null,
+            logLevel: 3,
+            hmr: true,
+            hmrPort: 3003,
+            sourceMaps: true,
+            hmrHostname: '',
+            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);
+    }
+}
+exports.Parcel = Parcel;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLnBhcmNlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rzd2F0Y2guY2xhc3Nlcy5wYXJjZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsMkRBQTZDO0FBQzdDLHVEQUF5QztBQUV6QyxNQUFhLE1BQU07SUFDVixLQUFLLENBQUMsS0FBSztRQUNoQixNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFFckUsa0JBQWtCO1FBQ2xCLE1BQU0sT0FBTyxHQUFpQztZQUM1QyxNQUFNLEVBQUUsY0FBYztZQUN0QixPQUFPLEVBQUUsWUFBWTtZQUNyQixTQUFTLEVBQUUsR0FBRztZQUNkLEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLElBQUk7WUFDWCxRQUFRLEVBQUUscUJBQXFCO1lBQy9CLFdBQVcsRUFBRSxLQUFLO1lBQ2xCLE1BQU0sRUFBRSxZQUFZO1lBQ3BCLE1BQU0sRUFBRSxLQUFLO1lBQ2IsVUFBVSxFQUFFLEtBQUs7WUFDakIsTUFBTSxFQUFFLFNBQVM7WUFDakIsaUJBQWlCLEVBQUUsSUFBSTtZQUN2QixLQUFLLEVBQUUsSUFBSTtZQUNYLFFBQVEsRUFBRSxDQUFDO1lBQ1gsR0FBRyxFQUFFLElBQUk7WUFDVCxPQUFPLEVBQUUsSUFBSTtZQUNiLFVBQVUsRUFBRSxJQUFJO1lBQ2hCLFdBQVcsRUFBRSxFQUFFO1lBQ2YsY0FBYyxFQUFFLEtBQUssQ0FBQyx5SUFBeUk7U0FDaEssQ0FBQztRQUVGLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFeEQsZ0RBQWdEO1FBQ2hELDZHQUE2RztRQUM3RyxNQUFNLE1BQU0sR0FBRyxNQUFNLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsQ0FBQztDQUNGO0FBakNELHdCQWlDQyJ9

dist_ts/tswatch.classes.tswatch.d.ts

@@ -0,0 +1,17 @@
+import * as plugins from './tswatch.plugins';
+import * as interfaces from './interfaces';
+import { Watcher } from './tswatch.classes.watcher';
+export declare class TsWatch {
+    watchmode: interfaces.TWatchModes;
+    watcherMap: plugins.lik.ObjectMap<Watcher>;
+    smartserve: plugins.smartserve.SmartServe;
+    constructor(watchmodeArg: interfaces.TWatchModes);
+    /**
+     * starts the TsWatch instance
+     */
+    start(): Promise<void>;
+    /**
+     * stops the execution of any active Watchers
+     */
+    stop(): Promise<void>;
+}

dist_ts/tswatch.classes.tswatch.js

@@ -0,0 +1,104 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TsWatch = void 0;
+const plugins = __importStar(require("./tswatch.plugins"));
+const paths = __importStar(require("./tswatch.paths"));
+const tswatch_classes_watcher_1 = require("./tswatch.classes.watcher");
+class TsWatch {
+    constructor(watchmodeArg) {
+        this.watcherMap = new plugins.lik.ObjectMap();
+        this.watchmode = watchmodeArg;
+    }
+    /**
+     * starts the TsWatch instance
+     */
+    async start() {
+        switch (this.watchmode) {
+            case 'test':
+                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                    filePathToWatch: paths.cwd,
+                    commandToExecute: 'npm run test2',
+                    timeout: null,
+                }));
+                break;
+            case 'gitzone_npm':
+                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                    filePathToWatch: paths.cwd,
+                    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!');
+                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.start();
+                break;
+            case 'gitzone_website':
+                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                    filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
+                    commandToExecute: 'npm run startTs',
+                    timeout: null,
+                }));
+                // client directory
+                const parcelWebsite = new plugins.smartparcel.Parcel(plugins.path.join(process.cwd(), './ts_web/index.ts'), plugins.path.join(process.cwd(), './dist_serve'), 'bundle.js');
+                await parcelWebsite.start();
+                break;
+            case 'gitzone_service':
+                this.watcherMap.add(new tswatch_classes_watcher_1.Watcher({
+                    filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
+                    commandToExecute: 'npm run startTs',
+                    timeout: null,
+                }));
+                break;
+            case 'echoSomething':
+                const tsWatchInstanceEchoSomething = new tswatch_classes_watcher_1.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();
+        }
+    }
+    /**
+     * stops the execution of any active Watchers
+     */
+    async stop() {
+        if (this.smartserve) {
+            await this.smartserve.stop();
+        }
+        this.watcherMap.forEach(async (watcher) => {
+            await watcher.stop();
+        });
+    }
+}
+exports.TsWatch = TsWatch;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLnRzd2F0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMudHN3YXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkRBQTZDO0FBQzdDLHVEQUF5QztBQUd6Qyx1RUFBb0Q7QUFFcEQsTUFBYSxPQUFPO0lBS2xCLFlBQVksWUFBb0M7UUFIekMsZUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQVcsQ0FBQztRQUl2RCxJQUFJLENBQUMsU0FBUyxHQUFHLFlBQVksQ0FBQztJQUNoQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixRQUFRLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDdEIsS0FBSyxNQUFNO2dCQUNULElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUNqQixJQUFJLGlDQUFPLENBQUM7b0JBQ1YsZUFBZSxFQUFFLEtBQUssQ0FBQyxHQUFHO29CQUMxQixnQkFBZ0IsRUFBRSxlQUFlO29CQUNqQyxPQUFPLEVBQUUsSUFBSTtpQkFDZCxDQUFDLENBQ0gsQ0FBQztnQkFDRixNQUFNO1lBQ1IsS0FBSyxhQUFhO2dCQUNoQixJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FDakIsSUFBSSxpQ0FBTyxDQUFDO29CQUNWLGVBQWUsRUFBRSxLQUFLLENBQUMsR0FBRztvQkFDMUIsZ0JBQWdCLEVBQUUsY0FBYztvQkFDaEMsT0FBTyxFQUFFLElBQUk7aUJBQ2QsQ0FBQyxDQUNILENBQUM7Z0JBQ0YsTUFBTTtZQUNSLEtBQUssaUJBQWlCO2dCQUNwQixnQ0FBZ0M7Z0JBQ2hDLE9BQU8sQ0FBQyxHQUFHLENBQ1QsK0VBQStFLENBQ2hGLENBQUM7Z0JBQ0YsTUFBTSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FDM0MsT0FBTyxDQUFDLElBQUksQ0FB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

dist_ts/tswatch.classes.watcher.d.ts

@@ -0,0 +1,35 @@
+export declare type TCommandFunction = () => Promise<void>;
+export interface IWatcherConstructorOptions {
+    filePathToWatch: string;
+    commandToExecute: string | TCommandFunction;
+    timeout?: number;
+}
+/**
+ * A watcher keeps track of one child execution
+ */
+export declare class Watcher {
+    /**
+     * used to execute shell commands
+     */
+    private smartshellInstance;
+    private currentExecution;
+    private smartchokWatcher;
+    private options;
+    constructor(optionsArg: IWatcherConstructorOptions);
+    /**
+     * start the file
+     */
+    start(): Promise<void>;
+    /**
+     * updates the current execution
+     */
+    private updateCurrentExecution;
+    /**
+     * this method sets up a clean exit strategy
+     */
+    private setupCleanup;
+    /**
+     * stops the watcher
+     */
+    stop(): Promise<void>;
+}

dist_ts/tswatch.classes.watcher.js

@@ -0,0 +1,107 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Watcher = void 0;
+const plugins = __importStar(require("./tswatch.plugins"));
+const tswatch_logging_1 = require("./tswatch.logging");
+/**
+ * A watcher keeps track of one child execution
+ */
+class Watcher {
+    constructor(optionsArg) {
+        /**
+         * used to execute shell commands
+         */
+        this.smartshellInstance = new plugins.smartshell.Smartshell({
+            executor: 'bash',
+        });
+        this.smartchokWatcher = new plugins.smartchok.Smartchok([], {});
+        this.options = optionsArg;
+    }
+    /**
+     * start the file
+     */
+    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
+     */
+    async updateCurrentExecution() {
+        if (typeof this.options.commandToExecute === 'string') {
+            if (this.currentExecution) {
+                tswatch_logging_1.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`);
+            }
+            this.currentExecution = await this.smartshellInstance.execStreaming(this.options.commandToExecute);
+        }
+        else {
+            console.log('cannot run execution task');
+        }
+    }
+    /**
+     * this method sets up a clean exit strategy
+     */
+    async setupCleanup() {
+        process.on('exit', () => {
+            console.log('');
+            console.log('now exiting!');
+            this.stop();
+            process.exit(0);
+        });
+        process.on('SIGINT', () => {
+            console.log('');
+            console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
+            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!`);
+                this.stop();
+                process.exit(0);
+            });
+        }
+    }
+    /**
+     * stops the watcher
+     */
+    async stop() {
+        await this.smartchokWatcher.stop();
+        if (this.currentExecution && !this.currentExecution.childProcess.killed) {
+            this.currentExecution.kill();
+        }
+    }
+}
+exports.Watcher = Watcher;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLndhdGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMud2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkRBQTZDO0FBQzdDLHVEQUEyQztBQVUzQzs7R0FFRztBQUNILE1BQWEsT0FBTztJQVlsQixZQUFZLFVBQXNDO1FBWGxEOztXQUVHO1FBQ0ssdUJBQWtCLEdBQUcsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQztZQUM3RCxRQUFRLEVBQUUsTUFBTTtTQUNqQixDQUFDLENBQUM7UUFHSyxxQkFBZ0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUlqRSxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUM1QixDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLGNBQWMsQ0FBQyxDQUFDO1FBQ3RFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxzREFBc0Q7UUFDakgsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDcEMsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRixnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQzlCLElBQUksQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO1FBQ2hDLENBQUMsQ0FBQyxDQUFD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

dist_ts/tswatch.cli.d.ts

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

dist_ts/tswatch.cli.js

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runCli = void 0;
+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`);
+    const tsWatch = new tswatch_classes_tswatch_1.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`);
+    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_npm');
+    await tsWatch.start();
+});
+tswatchCli.addCommand('service').subscribe(async (argvArg) => {
+    tswatch_logging_1.logger.log('info', `running test task`);
+    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_service');
+    await tsWatch.start();
+});
+tswatchCli.addCommand('test').subscribe(async (argvArg) => {
+    tswatch_logging_1.logger.log('info', `running test task`);
+    const tsWatch = new tswatch_classes_tswatch_1.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`);
+    const tsWatch = new tswatch_classes_tswatch_1.TsWatch('gitzone_website');
+    await tsWatch.start();
+});
+exports.runCli = async () => {
+    tswatchCli.startParse();
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkRBQTZDO0FBRTdDLHVEQUEyQztBQUUzQyx1RUFBb0Q7QUFFcEQsTUFBTSxVQUFVLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0FBRW5ELCtDQUErQztBQUUvQyxVQUFVLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDM0Qsd0JBQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGtEQUFrRCxDQUFDLENBQUM7SUFDdkUsTUFBTSxPQUFPLEdBQUcsSUFBSSxpQ0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDL0MsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7QUFDeEIsQ0FBQyxDQUFDLENBQUM7QUFFSCxVQUFVLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDdkQsd0JBQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGtEQUFrRCxDQUFDLENBQUM7SUFDdkUsTUFBTSxPQUFPLEdBQUcsSUFBSSxpQ0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQzNELHdCQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sT0FBTyxHQUFHLElBQUksaUNBQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQ3hELHdCQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sT0FBTyxHQUFHLElBQUksaUNBQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNwQyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN4QixDQUFDLENBQUMsQ0FBQztBQUVILFVBQVUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUMzRCx3QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0RBQWtELENBQUMsQ0FBQztJQUN2RSxNQUFNLE9BQU8sR0FBRyxJQUFJLGlDQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUMvQyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN4QixDQUFDLENBQUMsQ0FBQztBQUVVLFFBQUEsTUFBTSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQy9CLFVBQVUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztBQUMxQixDQUFDLENBQUMifQ==

dist_ts/tswatch.logging.d.ts

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

dist_ts/tswatch.logging.js

@@ -0,0 +1,36 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = void 0;
+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',
+    },
+    minimumLogLevel: 'silly',
+});
+exports.logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5sb2dnaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyREFBNkM7QUFFaEMsUUFBQSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztJQUNsRCxVQUFVLEVBQUU7UUFDVixPQUFPLEVBQUUsY0FBYztRQUN2QixXQUFXLEVBQUUsa0JBQWtCO1FBQy9CLGFBQWEsRUFBRSxvQkFBb0I7UUFDbkMsV0FBVyxFQUFFLE9BQU87UUFDcEIsT0FBTyxFQUFFLE1BQU07UUFDZixJQUFJLEVBQUUsU0FBUztLQUNoQjtJQUNELGVBQWUsRUFBRSxPQUFPO0NBQ3pCLENBQUMsQ0FBQztBQUVILGNBQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMifQ==

dist_ts/tswatch.paths.d.ts

@@ -0,0 +1 @@
+export declare const cwd: string;

dist_ts/tswatch.paths.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cwd = void 0;
+exports.cwd = process.cwd();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rzd2F0Y2gucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRWEsUUFBQSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDIn0=

dist_ts/tswatch.plugins.d.ts

@@ -0,0 +1,13 @@
+import * as path from 'path';
+export { path };
+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, smartparcel, smartserve, smartshell, taskbuffer, };

dist_ts/tswatch.plugins.js

@@ -0,0 +1,46 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskbuffer = exports.smartshell = exports.smartserve = exports.smartparcel = exports.smartlogDestinationLocal = exports.smartlog = exports.smartdelay = exports.smartcli = exports.smartchok = exports.lik = exports.path = void 0;
+const path = __importStar(require("path"));
+exports.path = path;
+// @pushrocks scope
+const lik = __importStar(require("@pushrocks/lik"));
+exports.lik = lik;
+const smartchok = __importStar(require("@pushrocks/smartchok"));
+exports.smartchok = smartchok;
+const smartcli = __importStar(require("@pushrocks/smartcli"));
+exports.smartcli = smartcli;
+const smartdelay = __importStar(require("@pushrocks/smartdelay"));
+exports.smartdelay = smartdelay;
+const smartlog = __importStar(require("@pushrocks/smartlog"));
+exports.smartlog = smartlog;
+const smartlogDestinationLocal = __importStar(require("@pushrocks/smartlog-destination-local"));
+exports.smartlogDestinationLocal = smartlogDestinationLocal;
+const smartparcel = __importStar(require("@pushrocks/smartparcel"));
+exports.smartparcel = smartparcel;
+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;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBNkI7QUFDcEIsb0JBQUk7QUFFYixtQkFBbUI7QUFDbkIsb0RBQXNDO0FBWXBDLGtCQUFHO0FBWEwsZ0VBQWtEO0FBWWhELDhCQUFTO0FBWFgsOERBQWdEO0FBWTlDLDRCQUFRO0FBWFYsa0VBQW9EO0FBWWxELGdDQUFVO0FBWFosOERBQWdEO0FBWTlDLDRCQUFRO0FBWFYsZ0dBQWtGO0FBWWhGLDREQUF3QjtBQVgxQixvRUFBc0Q7QUFZcEQsa0NBQVc7QUFYYixrRUFBb0Q7QUFZbEQsZ0NBQVU7QUFYWixrRUFBb0Q7QUFZbEQsZ0NBQVU7QUFYWixrRUFBb0Q7QUFZbEQsZ0NBQVUifQ==

npmextra.json

@@ -4,6 +4,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",

package.json

@@ -1,34 +1,54 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.10",
+  "version": "1.0.53",
   "private": false,
   "description": "watch typescript projects during development",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
+  "bin": {
+    "tswatch": "cli.js"
+  },
   "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild)",
-    "format": "(gitzone format)"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
-    "@gitzone/tstest": "^1.0.20",
-    "@pushrocks/tapbundle": "^3.0.9",
-    "@types/node": "^12.0.0",
-    "tslint": "^5.16.0",
+    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tstest": "^1.0.54",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "@types/node": "^16.4.3",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tsrun": "^1.2.17",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^3.0.5",
-    "@pushrocks/smartchok": "^1.0.18",
-    "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartdelay": "^2.0.3",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
-    "@pushrocks/smartshell": "^2.0.13"
-  }
+    "@pushrocks/lik": "^4.0.13",
+    "@pushrocks/smartchok": "^1.0.23",
+    "@pushrocks/smartcli": "^3.0.14",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartparcel": "^1.0.9",
+    "@pushrocks/smartserve": "^1.1.41",
+    "@pushrocks/smartshell": "^2.0.27",
+    "@pushrocks/taskbuffer": "^2.1.1"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

readme.md

@@ -8,19 +8,32 @@ watch typescript projects during development
 * [docs (typedoc)](https://gitzone.gitlab.io/tswatch/)
 
 ## Status for master
-[![build status](https://gitlab.com/gitzone/tswatch/badges/master/build.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)
-[![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)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tswatch/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tswatch/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tswatch)](https://lossless.cloud)
+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
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 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)

ts/index.ts

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

ts/interfaces/interfaces.watchmodes.ts

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

ts/tswatch.classes.tswatch.ts

@@ -6,7 +6,8 @@ import { Watcher } from './tswatch.classes.watcher';
 
 export class TsWatch {
   public watchmode: interfaces.TWatchModes;
-  public watcherMap = new plugins.lik.Objectmap<Watcher>();
+  public watcherMap = new plugins.lik.ObjectMap<Watcher>();
+  public smartserve: plugins.smartserve.SmartServe;
 
   constructor(watchmodeArg: interfaces.TWatchModes) {
     this.watchmode = watchmodeArg;
@@ -18,57 +19,88 @@ export class TsWatch {
   public async start() {
     switch (this.watchmode) {
       case 'test':
-        this.watcherMap.add(new Watcher({
-          filePathToWatch: paths.cwd,
-          commandToExecute: 'npm run test2',
-          timeout: null
-        }));
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: paths.cwd,
+            commandToExecute: 'npm run test2',
+            timeout: null,
+          })
+        );
         break;
       case 'gitzone_npm':
-        this.watcherMap.add(new Watcher({
-          filePathToWatch: paths.cwd,
-          commandToExecute: 'npm run test',
-          timeout: null
-        }));
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: paths.cwd,
+            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!'
+        );
+        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.start();
         break;
       case 'gitzone_website':
-        // server directory
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
-            commandToExecute: 'npm run start',
-            timeout: null
+            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
-        }));
+        const parcelWebsite = new plugins.smartparcel.Parcel(
+          plugins.path.join(process.cwd(), './ts_web/index.ts'),
+          plugins.path.join(process.cwd(), './dist_serve'),
+          'bundle.js'
+        );
+        await parcelWebsite.start();
+        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
+          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) {
+      await this.smartserve.start();
+    }
   }
 
   /**
    * stops the execution of any active Watchers
    */
   public async stop() {
-    this.watcherMap.forEach(async watcher => {
+    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,13 @@ 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'
+    executor: 'bash',
   });
+
   private currentExecution: plugins.smartshell.IExecResultStreaming;
   private smartchokWatcher = new plugins.smartchok.Smartchok([], {});
   private options: IWatcherConstructorOptions;
@@ -26,7 +32,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,44 +40,42 @@ export class Watcher {
     changeObservable.subscribe(() => {
       this.updateCurrentExecution();
     });
-    this.updateCurrentExecution();
+    await this.updateCurrentExecution();
   }
 
   /**
    * updates the current execution
    */
   private async updateCurrentExecution() {
-    if (this.currentExecution) {
-      logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
-      process.kill(-this.currentExecution.childProcess.pid);
+    if (typeof this.options.commandToExecute === 'string') {
+      if (this.currentExecution) {
+        logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
+        this.currentExecution.kill();
+      } else {
+        logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
+      }
+      this.currentExecution = await this.smartshellInstance.execStreaming(
+        this.options.commandToExecute
+      );
     } else {
-      logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
+      console.log('cannot run execution task');
     }
-    this.currentExecution = await this.smartshellInstance.execStreaming(
-      this.options.commandToExecute
-    );
-    this.currentExecution = null;
   }
 
   /**
    * 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);
     });
 
@@ -79,19 +83,19 @@ 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);
       });
     }
   }
-  
+
   /**
    * stops the watcher
    */
   public async stop() {
     await this.smartchokWatcher.stop();
-    if (this.currentExecution) {
-      process.kill(-this.currentExecution.childProcess.pid);
+    if (this.currentExecution && !this.currentExecution.childProcess.killed) {
+      this.currentExecution.kill();
     }
   }
 }

ts/tswatch.cli.ts

@@ -8,16 +8,36 @@ const tswatchCli = new plugins.smartcli.Smartcli();
 
 // standard behaviour will assume gitzone setup
 
-tswatchCli.addCommand('test').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) => {
+  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 => {
+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

@@ -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.plugins.ts

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