2.1.47

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,4 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-const cliTool = await import('./dist_ts/index');
+const cliTool = await import('./dist_ts/index.js');
 cliTool.runCli();

cli.ts.js

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

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.34",
+  "version": "2.1.47",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gitzone/tsbuild",
-      "version": "2.1.34",
+      "version": "2.1.47",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/early": "^3.0.6",
@@ -21,7 +21,7 @@
         "tsbuild": "cli.js"
       },
       "devDependencies": {
-        "@gitzone/tsrun": "^1.2.19",
+        "@gitzone/tsrun": "^1.2.26",
         "@pushrocks/tapbundle": "^4.0.8",
         "@types/node": "^17.0.21",
         "tslint": "^6.1.3",
@@ -176,15 +176,16 @@
       }
     },
     "node_modules/@gitzone/tsrun": {
-      "version": "1.2.19",
-      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.19.tgz",
-      "integrity": "sha512-GmJSpbx0uij7G06FhvURnSSfJ5O9U2NNXD0I3QE5BhFmBH/7otk4sovrytU7p4hYdgzhcvZ6jRrmMxaspiia7A==",
+      "version": "1.2.26",
+      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.26.tgz",
+      "integrity": "sha512-8gqZ4G9/owPa57xzbGfjjKVLglSN038bZ2O7RBTqFS0TfFjtSq3Tkn9GmndaV2mX4G0+y7dJfeShiVG4rw8YIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartfile": "^9.0.6",
+        "@pushrocks/smartshell": "^2.0.30",
         "ts-node": "^10.7.0",
-        "typescript": "^4.6.2"
+        "typescript": "4.7.0-dev.20220311"
       },
       "bin": {
         "tsrun": "cli.js"
@@ -361,6 +362,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@pushrocks/smartexit": {
+      "version": "1.0.20",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.20.tgz",
+      "integrity": "sha512-u/KgA7s2zAtZ7gZvL13HZbO3mZATvjfCLU8Ez6h8VweG8UsIBVaPfYziMDCmJOWIPYLGzEW8eG/u4mCHuyLBow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pushrocks/lik": "^4.0.20",
+        "@pushrocks/smartdelay": "^2.0.3"
+      }
+    },
     "node_modules/@pushrocks/smartexpect": {
       "version": "1.0.12",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpect/-/smartexpect-1.0.12.tgz",
@@ -558,6 +570,21 @@
       "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
       "license": "0BSD"
     },
+    "node_modules/@pushrocks/smartshell": {
+      "version": "2.0.30",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.30.tgz",
+      "integrity": "sha512-HPgdTFzfzhk2TQau/jVdYNSANlxyBZdqq2vyZ+bZahegVHfH/27Zur5Fk+2vE16VJjJMqP7zcvDITUe2+ipgJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pushrocks/smartdelay": "^2.0.13",
+        "@pushrocks/smartexit": "^1.0.20",
+        "@pushrocks/smartpromise": "^3.1.6",
+        "@types/which": "^2.0.1",
+        "tree-kill": "^1.2.2",
+        "which": "^2.0.2"
+      }
+    },
     "node_modules/@pushrocks/smarttime": {
       "version": "3.0.45",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.45.tgz",
@@ -705,6 +732,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/which": {
+      "version": "2.0.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-2.0.1.tgz",
+      "integrity": "sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/yargs": {
       "version": "16.0.4",
       "resolved": "https://verdaccio.lossless.one/@types%2fyargs/-/yargs-16.0.4.tgz",
@@ -1274,6 +1308,13 @@
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
       "license": "MIT"
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://verdaccio.lossless.one/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1612,6 +1653,16 @@
         "readable-stream": "3"
       }
     },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://verdaccio.lossless.one/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
     "node_modules/tslib": {
       "version": "1.13.0",
       "resolved": "https://verdaccio.lossless.one/tslib/-/tslib-1.13.0.tgz",
@@ -1711,6 +1762,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://verdaccio.lossless.one/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://verdaccio.lossless.one/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -1897,14 +1964,15 @@
       }
     },
     "@gitzone/tsrun": {
-      "version": "1.2.19",
-      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.19.tgz",
-      "integrity": "sha512-GmJSpbx0uij7G06FhvURnSSfJ5O9U2NNXD0I3QE5BhFmBH/7otk4sovrytU7p4hYdgzhcvZ6jRrmMxaspiia7A==",
+      "version": "1.2.26",
+      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.26.tgz",
+      "integrity": "sha512-8gqZ4G9/owPa57xzbGfjjKVLglSN038bZ2O7RBTqFS0TfFjtSq3Tkn9GmndaV2mX4G0+y7dJfeShiVG4rw8YIw==",
       "dev": true,
       "requires": {
         "@pushrocks/smartfile": "^9.0.6",
+        "@pushrocks/smartshell": "^2.0.30",
         "ts-node": "^10.7.0",
-        "typescript": "^4.6.2"
+        "typescript": "4.7.0-dev.20220311"
       },
       "dependencies": {
         "ts-node": {
@@ -2040,6 +2108,16 @@
         }
       }
     },
+    "@pushrocks/smartexit": {
+      "version": "1.0.20",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.20.tgz",
+      "integrity": "sha512-u/KgA7s2zAtZ7gZvL13HZbO3mZATvjfCLU8Ez6h8VweG8UsIBVaPfYziMDCmJOWIPYLGzEW8eG/u4mCHuyLBow==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/lik": "^4.0.20",
+        "@pushrocks/smartdelay": "^2.0.3"
+      }
+    },
     "@pushrocks/smartexpect": {
       "version": "1.0.12",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpect/-/smartexpect-1.0.12.tgz",
@@ -2219,6 +2297,20 @@
         }
       }
     },
+    "@pushrocks/smartshell": {
+      "version": "2.0.30",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.30.tgz",
+      "integrity": "sha512-HPgdTFzfzhk2TQau/jVdYNSANlxyBZdqq2vyZ+bZahegVHfH/27Zur5Fk+2vE16VJjJMqP7zcvDITUe2+ipgJg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartdelay": "^2.0.13",
+        "@pushrocks/smartexit": "^1.0.20",
+        "@pushrocks/smartpromise": "^3.1.6",
+        "@types/which": "^2.0.1",
+        "tree-kill": "^1.2.2",
+        "which": "^2.0.2"
+      }
+    },
     "@pushrocks/smarttime": {
       "version": "3.0.45",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.45.tgz",
@@ -2350,6 +2442,12 @@
         "@types/node": "*"
       }
     },
+    "@types/which": {
+      "version": "2.0.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-2.0.1.tgz",
+      "integrity": "sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ==",
+      "dev": true
+    },
     "@types/yargs": {
       "version": "16.0.4",
       "resolved": "https://verdaccio.lossless.one/@types%2fyargs/-/yargs-16.0.4.tgz",
@@ -2743,6 +2841,12 @@
       "resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.2.2.tgz",
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://verdaccio.lossless.one/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2975,6 +3079,12 @@
         "readable-stream": "3"
       }
     },
+    "tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://verdaccio.lossless.one/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true
+    },
     "tslib": {
       "version": "1.13.0",
       "resolved": "https://verdaccio.lossless.one/tslib/-/tslib-1.13.0.tgz",
@@ -3039,6 +3149,15 @@
       "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
       "dev": true
     },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://verdaccio.lossless.one/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
     "wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://verdaccio.lossless.one/wrap-ansi/-/wrap-ansi-7.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.34",
+  "version": "2.1.47",
   "private": false,
   "description": "TypeScript nightly to easily make use of latest features",
   "main": "dist_ts/index.js",
@@ -37,7 +37,7 @@
     "typescript": "4.7.0-dev.20220311"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.2.19",
+    "@gitzone/tsrun": "^1.2.26",
     "@pushrocks/tapbundle": "^4.0.8",
     "@types/node": "^17.0.21",
     "tslint": "^6.1.3",

test/assets/output/tocompile.js

@@ -3,7 +3,7 @@ console.log('test2');
 import * as early from '@pushrocks/early';
 early.start();
 early.stop();
-import { anExportedString } from './tocompile2';
+import { anExportedString } from './tocompile2.js';
 console.log(anExportedString);
 class test2 {
     constructor() {
@@ -14,4 +14,4 @@ class test2 {
 const run = async () => {
     return 'hi';
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUM5QyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFFOUIsTUFBTSxLQUFLO0lBRVQ7UUFEQSxTQUFJLEdBQWEsRUFBRSxDQUFDO1FBRWxCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDcEIsQ0FBQztDQUNGO0FBRUQsTUFBTSxHQUFHLEdBQUcsS0FBSyxJQUFxQixFQUFFO0lBQ3RDLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGlCQUFpQixDQUFDO0FBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUU5QixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==

test/assets/tocompile.ts

@@ -6,7 +6,7 @@ import * as early from '@pushrocks/early';
 early.start();
 early.stop();
 
-import {anExportedString} from './tocompile2';
+import {anExportedString} from './tocompile2.js';
 console.log(anExportedString);
 
 class test2 {

test/test.ts

@@ -1,6 +1,6 @@
 import { tap, expect, expectAsync } from '@pushrocks/tapbundle';
 
-import * as tsbuild from '../ts/index';
+import * as tsbuild from '../ts/index.js';
 
 let assetfiles: string[] = ['./test/assets/tocompile.ts', './test/assets/tocompile2.ts'];
 

ts/index.ts

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

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 './tsbuild.plugins.js';
+import { CompilerOptions, ScriptTarget, ModuleKind } from './tsbuild.exports.js';
+
 
 /**
  * the default typescript compilerOptions
@@ -14,11 +14,11 @@ export const compilerOptionsDefault: CompilerOptions = {
   noEmitOnError: true,
   outDir: 'dist_ts/',
   module: plugins.typescript.ModuleKind.ES2020,
+  target: plugins.typescript.ScriptTarget.ES2020,
   moduleResolution: plugins.typescript.ModuleResolutionKind.Node12,
   lib: [],
   noImplicitAny: false,
   esModuleInterop: true,
-  target: plugins.typescript.ScriptTarget.ES2020,
   importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve
 };
 

ts/tsbuild.cli.ts

@@ -1,5 +1,5 @@
-import * as plugins from './tsbuild.plugins';
-import * as tsbuild from './tsbuild.exports';
+import * as plugins from './tsbuild.plugins.js';
+import * as tsbuild from './tsbuild.exports.js';
 
 export const runCli = async () => {
   const tsbuildCli = new plugins.smartcli.Smartcli();

ts/tsbuild.exports.ts

@@ -1,7 +1,14 @@
-import * as plugins from './tsbuild.plugins';
-import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler';
+import * as plugins from './tsbuild.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

ts/tsbuild.plugins.ts

@@ -2,6 +2,6 @@ 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';
+import typescript from 'typescript';
 
 export { smartcli, smartfile, smartpath, smartpromise, typescript };