Compare commits
46 Commits
Author | SHA1 | Date | |
---|---|---|---|
42b83b888e | |||
832664b667 | |||
4925809030 | |||
622a080b3c | |||
18747dbc83 | |||
210a7a07f7 | |||
211d42c36b | |||
cfbe4bbcb9 | |||
72350a49ec | |||
d4a0d03301 | |||
75f506ba0e | |||
035207f4f9 | |||
6d2d48af9d | |||
9adbce12e1 | |||
318189c7b2 | |||
167483b909 | |||
67db62e7d5 | |||
ddf76c31b9 | |||
6a0a53adda | |||
eb1a70ea70 | |||
c10ddd3c1e | |||
9c9f7ae1dc | |||
70245584d7 | |||
f11d7c6cb0 | |||
dc7980e619 | |||
686a428624 | |||
6772bb439c | |||
3acab250db | |||
ec90a006ce | |||
30ba0c99fd | |||
17a7749f23 | |||
3926a66d1d | |||
6eb5755aed | |||
165113f132 | |||
7ee9935a9a | |||
5128d450bc | |||
8708b1442d | |||
0e39dfecba | |||
b4e8accad6 | |||
1415d66ffb | |||
38e3eed003 | |||
466095ed26 | |||
3d8041fdde | |||
f021525f9e | |||
63fa2e84d4 | |||
af66bd8ff1 |
4
.snyk
4
.snyk
@ -1,4 +0,0 @@
|
||||
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
|
||||
version: v1.13.3
|
||||
ignore: {}
|
||||
patch: {}
|
4
cli.child.ts
Normal file
4
cli.child.ts
Normal file
@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
import * as cliTool from './ts/index.js';
|
||||
cliTool.runCli();
|
2
cli.js
2
cli.js
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
const cliTool = require('./dist_ts/index');
|
||||
const cliTool = await import('./dist_ts/index.js');
|
||||
cliTool.runCli();
|
||||
|
@ -1,5 +1,4 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
require('@gitzone/tsrun');
|
||||
const cliTool = require('./ts/index');
|
||||
cliTool.runCli();
|
||||
import * as tsrun from '@gitzone/tsrun';
|
||||
tsrun.runPath('./cli.child.js');
|
3433
package-lock.json
generated
3433
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
28
package.json
28
package.json
@ -1,17 +1,18 @@
|
||||
{
|
||||
"name": "@gitzone/tsbuild",
|
||||
"version": "2.1.23",
|
||||
"version": "2.1.50",
|
||||
"private": false,
|
||||
"description": "TypeScript nightly to easily make use of latest features",
|
||||
"main": "dist_ts/index.js",
|
||||
"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 --allowimplicitany"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@ -27,19 +28,18 @@
|
||||
},
|
||||
"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"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsrun": "^1.2.8",
|
||||
"@pushrocks/tapbundle": "^3.0.13",
|
||||
"@types/node": "^12.7.2",
|
||||
"tslint": "^5.19.0",
|
||||
"tslint-config-prettier": "^1.18.0"
|
||||
"@gitzone/tsrun": "^1.2.29",
|
||||
"@pushrocks/tapbundle": "^4.0.8",
|
||||
"@types/node": "^17.0.21"
|
||||
},
|
||||
"files": [
|
||||
"ts/**/*",
|
||||
|
6
test/assets/output/tocompile.d.ts
vendored
6
test/assets/output/tocompile.d.ts
vendored
@ -1,5 +1 @@
|
||||
declare class test2 {
|
||||
test: string[];
|
||||
constructor();
|
||||
}
|
||||
declare const run: () => Promise<string>;
|
||||
export {};
|
||||
|
@ -1,5 +1,10 @@
|
||||
console.log('test');
|
||||
console.log('test2');
|
||||
import * as early from '@pushrocks/early';
|
||||
early.start();
|
||||
early.stop();
|
||||
import { anExportedString } from './tocompile2.js';
|
||||
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGlCQUFpQixDQUFDO0FBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUU5QixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==
|
1
test/assets/output/tocompile2.d.ts
vendored
1
test/assets/output/tocompile2.d.ts
vendored
@ -0,0 +1 @@
|
||||
export declare const anExportedString = "exported string";
|
||||
|
@ -1,2 +1,3 @@
|
||||
console.log('hello');
|
||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RvY29tcGlsZTIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyJ9
|
||||
export const anExportedString = 'exported string';
|
||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RvY29tcGlsZTIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNyQixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxpQkFBaUIsQ0FBQyJ9
|
@ -1,5 +1,14 @@
|
||||
console.log('test');
|
||||
console.log('test2');
|
||||
|
||||
import * as early from '@pushrocks/early';
|
||||
|
||||
early.start();
|
||||
early.stop();
|
||||
|
||||
import {anExportedString} from './tocompile2.js';
|
||||
console.log(anExportedString);
|
||||
|
||||
class test2 {
|
||||
test: string[] = [];
|
||||
constructor() {
|
||||
|
@ -1 +1,2 @@
|
||||
console.log('hello');
|
||||
export const anExportedString = 'exported string';
|
||||
|
@ -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.js';
|
||||
|
||||
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();
|
||||
|
@ -1,2 +1,5 @@
|
||||
export * from './tsbuild.exports';
|
||||
export * from './tsbuild.cli';
|
||||
import * as early from '@pushrocks/early';
|
||||
early.start('tsbuild');
|
||||
export * from './tsbuild.exports.js';
|
||||
export * from './tsbuild.cli.js';
|
||||
early.stop();
|
||||
|
@ -1,7 +1,7 @@
|
||||
// import all the stuff we need
|
||||
import * as plugins from './tsbuild.plugins';
|
||||
import { CompilerOptions } from 'typescript';
|
||||
export { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript';
|
||||
import * as plugins from './tsbuild.plugins.js';
|
||||
import { CompilerOptions, ScriptTarget, ModuleKind } from './tsbuild.exports.js';
|
||||
|
||||
|
||||
/**
|
||||
* the default typescript compilerOptions
|
||||
@ -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'],
|
||||
noImplicitAny: false,
|
||||
module: plugins.typescript.ModuleKind.ES2020,
|
||||
target: plugins.typescript.ScriptTarget.ES2020,
|
||||
moduleResolution: plugins.typescript.ModuleResolutionKind.Node12,
|
||||
lib: [],
|
||||
noImplicitAny: true,
|
||||
esModuleInterop: true,
|
||||
target: plugins.typescript.ScriptTarget.ES2017
|
||||
importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve
|
||||
};
|
||||
|
||||
export const compilerOptionsWebDefault: CompilerOptions = {
|
||||
@ -43,7 +45,13 @@ export const mergeCompilerOptions = (
|
||||
// create merged options
|
||||
const mergedOptions: CompilerOptions = {
|
||||
...defaultOptionsToMerge,
|
||||
...customTsOptions
|
||||
...customTsOptions,
|
||||
...argvArg && argvArg.skiplibcheck ? {
|
||||
skipLibCheck: true
|
||||
} : {},
|
||||
...argvArg && argvArg.allowimplicitany ? {
|
||||
noImplicitAny: false
|
||||
} : {},
|
||||
};
|
||||
|
||||
return mergedOptions;
|
||||
|
@ -1,5 +1,5 @@
|
||||
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';
|
||||
|
||||
export const runCli = async () => {
|
||||
const tsbuildCli = new plugins.smartcli.Smartcli();
|
||||
|
@ -1,7 +1,14 @@
|
||||
import * as plugins from './tsbuild.plugins';
|
||||
import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler';
|
||||
import * as plugins from './tsbuild.plugins.js';
|
||||
import type { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript';
|
||||
import { compiler, mergeCompilerOptions } from './tsbuild.classes.compiler.js';
|
||||
|
||||
export * from './tsbuild.classes.compiler';
|
||||
export type {
|
||||
CompilerOptions,
|
||||
ScriptTarget,
|
||||
ModuleKind
|
||||
}
|
||||
|
||||
export * from './tsbuild.classes.compiler.js';
|
||||
|
||||
/**
|
||||
* compile am array of absolute file paths
|
||||
@ -27,18 +34,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
|
||||
);
|
||||
|
@ -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 };
|
||||
|
@ -1,14 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"outDir": "dist_ts/",
|
||||
"module": "commonjs",
|
||||
"target": "es2015",
|
||||
"lib":[
|
||||
"es2016",
|
||||
"es2017"
|
||||
]
|
||||
},
|
||||
"include": [
|
||||
"ts/**/*.ts"
|
||||
]
|
||||
}
|
17
tslint.json
17
tslint.json
@ -1,17 +0,0 @@
|
||||
{
|
||||
"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"
|
||||
}
|
Reference in New Issue
Block a user