1.2.11

.gitignore

@@ -1,7 +1,22 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
 .yarn/
-tscache
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -34,31 +34,6 @@ snyk:
   - docker
   - notpriv
 
-sast:
-  stage: security
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run build
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
-
 # ====================
 # test stage
 # ====================
@@ -75,13 +50,13 @@ testLTS:
   - docker
   - notpriv
 
-testSTABLE:
+testBuild:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
@@ -90,7 +65,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -103,19 +78,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
   - docker
   - priv
@@ -134,10 +101,10 @@ pages:
   image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

cli.js

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

cli.ts.js

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

dist_ts/index.d.ts

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

dist_ts/index.js

@@ -0,0 +1,51 @@
+"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==

npmextra.json

@@ -5,6 +5,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@gitzone/tsrun",
-  "version": "1.2.6",
+  "version": "1.2.11",
   "description": "run typescript programs efficiently",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
@@ -15,15 +15,25 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@types/node": "^11.13.0",
-    "tslint": "^5.15.0",
+    "@gitzone/tsbuild": "^2.1.24",
+    "@types/node": "^14.0.6",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsbuild": "^2.1.8",
-    "@pushrocks/smartfile": "^7.0.2",
-    "ts-node": "^8.0.3",
-    "typescript": "^3.4.2"
+    "@pushrocks/smartfile": "^7.0.12",
+    "ts-node": "^8.10.2",
+    "typescript": "^3.9.3"
   },
-  "private": false
+  "private": false,
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

ts/index.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as tsNode from 'ts-node';
 import { CompilerOptions } from 'typescript';
 
-const defaultTsNodeOptions: tsNode.Options = {
+const defaultTsNodeOptions: tsNode.CreateOptions = {
   compilerOptions: {
     lib: ['es2017'],
     target: <any>'es2017', // Script Target should be a string -> 2 is for ES2015
@@ -17,7 +17,7 @@ if (process.argv.includes('--web')) {
   defaultTsNodeOptions.compilerOptions = {
     ...previousCompilerOptions,
     lib: ['es2016', 'es2017', 'dom'],
-    target: <any>'es2015' // Script Target should be a string -> 2 is for ES2015
+    target: <any>'es2017' // Script Target should be a string -> 2 is for ES2015
   };
 }
 
@@ -27,7 +27,7 @@ if (process.argv.includes('--nocache')) {
 
 tsNode.register(defaultTsNodeOptions);
 
-if (process.env.CLI_CALL_TSRUN) {
+export const runCli = async () => {
   // contents of argv array
   // process.argv[0] -> node Executable
   // process.argv[1] -> tsrun executable