2.1.24

.gitlab-ci.yml

@@ -24,13 +24,14 @@ mirror:
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
     - lossless
     - docker

cli.js

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

cli.ts.js

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.22",
+  "version": "2.1.24",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -64,7 +64,6 @@
       "version": "2.0.1",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fconsolecolor/-/consolecolor-2.0.1.tgz",
       "integrity": "sha512-iOFCHVeFZ2OywbdwSxVI4/wokkcLrXVdHLgvMmkNhJ220eeLgjNZWx3EJo3vNW3zq5ybCSCUIq0878djBxrWpw==",
-      "dev": true,
       "requires": {
         "ansi-256-colors": "^1.1.0"
       }
@@ -73,7 +72,6 @@
       "version": "3.0.3",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fearly/-/early-3.0.3.tgz",
       "integrity": "sha512-71/nwxTpqdp1glmHz4YaGusNl/XOOcPelAxC9RA6rpS/6280QyY2u4yx+mRdMrCzn7ruLYF5awbkS8llNZ94Pg==",
-      "dev": true,
       "requires": {
         "@pushrocks/consolecolor": "^2.0.1",
         "@pushrocks/smartpromise": "^2.0.5"
@@ -82,8 +80,7 @@
         "@pushrocks/smartpromise": {
           "version": "2.0.5",
           "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
-          "dev": true
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
         }
       }
     },
@@ -378,8 +375,7 @@
     "ansi-256-colors": {
       "version": "1.1.0",
       "resolved": "https://verdaccio.lossless.one/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz",
-      "integrity": "sha1-kQ3lDvzHwJ49gvL4er1rcAwYgYo=",
-      "dev": true
+      "integrity": "sha1-kQ3lDvzHwJ49gvL4er1rcAwYgYo="
     },
     "ansi-regex": {
       "version": "2.1.1",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.22",
+  "version": "2.1.24",
   "private": false,
   "description": "TypeScript nightly to easily make use of latest features",
   "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "bin": {
     "tsbuild": "cli.js"
   },
@@ -27,6 +27,7 @@
   },
   "homepage": "https://gitlab.com/pushrocks/tsn#README",
   "dependencies": {
+    "@pushrocks/early": "^3.0.3",
     "@pushrocks/smartcli": "^3.0.7",
     "@pushrocks/smartfile": "^7.0.2",
     "@pushrocks/smartlog": "^2.0.19",
@@ -45,8 +46,7 @@
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_bundle/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
     "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",

readme.md

@@ -67,7 +67,6 @@ tsn.compileGlobStringObject(
 
 [![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). :)

test/assets/output/tocompile.d.ts

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

ts/index.ts

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

ts/tsbuild.cli.ts

@@ -1,46 +1,46 @@
 import * as plugins from './tsbuild.plugins';
 import * as tsbuild from './tsbuild.exports';
 
-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.standardTask().subscribe(async (argvArg) => {
     tsbuild.compileGlobStringObject(
       {
-        './ts/**/*.ts': './dist_ts'
+        './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();
+    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 }
-  );
-});
+  tsbuildCli.addCommand('element').subscribe(async (argvArg) => {
+    await tsbuild.compileGlobStringObject(
+      {
+        './ts_web/**/*.ts': 'dist_ts_web',
+      },
+      {},
+      process.cwd(),
+      { web: true }
+    );
+  });
 
-tsbuildCli.startParse();
+  tsbuildCli.startParse();
+};