fix(core): update

2019-08-26 16:28:03 +02:00 · 2019-08-26 16:28:03 +02:00 · 6b1c7c4dc8
commit 6b1c7c4dc8
parent dbcfa977fd
10 changed files with 103 additions and 68 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,22 @@
-# gitzone standard
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
-pages/
 public/
-assets/output/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
 dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,5 +1,7 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+variables:
+  GIT_STRATEGY: clone

 cache:
  paths:
@ -38,19 +40,7 @@ snyk:
 # test stage
 # ====================

-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
  stage: test
  script:
  - npmci npm prepare
@ -60,12 +50,24 @@ testSTABLE:
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
  - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
  - notpriv

 release:
  stage: release
  script:
-  - npmci node install stable
+  - npmci node install lts
  - npmci npm publish
  only:
  - tags
@ -78,19 +80,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
@ -106,13 +100,15 @@ trigger:
  - notpriv

 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
  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
--- a/README.md
+++ b/README.md
@ -1,22 +1,20 @@
-# tsn
+# @gitzone/tsbuild
+TypeScript nightly to easily make use of latest features

-## 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/)
+## 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
-
-[![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/)
+[![build status](https://gitlab.com/gitzone/tsbuild/badges/master/build.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

@ -68,3 +66,10 @@ tsn.compileGlobStringObject(
 ```

 [![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **&copy;** [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)
--- a/npmextra.json
+++ b/npmextra.json
@ -2,5 +2,15 @@
  "npmci": {
    "npmGlobalTools": [],
    "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "gitzone",
+      "gitrepo": "tsbuild",
+      "shortDescription": "TypeScript nightly to easily make use of latest features",
+      "npmPackagename": "@gitzone/tsbuild",
+      "license": "MIT"
+    }
  }
 }
--- a/package.json
+++ b/package.json
@ -40,5 +40,16 @@
    "@types/node": "^12.7.2",
    "tslint": "^5.19.0",
    "tslint-config-prettier": "^1.18.0"
-  }
-}
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
+}
--- a/test/assets/output/tocompile.d.ts
+++ b/test/assets/output/tocompile.d.ts
@ -1,5 +1,5 @@
 declare class test2 {
-    test: string[];
-    constructor();
+  test: string[];
+  constructor();
 }
 declare const run: () => Promise<string>;
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,3 +1,3 @@
 export * from './tsbuild.exports';

-import './tsbuild.cli';
+import './tsbuild.cli';
--- a/ts/tsbuild.classes.compiler.ts
+++ b/ts/tsbuild.classes.compiler.ts
@ -28,7 +28,10 @@ export const compilerOptionsWebDefault: CompilerOptions = {
 /**
 * merges compilerOptions with the default compiler options
 */
-export const mergeCompilerOptions = (customTsOptions: CompilerOptions, argvArg?: any): CompilerOptions => {
+export const mergeCompilerOptions = (
+  customTsOptions: CompilerOptions,
+  argvArg?: any
+): CompilerOptions => {
  const defaultOptionsToMerge = (() => {
    if (argvArg && argvArg.web) {
      return compilerOptionsWebDefault;
@ -52,7 +55,7 @@ export const mergeCompilerOptions = (customTsOptions: CompilerOptions, argvArg?:
 export const compiler = (
  fileNames: string[],
  options: plugins.typescript.CompilerOptions,
-  argvArg?: any,
+  argvArg?: any
 ): Promise<any[]> => {
  console.log(`Compiling ${fileNames.length} files...`);
  let done = plugins.smartpromise.defer<any[]>();
--- a/ts/tsbuild.cli.ts
+++ b/ts/tsbuild.cli.ts
@ -25,16 +25,11 @@ tsbuildCli.standardTask().subscribe(argvArg => {
 tsbuildCli.addCommand('custom').subscribe(argvArg => {
  const listedDirectories = argvArg._;
  listedDirectories.shift();
-  const compilationCommandObject: {[key: string]: string} = {};
+  const compilationCommandObject: { [key: string]: string } = {};
  for (const directory of listedDirectories) {
    compilationCommandObject[`./${directory}/**/*.ts`] = `./dist_${directory}`;
-  };
-  tsbuild.compileGlobStringObject(
-    compilationCommandObject,
-    {},
-    process.cwd(),
-    argvArg
-  );
+  }
+  tsbuild.compileGlobStringObject(compilationCommandObject, {}, process.cwd(), argvArg);
 });

 tsbuildCli.startParse();
--- a/ts/tsbuild.exports.ts
+++ b/ts/tsbuild.exports.ts
@ -9,7 +9,7 @@ export * from './tsbuild.classes.compiler';
 export let compileFileArray = (
  fileStringArrayArg: string[],
  compilerOptionsArg: CompilerOptions = {},
-  argvArg?: any,
+  argvArg?: any
 ): Promise<any[]> => {
  return compiler(fileStringArrayArg, mergeCompilerOptions(compilerOptionsArg, argvArg), argvArg);
 };
@ -25,11 +25,11 @@ export let compileGlobStringObject = async (
  globStringObjectArg: any,
  tsOptionsArg: CompilerOptions = {},
  cwdArg: string = process.cwd(),
-  argvArg?: any,
+  argvArg?: any
 ) => {
  let compiledFiles = [];
  for (const keyArg in globStringObjectArg) {
-    if(globStringObjectArg[keyArg]) {
+    if (globStringObjectArg[keyArg]) {
      console.log(
        `TypeScript assignment: transpile from ${keyArg} to ${globStringObjectArg[keyArg]}`
      );