2.1.5

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: code.foss.global/host.today/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @ship.zone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: code.foss.global/host.today/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @ship.zone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @ship.zone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @ship.zone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @ship.zone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

@@ -3,7 +3,6 @@
 # artifacts
 coverage/
 public/
-pages/
 
 # installs
 node_modules/
@@ -15,8 +14,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
-# custom
+#------# custom

.gitlab-ci.yml

@@ -1,120 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
-
-stages:
-- security
-- test
-- release
-- metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-  - npmci git mirror
-  tags:
-  - docker
-  - notpriv
-
-snyk:
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-  - docker
-  - notpriv
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - priv
-
-testBuild:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-
-release:
-  stage: release
-  script:
-  - npmci node install stable
-  - npmci npm publish
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-  - docker
-  - priv
-
-trigger:
-  stage: metadata
-  script:
-  - npmci trigger
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
-pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
-  stage: metadata
-  script:
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-    - public
-  allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

changelog.md

@@ -0,0 +1,192 @@
+# Changelog
+
+## 2025-07-29 - 2.1.3 - fix(documentation)
+Update and align documentation with internal CLI and project structure
+
+- Refined readme.md and readme.hints.md to clearly describe the various watch modes and project setup
+- Ensured the CLI command mappings in tswatch.cli.ts are documented for consistent usage
+- Included update to internal commit information file for clarity
+
+## 2025-06-26 - 2.1.2 - fix(dependencies)
+Update @push.rocks/smartchok dependency to ^1.1.1
+
+- Bump @push.rocks/smartchok version from ^1.0.34 to ^1.1.1 in package.json
+
+## 2025-06-26 - 2.1.1 - fix(deps)
+Update dependency versions and test import paths for enhanced stability
+
+- Bump @git.zone/tsbuild from 2.2.1 to 2.6.4
+- Upgrade @git.zone/tstest from 1.0.96 to 2.3.1 and update test import path
+- Update @api.global/typedserver from 3.0.55 to 3.0.74
+- Update @git.zone/tsbundle from 2.2.1 to 2.5.1
+- Bump @push.rocks/lik from 6.1.0 to 6.2.2
+- Update @push.rocks/smartfile from 11.1.6 to 11.2.5
+- Upgrade @push.rocks/smartlog from 3.0.7 to 3.1.8
+- Bump @push.rocks/smartshell from 3.2.2 to 3.2.3
+- Upgrade @types/node from 22.12.0 to 24.0.4
+- Add packageManager field in package.json for pnpm v10.11.0
+
+## 2025-01-29 - 2.1.0 - feat(CI)
+Add Continuous Integration workflows for Gitea with Docker-based setup
+
+- Added new CI workflows for handling both regular and tagged pushes in Gitea.
+- Integrated security audits and setup tasks using Docker images in the CI workflows.
+- Ensured that CI includes testing, building, and releasing steps as per tag events.
+
+## 2025-01-29 - 2.0.39 - fix(package.json)
+Add pnpm overrides configuration for peek-readable package
+
+- Added pnpm overrides section in package.json
+- Specified version 5.3.1 for peek-readable package
+
+## 2025-01-29 - 2.0.38 - fix(core)
+Updated dependencies and added assetsHandler instantiation
+
+- Updated various dependencies in package.json to latest versions.
+- Added assetsHandler instantiation in TsWatch class to improve functionality.
+
+## 2024-12-09 - 2.0.37 - fix(core)
+Refactor TsWatch class to improve website execution handling
+
+- Removed unnecessary Smartshell instance creation in TsWatch class.
+- Ensured websiteExecution restarts and website bundle reloads in watcher function.
+
+## 2024-12-09 - 2.0.36 - fix(dependencies)
+Update @push.rocks/smartshell dependency version
+
+- Upgrade @push.rocks/smartshell to version ^3.2.0 from ^3.1.0 in package.json
+
+## 2024-12-09 - 2.0.35 - fix(core)
+Fixed website watch mode execution method
+
+- Replaced direct shell command execution with SmartExecution instance for website mode.
+- Updated dependency version for @push.rocks/smartshell to ^3.1.0.
+
+## 2024-12-04 - 2.0.34 - fix(TsWatch)
+Fix reloading issue for tsfolder changes in element mode.
+
+- Adjusted the function call from 'this.typedserver.reload()' to 'bundleAndReloadElement()' to ensure proper bundle handling in 'element' mode.
+
+## 2024-12-04 - 2.0.33 - fix(core)
+Improve async handling in TsWatch class for element and website modes
+
+- Ensured proper asynchronous execution for 'element' and 'website' watch modes.
+- Replaced console log with logger for consistency.
+
+## 2024-12-04 - 2.0.32 - fix(core)
+Minor improvements and dependency updates
+
+- Updated dependencies for improved performance
+- Refined TypeScript project watching logic
+
+## 2024-12-04 - 2.0.31 - fix(Watcher)
+Add missing logger message in Watcher class for start method
+
+- Added a log message when starting a watcher to track file path being watched
+
+## 2024-12-04 - 2.0.30 - fix(cli)
+Fix incorrect watch mode and update npm test command.
+
+- Updated the npm test command in .vscode/launch.json for streamlined launching.
+- Corrected the watch mode from 'echoSomething' to 'echo' in test/test.ts.
+
+## 2024-12-04 - 2.0.29 - fix(core)
+No changes detected in the codebase.
+
+
+## 2024-12-04 - 2.0.28 - fix(tswatch)
+Add logging to notify folder watcher creation and building processes
+
+- Logging added to notify the creation of folder watchers.
+- Logging added to indicate the start of the building process for folders.
+
+## 2024-12-04 - 2.0.27 - fix(core)
+Refactor watch mode commands and exports
+
+- Updated watch mode names in CLI and type definitions for consistency.
+- Added export for smartfile plugin.
+- Ensured updated command logic is applied during CLI operations.
+
+## 2024-12-04 - 2.0.26 - fix(core)
+Refactor watch modes and update dependencies
+
+- Updated dependencies in package.json
+- Refactored watch mode names in interfaces and classes
+- Refactored CLI commands to use new watch mode names
+- Added import for smartfile in tswatch.plugins.ts
+
+## 2024-10-27 - 2.0.25 - fix(typescript)
+Remove unnecessary reference types in TypeScript declaration files
+
+- Removed unnecessary comment line from TypeScript declaration files.
+
+## 2024-10-27 - 2.0.24 - fix(core)
+Remove .gitlab-ci.yml and update dependencies in package.json
+
+- Deleted .gitlab-ci.yml which contained CI/CD configuration settings.
+- Updated various dependencies and devDependencies in package.json to newer versions.
+
+## 2024-01-28 to 2024-01-09 - 2.0.14 to 2.0.23 - Core
+Several updates to the core functionality.
+
+- Updated core functionality for efficiency and stability.
+
+## 2023-09-21 to 2023-01-28 - 2.0.8 to 2.0.13 - Core
+Core system updates and fixes.
+
+- Continuous updates to core functionality for improved performance.
+
+## 2023-03-31 to 2022-08-04 - 2.0.0 to 2.0.7 - Core
+Enhanced core operations.
+
+- Regular core updates to address performance and reliability.
+
+## 2022-05-04 - 1.0.81 - Core
+Introduction of a breaking change in the core system.
+
+- Switched to gitzone v2 generation tools.
+
+## 2022-04-21 to 2022-03-18 - 1.0.62 to 1.0.80 - Core
+Routine updates to core operations.
+
+- Various core fixes enhancing stability and function.
+
+## 2022-03-14 to 2022-03-18 - 1.0.61 to 1.0.75 - Core
+Further adjustments to core functionality.
+
+- Fixes across multiple modules in core.
+
+## 2021-08-17 to 2020-07-07 - 1.0.46 to 1.0.60 - Core
+Core component updates.
+
+- Consistent core updates to refine performance.
+
+## 2020-07-04 to 2020-05-22 - 1.0.39 to 1.0.45 - Core
+Incremental updates to core systems.
+
+- Enhanced features within the core for better integration.
+
+## 2020-03-13 to 2020-03-05 - 1.0.30 to 1.0.38 - Core
+Stabilizing and refining core functions.
+
+- Series of core fixes improving overall system durability.
+
+## 2019-10-14 to 2019-10-12 - 1.0.21 to 1.0.29 - Core
+Tweaks and enhancements to the core mechanics.
+
+- Continued improvements in core system support services.
+
+## 2019-05-28 to 2019-05-06 - 1.0.10 to 1.0.20 - Core
+Core module enhancements and fixes.
+
+- Several iterations to the core functionality for increased resilience.
+
+## 2019-05-06 to 2019-05-08 - 1.0.5 to 1.0.9 - Core
+Regular updates ensuring core integrity.
+
+- Stability improvements within the core services.
+
+## 2018-10-28 - 1.0.1 to 1.0.3 - Core
+Initial setup and fixes to the core.
+
+- Foundational updates to core functionality.

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

npmextra.json

@@ -4,13 +4,39 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
-      "githost": "gitlab.com",
-      "gitscope": "gitzone",
+      "githost": "code.foss.global",
+      "gitscope": "git.zone",
       "gitrepo": "tswatch",
       "shortDescription": "watch typescript projects during development",
-      "npmPackagename": "@gitzone/tswatch",
-      "license": "MIT"
+      "npmPackagename": "@git.zone/tswatch",
+      "license": "MIT",
+      "description": "A development tool for automatically watching and re-compiling TypeScript projects upon detecting file changes, enhancing developer workflows.",
+      "keywords": [
+        "TypeScript",
+        "development",
+        "watcher",
+        "automation",
+        "CLI",
+        "build",
+        "npm",
+        "web development",
+        "service development",
+        "project monitoring",
+        "recompiling",
+        "testing",
+        "integration",
+        "continuous development",
+        "tooling",
+        "build automation",
+        "live reloading",
+        "node.js",
+        "development server"
+      ]
     }
+  },
+  "tsdoc": {
+    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
   }
 }

package.json

@@ -1,51 +1,87 @@
 {
-  "name": "@gitzone/tswatch",
-  "version": "1.0.34",
+  "name": "@git.zone/tswatch",
+  "version": "2.1.5",
   "private": false,
-  "description": "watch typescript projects during development",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "description": "A development tool for automatically watching and re-compiling TypeScript projects upon detecting file changes, enhancing developer workflows.",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
     "tswatch": "cli.js"
   },
   "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^13.9.0",
-    "tslint": "^6.0.0",
-    "tslint-config-prettier": "^1.18.0"
+    "@git.zone/tsbuild": "^2.6.4",
+    "@git.zone/tstest": "^2.3.2",
+    "@types/node": "^22"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.8",
-    "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^3.0.19",
-    "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartserve": "^1.1.39",
-    "@pushrocks/smartshell": "^2.0.25",
-    "@pushrocks/taskbuffer": "^2.1.1",
-    "@types/parcel-bundler": "^1.12.1",
-    "parcel-bundler": "^1.12.4"
+    "@api.global/typedserver": "^3.0.74",
+    "@git.zone/tsbundle": "^2.5.1",
+    "@git.zone/tsrun": "^1.3.3",
+    "@push.rocks/early": "^4.0.4",
+    "@push.rocks/lik": "^6.2.2",
+    "@push.rocks/smartchok": "^1.1.1",
+    "@push.rocks/smartcli": "^4.0.11",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartfile": "^11.2.5",
+    "@push.rocks/smartlog": "^3.1.8",
+    "@push.rocks/smartlog-destination-local": "^9.0.2",
+    "@push.rocks/smartshell": "^3.2.3",
+    "@push.rocks/taskbuffer": "^3.1.7"
   },
   "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"
+  ],
+  "keywords": [
+    "TypeScript",
+    "development",
+    "watcher",
+    "automation",
+    "CLI",
+    "build",
+    "npm",
+    "web development",
+    "service development",
+    "project monitoring",
+    "recompiling",
+    "testing",
+    "integration",
+    "continuous development",
+    "tooling",
+    "build automation",
+    "live reloading",
+    "node.js",
+    "development server"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://code.foss.global/git.zone/tswatch.git"
+  },
+  "bugs": {
+    "url": "https://code.foss.global/git.zone/tswatch/issues"
+  },
+  "homepage": "https://code.foss.global/git.zone/tswatch#readme",
+  "pnpm": {
+    "overrides": {}
+  },
+  "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
 }

readme.hints.md

@@ -0,0 +1,44 @@
+# tswatch Project Hints
+
+## Core Architecture
+- tswatch is a TypeScript file watcher with multiple operation modes
+- Main class `TsWatch` orchestrates different watch modes
+- `Watcher` class handles individual file watching and command execution
+
+## Available Watch Modes
+1. **npm/node** (default): Runs `npm test` on changes
+2. **test**: Runs `npm run test2` on changes
+3. **element**: Web component development with dev server on port 3002
+4. **service**: Runs `npm run startTs` for service projects
+5. **website**: Full website mode with bundling and asset processing
+6. **echo**: Test mode that runs `npm -v` (for testing)
+
+## Key Implementation Details
+- Uses `@push.rocks/smartchok` for file watching
+- Uses `@git.zone/tsbundle` for bundling with esbuild
+- Uses `@api.global/typedserver` for development server in element mode
+- Element/website modes watch multiple `ts*/` directories
+- All modes support both command execution and function callbacks
+
+## CLI Entry Points
+- `cli.js` -> Main CLI entry point
+- `ts/tswatch.cli.ts` -> CLI implementation with smartcli
+- Default command triggers npm mode
+
+## Project Structure Expectations
+- `ts/` - Backend TypeScript files
+- `ts_web/` - Frontend TypeScript files (element/website modes)
+- `html/` - HTML templates (element/website modes)
+- `assets/` - Static assets (website mode only)
+- `dist_watch/` - Output for element mode
+- `dist_serve/` - Output for website mode
+
+## Development Server Details
+- Port: 3002
+- Features: CORS, gzip compression, live reload injection
+- Only available in element mode via `typedserver` property
+
+## Common Issues to Watch For
+- The test mode runs `test2` script, not `test`
+- Website mode restarts the entire server process on backend changes
+- Element mode rebuilds and reloads on any ts* folder change

readme.md

@@ -1,26 +1,229 @@
-# @gitzone/tswatch
-watch typescript projects during development
+# @git.zone/tswatch
 
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/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/)
+A TypeScript file watcher that automatically recompiles and executes your project when files change. Designed to streamline development workflows for various TypeScript project types.
 
-## 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/)
+## Features
 
-## Usage
+- 🔄 **Automatic recompilation** on file changes
+- 🚀 **Multiple project modes**: npm packages, web elements, services, and websites
+- 🌐 **Built-in development server** with live reload for web projects
+- ⚡ **Fast bundling** with esbuild integration
+- 🛠️ **Flexible CLI and programmatic API**
+- 📦 **Zero configuration** for standard project structures
 
-For further information read the linked docs at the top of this readme.
+## Prerequisites
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+- Node.js (v14 or higher)
+- pnpm (recommended) or npm
 
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)
+## Installation
+
+Install `@git.zone/tswatch` globally or as a development dependency:
+
+```bash
+# Global installation
+pnpm install -g @git.zone/tswatch
+
+# As a dev dependency
+pnpm install --save-dev @git.zone/tswatch
+```
+
+## Quick Start
+
+```bash
+# Watch and run tests on changes (default behavior)
+tswatch
+
+# Watch a web element project with dev server
+tswatch element
+
+# Watch a service project
+tswatch service
+```
+
+## CLI Commands
+
+### `tswatch` or `tswatch npm`
+Watches TypeScript files and runs `npm test` on changes. This is the default mode.
+
+```bash
+tswatch
+# or explicitly
+tswatch npm
+```
+
+### `tswatch element`
+Sets up a development environment for web components/elements:
+- Starts a dev server on port 3002
+- Bundles TypeScript to `dist_watch/`
+- Enables live reload
+- Watches all `ts*/` folders
+
+```bash
+tswatch element
+```
+
+### `tswatch service`
+Watches TypeScript files in `./ts/` and runs `npm run startTs` on changes. Ideal for backend services.
+
+```bash
+tswatch service
+```
+
+### `tswatch website`
+Full website development mode:
+- Bundles TypeScript files to `dist_serve/`
+- Processes HTML files
+- Handles assets
+- Runs `npm run startTs` for server-side code
+
+```bash
+tswatch website
+```
+
+### `tswatch test`
+Runs `npm run test2` whenever files change. Useful for projects with custom test scripts.
+
+```bash
+tswatch test
+```
+
+## Project Structure
+
+tswatch expects certain project structures depending on the mode:
+
+### NPM/Node Projects
+```
+project/
+├── ts/           # TypeScript source files
+├── test/         # Test files
+└── package.json  # With "test" script
+```
+
+### Element Projects
+```
+project/
+├── ts/           # Backend TypeScript
+├── ts_web/       # Frontend TypeScript
+├── html/         # HTML templates
+│   └── index.ts  # Entry point
+└── dist_watch/   # Output directory (auto-created)
+```
+
+### Website Projects
+```
+project/
+├── ts/           # Backend TypeScript
+├── ts_web/       # Frontend TypeScript
+│   └── index.ts  # Entry point
+├── html/         # HTML files
+│   └── index.html
+├── assets/       # Static assets
+└── dist_serve/   # Output directory
+```
+
+## Programmatic API
+
+### Basic Usage
+
+```typescript
+import { TsWatch } from '@git.zone/tswatch';
+
+// Create and start a watcher
+const watcher = new TsWatch('node');
+await watcher.start();
+
+// Stop when done
+await watcher.stop();
+```
+
+### Custom Watchers
+
+```typescript
+import { Watcher } from '@git.zone/tswatch';
+
+const customWatcher = new Watcher({
+  filePathToWatch: './src',
+  commandToExecute: 'npm run build',
+  timeout: 5000 // Optional timeout in ms
+});
+
+await customWatcher.start();
+```
+
+### Using Function Callbacks
+
+```typescript
+const watcher = new Watcher({
+  filePathToWatch: './src',
+  functionToCall: async () => {
+    console.log('Files changed!');
+    // Your custom logic here
+  }
+});
+```
+
+## Development Server
+
+Element mode includes a built-in development server:
+
+- **Port**: 3002
+- **Features**: CORS enabled, gzip compression, live reload
+- **Serve directory**: `./dist_watch/`
+
+Access your project at `http://localhost:3002` when running in element mode.
+
+## Configuration Tips
+
+1. **TypeScript Config**: Ensure your `tsconfig.json` is properly configured for your target environment
+2. **Package Scripts**: Define appropriate scripts in `package.json`:
+   - `test`: For npm mode
+   - `startTs`: For service/website modes
+   - `build`: For general compilation
+
+3. **File Organization**: Keep TypeScript files in `ts/` (backend) and `ts_web/` (frontend) directories
+
+## Common Use Cases
+
+### Developing a Node.js Library
+```bash
+tswatch npm
+```
+Automatically runs tests when you modify source files.
+
+### Building a Web Component
+```bash
+tswatch element
+```
+Get instant feedback with live reload while developing custom elements.
+
+### Creating a Backend Service
+```bash
+tswatch service
+```
+Automatically restart your service on code changes.
+
+### Full-Stack Web Application
+```bash
+tswatch website
+```
+Handle both frontend and backend compilation with asset processing.
+
+## License and Legal Information
+
+This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository.
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+
+### Company Information
+
+Task Venture Capital GmbH  
+Registered at District court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

test/test.ts

@@ -1,18 +1,18 @@
 // tslint:disable-next-line: no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as tswatch from '../ts/index';
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+import * as tswatch from '../ts/index.js';
 
 let testTsWatchInstance: tswatch.TsWatch;
 
 tap.test('should create a valid TsWatch instance', async () => {
-  testTsWatchInstance = new tswatch.TsWatch('echoSomething');
+  testTsWatchInstance = new tswatch.TsWatch('echo');
 });
 
 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 @push.rocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@git.zone/tswatch',
+  version: '2.1.3',
+  description: 'A development tool for automatically watching and re-compiling TypeScript projects upon detecting file changes, enhancing developer workflows.'
+}

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';
-import './tswatch.cli';
+export * from './tswatch.classes.tswatch.js';
+export * from './tswatch.cli.js';
 early.stop();

ts/interfaces/index.ts

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

ts/interfaces/interfaces.watchmodes.ts

@@ -1,7 +1 @@
-export type TWatchModes =
-  | 'test'
-  | 'gitzone_npm'
-  | 'gitzone_service'
-  | 'gitzone_element'
-  | 'gitzone_website'
-  | 'echoSomething';
+export type TWatchModes = 'test' | 'node' | 'service' | 'element' | 'website' | 'echo';

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,14 @@
-import * as plugins from './tswatch.plugins';
-import * as paths from './tswatch.paths';
-import * as interfaces from './interfaces';
+import * as plugins from './tswatch.plugins.js';
+import * as paths from './tswatch.paths.js';
+import * as interfaces from './interfaces/index.js';
 
-import { Watcher } from './tswatch.classes.watcher';
-import { Parcel } from './tswatch.classes.parcel';
+import { Watcher } from './tswatch.classes.watcher.js';
+import { logger } from './tswatch.logging.js';
 
 export class TsWatch {
   public watchmode: interfaces.TWatchModes;
-  public watcherMap = new plugins.lik.Objectmap<Watcher>();
-  public smartserve: plugins.smartserve.SmartServe;
+  public watcherMap = new plugins.lik.ObjectMap<Watcher>();
+  public typedserver: plugins.typedserver.TypedServer;
 
   constructor(watchmodeArg: interfaces.TWatchModes) {
     this.watchmode = watchmodeArg;
@@ -18,80 +18,189 @@ export class TsWatch {
    * starts the TsWatch instance
    */
   public async start() {
+    const tsbundle = new plugins.tsbundle.TsBundle();
+    const assetsHandler = new plugins.tsbundle.AssetsHandler();
+    const htmlHandler = new plugins.tsbundle.HtmlHandler();
     switch (this.watchmode) {
       case 'test':
+        /**
+         * this strategy runs test whenever there is a change in the ts directory
+         */
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test2',
-            timeout: null
-          })
+            timeout: null,
+          }),
         );
         break;
-      case 'gitzone_npm':
+      case 'node':
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test',
-            timeout: null
-          })
+            timeout: null,
+          }),
         );
         break;
-      case 'gitzone_element':
-        // lets create a standard server
-        console.log('bundling TypeScript files to "dist_watch" Note: This is for development only!');
-        this.smartserve = new plugins.smartserve.SmartServe({
-          port: 3001,
-          injectReload: true,
-          serveDir: plugins.path.join(paths.cwd, './dist_watch/')
-        });
-        const parcel = new Parcel();
-        await parcel.start();
+      case 'element':
+        await (async () => {
+          /**
+           * this strategy runs a standard server and bundles the ts files to a dist_watch directory
+           */
+          // lets create a standard server
+          logger.log(
+            'info',
+            'bundling TypeScript files to "dist_watch" Note: This is for development only!',
+          );
+          this.typedserver = new plugins.typedserver.TypedServer({
+            cors: true,
+            injectReload: true,
+            serveDir: plugins.path.join(paths.cwd, './dist_watch/'),
+            port: 3002,
+            enableCompression: true,
+            preferredCompressionMethod: 'gzip',
+          });
+
+          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,
+            }),
+          );
+
+          // lets get the other ts folders
+          let tsfolders = await plugins.smartfile.fs.listFolders(paths.cwd);
+          tsfolders = tsfolders.filter(
+            (itemArg) => itemArg.startsWith('ts') && itemArg !== 'ts_web',
+          );
+          const smartshellInstance = new plugins.smartshell.Smartshell({
+            executor: 'bash',
+          });
+          for (const tsfolder of tsfolders) {
+            logger.log('info', `creating watcher for folder ${tsfolder}`);
+            this.watcherMap.add(
+              new Watcher({
+                filePathToWatch: plugins.path.join(paths.cwd, `./${tsfolder}/`),
+                functionToCall: async () => {
+                  logger.log('info', `building ${tsfolder}`);
+                  await smartshellInstance.exec(`(cd ${paths.cwd} && npm run build)`);
+                  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':
+      case 'website':
+        await (async () => {
+          const websiteExecution = new plugins.smartshell.SmartExecution('npm run startTs');
+          const bundleAndReloadWebsite = async () => {
+            await tsbundle.build(paths.cwd, './ts_web/index.ts', './dist_serve/bundle.js', {
+              bundler: 'esbuild',
+            });
+          };
+          let tsfolders = await plugins.smartfile.fs.listFolders(paths.cwd);
+          tsfolders = tsfolders.filter(
+            (itemArg) => itemArg.startsWith('ts') && itemArg !== 'ts_web',
+          );
+          for (const tsfolder of tsfolders) {
+            this.watcherMap.add(
+              new Watcher({
+                filePathToWatch: plugins.path.join(paths.cwd, `./${tsfolder}/`),
+                functionToCall: async () => {
+                  await websiteExecution.restart();
+                  await bundleAndReloadWebsite();
+                },
+                timeout: null,
+              }),
+            );
+          }
+          this.watcherMap.add(
+            new Watcher({
+              filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
+              functionToCall: async () => {
+                await bundleAndReloadWebsite();
+              },
+              timeout: null,
+            }),
+          );
+          this.watcherMap.add(
+            new Watcher({
+              filePathToWatch: plugins.path.join(paths.cwd, './html/'),
+              functionToCall: async () => {
+                await htmlHandler.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,
+            }),
+          );
+          this.watcherMap.add(
+            new Watcher({
+              filePathToWatch: plugins.path.join(paths.cwd, './assets/'),
+              functionToCall: async () => {
+                await assetsHandler.processAssets();
+                await bundleAndReloadWebsite();
+              },
+              timeout: null,
+            }),
+          );
+        })();
+        break;
+      case 'service':
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
             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
-          })
+            timeout: null,
+          }),
         );
         break;
-      case 'gitzone_service':
-          this.watcherMap.add(
-            new Watcher({
-              filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
-              commandToExecute: 'npm run startTs',
-              timeout: null
-            })
-          );
-          break;
-      case 'echoSomething':
+      case 'echo':
         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) {
-
-      await this.smartserve.start();
+    if (this.typedserver) {
+      await this.typedserver.start();
     }
   }
 
@@ -99,10 +208,10 @@ export class TsWatch {
    * stops the execution of any active Watchers
    */
   public async stop() {
-    if (this.smartserve) {
-      await this.smartserve.stop();
+    if (this.typedserver) {
+      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 { logger } from './tswatch.logging';
-
-export type TCommandFunction = () => Promise<void>;
+import * as plugins from './tswatch.plugins.js';
+import { logger } from './tswatch.logging.js';
 
 export interface IWatcherConstructorOptions {
   filePathToWatch: string;
-  commandToExecute: string | TCommandFunction;
+  commandToExecute?: string;
+  functionToCall?: () => Promise<any>;
   timeout?: number;
 }
 
@@ -17,26 +16,11 @@ export class Watcher {
    * used to execute shell commands
    */
   private smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash'
-  });
-
-  /**
-   * used to execute 
-   */
-  private executionTask: plugins.taskbuffer.Task = new plugins.taskbuffer.Task({
-    name: 'watcherCommandFunctionTask',
-    taskFunction: async () => {
-      if (typeof this.options.commandToExecute === 'string') {
-        throw new Error('cannot execute string as task');
-      }
-      await this.options.commandToExecute();
-    },
-    buffered: true,
-    bufferMax: 1
+    executor: 'bash',
   });
 
   private currentExecution: plugins.smartshell.IExecResultStreaming;
-  private smartchokWatcher = new plugins.smartchok.Smartchok([], {});
+  private smartchokWatcher = new plugins.smartchok.Smartchok([]);
   private options: IWatcherConstructorOptions;
 
   constructor(optionsArg: IWatcherConstructorOptions) {
@@ -47,6 +31,7 @@ export class Watcher {
    * start the file
    */
   public async start() {
+    logger.log('info', `trying to start watcher for ${this.options.filePathToWatch}`);
     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
@@ -56,25 +41,30 @@ export class Watcher {
       this.updateCurrentExecution();
     });
     await this.updateCurrentExecution();
+    logger.log('info', `watcher started for ${this.options.filePathToWatch}`);
   }
 
   /**
    * 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.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 +72,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 +89,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 +101,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 paths from './tswatch.paths';
-import { logger } from './tswatch.logging';
+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';
+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');
+  const tsWatch = new TsWatch('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');
+  const tsWatch = new TsWatch('node');
   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');
+  const tsWatch = new TsWatch('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');
+  const tsWatch = new TsWatch('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,35 @@
+// 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 '@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 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 };
-
-
-// third party scope
-import parcel from 'parcel-bundler';
+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 smartfile from '@push.rocks/smartfile';
+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 {
-  parcel
+  lik,
+  smartchok,
+  smartcli,
+  smartdelay,
+  smartfile,
+  smartlog,
+  smartlogDestinationLocal,
+  smartshell,
+  taskbuffer,
 };

tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
+    "baseUrl": ".",
+    "paths": {}
+  },
+  "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"
-}