2.1.85

.gitignore

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

.gitlab-ci.yml

@@ -1,40 +1,49 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-variables:
-  GIT_STRATEGY: clone
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
+
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-  - npmci git mirror
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+  allow_failure: true
 
-snyk:
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command pnpm audit --audit-level=high --dev
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -43,37 +52,34 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - priv
+    - docker
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci command npm run build
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install lts
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -81,35 +87,36 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
+    - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:18-dind
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
+    - npmci node install stable
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -117,5 +124,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.snyk

@@ -1,4 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.3
-ignore: {}
-patch: {}

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

README.md

@@ -1,75 +0,0 @@
-# @gitzone/tsbuild
-TypeScript nightly to easily make use of latest features
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbuild)
-* [gitlab.com (source)](https://gitlab.com/gitzone/tsbuild)
-* [github.com (source mirror)](https://github.com/gitzone/tsbuild)
-* [docs (typedoc)](https://gitzone.gitlab.io/tsbuild/)
-
-## Status for master
-[![build status](https://gitlab.com/gitzone/tsbuild/badges/master/build.svg)](https://gitlab.com/gitzone/tsbuild/commits/master)
-[![coverage report](https://gitlab.com/gitzone/tsbuild/badges/master/coverage.svg)](https://gitlab.com/gitzone/tsbuild/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tsbuild.svg)](https://www.npmjs.com/package/@gitzone/tsbuild)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tsbuild/badge.svg)](https://snyk.io/test/npm/@gitzone/tsbuild)
-[![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/)
-
-## Usage
-
-Tsn uses the **next** tagged npm version of typescript
-
-```typescript
-import * as tsn from 'tsn';
-
-let myGlobStringObject = {
-  './myTsFolder/**/*.ts': './myDestinationFolder/',
-  './someOtherTsFolder/**/*.ts': './myOtherDestinationFolder/'
-};
-
-let tsOptions = {
-  target: tsn.ScriptTarget.ES2015,
-  module: tsn.ModuleKind.CommonJS
-};
-
-/*
-note: since this only works in code, here are the target numbers
-enum ScriptTarget {
-        ES3 = 0,
-        ES5 = 1,
-        ES2015 = 2,
-        ES2016 = 3,
-        ES2017 = 4,
-        ESNext = 5,
-        Latest = 5,
-}
-
-and here are the module kinds
-enum ModuleKind {
-        None = 0,
-        CommonJS = 1,
-        AMD = 2,
-        UMD = 3,
-        System = 4,
-        ES2015 = 5,
-    }
-*/
-
-let myCwd = process.cwd();
-
-tsn.compileGlobStringObject(
-  myGlobStringObject, // the glob string object describing from where to compile what to where
-  tsOptions, // the options for TypeScript
-  myCwd // a custom cwd, optional, defaults to process.cwd()
-);
-```
-
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
-
-For further information read the linked docs at the top of this readme.
-
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

changelog.md

@@ -0,0 +1,185 @@
+# Changelog
+
+## 2024-10-27 - 2.1.85 - fix(compiler)
+Improve path handling in compiler options
+
+- Refactored path import in tsbuild.classes.compiler.ts.
+- Enhanced mergeCompilerOptions to read paths and baseUrl from tsconfig.json if present.
+
+## 2024-07-22 - 2.1.84 - fix(cli)
+Fixed transpilation order issue in tsfolders command
+
+- Corrected the transpilation order so 'ts_shared' is processed before other folders in the 'tsfolders' CLI command.
+
+## 2024-07-21 - 2.1.83 - fix(cli)
+Ensure 'ts_shared' folder is compiled first if present
+
+- Added logic to make sure the 'ts_shared' folder is compiled first when running 'tsfolders' command.
+
+## 2024-06-24 - 2.1.82 - fix(core)
+Minor improvements and optimizations in core TypeScript compiler integration.
+
+- Updated TypeScript dependency to latest version 5.5.2.
+- Enhanced logging in compiler process.
+- Improved handling of CLI commands for better flexibility.
+- Compiled output directories are now more structured.
+- Refactored internal compiler options merge function.
+
+## 2024-06-24 - 2.1.81 - fix(dependencies)
+Update dependencies to latest versions
+
+- Upgraded @push.rocks/smartcli from ^4.0.10 to ^4.0.11
+- Upgraded @push.rocks/smartfile from ^11.0.14 to ^11.0.21
+- Upgraded @push.rocks/smartlog from ^3.0.3 to ^3.0.7
+- Upgraded @push.rocks/smartpromise from ^4.0.3 to ^4.0.4
+- Upgraded typescript from 5.4.5 to 5.5.2
+- Upgraded @git.zone/tsrun from ^1.2.46 to ^1.2.47
+- Upgraded @types/node from ^20.12.11 to ^20.14.8
+
+## 2024-05-17 - 2.1.80 - core
+Fix multiple core issues.
+
+- Various small fixes and updates to the core functionality.
+
+## 2024-05-17 - 2.1.76 to 2.1.79 - core
+Routine core updates and fixes.
+
+- Several minor enhancements and bug fixes.
+
+## 2024-05-14 - 2.1.74 to 2.1.75 - core
+General core maintenance updates.
+
+- Core updated to fix minor bugs.
+
+## 2024-05-10 - 2.1.72 to 2.1.73 - core
+Minor core updates.
+
+- Improvements and fixes to core components.
+
+## 2024-01-08 - 2.1.70 to 2.1.71 - core
+Core functionality enhancements.
+
+- Small fixes and updates in the core.
+
+## 2023-08-26 - 2.1.66 to 2.1.69 - core
+Regular core updates and fixes.
+
+- Various updates to improve core functionality.
+
+## 2023-06-03 - 2.1.65 - core
+Core maintenance update.
+
+- Fixed issues in core functionality.
+
+## 2022-08-03 - 2.1.63 to 2.1.64 - core
+Minor core updates and fixes.
+
+- Updated core functionality with minor fixes.
+
+## 2022-05-25 - 2.1.61 to 2.1.62 - core
+Routine core updates.
+
+- Fixed minor bugs in the core.
+
+## 2022-03-24 - 2.1.60 - core
+Core functionality update.
+
+- Fixed various minor issues in core.
+
+## 2022-03-18 - 2.1.57 to 2.1.59 - core
+Minor core updates and enhancements.
+
+- Updated core components with small fixes.
+
+## 2022-03-15 - 2.1.50 to 2.1.56 - core
+Several core bug fixes.
+
+- Fixed various minor issues in the core functionality.
+
+## 2022-03-14 - 2.1.49 - core
+Core update.
+
+- Fixed minor bugs in the core.
+
+## 2022-03-12 - 2.1.43 to 2.1.48 - core
+General core maintenance updates.
+
+- Core updated to fix minor bugs and improve functionality.
+
+## 2022-03-11 - 2.1.33 to 2.1.42 - core
+Core functionality enhancements and fixes.
+
+- Multiple updates to improve core functionality and fix bugs.
+
+## 2022-03-11 - 2.1.29 to 2.1.32 - core
+Routine core updates.
+
+- Minor bug fixes and improvements in core functionality.
+
+## 2022-01-19 - 2.1.28 to 2.1.29 - core
+Core bug fixes.
+
+- Updated core to address minor issues.
+
+## 2021-10-06 - 2.1.27 - core
+Minor core update.
+
+- Fixed core bugs.
+
+## 2021-09-08 - 2.1.26 - core
+Core update.
+
+- Fixed minor bugs in the core.
+
+## 2021-08-17 - 2.1.25 - core
+Core bug fixes.
+
+- Small updates to improve core functionality.
+
+## 2020-08-11 - 2.1.24 - core
+Routine core update.
+
+- Fixed minor bugs in the core.
+
+## 2020-05-14 - 2.1.23 - core
+General core updates.
+
+- Fixes to improve core stability.
+
+## 2020-03-13 - 2.1.20 to 2.1.22 - core
+Minor core updates.
+
+- Enhancements and fixes for core functionality.
+
+## 2020-03-09 - 2.1.19 - core
+Maintenance core update.
+
+- Fixes addressing minor issues in core functionality.
+
+## 2019-08-26 - 2.1.16 to 2.1.17 - core
+Routine minor core updates.
+
+- Improvement and fixes within the core functionality.
+
+## 2019-01-27 - 2.1.6 - custom directory compilation
+Now picking up TypeScript files correctly.
+
+- Resolved compilation issues with custom directories.
+
+## 2018-12-05 - 2.1.0 to 2.1.1 - core
+Minor core updates.
+
+- Small enhancements and fixes applied to core functionality.
+
+## 2018-12-05 - 2.0.22 - cli options
+Now support --web for web compilations targeting Google Chrome.
+
+- Added new CLI option for web compilation.
+
+## 2018-07-25 - 2.0.15 to 2.0.19 - various
+Multiple fixes across core, dependency, and compiler modules.
+
+- Packagename fix in core.
+- Dependency updates.
+- Compiler options fixed.
+- Initial core updates.

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_TSBUILD = 'true'
-var index = require("./dist/index.js");
+process.env.CLI_CALL = 'true';
+const cliTool = await import('./dist_ts/index.js');
+cliTool.runCli();

cli.ts.js

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

npmextra.json

@@ -4,11 +4,12 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tsbuild",
-      "shortDescription": "TypeScript nightly to easily make use of latest features",
+      "description": "TypeScript nightly to easily make use of latest features",
       "npmPackagename": "@gitzone/tsbuild",
       "license": "MIT"
     }

package.json

@@ -1,17 +1,18 @@
 {
-  "name": "@gitzone/tsbuild",
-  "version": "2.1.20",
+  "name": "@git.zone/tsbuild",
+  "version": "2.1.85",
   "private": false,
   "description": "TypeScript nightly to easily make use of latest features",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "bin": {
-    "tsbuild": "cli.js"
+    "tsbuild": "./cli.js"
   },
   "scripts": {
     "test": "tsrun test/test.ts",
-    "testCustom": "node cli.ts.js custom ts_web",
-    "build": "node cli.ts.js"
+    "build": "node cli.ts.js --web --allowimplicitany",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -27,29 +28,33 @@
   },
   "homepage": "https://gitlab.com/pushrocks/tsn#README",
   "dependencies": {
-    "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartfile": "^7.0.2",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartpath": "^4.0.1",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "typescript": "^3.5.2"
+    "@push.rocks/early": "^4.0.4",
+    "@push.rocks/smartcli": "^4.0.11",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartfile": "^11.0.21",
+    "@push.rocks/smartlog": "^3.0.7",
+    "@push.rocks/smartpath": "^5.0.18",
+    "@push.rocks/smartpromise": "^4.0.4",
+    "typescript": "5.5.2"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.2.8",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.2",
-    "tslint": "^5.19.0",
-    "tslint-config-prettier": "^1.18.0"
+    "@git.zone/tsrun": "^1.2.47",
+    "@push.rocks/tapbundle": "^5.0.23",
+    "@types/node": "^20.14.8"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -0,0 +1,84 @@
+# @gitzone/tsbuild
+TypeScript nightly to easily make use of latest features
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbuild)
+* [gitlab.com (source)](https://gitlab.com/gitzone/tsbuild)
+* [github.com (source mirror)](https://github.com/gitzone/tsbuild)
+* [docs (typedoc)](https://gitzone.gitlab.io/tsbuild/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbuild/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbuild/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tsbuild)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tsbuild)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tsbuild)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsbuild)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsbuild)](https://lossless.cloud)
+
+## Usage
+
+Tsn uses the **next** tagged npm version of typescript
+
+```typescript
+import * as tsn from 'tsn';
+
+let myGlobStringObject = {
+  './myTsFolder/**/*.ts': './myDestinationFolder/',
+  './someOtherTsFolder/**/*.ts': './myOtherDestinationFolder/',
+};
+
+let tsOptions = {
+  target: tsn.ScriptTarget.ES2015,
+  module: tsn.ModuleKind.CommonJS,
+};
+
+/*
+note: since this only works in code, here are the target numbers
+enum ScriptTarget {
+        ES3 = 0,
+        ES5 = 1,
+        ES2015 = 2,
+        ES2016 = 3,
+        ES2017 = 4,
+        ESNext = 5,
+        Latest = 5,
+}
+
+and here are the module kinds
+enum ModuleKind {
+        None = 0,
+        CommonJS = 1,
+        AMD = 2,
+        UMD = 3,
+        System = 4,
+        ES2015 = 5,
+    }
+*/
+
+let myCwd = process.cwd();
+
+tsn.compileGlobStringObject(
+  myGlobStringObject, // the glob string object describing from where to compile what to where
+  tsOptions, // the options for TypeScript
+  myCwd // a custom cwd, optional, defaults to process.cwd()
+);
+```
+
+[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+
+## 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.
+
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)

test/assets/output/tocompile.d.ts

@@ -1,5 +1 @@
-declare class test2 {
-    test: string[];
-    constructor();
-}
-declare const run: () => Promise<string>;
+export {};

test/assets/output/tocompile.js

@@ -1,5 +1,10 @@
 console.log('test');
 console.log('test2');
+import * as early from '@push.rocks/early';
+early.start();
+early.stop();
+import { anExportedString } from './tocompile2.js';
+console.log(anExportedString);
 class test2 {
     constructor() {
         this.test = [];
@@ -9,4 +14,4 @@ class test2 {
 const run = async () => {
     return 'hi';
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNyQixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLG1CQUFtQixDQUFDO0FBRTNDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ25ELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUU5QixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==

test/assets/output/tocompile2.d.ts

@@ -0,0 +1 @@
+export declare const anExportedString = "exported string";

test/assets/output/tocompile2.js

@@ -1,2 +1,3 @@
 console.log('hello');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RvY29tcGlsZTIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyJ9
+export const anExportedString = 'exported string';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RvY29tcGlsZTIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNyQixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxpQkFBaUIsQ0FBQyJ9

test/assets/tocompile.ts

@@ -1,5 +1,14 @@
 console.log('test');
 console.log('test2');
+
+import * as early from '@push.rocks/early';
+
+early.start();
+early.stop();
+
+import { anExportedString } from './tocompile2.js';
+console.log(anExportedString);
+
 class test2 {
   test: string[] = [];
   constructor() {

test/assets/tocompile2.ts

@@ -1 +1,2 @@
 console.log('hello');
+export const anExportedString = 'exported string';

test/test.ts

@@ -1,19 +1,19 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect, expectAsync } from '@push.rocks/tapbundle';
 
-import * as tsn from '../ts/index';
+import * as tsbuild from '../ts/index.js';
 
 let assetfiles: string[] = ['./test/assets/tocompile.ts', './test/assets/tocompile2.ts'];
 
 let assetfiles2 = {
-  './test/assets/**/!(*.d.ts|*.js|output)': './test/assets/output'
+  './test/assets/**/!(*.d.ts|*.js|output)': './test/assets/output',
 };
 
-tap.test('should convert files from an array with single files to output', async tools => {
-  tsn.compileFileArray(assetfiles, { outDir: './test/assets/output' });
+tap.test('should convert files from an array with single files to output', async (tools) => {
+  tsbuild.compileFileArray(assetfiles, { outDir: './test/assets/output' });
 });
 
-tap.test('should convert files from an array with single files to output', async tools => {
-  tsn.compileGlobStringObject(assetfiles2);
+tap.test('should convert files from an array with single files to output', async (tools) => {
+  tsbuild.compileGlobStringObject(assetfiles2);
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @push.rocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@git.zone/tsbuild',
+  version: '2.1.85',
+  description: 'TypeScript nightly to easily make use of latest features'
+}

ts/index.ts

@@ -1,3 +1,5 @@
-export * from './tsbuild.exports';
-
-import './tsbuild.cli';
+import * as early from '@push.rocks/early';
+early.start('tsbuild');
+export * from './tsbuild.exports.js';
+export * from './tsbuild.cli.js';
+early.stop();

ts/paths.ts

@@ -0,0 +1,4 @@
+import * as plugins from './plugins.js';
+
+export const cwd = process.cwd();
+export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');

ts/plugins.ts

@@ -0,0 +1,22 @@
+// node native
+import * as path from 'path';
+
+export {
+  path
+}
+
+// @push.rocks scope
+import * as smartcli from '@push.rocks/smartcli';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartfile from '@push.rocks/smartfile';
+import * as smartpath from '@push.rocks/smartpath';
+import * as smartpromise from '@push.rocks/smartpromise';
+
+export { smartcli, smartdelay, smartfile, smartpath, smartpromise };
+
+// third party scope
+import typescript from 'typescript';
+
+export {
+  typescript
+}

ts/tsbuild.classes.compiler.ts

@@ -1,7 +1,7 @@
 // import all the stuff we need
-import * as plugins from './tsbuild.plugins';
-import { CompilerOptions } from 'typescript';
-export { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript';
+import * as plugins from './plugins.js';
+import * as paths from './paths.js';
+import type { CompilerOptions, ScriptTarget, ModuleKind } from './tsbuild.exports.js';
 
 /**
  * the default typescript compilerOptions
@@ -12,17 +12,16 @@ export const compilerOptionsDefault: CompilerOptions = {
   experimentalDecorators: true,
   inlineSourceMap: true,
   noEmitOnError: true,
-  outDir: 'dist/',
-  module: plugins.typescript.ModuleKind.CommonJS,
-  lib: ['lib.es2017.d.ts'],
-  noImplicitAny: false,
+  outDir: 'dist_ts/',
+  module: plugins.typescript.ModuleKind.NodeNext,
+  target: plugins.typescript.ScriptTarget.ESNext,
+  moduleResolution: plugins.typescript.ModuleResolutionKind.NodeNext,
+  lib: ['lib.dom.d.ts', 'lib.es2022.d.ts'],
+  noImplicitAny: true,
   esModuleInterop: true,
-  target: plugins.typescript.ScriptTarget.ES2017
-};
-
-export const compilerOptionsWebDefault: CompilerOptions = {
-  ...compilerOptionsDefault,
-  lib: [...compilerOptionsDefault.lib, 'lib.dom.d.ts']
+  useDefineForClassFields: false,
+  verbatimModuleSyntax: true,
+  baseUrl: './',
 };
 
 /**
@@ -32,48 +31,79 @@ export const mergeCompilerOptions = (
   customTsOptions: CompilerOptions,
   argvArg?: any
 ): CompilerOptions => {
-  const defaultOptionsToMerge = (() => {
-    if (argvArg && argvArg.web) {
-      return compilerOptionsWebDefault;
-    } else {
-      return compilerOptionsDefault;
-    }
-  })();
-
   // create merged options
-  let mergedOptions: CompilerOptions = {
-    ...defaultOptionsToMerge,
-    ...customTsOptions
+  const mergedOptions: CompilerOptions = {
+    ...compilerOptionsDefault,
+    ...customTsOptions,
+    ...(argvArg && argvArg.skiplibcheck
+      ? {
+          skipLibCheck: true,
+        }
+      : {}),
+    ...(argvArg && argvArg.allowimplicitany
+      ? {
+          noImplicitAny: false,
+        }
+      : {}),
+    ...(argvArg && argvArg.commonjs
+      ? {
+          module: plugins.typescript.ModuleKind.CommonJS,
+          moduleResolution: plugins.typescript.ModuleResolutionKind.NodeJs,
+        }
+      : {}),
+    ...(() => {
+      const returnObject: CompilerOptions = {};
+      console.log(`looking at tsconfig.json at ${paths.cwd}`);
+      const tsconfig = plugins.smartfile.fs.toObjectSync(plugins.path.join(paths.cwd, 'tsconfig.json'));
+      if (tsconfig && tsconfig.compilerOptions && tsconfig.compilerOptions.baseUrl) {
+        console.log('baseUrl found in tsconfig.json');
+        returnObject.baseUrl = tsconfig.compilerOptions.baseUrl;
+      }
+      if (tsconfig && tsconfig.compilerOptions && tsconfig.compilerOptions.paths) {
+        console.log('paths found in tsconfig.json');
+        returnObject.paths = tsconfig.compilerOptions.paths;
+      }
+      return returnObject;
+    })(),
   };
 
+  console.log(mergedOptions);
+
   return mergedOptions;
 };
 
 /**
  * the internal main compiler function that compiles the files
  */
-export const compiler = (
+export const compiler = async (
   fileNames: string[],
   options: plugins.typescript.CompilerOptions,
   argvArg?: any
 ): Promise<any[]> => {
+  if (options.skipLibCheck) {
+    console.log('? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?');
+    console.log('You are skipping libcheck... Is that really wanted?');
+    console.log('continuing in 5 seconds...');
+    console.log('? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?');
+    await plugins.smartdelay.delayFor(5000);
+  }
   console.log(`Compiling ${fileNames.length} files...`);
-  let done = plugins.smartpromise.defer<any[]>();
-  let program = plugins.typescript.createProgram(fileNames, options);
-  let emitResult = program.emit();
+  const done = plugins.smartpromise.defer<any[]>();
+  const program = plugins.typescript.createProgram(fileNames, options);
+  const emitResult = program.emit();
 
   // implement check only
   /*let emitResult = program.emit(undefined,(args) => {
     console.log(args)
   });*/
 
-  let allDiagnostics = plugins.typescript
+  const allDiagnostics = plugins.typescript
     .getPreEmitDiagnostics(program)
     .concat(emitResult.diagnostics);
-  allDiagnostics.forEach(diagnostic => {
+  allDiagnostics.forEach((diagnostic) => {
     if (diagnostic.file) {
-      let { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
-      let message = plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
+      const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
+      const message = plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
       console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
     } else {
       console.log(
@@ -82,7 +112,7 @@ export const compiler = (
     }
   });
 
-  let exitCode = emitResult.emitSkipped ? 1 : 0;
+  const exitCode = emitResult.emitSkipped ? 1 : 0;
   if (exitCode === 0) {
     console.log('TypeScript emit succeeded!');
     done.resolve(emitResult.emittedFiles);

ts/tsbuild.cli.ts

@@ -1,41 +1,64 @@
-import * as plugins from './tsbuild.plugins';
-import * as tsbuild from './tsbuild.exports';
+import * as plugins from './plugins.js';
+import * as paths from './paths.js';
+import * as tsbuild from './tsbuild.exports.js';
 
-const tsbuildCli = new plugins.smartcli.Smartcli();
+export const runCli = async () => {
+  const tsbuildCli = new plugins.smartcli.Smartcli();
 
-/**
- * the standard task compiles anything in ts/ directory to dist directory
- */
-tsbuildCli.standardTask().subscribe(async argvArg => {
-  if (process.env.CLI_CALL_TSBUILD === 'true') {
+  /**
+   * the standard task compiles anything in ts/ directory to dist directory
+   */
+  tsbuildCli.standardCommand().subscribe(async (argvArg) => {
     tsbuild.compileGlobStringObject(
       {
-        './ts/**/*.ts': './dist'
+        './ts/**/*.ts': './dist_ts',
       },
       {},
       process.cwd(),
       argvArg
     );
-  }
-});
+  });
 
-/**
- * the custom command compiles any customDir to dist_customDir
- */
-tsbuildCli.addCommand('custom').subscribe(async argvArg => {
-  const listedDirectories = argvArg._;
-  listedDirectories.shift();
-  const compilationCommandObject: { [key: string]: string } = {};
-  for (const directory of listedDirectories) {
-    compilationCommandObject[`./${directory}/**/*.ts`] = `./dist_${directory}`;
-  }
-  await tsbuild.compileGlobStringObject(compilationCommandObject, {}, process.cwd(), argvArg);
-});
+  /**
+   * the custom command compiles any customDir to dist_customDir
+   */
+  tsbuildCli.addCommand('custom').subscribe(async (argvArg) => {
+    const listedDirectories = argvArg._;
+    listedDirectories.shift(); // removes the first element that is "custom"
+    const compilationCommandObject: { [key: string]: string } = {};
+    for (const directory of listedDirectories) {
+      compilationCommandObject[`./${directory}/**/*.ts`] = `./dist_${directory}`;
+    }
+    await tsbuild.compileGlobStringObject(compilationCommandObject, {}, process.cwd(), argvArg);
+  });
 
-tsbuildCli.addCommand('element').subscribe(async argvArg => {
-  await tsbuild.compileGlobStringObject({
-    "./ts_web/**/*.ts": "dist_ts_web"
-  }, {}, process.cwd(), {web: true});
-});
+  /**
+   * the custom command compiles any customDir to dist_customDir
+   */
+  tsbuildCli.addCommand('tsfolders').subscribe(async (argvArg) => {
+    const tsFolders = await plugins.smartfile.fs.listFolders(paths.cwd, /^ts/);
+    // lets make sure shared is always transpiled first
+    const indexShared = tsFolders.indexOf('ts_shared');
+    if (indexShared > -1) {
+      tsFolders.splice(indexShared, 1);
+      tsFolders.unshift('ts_shared');
+    }
 
-tsbuildCli.startParse();
+
+    // lets make sure interfaces are always transpiled first
+    const indexInterfaces = tsFolders.indexOf('ts_interfaces');
+    if (indexInterfaces > -1) {
+      tsFolders.splice(indexInterfaces, 1);
+      tsFolders.unshift('ts_interfaces');
+    }
+    const compilationCommandObject: { [key: string]: string } = {};
+    console.log(`compiling in this order:`);
+    console.log(tsFolders);
+    for (const tsFolder of tsFolders) {
+      compilationCommandObject[`./${tsFolder}/**/*.ts`] = `./dist_${tsFolder}`;
+    }
+    await tsbuild.compileGlobStringObject(compilationCommandObject, {}, process.cwd(), argvArg);
+  });
+
+  tsbuildCli.startParse();
+};

ts/tsbuild.exports.ts

@@ -1,7 +1,10 @@
-import * as plugins from './tsbuild.plugins';
-import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler';
+import * as plugins from './plugins.js';
+import type { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript';
+import { compiler, mergeCompilerOptions } from './tsbuild.classes.compiler.js';
 
-export * from './tsbuild.classes.compiler';
+export type { CompilerOptions, ScriptTarget, ModuleKind };
+
+export * from './tsbuild.classes.compiler.js';
 
 /**
  * compile am array of absolute file paths
@@ -27,24 +30,24 @@ export let compileGlobStringObject = async (
   cwdArg: string = process.cwd(),
   argvArg?: any
 ) => {
-  let compiledFiles = [];
+  let compiledFiles: plugins.smartfile.SmartFile[] = [];
   for (const keyArg in globStringObjectArg) {
     if (globStringObjectArg[keyArg]) {
       console.log(
         `TypeScript assignment: transpile from ${keyArg} to ${globStringObjectArg[keyArg]}`
       );
       const fileTreeArray = await plugins.smartfile.fs.listFileTree(cwdArg, keyArg);
-      let absoluteFilePathArray: string[] = plugins.smartpath.transform.toAbsolute(
+      const absoluteFilePathArray: string[] = plugins.smartpath.transform.toAbsolute(
         fileTreeArray,
         cwdArg
-      );
-      let destDir: string = plugins.smartpath.transform.toAbsolute(
+      ) as string[];
+      const destDir: string = plugins.smartpath.transform.toAbsolute(
         globStringObjectArg[keyArg],
         cwdArg
-      );
+      ) as string;
       tsOptionsArg = {
         ...tsOptionsArg,
-        outDir: destDir
+        outDir: destDir,
       };
       compiledFiles = compiledFiles.concat(
         compiledFiles,

ts/tsbuild.plugins.ts

@@ -1,7 +0,0 @@
-import * as smartcli from '@pushrocks/smartcli';
-import * as smartfile from '@pushrocks/smartfile';
-import * as smartpath from '@pushrocks/smartpath';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as typescript from 'typescript';
-
-export { smartcli, smartfile, smartpath, smartpromise, typescript };

tsconfig.json

@@ -1,14 +1,11 @@
 {
   "compilerOptions": {
-    "outDir": "dist/",
-    "module": "commonjs",
-    "target": "es2015",
-    "lib":[
-      "es2016",
-      "es2017"
-    ]
-  },
-  "include": [
-    "ts/**/*.ts"
-  ]
-}
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  }
+}

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