mwts 1.2.2 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/clean.js +2 -2
- package/dist/src/clean.js.map +1 -1
- package/dist/src/cli.js +5 -5
- package/dist/src/cli.js.map +1 -1
- package/dist/src/init.d.ts.map +1 -1
- package/dist/src/init.js +14 -11
- package/dist/src/init.js.map +1 -1
- package/dist/src/util.d.ts +3 -2
- package/dist/src/util.d.ts.map +1 -1
- package/dist/src/util.js +32 -15
- package/dist/src/util.js.map +1 -1
- package/package.json +5 -5
package/dist/src/clean.js
CHANGED
|
@@ -7,7 +7,7 @@ const util_1 = require("./util");
|
|
|
7
7
|
* Remove files generated by the build.
|
|
8
8
|
*/
|
|
9
9
|
async function clean(options) {
|
|
10
|
-
const tsconfig = (await util_1.getTSConfig(options.targetRootDir));
|
|
10
|
+
const tsconfig = (await (0, util_1.getTSConfig)(options.targetRootDir));
|
|
11
11
|
if (tsconfig.compilerOptions && tsconfig.compilerOptions.outDir) {
|
|
12
12
|
const outDir = tsconfig.compilerOptions.outDir;
|
|
13
13
|
if (outDir === '.') {
|
|
@@ -17,7 +17,7 @@ async function clean(options) {
|
|
|
17
17
|
}
|
|
18
18
|
const message = `${chalk.red('Removing')} ${outDir} ...`;
|
|
19
19
|
options.logger.log(message);
|
|
20
|
-
await util_1.rimrafp(outDir);
|
|
20
|
+
await (0, util_1.rimrafp)(outDir);
|
|
21
21
|
return true;
|
|
22
22
|
}
|
|
23
23
|
else {
|
package/dist/src/clean.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../src/clean.ts"],"names":[],"mappings":";;;AAAA,+BAAgC;AAIhC,iCAA8C;AAM9C;;GAEG;AACI,KAAK,UAAU,KAAK,CAAC,OAAgB;IAC1C,MAAM,QAAQ,GAAG,CAAC,MAAM,kBAAW,
|
|
1
|
+
{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../src/clean.ts"],"names":[],"mappings":";;;AAAA,+BAAgC;AAIhC,iCAA8C;AAM9C;;GAEG;AACI,KAAK,UAAU,KAAK,CAAC,OAAgB;IAC1C,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAA,kBAAW,EAAC,OAAO,CAAC,aAAa,CAAC,CAAa,CAAC;IACxE,IAAI,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;QAC/D,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC;QAC/C,IAAI,MAAM,KAAK,GAAG,EAAE;YAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG;gBAC/D,kEAAkE,CACrE,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QACD,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,MAAM,MAAM,CAAC;QACzD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU;YACzD,aAAa,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,oBAAoB;YACrE,gBAAgB,CACnB,CAAC;QACF,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAvBD,sBAuBC"}
|
package/dist/src/cli.js
CHANGED
|
@@ -56,12 +56,12 @@ function getNodeVersion() {
|
|
|
56
56
|
}
|
|
57
57
|
exports.getNodeVersion = getNodeVersion;
|
|
58
58
|
function getEslintVersion() {
|
|
59
|
-
const packageJson = util_1.readJSON(require.resolve('eslint/package.json'));
|
|
59
|
+
const packageJson = (0, util_1.readJSON)(require.resolve('eslint/package.json'));
|
|
60
60
|
return packageJson.version;
|
|
61
61
|
}
|
|
62
62
|
exports.getEslintVersion = getEslintVersion;
|
|
63
63
|
function getPrettierVersion() {
|
|
64
|
-
const packageJson = util_1.readJSON(require.resolve('prettier/package.json'));
|
|
64
|
+
const packageJson = (0, util_1.readJSON)(require.resolve('prettier/package.json'));
|
|
65
65
|
return packageJson.version;
|
|
66
66
|
}
|
|
67
67
|
exports.getPrettierVersion = getPrettierVersion;
|
|
@@ -90,13 +90,13 @@ async function run(verb, files) {
|
|
|
90
90
|
yes: cli.flags.yes || cli.flags.y || false,
|
|
91
91
|
no: cli.flags.no || cli.flags.n || false,
|
|
92
92
|
logger,
|
|
93
|
-
yarn: cli.flags.yarn || util_1.isYarnUsed(),
|
|
93
|
+
yarn: cli.flags.yarn || (0, util_1.isYarnUsed)(),
|
|
94
94
|
};
|
|
95
95
|
// Linting/formatting depend on typescript. We don't want to load the
|
|
96
96
|
// typescript module during init, since it might not exist.
|
|
97
97
|
// See: https://github.com/google/gts/issues/48
|
|
98
98
|
if (verb === 'init') {
|
|
99
|
-
return init_1.init(options);
|
|
99
|
+
return (0, init_1.init)(options);
|
|
100
100
|
}
|
|
101
101
|
const flags = Object.assign([], files);
|
|
102
102
|
if (flags.length === 0) {
|
|
@@ -129,7 +129,7 @@ async function run(verb, files) {
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
case 'clean':
|
|
132
|
-
return clean_1.clean(options);
|
|
132
|
+
return (0, clean_1.clean)(options);
|
|
133
133
|
default:
|
|
134
134
|
usage(`Unknown verb: ${verb}`);
|
|
135
135
|
return false;
|
package/dist/src/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";;;;AACA,6BAA6B;AAC7B,6BAA6B;AAC7B,kDAAkD;AAClD,iCAA8B;AAC9B,mCAAgC;AAChC,iCAA8C;AAC9C,+BAA+B;AAG/B,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAgB,CAAC;AACjE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAwBpD,MAAM,MAAM,GAAW,OAAiB,CAAC;AAEzC,MAAM,GAAG,GAAG,IAAI,CAAC;IACf,IAAI,EAAE;;;;;;;;;;;;;;;;;;;;;;;iBAuBS;IACf,KAAK,EAAE;QACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACzB,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE;QACpC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE;QACnC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC1B;CACF,CAAC,CAAC;AAEH;;;;GAIG;AACH,SAAgB,cAAc;IAC5B,OAAO,OAAO,CAAC,OAAO,CAAC;AACzB,CAAC;AAFD,wCAEC;AAED,SAAgB,gBAAgB;IAC9B,MAAM,WAAW,GAAG,eAAQ,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/src/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA6CzC,wBAAsB,UAAU,CAC9B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC,CAkClB;AAsBD,eAAO,MAAM,aAAa;;CAEzB,CAAC;AAEF,eAAO,MAAM,aAAa,YAAY,CAAC;AAsEvC,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC,CA4BlB;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAoD7D"}
|
package/dist/src/init.js
CHANGED
|
@@ -43,7 +43,7 @@ async function query(message, question, defaultVal, options) {
|
|
|
43
43
|
}
|
|
44
44
|
async function addScripts(packageJson, options) {
|
|
45
45
|
let edits = false;
|
|
46
|
-
const pkgManager = util_1.getPkgManagerCommand(options.yarn);
|
|
46
|
+
const pkgManager = (0, util_1.getPkgManagerCommand)(options.yarn);
|
|
47
47
|
const scripts = {
|
|
48
48
|
lint: 'mwts lint',
|
|
49
49
|
clean: 'mwts clean',
|
|
@@ -113,7 +113,7 @@ function formatJson(object) {
|
|
|
113
113
|
async function writePackageJson(packageJson, options) {
|
|
114
114
|
options.logger.log('Writing package.json...');
|
|
115
115
|
if (!options.dryRun) {
|
|
116
|
-
await util_1.writeFileAtomicp('./package.json', formatJson(packageJson));
|
|
116
|
+
await (0, util_1.writeFileAtomicp)('./package.json', formatJson(packageJson));
|
|
117
117
|
}
|
|
118
118
|
const preview = {
|
|
119
119
|
scripts: packageJson.scripts,
|
|
@@ -128,9 +128,10 @@ exports.ESLINT_IGNORE = 'dist/\n';
|
|
|
128
128
|
async function generateConfigFile(options, filename, contents) {
|
|
129
129
|
let existing;
|
|
130
130
|
try {
|
|
131
|
-
existing = await util_1.readFilep(filename, 'utf8');
|
|
131
|
+
existing = await (0, util_1.readFilep)(filename, 'utf8');
|
|
132
132
|
}
|
|
133
|
-
catch (
|
|
133
|
+
catch (exc) {
|
|
134
|
+
const err = (0, util_1.safeError)(exc);
|
|
134
135
|
if (err.code === 'ENOENT') {
|
|
135
136
|
/* not found, create it. */
|
|
136
137
|
}
|
|
@@ -149,7 +150,7 @@ async function generateConfigFile(options, filename, contents) {
|
|
|
149
150
|
if (writeFile) {
|
|
150
151
|
options.logger.log(`Writing ${filename}...`);
|
|
151
152
|
if (!options.dryRun) {
|
|
152
|
-
await util_1.writeFileAtomicp(filename, contents);
|
|
153
|
+
await (0, util_1.writeFileAtomicp)(filename, contents);
|
|
153
154
|
}
|
|
154
155
|
options.logger.log(contents);
|
|
155
156
|
}
|
|
@@ -182,9 +183,10 @@ async function installDefaultTemplate(options) {
|
|
|
182
183
|
try {
|
|
183
184
|
fs.mkdirSync(targetDirName);
|
|
184
185
|
}
|
|
185
|
-
catch (
|
|
186
|
-
|
|
187
|
-
|
|
186
|
+
catch (exc) {
|
|
187
|
+
const err = (0, util_1.safeError)(exc);
|
|
188
|
+
if (err.code !== 'EEXIST') {
|
|
189
|
+
throw err;
|
|
188
190
|
}
|
|
189
191
|
// Else, continue and populate files into the existing directory.
|
|
190
192
|
}
|
|
@@ -205,9 +207,10 @@ async function init(options) {
|
|
|
205
207
|
let generatedPackageJson = false;
|
|
206
208
|
let packageJson;
|
|
207
209
|
try {
|
|
208
|
-
packageJson = (await util_1.readJsonp('./package.json'));
|
|
210
|
+
packageJson = (await (0, util_1.readJsonp)('./package.json'));
|
|
209
211
|
}
|
|
210
|
-
catch (
|
|
212
|
+
catch (exc) {
|
|
213
|
+
const err = (0, util_1.safeError)(exc);
|
|
211
214
|
if (err.code !== 'ENOENT') {
|
|
212
215
|
throw new Error(`Unable to open package.json file: ${err.message}`);
|
|
213
216
|
}
|
|
@@ -236,7 +239,7 @@ async function init(options) {
|
|
|
236
239
|
if (!options.dryRun) {
|
|
237
240
|
// --ignore-scripts so that compilation doesn't happen because there's no
|
|
238
241
|
// source files yet.
|
|
239
|
-
cp.spawnSync(util_1.getPkgManagerCommand(options.yarn), ['install', '--ignore-scripts'], { stdio: 'inherit' });
|
|
242
|
+
cp.spawnSync((0, util_1.getPkgManagerCommand)(options.yarn), ['install', '--ignore-scripts'], { stdio: 'inherit' });
|
|
240
243
|
}
|
|
241
244
|
return true;
|
|
242
245
|
}
|
package/dist/src/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,yBAAyB;AACzB,qCAAqC;AACrC,6BAA6B;AAC7B,6BAA0B;AAC1B,6BAA6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"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"}
|
package/dist/src/util.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as fs from 'fs';
|
|
3
3
|
import * as ncp from 'ncp';
|
|
4
|
-
export declare const readFilep:
|
|
4
|
+
export declare const readFilep: ReadFileP;
|
|
5
5
|
export declare const rimrafp: (arg1: string) => Promise<void>;
|
|
6
6
|
export declare const writeFileAtomicp: (arg1: string, arg2: string | Buffer) => Promise<void>;
|
|
7
7
|
export declare const ncpp: (source: string, destination: string, options?: ncp.Options | undefined) => Promise<void>;
|
|
@@ -18,6 +18,7 @@ export interface ReadFileP {
|
|
|
18
18
|
(path: string, encoding: string): Promise<string>;
|
|
19
19
|
}
|
|
20
20
|
export declare function nop(): void;
|
|
21
|
+
export declare function safeError(err: unknown): NodeJS.ErrnoException;
|
|
21
22
|
/**
|
|
22
23
|
* An interface containing the top level data fields present in Config Files
|
|
23
24
|
*/
|
|
@@ -26,7 +27,7 @@ export interface ConfigFile {
|
|
|
26
27
|
compilerOptions?: unknown;
|
|
27
28
|
include?: string[];
|
|
28
29
|
exclude?: string[];
|
|
29
|
-
extends?: string[];
|
|
30
|
+
extends?: string[] | string;
|
|
30
31
|
}
|
|
31
32
|
/**
|
|
32
33
|
* Automatically defines npm or yarn is going to be used:
|
package/dist/src/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAIzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAI3B,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAIzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAI3B,eAAO,MAAM,SAAS,WAAsC,CAAC;AAC7D,eAAO,MAAM,OAAO,iCAAoB,CAAC;AACzC,eAAO,MAAM,gBAAgB,wDAA6B,CAAC;AAC3D,eAAO,MAAM,IAAI,2FAAqB,CAAC;AAEvC,MAAM,WAAW,GAAG,CAAC,CAAC;IACpB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,GAAG,CAAC,MAAM,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,gBAG/C;AAED,MAAM,WAAW,SAAS;IACxB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACnD;AAED,wBAAgB,GAAG,SAElB;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,cAAc,CAQ7D;AAoFD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,UAAU,uBAAgB,GAAG,OAAO,CAK9D;AAED,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAIjE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,SAAS,GAC1B,OAAO,CAAC,UAAU,CAAC,CAGrB;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAUlD"}
|
package/dist/src/util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readJSON = exports.getTSConfig = exports.getPkgManagerCommand = exports.isYarnUsed = exports.nop = exports.readJsonp = exports.ncpp = exports.writeFileAtomicp = exports.rimrafp = exports.readFilep = void 0;
|
|
3
|
+
exports.readJSON = exports.getTSConfig = exports.getPkgManagerCommand = exports.isYarnUsed = exports.safeError = exports.nop = exports.readJsonp = exports.ncpp = exports.writeFileAtomicp = exports.rimrafp = exports.readFilep = void 0;
|
|
4
4
|
const fs = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const rimraf = require("rimraf");
|
|
@@ -8,12 +8,12 @@ const util_1 = require("util");
|
|
|
8
8
|
const ncp = require("ncp");
|
|
9
9
|
const writeFileAtomic = require("write-file-atomic");
|
|
10
10
|
const JSON5 = require("json5");
|
|
11
|
-
exports.readFilep = util_1.promisify(fs.readFile);
|
|
12
|
-
exports.rimrafp = util_1.promisify(rimraf);
|
|
13
|
-
exports.writeFileAtomicp = util_1.promisify(writeFileAtomic);
|
|
14
|
-
exports.ncpp = util_1.promisify(ncp.ncp);
|
|
11
|
+
exports.readFilep = (0, util_1.promisify)(fs.readFile);
|
|
12
|
+
exports.rimrafp = (0, util_1.promisify)(rimraf);
|
|
13
|
+
exports.writeFileAtomicp = (0, util_1.promisify)(writeFileAtomic);
|
|
14
|
+
exports.ncpp = (0, util_1.promisify)(ncp.ncp);
|
|
15
15
|
async function readJsonp(jsonPath) {
|
|
16
|
-
const contents = await exports.readFilep(jsonPath,
|
|
16
|
+
const contents = await (0, exports.readFilep)(jsonPath, 'utf8');
|
|
17
17
|
return JSON5.parse(contents);
|
|
18
18
|
}
|
|
19
19
|
exports.readJsonp = readJsonp;
|
|
@@ -21,6 +21,16 @@ function nop() {
|
|
|
21
21
|
/* empty */
|
|
22
22
|
}
|
|
23
23
|
exports.nop = nop;
|
|
24
|
+
function safeError(err) {
|
|
25
|
+
if (err == null) {
|
|
26
|
+
return new Error(`(${err})`);
|
|
27
|
+
}
|
|
28
|
+
if (err instanceof Error) {
|
|
29
|
+
return err;
|
|
30
|
+
}
|
|
31
|
+
return new Error(`${err}`);
|
|
32
|
+
}
|
|
33
|
+
exports.safeError = safeError;
|
|
24
34
|
/**
|
|
25
35
|
* Recursively iterate through the dependency chain until we reach the end of
|
|
26
36
|
* the dependency chain or encounter a circular reference
|
|
@@ -41,22 +51,29 @@ async function getBase(filePath, customReadFilep, readFiles, currentDir) {
|
|
|
41
51
|
readFiles.add(filePath);
|
|
42
52
|
try {
|
|
43
53
|
const json = await customReadFilep(filePath, 'utf8');
|
|
44
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
54
|
let contents;
|
|
46
55
|
try {
|
|
47
56
|
contents = JSON5.parse(json);
|
|
48
57
|
}
|
|
49
|
-
catch (
|
|
50
|
-
|
|
51
|
-
|
|
58
|
+
catch (exc) {
|
|
59
|
+
const err = safeError(exc);
|
|
60
|
+
err.message = `Unable to parse ${filePath}!\n${err.message}`;
|
|
61
|
+
throw err;
|
|
52
62
|
}
|
|
53
|
-
if (contents.extends) {
|
|
63
|
+
if (typeof contents.extends === 'string') {
|
|
54
64
|
const nextFile = await getBase(contents.extends, customReadFilep, readFiles, path.dirname(filePath));
|
|
55
65
|
contents = combineTSConfig(nextFile, contents);
|
|
56
66
|
}
|
|
67
|
+
else if (Array.isArray(contents.extends)) {
|
|
68
|
+
for (const extend of contents.extends) {
|
|
69
|
+
const nextFile = await getBase(extend, customReadFilep, readFiles, path.dirname(filePath));
|
|
70
|
+
contents = combineTSConfig(nextFile, contents);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
57
73
|
return contents;
|
|
58
74
|
}
|
|
59
|
-
catch (
|
|
75
|
+
catch (exc) {
|
|
76
|
+
const err = safeError(exc);
|
|
60
77
|
err.message = `Error: ${filePath}\n${err.message}`;
|
|
61
78
|
throw err;
|
|
62
79
|
}
|
|
@@ -97,7 +114,6 @@ exports.getPkgManagerCommand = getPkgManagerCommand;
|
|
|
97
114
|
* thrown
|
|
98
115
|
*/
|
|
99
116
|
async function getTSConfig(rootDir, customReadFilep) {
|
|
100
|
-
customReadFilep = customReadFilep || exports.readFilep;
|
|
101
117
|
const readArr = new Set();
|
|
102
118
|
return getBase('tsconfig.json', customReadFilep, readArr, rootDir);
|
|
103
119
|
}
|
|
@@ -107,8 +123,9 @@ function readJSON(filepath) {
|
|
|
107
123
|
try {
|
|
108
124
|
return JSON.parse(content);
|
|
109
125
|
}
|
|
110
|
-
catch (
|
|
111
|
-
|
|
126
|
+
catch (exc) {
|
|
127
|
+
const err = safeError(exc);
|
|
128
|
+
throw new Error(`Failed to parse JSON file '${content}' for: ${err.message}`);
|
|
112
129
|
}
|
|
113
130
|
}
|
|
114
131
|
exports.readJSON = readJSON;
|
package/dist/src/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AACjC,+BAAiC;AACjC,2BAA2B;AAC3B,qDAAqD;AACrD,+BAA+B;AAElB,QAAA,SAAS,GAAG,gBAAS,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mwts",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "MidwayJS TypeScript Style",
|
|
5
5
|
"repository": "midwayjs/mwts",
|
|
6
6
|
"main": "dist/src/index.js",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"keywords": [],
|
|
38
38
|
"license": "Apache-2.0",
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@typescript-eslint/eslint-plugin": "^4.
|
|
41
|
-
"@typescript-eslint/parser": "^4.
|
|
40
|
+
"@typescript-eslint/eslint-plugin": "^5.4.0",
|
|
41
|
+
"@typescript-eslint/parser": "^5.4.0",
|
|
42
42
|
"chalk": "^4.1.0",
|
|
43
43
|
"eslint": "^7.10.0",
|
|
44
44
|
"eslint-config-prettier": "^8.0.0",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"eslint-plugin-prettier": "^3.1.4",
|
|
47
47
|
"execa": "^5.0.0",
|
|
48
48
|
"inquirer": "^7.3.3",
|
|
49
|
-
"meow": "^9.0.0",
|
|
50
49
|
"json5": "^2.1.3",
|
|
50
|
+
"meow": "^9.0.0",
|
|
51
51
|
"ncp": "^2.0.0",
|
|
52
52
|
"prettier": "^2.1.2",
|
|
53
53
|
"rimraf": "^3.0.2",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"mocha": "^8.1.3",
|
|
79
79
|
"sinon": "^9.0.3",
|
|
80
80
|
"tmp": "0.2.1",
|
|
81
|
-
"typescript": "
|
|
81
|
+
"typescript": "~4.5.2"
|
|
82
82
|
},
|
|
83
83
|
"peerDependencies": {
|
|
84
84
|
"typescript": ">=3"
|