2.1.21

.gitignore

@@ -1,7 +1,20 @@
-# gitzone standard
+.nogit/
-node_modules/
+
+# artifacts
 coverage/
-pages/
 public/
-assets/output/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
 dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,10 +1,10 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -20,53 +20,49 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - lossless
     - docker
     - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
-    - npmci command npm install -g snyk
+    - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
+    - lossless
     - docker
     - notpriv
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
-  stage: test
-  script:
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
   stage: test
   script:
+    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
+    - docker
+    - priv
+
+testBuild:
+  stage: test
+  script:
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - lossless
     - docker
     - notpriv
 
@@ -78,6 +74,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -86,20 +83,14 @@ 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/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --volume "$PWD":/code
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
+    - lossless
     - docker
     - priv
 
@@ -110,17 +101,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - 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:
+    - lossless
     - docker
     - notpriv
   only:
@@ -130,13 +124,3 @@ pages:
     paths:
       - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

.snyk

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

.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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,70 +0,0 @@
-# tsn
-
-## Availabililty
-
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/tsn)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/tsn)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/tsn)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/tsn/)
-
-## Status for master
-
-[![build status](https://gitlab.com/pushrocks/tsn/badges/master/build.svg)](https://gitlab.com/pushrocks/tsn/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/tsn/badges/master/coverage.svg)](https://gitlab.com/pushrocks/tsn/commits/master)
-[![Dependency Status](https://david-dm.org/pushrocks/tsn.svg)](https://david-dm.org/pushrocks/tsn)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/tsn/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/tsn/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/tsn/badges/code.svg)](https://www.bithound.io/github/pushrocks/tsn)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## 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)

npmextra.json

@@ -1,8 +1,17 @@
 {
   "npmci": {
-    "npmGlobalTools": [
+    "npmGlobalTools": [],
-      "typescript"
-    ],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "gitzone",
+      "gitrepo": "tsbuild",
+      "shortDescription": "TypeScript nightly to easily make use of latest features",
+      "npmPackagename": "@gitzone/tsbuild",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,12 +1,16 @@
 {
-  "name": "tsn",
+  "name": "@gitzone/tsbuild",
-  "version": "2.0.16",
+  "version": "2.1.21",
   "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"
+  },
   "scripts": {
     "test": "tsrun test/test.ts",
+    "testCustom": "node cli.ts.js custom ts_web",
     "build": "node cli.ts.js"
   },
   "repository": {
@@ -23,15 +27,31 @@
   },
   "homepage": "https://gitlab.com/pushrocks/tsn#README",
   "dependencies": {
-    "@pushrocks/smartfile": "^6.0.3",
+    "@pushrocks/smartcli": "^3.0.7",
+    "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartlog": "^2.0.19",
     "@pushrocks/smartpath": "^4.0.1",
-    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartpromise": "^3.0.2",
-    "smartlog": "^1.0.3",
+    "typescript": "^3.5.2"
-    "typescript": "^2.9.2"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.1.9",
+    "@gitzone/tsrun": "^1.2.8",
-    "@pushrocks/tapbundle": "^3.0.1",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^10.5.3"
+    "@types/node": "^12.7.2",
-  }
+    "tslint": "^5.19.0",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_bundle/**/*",
+    "dist_web/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

test/assets/output/tocompile.d.ts

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

test/assets/output/tocompile.js

@@ -1,9 +1,12 @@
 console.log('test');
 console.log('test2');
-class test {
+class test2 {
     constructor() {
         this.test = [];
         console.log('hi');
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNyQjtJQUVFO1FBREEsU0FBSSxHQUFhLEVBQUUsQ0FBQztRQUVsQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BCLENBQUM7Q0FDRiJ9
+const run = async () => {
+    return 'hi';
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNyQixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==

test/assets/tocompile.ts

@@ -1,8 +1,12 @@
 console.log('test');
 console.log('test2');
-class test {
+class test2 {
   test: string[] = [];
   constructor() {
     console.log('hi');
   }
 }
+
+const run = async (): Promise<string> => {
+  return 'hi';
+};

ts/index.ts

@@ -1,9 +1,3 @@
-export * from "./tsbuild.exports";
+export * from './tsbuild.exports';
 
-import * as tsbuild from './tsbuild.exports'
+import './tsbuild.cli';
-
-if (process.env.CLI_CALL_TSBUILD === "true") {
-  tsbuild.compileGlobStringObject({
-    "./ts/**/*.ts": "./dist"
-  })
-}

ts/tsbuild.classes.compiler.ts

@@ -11,24 +11,38 @@ export const compilerOptionsDefault: CompilerOptions = {
   emitDecoratorMetadata: true,
   experimentalDecorators: true,
   inlineSourceMap: true,
-  noEmitOnError: false,
+  noEmitOnError: true,
-  outDir: 'dist/',
+  outDir: 'dist_ts/',
   module: plugins.typescript.ModuleKind.CommonJS,
-  lib: [
+  lib: ['lib.es2017.d.ts'],
-    'es2016',
-    'es2017'
-  ],
   noImplicitAny: false,
-  target: plugins.typescript.ScriptTarget.ES2015
+  esModuleInterop: true,
+  target: plugins.typescript.ScriptTarget.ES2017
+};
+
+export const compilerOptionsWebDefault: CompilerOptions = {
+  ...compilerOptionsDefault,
+  lib: [...compilerOptionsDefault.lib, 'lib.dom.d.ts']
 };
 
 /**
  * merges compilerOptions with the default compiler options
  */
-export const mergeCompilerOptions = function(customTsOptions: CompilerOptions): CompilerOptions {
+export const mergeCompilerOptions = (
+  customTsOptions: CompilerOptions,
+  argvArg?: any
+): CompilerOptions => {
+  const defaultOptionsToMerge = (() => {
+    if (argvArg && argvArg.web) {
+      return compilerOptionsWebDefault;
+    } else {
+      return compilerOptionsDefault;
+    }
+  })();
+
   // create merged options
-  let mergedOptions: CompilerOptions = {
+  const mergedOptions: CompilerOptions = {
-    ...compilerOptionsDefault,
+    ...defaultOptionsToMerge,
     ...customTsOptions
   };
 
@@ -40,32 +54,35 @@ export const mergeCompilerOptions = function(customTsOptions: CompilerOptions):
  */
 export const compiler = (
   fileNames: string[],
-  options: plugins.typescript.CompilerOptions
+  options: plugins.typescript.CompilerOptions,
+  argvArg?: any
 ): Promise<any[]> => {
-  console.log(options);
+  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);
-  try {
   allDiagnostics.forEach(diagnostic => {
-      let { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+    if (diagnostic.file) {
-      let message = plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
+      const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
+      const message = plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
       console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
-    });
+    } else {
-  } catch (err) {
+      console.log(
-    // console.log(allDiagnostics)
+        `${plugins.typescript.flattenDiagnosticMessageText(diagnostic.messageText, '\n')}`
+      );
     }
+  });
 
-  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

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

ts/tsbuild.exports.ts

@@ -8,9 +8,10 @@ export * from './tsbuild.classes.compiler';
  */
 export let compileFileArray = (
   fileStringArrayArg: string[],
-  compilerOptionsArg: CompilerOptions = {}
+  compilerOptionsArg: CompilerOptions = {},
+  argvArg?: any
 ): Promise<any[]> => {
-  return compiler(fileStringArrayArg, mergeCompilerOptions(compilerOptionsArg));
+  return compiler(fileStringArrayArg, mergeCompilerOptions(compilerOptionsArg, argvArg), argvArg);
 };
 
 /**
@@ -23,10 +24,12 @@ export let compileFileArray = (
 export let compileGlobStringObject = async (
   globStringObjectArg: any,
   tsOptionsArg: CompilerOptions = {},
-  cwdArg: string = process.cwd()
+  cwdArg: string = process.cwd(),
+  argvArg?: any
 ) => {
   let compiledFiles = [];
-  for (let keyArg in globStringObjectArg) {
+  for (const keyArg in globStringObjectArg) {
+    if (globStringObjectArg[keyArg]) {
       console.log(
         `TypeScript assignment: transpile from ${keyArg} to ${globStringObjectArg[keyArg]}`
       );
@@ -45,8 +48,9 @@ export let compileGlobStringObject = async (
       };
       compiledFiles = compiledFiles.concat(
         compiledFiles,
-      await compileFileArray(absoluteFilePathArray, tsOptionsArg)
+        await compileFileArray(absoluteFilePathArray, tsOptionsArg, argvArg)
       );
     }
+  }
   return compiledFiles;
 };

ts/tsbuild.plugins.ts

@@ -1,6 +1,7 @@
+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';
 
-export { smartfile, smartpath, smartpromise, typescript };
+export { smartcli, smartfile, smartpath, smartpromise, typescript };

tsconfig.json

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

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }