2.1.22

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -1,18 +1,16 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-variables:
-  GIT_STRATEGY: clone
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -20,21 +18,23 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -43,37 +43,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci command npm run build
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -83,33 +86,35 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:18-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -117,5 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

cli.js

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

npmextra.json

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.18",
+  "version": "2.1.22",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.18",
+  "version": "2.1.22",
   "private": false,
   "description": "TypeScript nightly to easily make use of latest features",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
     "tsbuild": "cli.js"
@@ -42,12 +42,14 @@
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_bundle/**/*",
-    "dist_ts_web/*",
+    "dist_web/**/*",
-    "assets/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ TypeScript nightly to easily make use of latest features
 * [docs (typedoc)](https://gitzone.gitlab.io/tsbuild/)
 
 ## Status for master
-[![build status](https://gitlab.com/gitzone/tsbuild/badges/master/build.svg)](https://gitlab.com/gitzone/tsbuild/commits/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)
@@ -67,6 +67,11 @@ 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). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/assets/output/tocompile.d.ts

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

ts/tsbuild.classes.compiler.ts

@@ -12,7 +12,7 @@ export const compilerOptionsDefault: CompilerOptions = {
   experimentalDecorators: true,
   inlineSourceMap: true,
   noEmitOnError: true,
-  outDir: 'dist/',
+  outDir: 'dist_ts/',
   module: plugins.typescript.ModuleKind.CommonJS,
   lib: ['lib.es2017.d.ts'],
   noImplicitAny: false,
@@ -41,7 +41,7 @@ export const mergeCompilerOptions = (
   })();
 
   // create merged options
-  let mergedOptions: CompilerOptions = {
+  const mergedOptions: CompilerOptions = {
     ...defaultOptionsToMerge,
     ...customTsOptions
   };
@@ -58,22 +58,22 @@ export const compiler = (
   argvArg?: any
 ): Promise<any[]> => {
   console.log(`Compiling ${fileNames.length} files...`);
-  let done = plugins.smartpromise.defer<any[]>();
+  const done = plugins.smartpromise.defer<any[]>();
-  let program = plugins.typescript.createProgram(fileNames, options);
+  const program = plugins.typescript.createProgram(fileNames, options);
-  let emitResult = program.emit();
+  const emitResult = program.emit();
 
   // implement check only
   /*let emitResult = program.emit(undefined,(args) => {
     console.log(args)
   });*/
 
-  let allDiagnostics = plugins.typescript
+  const allDiagnostics = plugins.typescript
     .getPreEmitDiagnostics(program)
     .concat(emitResult.diagnostics);
   allDiagnostics.forEach(diagnostic => {
     if (diagnostic.file) {
-      let { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
+      const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
-      let message = plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
+      const message = plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
       console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
     } else {
       console.log(
@@ -82,7 +82,7 @@ export const compiler = (
     }
   });
 
-  let exitCode = emitResult.emitSkipped ? 1 : 0;
+  const exitCode = emitResult.emitSkipped ? 1 : 0;
   if (exitCode === 0) {
     console.log('TypeScript emit succeeded!');
     done.resolve(emitResult.emittedFiles);

ts/tsbuild.cli.ts

@@ -10,7 +10,7 @@ tsbuildCli.standardTask().subscribe(async argvArg => {
   if (process.env.CLI_CALL_TSBUILD === 'true') {
     tsbuild.compileGlobStringObject(
       {
-        './ts/**/*.ts': './dist'
+        './ts/**/*.ts': './dist_ts'
       },
       {},
       process.cwd(),
@@ -33,9 +33,14 @@ tsbuildCli.addCommand('custom').subscribe(async argvArg => {
 });
 
 tsbuildCli.addCommand('element').subscribe(async argvArg => {
-  await tsbuild.compileGlobStringObject({
+  await tsbuild.compileGlobStringObject(
-    "./ts_web": "dist_ts_web"
+    {
-  }, {}, process.cwd(), argvArg);
+      './ts_web/**/*.ts': 'dist_ts_web'
+    },
+    {},
+    process.cwd(),
+    { web: true }
+  );
 });
 
 tsbuildCli.startParse();

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "outDir": "dist/",
+    "outDir": "dist_ts/",
     "module": "commonjs",
     "target": "es2015",
     "lib":[