Compare commits

...

26 Commits

Author SHA1 Message Date
31e99a0035 2.1.18 2020-03-09 15:14:07 +00:00
8aa3823e65 fix(core): update 2020-03-09 15:14:06 +00:00
d36a5f7751 2.1.17 2019-08-26 16:28:03 +02:00
6b1c7c4dc8 fix(core): update 2019-08-26 16:28:03 +02:00
dbcfa977fd 2.1.16 2019-08-26 16:15:51 +02:00
fda30f611a 2.1.15 2019-08-26 16:12:24 +02:00
c1e43788a6 2.1.14 2019-08-26 16:01:39 +02:00
3a0efa37cc 2.1.13 2019-08-25 16:27:54 +02:00
d238012b68 fix(core): update 2019-08-25 16:27:54 +02:00
990fbaf785 2.1.12 2019-06-21 09:49:38 +02:00
aaa459e4b7 fix(core): update 2019-06-21 09:49:37 +02:00
fbad295644 2.1.11 2019-04-30 13:32:36 +02:00
334d3c0c82 fix(core): update 2019-04-30 13:32:36 +02:00
b9523d25e6 2.1.10 2019-04-30 13:27:42 +02:00
fdf3d14456 fix(core): update 2019-04-30 13:27:42 +02:00
5a68e83abf 2.1.9 2019-04-30 13:26:50 +02:00
def7dc65c8 fix(core): update 2019-04-30 13:26:49 +02:00
649ca48d03 2.1.8 2019-01-27 20:02:39 +01:00
abc515c742 2.1.7 2019-01-27 19:21:07 +01:00
1eb2b727aa fix(custom directory compilation): now picking up TypeScript files correctly 2019-01-27 19:21:07 +01:00
93a332ba50 2.1.6 2019-01-27 02:44:55 +01:00
109ba0b0ee fix(core): update 2019-01-27 02:44:54 +01:00
ee3ef5d6e9 2.1.5 2019-01-27 02:42:58 +01:00
d5852ce85d fix(core): update 2019-01-27 02:42:58 +01:00
f36dea3875 2.1.4 2018-12-11 01:58:39 +01:00
d36bf42f8b fix(core): update 2018-12-11 01:58:39 +01:00
12 changed files with 442 additions and 498 deletions

23
.gitignore vendored
View File

@ -1,7 +1,22 @@
# gitzone standard .nogit/
node_modules/
# artifacts
coverage/ coverage/
pages/
public/ public/
assets/output/ pages/
# installs
node_modules/
# caches
.yarn/
.cache/
.rpt2_cache
# builds
dist/ dist/
dist_web/
dist_serve/
dist_ts_web/
# custom

View File

@ -1,5 +1,7 @@
# gitzone standard # gitzone ci_default
image: hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
variables:
GIT_STRATEGY: clone
cache: cache:
paths: paths:
@ -38,19 +40,7 @@ snyk:
# test stage # test stage
# ==================== # ====================
testLTS: testStable:
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:
stage: test stage: test
script: script:
- npmci npm prepare - npmci npm prepare
@ -60,12 +50,24 @@ testSTABLE:
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- docker - 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 - notpriv
release: release:
stage: release stage: release
script: script:
- npmci node install stable - npmci node install lts
- npmci npm publish - npmci npm publish
only: only:
- tags - tags
@ -78,19 +80,11 @@ release:
# ==================== # ====================
codequality: codequality:
stage: metadata stage: metadata
image: docker:stable
allow_failure: true allow_failure: true
services:
- docker:stable-dind
script: 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 install
--env SOURCE_CODE="$PWD" - npmci command "tslint -c tslint.json ./ts/**/*.ts"
--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]
tags: tags:
- docker - docker
- priv - priv
@ -106,13 +100,15 @@ trigger:
- notpriv - notpriv
pages: pages:
image: hosttoday/ht-docker-node:npmci image: hosttoday/ht-docker-dbase:npmci
services:
- docker:18-dind
stage: metadata stage: metadata
script: script:
- npmci command npm install -g typedoc typescript - npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare - npmci npm prepare
- npmci npm install - npmci npm install
- npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ - npmci command tsdoc
tags: tags:
- docker - docker
- notpriv - notpriv

4
.snyk Normal file
View File

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

View File

@ -1,22 +1,20 @@
# tsn # @gitzone/tsbuild
TypeScript nightly to easily make use of latest features
## Availabililty ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbuild)
[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/tsn) * [gitlab.com (source)](https://gitlab.com/gitzone/tsbuild)
[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/tsn) * [github.com (source mirror)](https://github.com/gitzone/tsbuild)
[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/tsn) * [docs (typedoc)](https://gitzone.gitlab.io/tsbuild/)
[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/tsn/)
## Status for master ## Status for master
[![build status](https://gitlab.com/gitzone/tsbuild/badges/master/build.svg)](https://gitlab.com/gitzone/tsbuild/commits/master)
[![build status](https://gitlab.com/pushrocks/tsn/badges/master/build.svg)](https://gitlab.com/pushrocks/tsn/commits/master) [![coverage report](https://gitlab.com/gitzone/tsbuild/badges/master/coverage.svg)](https://gitlab.com/gitzone/tsbuild/commits/master)
[![coverage report](https://gitlab.com/pushrocks/tsn/badges/master/coverage.svg)](https://gitlab.com/pushrocks/tsn/commits/master) [![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tsbuild.svg)](https://www.npmjs.com/package/@gitzone/tsbuild)
[![Dependency Status](https://david-dm.org/pushrocks/tsn.svg)](https://david-dm.org/pushrocks/tsn) [![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tsbuild/badge.svg)](https://snyk.io/test/npm/@gitzone/tsbuild)
[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/tsn/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/tsn/master/dependencies/npm) [![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![bitHound Code](https://www.bithound.io/github/pushrocks/tsn/badges/code.svg)](https://www.bithound.io/github/pushrocks/tsn) [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
[![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 ## Usage
@ -68,3 +66,10 @@ tsn.compileGlobStringObject(
``` ```
[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks) [![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 | **©** [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)

View File

@ -2,5 +2,15 @@
"npmci": { "npmci": {
"npmGlobalTools": [], "npmGlobalTools": [],
"npmAccessLevel": "public" "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"
}
} }
} }

716
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tsbuild", "name": "@gitzone/tsbuild",
"version": "2.1.3", "version": "2.1.18",
"private": false, "private": false,
"description": "TypeScript nightly to easily make use of latest features", "description": "TypeScript nightly to easily make use of latest features",
"main": "dist/index.js", "main": "dist/index.js",
@ -10,6 +10,7 @@
}, },
"scripts": { "scripts": {
"test": "tsrun test/test.ts", "test": "tsrun test/test.ts",
"testCustom": "node cli.ts.js custom ts_web",
"build": "node cli.ts.js" "build": "node cli.ts.js"
}, },
"repository": { "repository": {
@ -26,18 +27,29 @@
}, },
"homepage": "https://gitlab.com/pushrocks/tsn#README", "homepage": "https://gitlab.com/pushrocks/tsn#README",
"dependencies": { "dependencies": {
"@pushrocks/smartcli": "^3.0.6", "@pushrocks/smartcli": "^3.0.7",
"@pushrocks/smartfile": "^6.0.11", "@pushrocks/smartfile": "^7.0.2",
"@pushrocks/smartlog": "^2.0.9", "@pushrocks/smartlog": "^2.0.19",
"@pushrocks/smartpath": "^4.0.1", "@pushrocks/smartpath": "^4.0.1",
"@pushrocks/smartpromise": "^2.0.5", "@pushrocks/smartpromise": "^3.0.2",
"typescript": "^3.2.1" "typescript": "^3.5.2"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsrun": "^1.1.13", "@gitzone/tsrun": "^1.2.8",
"@pushrocks/tapbundle": "^3.0.7", "@pushrocks/tapbundle": "^3.0.13",
"@types/node": "^10.12.12", "@types/node": "^12.7.2",
"tslint": "^5.11.0", "tslint": "^5.19.0",
"tslint-config-prettier": "^1.17.0" "tslint-config-prettier": "^1.18.0"
} },
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"dist_ts_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
]
} }

View File

@ -1,11 +1,3 @@
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
console.log('test'); console.log('test');
console.log('test2'); console.log('test2');
class test2 { class test2 {
@ -14,7 +6,7 @@ class test2 {
console.log('hi'); console.log('hi');
} }
} }
const run = () => __awaiter(this, void 0, void 0, function* () { const run = async () => {
return 'hi'; return 'hi';
}); };
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNwQixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ3JCLE1BQU0sS0FBSztJQUVUO1FBREEsU0FBSSxHQUFhLEVBQUUsQ0FBQztRQUVsQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BCLENBQUM7Q0FDRjtBQUVELE1BQU0sR0FBRyxHQUFHLEdBQTBCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUEsQ0FBQyJ9 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNyQixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==

View File

@ -1,3 +1,3 @@
export * from './tsbuild.exports'; export * from './tsbuild.exports';
import './tsbuild.cli'; import './tsbuild.cli';

View File

@ -14,9 +14,10 @@ export const compilerOptionsDefault: CompilerOptions = {
noEmitOnError: true, noEmitOnError: true,
outDir: 'dist/', outDir: 'dist/',
module: plugins.typescript.ModuleKind.CommonJS, module: plugins.typescript.ModuleKind.CommonJS,
lib: ['lib.es2016.d.ts', 'lib.es2017.d.ts'], lib: ['lib.es2017.d.ts'],
noImplicitAny: false, noImplicitAny: false,
target: plugins.typescript.ScriptTarget.ES2015 esModuleInterop: true,
target: plugins.typescript.ScriptTarget.ES2017
}; };
export const compilerOptionsWebDefault: CompilerOptions = { export const compilerOptionsWebDefault: CompilerOptions = {
@ -27,7 +28,10 @@ export const compilerOptionsWebDefault: CompilerOptions = {
/** /**
* merges compilerOptions with the default compiler options * 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 = (() => { const defaultOptionsToMerge = (() => {
if (argvArg && argvArg.web) { if (argvArg && argvArg.web) {
return compilerOptionsWebDefault; return compilerOptionsWebDefault;
@ -51,7 +55,7 @@ export const mergeCompilerOptions = (customTsOptions: CompilerOptions, argvArg?:
export const compiler = ( export const compiler = (
fileNames: string[], fileNames: string[],
options: plugins.typescript.CompilerOptions, options: plugins.typescript.CompilerOptions,
argvArg?: any, argvArg?: any
): Promise<any[]> => { ): Promise<any[]> => {
console.log(`Compiling ${fileNames.length} files...`); console.log(`Compiling ${fileNames.length} files...`);
let done = plugins.smartpromise.defer<any[]>(); let done = plugins.smartpromise.defer<any[]>();

View File

@ -3,7 +3,10 @@ import * as tsbuild from './tsbuild.exports';
const tsbuildCli = new plugins.smartcli.Smartcli(); const tsbuildCli = new plugins.smartcli.Smartcli();
tsbuildCli.standardTask().subscribe(argvArg => { /**
* the standard task compiles anything in ts/ directory to dist directory
*/
tsbuildCli.standardTask().subscribe(async argvArg => {
if (process.env.CLI_CALL_TSBUILD === 'true') { if (process.env.CLI_CALL_TSBUILD === 'true') {
tsbuild.compileGlobStringObject( tsbuild.compileGlobStringObject(
{ {
@ -16,4 +19,23 @@ tsbuildCli.standardTask().subscribe(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": "dist_ts_web"
}, {}, process.cwd(), argvArg);
});
tsbuildCli.startParse(); tsbuildCli.startParse();

View File

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