1.2.25

.gitlab-ci.yml

@@ -19,23 +19,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +63,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +74,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +94,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.snyk

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

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

cli.js

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

cli.ts.js

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

dependencies.yml

@@ -1 +0,0 @@
-.gitignore: ../gitignore/

dist/index.d.ts

@@ -1 +0,0 @@
-export {};

dist/index.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const tsNode = require("ts-node");
-const defaultTsNodeOptions = {
-    compilerOptions: {
-        lib: ['es2017'],
-        target: 'es2017',
-        experimentalDecorators: true,
-        esModuleInterop: true
-    },
-    skipIgnore: true
-};
-if (process.argv.includes('--web')) {
-    const previousCompilerOptions = defaultTsNodeOptions.compilerOptions;
-    defaultTsNodeOptions.compilerOptions = Object.assign({}, previousCompilerOptions, { lib: ['es2016', 'es2017', 'dom'], target: 'es2015' // Script Target should be a string -> 2 is for ES2015
-     });
-}
-if (process.argv.includes('--nocache')) {
-    // currently caching is not used
-}
-tsNode.register(defaultTsNodeOptions);
-if (process.env.CLI_CALL_TSRUN) {
-    // contents of argv array
-    // process.argv[0] -> node Executable
-    // process.argv[1] -> tsrun executable
-    const pathToTsFile = process.argv[2];
-    const pathToLoad = path.join(process.cwd(), pathToTsFile);
-    Promise.resolve().then(() => require(pathToLoad));
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZCQUE2QjtBQUM3QixrQ0FBa0M7QUFHbEMsTUFBTSxvQkFBb0IsR0FBbUI7SUFDM0MsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLENBQUMsUUFBUSxDQUFDO1FBQ2YsTUFBTSxFQUFPLFFBQVE7UUFDckIsc0JBQXNCLEVBQUUsSUFBSTtRQUM1QixlQUFlLEVBQUUsSUFBSTtLQUNIO0lBQ3BCLFVBQVUsRUFBRSxJQUFJO0NBQ2pCLENBQUM7QUFFRixJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFO0lBQ2xDLE1BQU0sdUJBQXVCLEdBQUcsb0JBQW9CLENBQUMsZUFBa0MsQ0FBQztJQUN4RixvQkFBb0IsQ0FBQyxlQUFlLHFCQUMvQix1QkFBdUIsSUFDMUIsR0FBRyxFQUFFLENBQUMsUUFBUSxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFDaEMsTUFBTSxFQUFPLFFBQVEsQ0FBQyxzREFBc0Q7T0FDN0UsQ0FBQztDQUNIO0FBRUQsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsRUFBRTtJQUN0QyxnQ0FBZ0M7Q0FDakM7QUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLENBQUM7QUFFdEMsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRTtJQUM5Qix5QkFBeUI7SUFDekIscUNBQXFDO0lBQ3JDLHNDQUFzQztJQUN0QyxNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXJDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQzFELHFDQUFPLFVBQVUsR0FBRTtDQUNwQiJ9

dist_ts/index.d.ts

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

dist_ts/index.js

@@ -1,51 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCli = void 0;
-const path = __importStar(require("path"));
-const tsNode = __importStar(require("ts-node"));
-const defaultTsNodeOptions = {
-    compilerOptions: {
-        lib: ['es2017'],
-        target: 'es2017',
-        experimentalDecorators: true,
-        esModuleInterop: true
-    },
-    skipIgnore: true
-};
-if (process.argv.includes('--web')) {
-    const previousCompilerOptions = defaultTsNodeOptions.compilerOptions;
-    defaultTsNodeOptions.compilerOptions = Object.assign(Object.assign({}, previousCompilerOptions), { lib: ['es2016', 'es2017', 'dom'], target: 'es2017' // Script Target should be a string -> 2 is for ES2015
-     });
-}
-if (process.argv.includes('--nocache')) {
-    // currently caching is not used
-}
-tsNode.register(defaultTsNodeOptions);
-exports.runCli = async () => {
-    // contents of argv array
-    // process.argv[0] -> node Executable
-    // process.argv[1] -> tsrun executable
-    const pathToTsFile = process.argv[2];
-    const pathToLoad = path.join(process.cwd(), pathToTsFile);
-    Promise.resolve().then(() => __importStar(require(pathToLoad)));
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkNBQTZCO0FBQzdCLGdEQUFrQztBQUdsQyxNQUFNLG9CQUFvQixHQUF5QjtJQUNqRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsQ0FBQyxRQUFRLENBQUM7UUFDZixNQUFNLEVBQU8sUUFBUTtRQUNyQixzQkFBc0IsRUFBRSxJQUFJO1FBQzVCLGVBQWUsRUFBRSxJQUFJO0tBQ0g7SUFDcEIsVUFBVSxFQUFFLElBQUk7Q0FDakIsQ0FBQztBQUVGLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUU7SUFDbEMsTUFBTSx1QkFBdUIsR0FBRyxvQkFBb0IsQ0FBQyxlQUFrQyxDQUFDO0lBQ3hGLG9CQUFvQixDQUFDLGVBQWUsbUNBQy9CLHVCQUF1QixLQUMxQixHQUFHLEVBQUUsQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxFQUNoQyxNQUFNLEVBQU8sUUFBUSxDQUFDLHNEQUFzRDtPQUM3RSxDQUFDO0NBQ0g7QUFFRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxFQUFFO0lBQ3RDLGdDQUFnQztDQUNqQztBQUVELE1BQU0sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUV6QixRQUFBLE1BQU0sR0FBRyxLQUFLLElBQUksRUFBRTtJQUMvQix5QkFBeUI7SUFDekIscUNBQXFDO0lBQ3JDLHNDQUFzQztJQUN0QyxNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXJDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQzFELGtEQUFPLFVBQVUsSUFBRTtBQUNyQixDQUFDLENBQUEifQ==

package.json

@@ -1,29 +1,33 @@
 {
   "name": "@gitzone/tsrun",
-  "version": "1.2.12",
+  "version": "1.2.25",
   "description": "run typescript programs efficiently",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
     "tsrun": "./cli.js"
   },
   "scripts": {
-    "test": "(tsbuild && node ./cli.js test/test.ts)",
+    "test": "(tsbuild && node ./cli.js test/test.js sayhello)",
     "format": "(gitzone format)",
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
-    "@types/node": "^14.0.6",
+    "@gitzone/tsbuild": "^2.1.43",
+    "@pushrocks/smartcli": "^3.0.14",
+    "@types/node": "^17.0.21",
+    "node-fetch": "^3.2.2",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^7.0.12",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartshell": "^2.0.30",
+    "ts-node": "^10.7.0",
+    "typescript": "4.7.0-dev.20220311"
   },
   "private": false,
   "files": [
@@ -37,5 +41,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -19,7 +19,7 @@ TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x
 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/tsrun)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsrun)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsrun)](https://lossless.cloud)
 BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsrun)](https://lossless.cloud)
 Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
@@ -37,7 +37,6 @@ There are options available:
 
 - `--web` will inject browser types. this is useful when testing code with polyfills on node, but that is meant for the browser later on.
 
-
 ## 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). :)

test/test.ts

@@ -1,2 +1,14 @@
 const textToPost: string = 'Test runs!';
 console.log(textToPost);
+
+const run = async () => {
+  const smartcli = await import('@pushrocks/smartcli');
+  const smartcliInstance = new smartcli.Smartcli();
+  console.log(process.argv)
+  smartcliInstance.addCommand('sayhello').subscribe(async argvArg => {
+    console.log('hello there');
+  })
+  smartcliInstance.startParse();
+}
+
+run();

ts/index.ts

@@ -1,31 +1,9 @@
-import * as path from 'path';
-import * as tsNode from 'ts-node';
-import { CompilerOptions } from 'typescript';
+import * as plugins from './plugins.js';
 
-const defaultTsNodeOptions: tsNode.CreateOptions = {
-  compilerOptions: {
-    lib: ['es2017'],
-    target: <any>'es2017', // Script Target should be a string -> 2 is for ES2015
-    experimentalDecorators: true,
-    esModuleInterop: true
-  } as CompilerOptions,
-  skipIgnore: true
-};
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
 
-if (process.argv.includes('--web')) {
-  const previousCompilerOptions = defaultTsNodeOptions.compilerOptions as CompilerOptions;
-  defaultTsNodeOptions.compilerOptions = {
-    ...previousCompilerOptions,
-    lib: ['es2016', 'es2017', 'dom'],
-    target: <any>'es2017' // Script Target should be a string -> 2 is for ES2015
-  };
-}
-
-if (process.argv.includes('--nocache')) {
-  // currently caching is not used
-}
-
-tsNode.register(defaultTsNodeOptions);
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 export const runCli = async () => {
   // contents of argv array
@@ -33,6 +11,18 @@ export const runCli = async () => {
   // process.argv[1] -> tsrun executable
   const pathToTsFile = process.argv[2];
   
-  const pathToLoad = path.join(process.cwd(), pathToTsFile);
-  import(pathToLoad);
+  const tsNodeLoaderPath = plugins.path.join(__dirname, 'loader.js')
+  const pathToLoad = plugins.path.join(process.cwd(), pathToTsFile);
+  process.argv.splice(0, 3); // this ensures transparent arguments for the child process
+  
+  const smartshellInstance = new plugins.smartshell.Smartshell({
+    executor: 'bash'
+  });
+
+  // note: -> reduce on emtpy array does not work
+  // thus check needed before reducing the argv array
+  smartshellInstance.exec(`node --loader ${tsNodeLoaderPath} ${pathToLoad} ${process.argv.length > 0 ? process.argv.reduce((prevArg, currentArg) => {
+    return prevArg + ' ' + currentArg;
+  }) : ''}`);
+
 };

ts/loader.ts

@@ -0,0 +1,20 @@
+import * as plugins from './plugins.js';
+import type { CompilerOptions } from 'typescript';
+
+const defaultTsNodeOptions: plugins.tsNode.CreateOptions = {
+  compilerOptions: {
+    lib: ['dom'],
+    target: <any>'es2020', // Script Target should be a string -> 2 is for ES2015
+    experimentalDecorators: true,
+    esModuleInterop: true,
+    strictNullChecks: false,
+    moduleResolution: <any>'node12',
+    module: <any>'ESNext',
+    importsNotUsedAsValues: <any>'preserve',
+  } as CompilerOptions,
+  esm: true,
+  skipIgnore: true,
+  transpileOnly: true
+};
+
+export const { resolve, load, getFormat, transformSource } = plugins.tsNode.createEsmHooks(plugins.tsNode.register(defaultTsNodeOptions)) as any;

ts/plugins.ts

@@ -0,0 +1,15 @@
+// @pushrocks scope
+import * as smartshell from '@pushrocks/smartshell';
+
+export {
+  smartshell
+}
+
+// third party scope
+import * as path from 'path';
+import * as tsNode from 'ts-node';
+
+export {
+  path,
+  tsNode
+}

tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "module": "ES2022",
+    "target": "ES2020",
+    "moduleResolution": "Node12"
+  }
+}