2.1.37

.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

.snyk

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

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,5 @@
 #!/usr/bin/env node
-process.env.CLI_CALL_TSBUILD = 'true';
-require('@gitzone/tsrun');
-require('./ts/index');
+process.env.CLI_CALL = 'true';
+await import('@gitzone/tsrun');
+const cliTool = await import('./ts/index.js');
+cliTool.runCli();

package.json

@@ -1,17 +1,18 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.21",
+  "version": "2.1.37",
   "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",
+  "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"
   },
   "repository": {
     "type": "git",
@@ -27,26 +28,26 @@
   },
   "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"
+    "@pushrocks/early": "^3.0.6",
+    "@pushrocks/smartcli": "^3.0.14",
+    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartpath": "^4.0.3",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "typescript": "4.7.0-dev.20220311"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.2.8",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.2",
-    "tslint": "^5.19.0",
+    "@gitzone/tsrun": "^1.2.19",
+    "@pushrocks/tapbundle": "^4.0.8",
+    "@types/node": "^17.0.21",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_bundle/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
     "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",

readme.md

@@ -0,0 +1,79 @@
+# @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
+[![pipeline status](https://gitlab.com/gitzone/tsbuild/badges/master/pipeline.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)
+
+## 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.
+
+> 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)

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 '@pushrocks/early';
+early.start();
+early.stop();
+import { anExportedString } from './tocompile2';
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUM5QyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFFOUIsTUFBTSxLQUFLO0lBRVQ7UUFEQSxTQUFJLEdBQWEsRUFBRSxDQUFDO1FBRWxCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDcEIsQ0FBQztDQUNGO0FBRUQsTUFBTSxHQUFHLEdBQUcsS0FBSyxJQUFxQixFQUFFO0lBQ3RDLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyxDQUFDIn0=

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 '@pushrocks/early';
+
+early.start();
+early.stop();
+
+import {anExportedString} from './tocompile2';
+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,6 +1,6 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect, expectAsync } from '@pushrocks/tapbundle';
 
-import * as tsn from '../ts/index';
+import * as tsbuild from '../ts/index';
 
 let assetfiles: string[] = ['./test/assets/tocompile.ts', './test/assets/tocompile2.ts'];
 
@@ -9,11 +9,11 @@ let assetfiles2 = {
 };
 
 tap.test('should convert files from an array with single files to output', async tools => {
-  tsn.compileFileArray(assetfiles, { outDir: './test/assets/output' });
+  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);
+  tsbuild.compileGlobStringObject(assetfiles2);
 });
 
 tap.start();

ts/index.ts

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

ts/tsbuild.classes.compiler.ts

@@ -1,5 +1,5 @@
 // import all the stuff we need
-import * as plugins from './tsbuild.plugins';
+import * as plugins from './tsbuild.plugins.js';
 import { CompilerOptions } from 'typescript';
 export { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript';
 
@@ -13,11 +13,13 @@ export const compilerOptionsDefault: CompilerOptions = {
   inlineSourceMap: true,
   noEmitOnError: true,
   outDir: 'dist_ts/',
-  module: plugins.typescript.ModuleKind.CommonJS,
-  lib: ['lib.es2017.d.ts'],
+  module: plugins.typescript.ModuleKind.ES2020,
+  moduleResolution: plugins.typescript.ModuleResolutionKind.Node12,
+  lib: [],
   noImplicitAny: false,
   esModuleInterop: true,
-  target: plugins.typescript.ScriptTarget.ES2017
+  target: plugins.typescript.ScriptTarget.ES2020,
+  importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve
 };
 
 export const compilerOptionsWebDefault: CompilerOptions = {
@@ -43,7 +45,10 @@ export const mergeCompilerOptions = (
   // create merged options
   const mergedOptions: CompilerOptions = {
     ...defaultOptionsToMerge,
-    ...customTsOptions
+    ...customTsOptions,
+    ...argvArg && argvArg.skiplibcheck ? {
+      skipLibCheck: true
+    } : {},
   };
 
   return mergedOptions;

ts/tsbuild.cli.ts

@@ -1,46 +1,46 @@
-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';
 
-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();
+};

ts/tsbuild.exports.ts

@@ -1,5 +1,5 @@
-import * as plugins from './tsbuild.plugins';
-import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler';
+import * as plugins from './tsbuild.plugins.js';
+import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler.js';
 
 export * from './tsbuild.classes.compiler';
 
@@ -27,18 +27,18 @@ 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(
+      const destDir: string = plugins.smartpath.transform.toAbsolute(
         globStringObjectArg[keyArg],
         cwdArg
       );

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

tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "dist_ts/",
-    "module": "commonjs",
-    "target": "es2015",
-    "lib":[
-      "es2016",
-      "es2017"
-    ]
-  },
-  "include": [
-    "ts/**/*.ts"
-  ]
-}