2.0.18

.gitignore

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

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,21 +18,37 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - 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 --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
+    - docker
-  - notpriv
+  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
@@ -41,37 +57,36 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci command npm run build
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -79,36 +94,39 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install lts
+    - npmci command npm install -g @git.zone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -116,5 +134,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.snyk

@@ -1,24 +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'
-patch: {}

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@git.zone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@git.zone/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.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 '@git.zone/tsrun';
+tsrun.runPath('./cli.child.js', import.meta.url);

dist_ts/index.d.ts

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

dist_ts/index.js

@@ -0,0 +1,6 @@
+import * as early from '@push.rocks/early';
+early.start('tswatch');
+export * from './tswatch.classes.tswatch.js';
+export * from './tswatch.cli.js';
+early.stop();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLG1CQUFtQixDQUFDO0FBQzNDLEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDdkIsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyJ9

dist_ts/interfaces/index.d.ts

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

dist_ts/interfaces/index.js

@@ -0,0 +1,2 @@
+export * from './interfaces.watchmodes.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbnRlcmZhY2VzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsNEJBQTRCLENBQUMifQ==

dist_ts/interfaces/interfaces.watchmodes.d.ts

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

dist_ts/interfaces/interfaces.watchmodes.js

@@ -0,0 +1,2 @@
+export {};
+//# 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.js';
+import * as interfaces from './interfaces/index.js';
+import { Watcher } from './tswatch.classes.watcher.js';
+export declare class TsWatch {
+    watchmode: interfaces.TWatchModes;
+    watcherMap: plugins.lik.ObjectMap<Watcher>;
+    typedserver: plugins.typedserver.TypedServer;
+    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.watcher.d.ts

@@ -0,0 +1,35 @@
+export interface IWatcherConstructorOptions {
+    filePathToWatch: string;
+    commandToExecute?: string;
+    functionToCall?: () => Promise<any>;
+    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,90 @@
+import * as plugins from './tswatch.plugins.js';
+import { logger } from './tswatch.logging.js';
+/**
+ * A watcher keeps track of one child execution
+ */
+export 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 (this.options.commandToExecute) {
+            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 {
+            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() {
+        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();
+        }
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLndhdGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMud2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQVM5Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxPQUFPO0lBWWxCLFlBQVksVUFBc0M7UUFYbEQ7O1dBRUc7UUFDSyx1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO1lBQzdELFFBQVEsRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQztRQUdLLHFCQUFnQixHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBSWpFLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQzVCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLE1BQU0sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsY0FBYyxDQUFDLENBQUM7UUFDdEUsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLHNEQUFzRDtRQUNqSCxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNwQyxNQUFNLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hGLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxDQUFD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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,38 @@
+import * as plugins from './tswatch.plugins.js';
+import * as paths from './tswatch.paths.js';
+import { logger } from './tswatch.logging.js';
+import { TsWatch } from './tswatch.classes.tswatch.js';
+const tswatchCli = new plugins.smartcli.Smartcli();
+// standard behaviour will assume gitzone setup
+tswatchCli.standardCommand().subscribe((argvArg => {
+    tswatchCli.triggerCommand('npm', {});
+}));
+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) => {
+    logger.log('info', `running watch task for a gitzone website project`);
+    const tsWatch = new TsWatch('gitzone_website');
+    await tsWatch.start();
+});
+export const runCli = async () => {
+    tswatchCli.startParse();
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxLQUFLLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUV2RCxNQUFNLFVBQVUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFFbkQsK0NBQStDO0FBQy9DLFVBQVUsQ0FBQyxlQUFlLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRTtJQUNoRCxVQUFVLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztBQUN2QyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQzNELE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGtEQUFrRCxDQUFDLENBQUM7SUFDdkUsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUMvQyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN4QixDQUFDLENBQUMsQ0FBQztBQUVILFVBQVUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUN2RCxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxrREFBa0QsQ0FBQyxDQUFDO0lBQ3ZFLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQzNELE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLG1CQUFtQixDQUFDLENBQUM7SUFDeEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUMvQyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN4QixDQUFDLENBQUMsQ0FBQztBQUVILFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUN4RCxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQzNELE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGtEQUFrRCxDQUFDLENBQUM7SUFDdkUsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUMvQyxNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN4QixDQUFDLENBQUMsQ0FBQztBQUVILE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxLQUFLLElBQUksRUFBRTtJQUMvQixVQUFVLENBQUMsVUFBVSxFQUFFLENBQUM7QUFDMUIsQ0FBQyxDQUFDIn0=

dist_ts/tswatch.logging.d.ts

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

dist_ts/tswatch.logging.js

@@ -0,0 +1,14 @@
+import * as plugins from './tswatch.plugins.js';
+export const logger = new plugins.smartlog.Smartlog({
+    logContext: {
+        company: 'Some Company',
+        companyunit: 'Some CompanyUnit',
+        containerName: 'Some Containername',
+        environment: 'local',
+        runtime: 'node',
+        zone: 'gitzone',
+    },
+    minimumLogLevel: 'silly',
+});
+logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5sb2dnaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sc0JBQXNCLENBQUM7QUFFaEQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUM7SUFDbEQsVUFBVSxFQUFFO1FBQ1YsT0FBTyxFQUFFLGNBQWM7UUFDdkIsV0FBVyxFQUFFLGtCQUFrQjtRQUMvQixhQUFhLEVBQUUsb0JBQW9CO1FBQ25DLFdBQVcsRUFBRSxPQUFPO1FBQ3BCLE9BQU8sRUFBRSxNQUFNO1FBQ2YsSUFBSSxFQUFFLFNBQVM7S0FDaEI7SUFDRCxlQUFlLEVBQUUsT0FBTztDQUN6QixDQUFDLENBQUM7QUFFSCxNQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBSSxPQUFPLENBQUMsd0JBQXdCLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDIn0=

dist_ts/tswatch.paths.d.ts

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

dist_ts/tswatch.paths.js

@@ -0,0 +1,3 @@
+import * as plugins from './tswatch.plugins.js';
+export const cwd = process.cwd();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rzd2F0Y2gucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxzQkFBc0IsQ0FBQztBQUVoRCxNQUFNLENBQUMsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDIn0=

dist_ts/tswatch.plugins.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="node" resolution-mode="require"/>
+import * as path from 'path';
+export { path };
+import * as tsbundle from '@git.zone/tsbundle';
+export { tsbundle };
+import * as typedserver from '@api.global/typedserver';
+export { typedserver, };
+import * as lik from '@push.rocks/lik';
+import * as smartchok from '@push.rocks/smartchok';
+import * as smartcli from '@push.rocks/smartcli';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
+import * as smartshell from '@push.rocks/smartshell';
+import * as taskbuffer from '@push.rocks/taskbuffer';
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartshell, taskbuffer, };

dist_ts/tswatch.plugins.js

@@ -0,0 +1,20 @@
+// node native scope
+import * as path from 'path';
+export { path };
+// @gitzone scope
+import * as tsbundle from '@git.zone/tsbundle';
+export { tsbundle };
+// @apiglobal scope
+import * as typedserver from '@api.global/typedserver';
+export { typedserver, };
+// @pushrocks scope
+import * as lik from '@push.rocks/lik';
+import * as smartchok from '@push.rocks/smartchok';
+import * as smartcli from '@push.rocks/smartcli';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
+import * as smartshell from '@push.rocks/smartshell';
+import * as taskbuffer from '@push.rocks/taskbuffer';
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartshell, taskbuffer, };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFFaEIsaUJBQWlCO0FBQ2pCLE9BQU8sS0FBSyxRQUFRLE1BQU0sb0JBQW9CLENBQUM7QUFDL0MsT0FBTyxFQUNMLFFBQVEsRUFDVCxDQUFBO0FBRUQsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUNMLFdBQVcsR0FDWixDQUFBO0FBRUQsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFDbkYsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELE9BQU8sRUFDTCxHQUFHLEVBQ0gsU0FBUyxFQUNULFFBQVEsRUFDUixVQUFVLEVBQ1YsUUFBUSxFQUNSLHdCQUF3QixFQUN4QixVQUFVLEVBQ1YsVUFBVSxHQUNYLENBQUMifQ==

npmextra.json

@@ -4,12 +4,13 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tswatch",
       "shortDescription": "watch typescript projects during development",
-      "npmPackagename": "@gitzone/tswatch",
+      "npmPackagename": "@git.zone/tswatch",
       "license": "MIT"
     }
   }

package.json

@@ -1,51 +1,53 @@
 {
-  "name": "@gitzone/tswatch",
+  "name": "@git.zone/tswatch",
-  "version": "1.0.35",
+  "version": "2.0.18",
   "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 --allowimplicitany)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@git.zone/tsbuild": "^2.1.72",
-    "@gitzone/tstest": "^1.0.28",
+    "@git.zone/tstest": "^1.0.84",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "@types/node": "^13.9.0",
+    "@types/node": "^20.10.7"
-    "tslint": "^6.0.0",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.8",
+    "@api.global/typedserver": "^3.0.13",
-    "@pushrocks/early": "^3.0.3",
+    "@git.zone/tsbundle": "^2.0.12",
-    "@pushrocks/lik": "^3.0.19",
+    "@git.zone/tsrun": "^1.2.46",
-    "@pushrocks/smartchok": "^1.0.23",
+    "@push.rocks/early": "^4.0.4",
-    "@pushrocks/smartcli": "^3.0.7",
+    "@push.rocks/lik": "^6.0.12",
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@push.rocks/smartchok": "^1.0.23",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@push.rocks/smartcli": "^4.0.8",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
+    "@push.rocks/smartdelay": "^3.0.5",
-    "@pushrocks/smartserve": "^1.1.39",
+    "@push.rocks/smartlog": "^3.0.3",
-    "@pushrocks/smartshell": "^2.0.25",
+    "@push.rocks/smartlog-destination-local": "^9.0.0",
-    "@pushrocks/taskbuffer": "^2.1.1",
+    "@push.rocks/smartshell": "^3.0.3",
-    "@types/parcel-bundler": "^1.12.1",
+    "@push.rocks/taskbuffer": "^3.1.7"
-    "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

@@ -1,23 +1,36 @@
-# @gitzone/tswatch
+# @git.zone/tswatch
 watch typescript projects during development
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tswatch)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@git.zone/tswatch)
 * [gitlab.com (source)](https://gitlab.com/gitzone/tswatch)
 * [github.com (source mirror)](https://github.com/gitzone/tswatch)
 * [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)
+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/@git.zone/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/@git.zone/tswatch)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@git.zone/tswatch)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@git.zone/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)

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 '@push.rocks/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/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@git.zone/tswatch',
+  version: '2.0.18',
+  description: 'watch typescript projects during development'
+}

ts/index.ts

@@ -1,5 +1,5 @@
-import * as early from '@pushrocks/early';
+import * as early from '@push.rocks/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,14 +1,13 @@
-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;
-  public watcherMap = new plugins.lik.Objectmap<Watcher>();
+  public watcherMap = new plugins.lik.ObjectMap<Watcher>();
-  public smartserve: plugins.smartserve.SmartServe;
+  public typedserver: plugins.typedserver.TypedServer;
 
   constructor(watchmodeArg: interfaces.TWatchModes) {
     this.watchmode = watchmodeArg;
@@ -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,65 +34,114 @@ export class TsWatch {
           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!');
+        console.log(
-        this.smartserve = new plugins.smartserve.SmartServe({
+          'bundling TypeScript files to "dist_watch" Note: This is for development only!'
-          port: 3001,
+        );
+        this.typedserver = new plugins.typedserver.TypedServer({
+          cors: true,
           injectReload: true,
-          serveDir: plugins.path.join(paths.cwd, './dist_watch/')
+          serveDir: plugins.path.join(paths.cwd, './dist_watch/'),
+          port: 3002,
         });
-        const parcel = new Parcel();
+
-        await parcel.start();
+        const bundleAndReloadElement = async () => {
+          await tsbundle.build(paths.cwd, './html/index.ts', './dist_watch/bundle.js', {
+            bundler: 'esbuild',
+          });
+          await this.typedserver.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.processHtml({
+                from: plugins.path.join(paths.cwd, './html/index.html'),
+                to: plugins.path.join(paths.cwd, './dist_watch/index.html'),
+                minify: false,
+              });
+              await bundleAndReloadElement();
+            },
+            timeout: null,
+          })
+        );
         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 () => {
-        // client directory
+          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/'),
-            commandToExecute: 'npm run build',
+            functionToCall: async () => {
-            timeout: null
+              await bundleAndReloadWebsite();
+            },
+            timeout: null,
+          })
+        );
+        this.watcherMap.add(
+          new Watcher({
+            filePathToWatch: plugins.path.join(paths.cwd, './html/'),
+            functionToCall: async () => {
+              await htmlHandler.processHtml({
+                from: plugins.path.join(paths.cwd, './html/index.html'),
+                to: plugins.path.join(paths.cwd, './dist_serve/index.html'),
+                minify: false,
+              });
+              await bundleAndReloadWebsite();
+            },
+            timeout: null,
           })
         );
         break;
       case 'gitzone_service':
-          this.watcherMap.add(
+        this.watcherMap.add(
-            new Watcher({
+          new Watcher({
-              filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
+            filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
-              commandToExecute: 'npm run startTs',
+            commandToExecute: 'npm run startTs',
-              timeout: null
+            timeout: null,
-            })
+          })
-          );
+        );
-          break;
+        break;
       case 'echoSomething':
         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) {
+    if (this.typedserver) {
-
+      await this.typedserver.start();
-      await this.smartserve.start();
     }
   }
 
@@ -99,10 +149,10 @@ export class TsWatch {
    * stops the execution of any active Watchers
    */
   public async stop() {
-    if (this.smartserve) {
+    if (this.typedserver) {
-      await this.smartserve.stop();
+      await this.typedserver.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,22 +16,7 @@ export class Watcher {
    * used to execute shell commands
    */
   private smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash'
+    executor: 'bash',
-  });
-
-  /**
-   * used to execute 
-   */
-  private executionTask: plugins.taskbuffer.Task = new plugins.taskbuffer.Task({
-    name: 'watcherCommandFunctionTask',
-    taskFunction: async () => {
-      if (typeof this.options.commandToExecute === 'string') {
-        throw new Error('cannot execute string as task');
-      }
-      await this.options.commandToExecute();
-    },
-    buffered: true,
-    bufferMax: 1
   });
 
   private currentExecution: plugins.smartshell.IExecResultStreaming;
@@ -62,19 +46,23 @@ 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}`);
-        process.kill(-this.currentExecution.childProcess.pid);
+        this.currentExecution.kill();
       } else {
         logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
       }
       this.currentExecution = await this.smartshellInstance.execStreaming(
         this.options.commandToExecute
       );
-      this.currentExecution = null;
     } else {
-      await this.executionTask.trigger();
+      console.log('no executionCommand set');
+    }
+    if (this.options.functionToCall) {
+      this.options.functionToCall();
+    } else {
+      console.log('no functionToCall set.')
     }
   }
 
@@ -82,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);
     });
 
@@ -104,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);
       });
     }
@@ -116,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,46 @@
-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.standardCommand().subscribe((argvArg => {
+  tswatchCli.triggerCommand('npm', {});
+}))
 
-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,23 +1,37 @@
+// node native scope
 import * as path from 'path';
 export { path };
 
-// @pushrocks scope
+// @gitzone scope
-import * as lik from '@pushrocks/lik';
+import * as tsbundle from '@git.zone/tsbundle';
-import * as smartchok from '@pushrocks/smartchok';
+export {
-import * as smartcli from '@pushrocks/smartcli';
+  tsbundle
-import * as smartdelay from '@pushrocks/smartdelay';
+}
-import * as smartlog from '@pushrocks/smartlog';
-import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
-import * as smartserve from '@pushrocks/smartserve';
-import * as smartshell from '@pushrocks/smartshell';
-import * as taskbuffer from '@pushrocks/taskbuffer';
 
-export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer };
+// @apiglobal scope
-
+import * as typedserver from '@api.global/typedserver';
-
-// third party scope
-import parcel from 'parcel-bundler';
 
 export {
-  parcel
+  typedserver,
+}
+
+// @pushrocks scope
+import * as lik from '@push.rocks/lik';
+import * as smartchok from '@push.rocks/smartchok';
+import * as smartcli from '@push.rocks/smartcli';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
+import * as smartshell from '@push.rocks/smartshell';
+import * as taskbuffer from '@push.rocks/taskbuffer';
+
+export {
+  lik,
+  smartchok,
+  smartcli,
+  smartdelay,
+  smartlog,
+  smartlogDestinationLocal,
+  smartshell,
+  taskbuffer,
 };

tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}

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"
-}