dpdm 3.15.1 → 4.1.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/README.md +17 -9
- package/lib/bin/dpdm.js +31 -3
- package/lib/bin/dpdm.js.map +1 -1
- package/lib/bin/dpdm.mjs +31 -3
- package/lib/bin/dpdm.mjs.map +1 -1
- package/lib/utils.d.ts +2 -1
- package/lib/utils.js +11 -2
- package/lib/utils.js.map +1 -1
- package/lib/utils.mjs +11 -2
- package/lib/utils.mjs.map +1 -1
- package/lib/utils.spec.js +50 -3
- package/lib/utils.spec.js.map +1 -1
- package/lib/utils.spec.mjs +50 -3
- package/lib/utils.spec.mjs.map +1 -1
- package/package.json +19 -19
- package/src/bin/dpdm.ts +45 -2
- package/src/utils.spec.ts +64 -3
- package/src/utils.ts +18 -1
package/README.md
CHANGED
|
@@ -92,6 +92,12 @@
|
|
|
92
92
|
dpdm --skip-dynamic-imports circular index.js
|
|
93
93
|
```
|
|
94
94
|
|
|
95
|
+
7. Ignore specified imports when finding circular dependencies:
|
|
96
|
+
|
|
97
|
+
```bash
|
|
98
|
+
dpdm ./src/index.js --skip-imports 'src/a.js:.*' src/c.js:src/d.js
|
|
99
|
+
```
|
|
100
|
+
|
|
95
101
|
### Options
|
|
96
102
|
|
|
97
103
|
```bash
|
|
@@ -132,6 +138,8 @@ Options:
|
|
|
132
138
|
--detect-unused-files-from this file is a glob, used for finding unused files. [string]
|
|
133
139
|
--skip-dynamic-imports Skip parse import(...) statement.
|
|
134
140
|
[string] [choices: "tree", "circular"]
|
|
141
|
+
--skip-imports Skip import edges from circular checks. Values are regexp
|
|
142
|
+
ISSUER:DEPENDENCY pairs. [array]
|
|
135
143
|
-h, --help Show help [boolean]
|
|
136
144
|
```
|
|
137
145
|
|
|
@@ -170,15 +178,15 @@ parseDependencyTree('./index', {
|
|
|
170
178
|
* the parse options
|
|
171
179
|
*/
|
|
172
180
|
export interface ParseOptions {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
181
|
+
context: string;
|
|
182
|
+
extensions: string[];
|
|
183
|
+
js: string[];
|
|
184
|
+
include: RegExp;
|
|
185
|
+
exclude: RegExp;
|
|
186
|
+
tsconfig: string | undefined;
|
|
187
|
+
onProgress: (event: 'start' | 'end', target: string) => void;
|
|
188
|
+
transform: boolean;
|
|
189
|
+
skipDynamicImports: boolean;
|
|
182
190
|
}
|
|
183
191
|
|
|
184
192
|
export enum DependencyKind {
|
package/lib/bin/dpdm.js
CHANGED
|
@@ -14,9 +14,30 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
14
14
|
const yargs_1 = tslib_1.__importDefault(require("yargs"));
|
|
15
15
|
const parser_1 = require("../parser");
|
|
16
16
|
const utils_1 = require("../utils");
|
|
17
|
+
const helpers_1 = require("yargs/helpers");
|
|
18
|
+
function splitSkipImportValue(value) {
|
|
19
|
+
return value.split(',').filter(Boolean);
|
|
20
|
+
}
|
|
21
|
+
function normalizeCircularId(context, id) {
|
|
22
|
+
const fullPath = path_1.default.isAbsolute(id) ? id : path_1.default.resolve(context, id);
|
|
23
|
+
return path_1.default.relative(context, fullPath);
|
|
24
|
+
}
|
|
25
|
+
function parseSkipImports(skipImports, context) {
|
|
26
|
+
return skipImports.map((item) => {
|
|
27
|
+
const parts = item.split(':');
|
|
28
|
+
if (parts.length !== 2 || !parts[0] || !parts[1]) {
|
|
29
|
+
throw new TypeError(`skip import should be in the format ISSUER:DEPENDENCY`);
|
|
30
|
+
}
|
|
31
|
+
return [
|
|
32
|
+
normalizeCircularId(context, parts[0]),
|
|
33
|
+
normalizeCircularId(context, parts[1]),
|
|
34
|
+
];
|
|
35
|
+
});
|
|
36
|
+
}
|
|
17
37
|
function main() {
|
|
18
38
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
const
|
|
39
|
+
const y = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv));
|
|
40
|
+
const argv = yield y
|
|
20
41
|
.strict()
|
|
21
42
|
.usage('$0 [options] <files...>', "Analyze the files' dependencies.", (yargs) => {
|
|
22
43
|
return yargs.positional('files', {
|
|
@@ -100,9 +121,15 @@ function main() {
|
|
|
100
121
|
type: 'string',
|
|
101
122
|
choices: ['tree', 'circular'],
|
|
102
123
|
desc: 'Skip parse import(...) statement.',
|
|
124
|
+
})
|
|
125
|
+
.option('skip-imports', {
|
|
126
|
+
type: 'string',
|
|
127
|
+
array: true,
|
|
128
|
+
desc: 'Skip import edges from circular checks. Values are regexp ISSUER:DEPENDENCY pairs.',
|
|
103
129
|
})
|
|
104
130
|
.alias('h', 'help')
|
|
105
|
-
.wrap(Math.min(
|
|
131
|
+
.wrap(Math.min(y.terminalWidth(), 100))
|
|
132
|
+
.parseAsync();
|
|
106
133
|
const files = argv.files;
|
|
107
134
|
if (files.length === 0) {
|
|
108
135
|
yargs_1.default.showHelp();
|
|
@@ -128,6 +155,7 @@ function main() {
|
|
|
128
155
|
let ended = 0;
|
|
129
156
|
let current = '';
|
|
130
157
|
const context = argv.context || process.cwd();
|
|
158
|
+
const skippedImports = parseSkipImports((argv.skipImports || []).flatMap(splitSkipImportValue), context);
|
|
131
159
|
function onProgress(event, target) {
|
|
132
160
|
switch (event) {
|
|
133
161
|
case 'start':
|
|
@@ -164,7 +192,7 @@ function main() {
|
|
|
164
192
|
const entries = yield Promise.all(Array()
|
|
165
193
|
.concat(...entriesDeep)
|
|
166
194
|
.map((name) => (0, utils_1.simpleResolver)(options.context, path_1.default.join(options.context, name), options.extensions).then((id) => (id ? path_1.default.relative(options.context, id) : name))));
|
|
167
|
-
const circulars = (0, utils_1.parseCircular)(tree, argv.skipDynamicImports === 'circular');
|
|
195
|
+
const circulars = (0, utils_1.parseCircular)(tree, argv.skipDynamicImports === 'circular', skippedImports);
|
|
168
196
|
if (argv.output) {
|
|
169
197
|
yield fs_extra_1.default.outputJSON(argv.output, { entries, tree, circulars }, { spaces: 2 });
|
|
170
198
|
}
|
package/lib/bin/dpdm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dpdm.js","sourceRoot":"","sources":["../../src/bin/dpdm.ts"],"names":[],"mappings":";;AACA;;;GAGG;;;AAEH,0DAA0B;AAC1B,gEAA0B;AAC1B,gDAA0B;AAC1B,sDAAsB;AACtB,wDAAwB;AACxB,0DAA0B;AAC1B,sCAAgD;AAEhD,oCASkB;AAElB,SAAe,IAAI;;QACjB,MAAM,IAAI,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"dpdm.js","sourceRoot":"","sources":["../../src/bin/dpdm.ts"],"names":[],"mappings":"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"}
|
package/lib/bin/dpdm.mjs
CHANGED
|
@@ -12,9 +12,30 @@ import path from 'path';
|
|
|
12
12
|
import yargs from 'yargs';
|
|
13
13
|
import { parseDependencyTree } from '../parser';
|
|
14
14
|
import { defaultOptions, isEmpty, parseCircular, parseWarnings, prettyCircular, prettyTree, prettyWarning, simpleResolver, } from '../utils';
|
|
15
|
+
import { hideBin } from 'yargs/helpers';
|
|
16
|
+
function splitSkipImportValue(value) {
|
|
17
|
+
return value.split(',').filter(Boolean);
|
|
18
|
+
}
|
|
19
|
+
function normalizeCircularId(context, id) {
|
|
20
|
+
const fullPath = path.isAbsolute(id) ? id : path.resolve(context, id);
|
|
21
|
+
return path.relative(context, fullPath);
|
|
22
|
+
}
|
|
23
|
+
function parseSkipImports(skipImports, context) {
|
|
24
|
+
return skipImports.map((item) => {
|
|
25
|
+
const parts = item.split(':');
|
|
26
|
+
if (parts.length !== 2 || !parts[0] || !parts[1]) {
|
|
27
|
+
throw new TypeError(`skip import should be in the format ISSUER:DEPENDENCY`);
|
|
28
|
+
}
|
|
29
|
+
return [
|
|
30
|
+
normalizeCircularId(context, parts[0]),
|
|
31
|
+
normalizeCircularId(context, parts[1]),
|
|
32
|
+
];
|
|
33
|
+
});
|
|
34
|
+
}
|
|
15
35
|
function main() {
|
|
16
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
17
|
-
const
|
|
37
|
+
const y = yargs(hideBin(process.argv));
|
|
38
|
+
const argv = yield y
|
|
18
39
|
.strict()
|
|
19
40
|
.usage('$0 [options] <files...>', "Analyze the files' dependencies.", (yargs) => {
|
|
20
41
|
return yargs.positional('files', {
|
|
@@ -98,9 +119,15 @@ function main() {
|
|
|
98
119
|
type: 'string',
|
|
99
120
|
choices: ['tree', 'circular'],
|
|
100
121
|
desc: 'Skip parse import(...) statement.',
|
|
122
|
+
})
|
|
123
|
+
.option('skip-imports', {
|
|
124
|
+
type: 'string',
|
|
125
|
+
array: true,
|
|
126
|
+
desc: 'Skip import edges from circular checks. Values are regexp ISSUER:DEPENDENCY pairs.',
|
|
101
127
|
})
|
|
102
128
|
.alias('h', 'help')
|
|
103
|
-
.wrap(Math.min(
|
|
129
|
+
.wrap(Math.min(y.terminalWidth(), 100))
|
|
130
|
+
.parseAsync();
|
|
104
131
|
const files = argv.files;
|
|
105
132
|
if (files.length === 0) {
|
|
106
133
|
yargs.showHelp();
|
|
@@ -126,6 +153,7 @@ function main() {
|
|
|
126
153
|
let ended = 0;
|
|
127
154
|
let current = '';
|
|
128
155
|
const context = argv.context || process.cwd();
|
|
156
|
+
const skippedImports = parseSkipImports((argv.skipImports || []).flatMap(splitSkipImportValue), context);
|
|
129
157
|
function onProgress(event, target) {
|
|
130
158
|
switch (event) {
|
|
131
159
|
case 'start':
|
|
@@ -162,7 +190,7 @@ function main() {
|
|
|
162
190
|
const entries = yield Promise.all(Array()
|
|
163
191
|
.concat(...entriesDeep)
|
|
164
192
|
.map((name) => simpleResolver(options.context, path.join(options.context, name), options.extensions).then((id) => (id ? path.relative(options.context, id) : name))));
|
|
165
|
-
const circulars = parseCircular(tree, argv.skipDynamicImports === 'circular');
|
|
193
|
+
const circulars = parseCircular(tree, argv.skipDynamicImports === 'circular', skippedImports);
|
|
166
194
|
if (argv.output) {
|
|
167
195
|
yield fs.outputJSON(argv.output, { entries, tree, circulars }, { spaces: 2 });
|
|
168
196
|
}
|
package/lib/bin/dpdm.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dpdm.js","sourceRoot":"","sources":["../../src/bin/dpdm.ts"],"names":[],"mappings":";AACA;;;GAGG;;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,CAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,OAAO,EACP,aAAa,EACb,aAAa,EACb,cAAc,EACd,UAAU,EACV,aAAa,EACb,cAAc,GACf,MAAM,UAAU,CAAC;AAElB,SAAe,IAAI;;QACjB,MAAM,IAAI,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"dpdm.js","sourceRoot":"","sources":["../../src/bin/dpdm.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.d.ts
CHANGED
|
@@ -3,13 +3,14 @@
|
|
|
3
3
|
* @since 2019-07-17 18:45:32
|
|
4
4
|
*/
|
|
5
5
|
import { DependencyTree, ParseOptions } from './types';
|
|
6
|
+
export type SkippedImport = readonly [string, string];
|
|
6
7
|
export declare const defaultOptions: ParseOptions;
|
|
7
8
|
export declare function normalizeOptions(options: Partial<ParseOptions>): ParseOptions;
|
|
8
9
|
export declare function appendSuffix(request: string, extensions: string[]): Promise<string | null>;
|
|
9
10
|
export type Resolver = (context: string, request: string, extensions: string[]) => Promise<string | null>;
|
|
10
11
|
export declare const simpleResolver: Resolver;
|
|
11
12
|
export declare function shortenTree(context: string, tree: DependencyTree): DependencyTree;
|
|
12
|
-
export declare function parseCircular(tree: DependencyTree, skipDynamicImports?: boolean): string[][];
|
|
13
|
+
export declare function parseCircular(tree: DependencyTree, skipDynamicImports?: boolean, skipImports?: readonly SkippedImport[]): string[][];
|
|
13
14
|
export declare function parseDependents(tree: DependencyTree): Record<string, string[]>;
|
|
14
15
|
export declare function parseWarnings(tree: DependencyTree, dependents?: Record<string, string[]>): string[];
|
|
15
16
|
export declare function prettyTree(tree: DependencyTree, entries: string[], prefix?: string): string;
|
package/lib/utils.js
CHANGED
|
@@ -22,6 +22,12 @@ const module_1 = require("module");
|
|
|
22
22
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
23
23
|
const consts_1 = require("./consts");
|
|
24
24
|
const allBuiltins = new Set(module_1.builtinModules);
|
|
25
|
+
function createSkippedImportsRegExp(skipImports) {
|
|
26
|
+
if (skipImports.length === 0) {
|
|
27
|
+
return /$./;
|
|
28
|
+
}
|
|
29
|
+
return new RegExp(`^(?:${skipImports.map((item) => item.join(':')).join('|')})$`);
|
|
30
|
+
}
|
|
25
31
|
exports.defaultOptions = {
|
|
26
32
|
context: process.cwd(),
|
|
27
33
|
extensions: ['', '.ts', '.tsx', '.mjs', '.js', '.jsx', '.json'],
|
|
@@ -116,8 +122,9 @@ function shortenTree(context, tree) {
|
|
|
116
122
|
}
|
|
117
123
|
return output;
|
|
118
124
|
}
|
|
119
|
-
function parseCircular(tree, skipDynamicImports = false) {
|
|
125
|
+
function parseCircular(tree, skipDynamicImports = false, skipImports = []) {
|
|
120
126
|
const circulars = [];
|
|
127
|
+
const skippedImports = createSkippedImportsRegExp(skipImports);
|
|
121
128
|
tree = Object.assign({}, tree);
|
|
122
129
|
function visit(id, used) {
|
|
123
130
|
const index = used.indexOf(id);
|
|
@@ -131,7 +138,9 @@ function parseCircular(tree, skipDynamicImports = false) {
|
|
|
131
138
|
deps &&
|
|
132
139
|
deps.forEach((dep) => {
|
|
133
140
|
if (dep.id &&
|
|
134
|
-
(!skipDynamicImports ||
|
|
141
|
+
(!skipDynamicImports ||
|
|
142
|
+
dep.kind !== consts_1.DependencyKind.DynamicImport) &&
|
|
143
|
+
!skippedImports.test(`${dep.issuer}:${dep.id}`)) {
|
|
135
144
|
visit(dep.id, used.slice());
|
|
136
145
|
}
|
|
137
146
|
});
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.mjs
CHANGED
|
@@ -9,6 +9,12 @@ import { builtinModules } from 'module';
|
|
|
9
9
|
import path from 'path';
|
|
10
10
|
import { DependencyKind } from './consts';
|
|
11
11
|
const allBuiltins = new Set(builtinModules);
|
|
12
|
+
function createSkippedImportsRegExp(skipImports) {
|
|
13
|
+
if (skipImports.length === 0) {
|
|
14
|
+
return /$./;
|
|
15
|
+
}
|
|
16
|
+
return new RegExp(`^(?:${skipImports.map((item) => item.join(':')).join('|')})$`);
|
|
17
|
+
}
|
|
12
18
|
export const defaultOptions = {
|
|
13
19
|
context: process.cwd(),
|
|
14
20
|
extensions: ['', '.ts', '.tsx', '.mjs', '.js', '.jsx', '.json'],
|
|
@@ -102,8 +108,9 @@ export function shortenTree(context, tree) {
|
|
|
102
108
|
}
|
|
103
109
|
return output;
|
|
104
110
|
}
|
|
105
|
-
export function parseCircular(tree, skipDynamicImports = false) {
|
|
111
|
+
export function parseCircular(tree, skipDynamicImports = false, skipImports = []) {
|
|
106
112
|
const circulars = [];
|
|
113
|
+
const skippedImports = createSkippedImportsRegExp(skipImports);
|
|
107
114
|
tree = Object.assign({}, tree);
|
|
108
115
|
function visit(id, used) {
|
|
109
116
|
const index = used.indexOf(id);
|
|
@@ -117,7 +124,9 @@ export function parseCircular(tree, skipDynamicImports = false) {
|
|
|
117
124
|
deps &&
|
|
118
125
|
deps.forEach((dep) => {
|
|
119
126
|
if (dep.id &&
|
|
120
|
-
(!skipDynamicImports ||
|
|
127
|
+
(!skipDynamicImports ||
|
|
128
|
+
dep.kind !== DependencyKind.DynamicImport) &&
|
|
129
|
+
!skippedImports.test(`${dep.issuer}:${dep.id}`)) {
|
|
121
130
|
visit(dep.id, used.slice());
|
|
122
131
|
}
|
|
123
132
|
});
|
package/lib/utils.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.spec.js
CHANGED
|
@@ -47,11 +47,11 @@ describe('util', () => {
|
|
|
47
47
|
]);
|
|
48
48
|
}));
|
|
49
49
|
describe('When parsing circular', () => {
|
|
50
|
-
function dependencyFactory(id) {
|
|
50
|
+
function dependencyFactory(id, issuer = '', kind = consts_1.DependencyKind.StaticImport) {
|
|
51
51
|
return {
|
|
52
|
-
issuer
|
|
52
|
+
issuer,
|
|
53
53
|
request: '',
|
|
54
|
-
kind
|
|
54
|
+
kind,
|
|
55
55
|
id,
|
|
56
56
|
};
|
|
57
57
|
}
|
|
@@ -183,6 +183,53 @@ describe('util', () => {
|
|
|
183
183
|
expect(actual[1]).toMatchObject(['start', 'mid', 'right']);
|
|
184
184
|
});
|
|
185
185
|
});
|
|
186
|
+
describe('When skip imports are specified', () => {
|
|
187
|
+
it('Should not skip imports when the skip list is empty', () => {
|
|
188
|
+
const tree = {
|
|
189
|
+
a: [dependencyFactory('b', 'a')],
|
|
190
|
+
b: [dependencyFactory('a', 'b')],
|
|
191
|
+
};
|
|
192
|
+
expect((0, utils_1.parseCircular)(tree, false, [])).toEqual([['a', 'b']]);
|
|
193
|
+
});
|
|
194
|
+
it('Should ignore a matching import edge when parsing circulars', () => {
|
|
195
|
+
const tree = {
|
|
196
|
+
a: [dependencyFactory('b', 'a')],
|
|
197
|
+
b: [dependencyFactory('a', 'b')],
|
|
198
|
+
};
|
|
199
|
+
expect((0, utils_1.parseCircular)(tree, false, [['b', 'a']])).toEqual([]);
|
|
200
|
+
});
|
|
201
|
+
it('Should only ignore the specified import edge', () => {
|
|
202
|
+
const tree = {
|
|
203
|
+
start: [
|
|
204
|
+
dependencyFactory('left', 'start'),
|
|
205
|
+
dependencyFactory('right', 'start'),
|
|
206
|
+
],
|
|
207
|
+
left: [dependencyFactory('start', 'left')],
|
|
208
|
+
right: [dependencyFactory('start', 'right')],
|
|
209
|
+
};
|
|
210
|
+
const actual = (0, utils_1.parseCircular)(tree, false, [['left', 'start']]);
|
|
211
|
+
expect(actual).toHaveLength(1);
|
|
212
|
+
expect(actual[0]).toMatchObject(['start', 'right']);
|
|
213
|
+
});
|
|
214
|
+
it('Should support regexp patterns for skipped imports', () => {
|
|
215
|
+
const tree = {
|
|
216
|
+
'src/a.js': [
|
|
217
|
+
dependencyFactory('src/b.js', 'src/a.js'),
|
|
218
|
+
dependencyFactory('src/c.js', 'src/a.js'),
|
|
219
|
+
],
|
|
220
|
+
'src/b.js': [dependencyFactory('src/a.js', 'src/b.js')],
|
|
221
|
+
'src/c.js': [dependencyFactory('src/a.js', 'src/c.js')],
|
|
222
|
+
};
|
|
223
|
+
expect((0, utils_1.parseCircular)(tree, false, [['src/a.js', '.*']])).toEqual([]);
|
|
224
|
+
});
|
|
225
|
+
it('Should not match skipped imports by prefix', () => {
|
|
226
|
+
const tree = {
|
|
227
|
+
a: [dependencyFactory('bc', 'a')],
|
|
228
|
+
bc: [dependencyFactory('a', 'bc')],
|
|
229
|
+
};
|
|
230
|
+
expect((0, utils_1.parseCircular)(tree, false, [['a', 'b']])).toEqual([['a', 'bc']]);
|
|
231
|
+
});
|
|
232
|
+
});
|
|
186
233
|
});
|
|
187
234
|
});
|
|
188
235
|
//# sourceMappingURL=utils.spec.js.map
|
package/lib/utils.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../src/utils.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAA0B;AAC1B,+BAAqC;AACrC,mCAAwD;AAExD,qCAA0C;AAE1C,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,0BAA0B,EAAE,GAAS,EAAE;QACxC,MAAM,GAAG,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAc,EAAC,SAAS,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAc,EAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAExD,MAAM,kBAAE,CAAC,UAAU,CAAC,0CAA0C,EAAE;YAC9D,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE;gBACZ,cAAc,EAAE,QAAQ;aACzB;SACF,CAAC,CAAC;QACH,MAAM,kBAAE,CAAC,UAAU,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAAC;QAEhE,MAAM,kBAAE,CAAC,UAAU,CACjB,oEAAoE,EACpE;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,UAAU;SACjB,CACF,CAAC;QACF,MAAM,kBAAE,CAAC,UAAU,CACjB,gEAAgE,EAChE,EAAE,CACH,CAAC;QAEF,MAAM,kBAAE,CAAC,UAAU,CAAC,wCAAwC,EAAE;YAC5D,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QACH,MAAM,kBAAE,CAAC,UAAU,CAAC,oCAAoC,EAAE,EAAE,CAAC,CAAC;QAE9D,MAAM,GAAG,GAAG,MAAM,IAAA,sBAAc,EAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAA,cAAO,EAAC,GAAI,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAc,EAAC,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QACrE,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;YACrD,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC;YAC9B,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC;YAC3B,IAAA,WAAI,EAAC,SAAS,EAAE,yCAAyC,CAAC;YAC1D,IAAA,WAAI,EACF,SAAS,EACT,mEAAmE,CACpE;YACD,IAAI;SACL,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,SAAS,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../src/utils.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.spec.mjs
CHANGED
|
@@ -45,11 +45,11 @@ describe('util', () => {
|
|
|
45
45
|
]);
|
|
46
46
|
}));
|
|
47
47
|
describe('When parsing circular', () => {
|
|
48
|
-
function dependencyFactory(id) {
|
|
48
|
+
function dependencyFactory(id, issuer = '', kind = DependencyKind.StaticImport) {
|
|
49
49
|
return {
|
|
50
|
-
issuer
|
|
50
|
+
issuer,
|
|
51
51
|
request: '',
|
|
52
|
-
kind
|
|
52
|
+
kind,
|
|
53
53
|
id,
|
|
54
54
|
};
|
|
55
55
|
}
|
|
@@ -181,6 +181,53 @@ describe('util', () => {
|
|
|
181
181
|
expect(actual[1]).toMatchObject(['start', 'mid', 'right']);
|
|
182
182
|
});
|
|
183
183
|
});
|
|
184
|
+
describe('When skip imports are specified', () => {
|
|
185
|
+
it('Should not skip imports when the skip list is empty', () => {
|
|
186
|
+
const tree = {
|
|
187
|
+
a: [dependencyFactory('b', 'a')],
|
|
188
|
+
b: [dependencyFactory('a', 'b')],
|
|
189
|
+
};
|
|
190
|
+
expect(parseCircular(tree, false, [])).toEqual([['a', 'b']]);
|
|
191
|
+
});
|
|
192
|
+
it('Should ignore a matching import edge when parsing circulars', () => {
|
|
193
|
+
const tree = {
|
|
194
|
+
a: [dependencyFactory('b', 'a')],
|
|
195
|
+
b: [dependencyFactory('a', 'b')],
|
|
196
|
+
};
|
|
197
|
+
expect(parseCircular(tree, false, [['b', 'a']])).toEqual([]);
|
|
198
|
+
});
|
|
199
|
+
it('Should only ignore the specified import edge', () => {
|
|
200
|
+
const tree = {
|
|
201
|
+
start: [
|
|
202
|
+
dependencyFactory('left', 'start'),
|
|
203
|
+
dependencyFactory('right', 'start'),
|
|
204
|
+
],
|
|
205
|
+
left: [dependencyFactory('start', 'left')],
|
|
206
|
+
right: [dependencyFactory('start', 'right')],
|
|
207
|
+
};
|
|
208
|
+
const actual = parseCircular(tree, false, [['left', 'start']]);
|
|
209
|
+
expect(actual).toHaveLength(1);
|
|
210
|
+
expect(actual[0]).toMatchObject(['start', 'right']);
|
|
211
|
+
});
|
|
212
|
+
it('Should support regexp patterns for skipped imports', () => {
|
|
213
|
+
const tree = {
|
|
214
|
+
'src/a.js': [
|
|
215
|
+
dependencyFactory('src/b.js', 'src/a.js'),
|
|
216
|
+
dependencyFactory('src/c.js', 'src/a.js'),
|
|
217
|
+
],
|
|
218
|
+
'src/b.js': [dependencyFactory('src/a.js', 'src/b.js')],
|
|
219
|
+
'src/c.js': [dependencyFactory('src/a.js', 'src/c.js')],
|
|
220
|
+
};
|
|
221
|
+
expect(parseCircular(tree, false, [['src/a.js', '.*']])).toEqual([]);
|
|
222
|
+
});
|
|
223
|
+
it('Should not match skipped imports by prefix', () => {
|
|
224
|
+
const tree = {
|
|
225
|
+
a: [dependencyFactory('bc', 'a')],
|
|
226
|
+
bc: [dependencyFactory('a', 'bc')],
|
|
227
|
+
};
|
|
228
|
+
expect(parseCircular(tree, false, [['a', 'b']])).toEqual([['a', 'bc']]);
|
|
229
|
+
});
|
|
230
|
+
});
|
|
184
231
|
});
|
|
185
232
|
});
|
|
186
233
|
//# sourceMappingURL=utils.spec.js.map
|
package/lib/utils.spec.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../src/utils.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,0BAA0B,EAAE,GAAS,EAAE;QACxC,MAAM,GAAG,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAExD,MAAM,EAAE,CAAC,UAAU,CAAC,0CAA0C,EAAE;YAC9D,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE;gBACZ,cAAc,EAAE,QAAQ;aACzB;SACF,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,UAAU,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAAC;QAEhE,MAAM,EAAE,CAAC,UAAU,CACjB,oEAAoE,EACpE;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,UAAU;SACjB,CACF,CAAC;QACF,MAAM,EAAE,CAAC,UAAU,CACjB,gEAAgE,EAChE,EAAE,CACH,CAAC;QAEF,MAAM,EAAE,CAAC,UAAU,CAAC,wCAAwC,EAAE;YAC5D,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,UAAU,CAAC,oCAAoC,EAAE,EAAE,CAAC,CAAC;QAE9D,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,GAAI,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QACrE,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;YACrD,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC;YAC9B,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC;YAC3B,IAAI,CAAC,SAAS,EAAE,yCAAyC,CAAC;YAC1D,IAAI,CACF,SAAS,EACT,mEAAmE,CACpE;YACD,IAAI;SACL,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,SAAS,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../src/utils.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dpdm",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"description": "Analyze circular dependencies in your JavaScript/TypeScript projects.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"circular",
|
|
@@ -41,7 +41,8 @@
|
|
|
41
41
|
"clean": "rm -rf cjs esm lib build temp .cache",
|
|
42
42
|
"prepublishOnly": "run-s test build",
|
|
43
43
|
"start": "npm run clean && npm run build:esm -- --watch",
|
|
44
|
-
"test": "
|
|
44
|
+
"test": "vitest",
|
|
45
|
+
"typecheck": "tsc --noEmit",
|
|
45
46
|
"demo": "ts-node -T ./src/bin/dpdm.ts ./example/index.js",
|
|
46
47
|
"prepare": "husky install"
|
|
47
48
|
},
|
|
@@ -52,25 +53,24 @@
|
|
|
52
53
|
"license": "MIT",
|
|
53
54
|
"devDependencies": {
|
|
54
55
|
"@types/fs-extra": "^11.0.4",
|
|
55
|
-
"@types/
|
|
56
|
-
"
|
|
57
|
-
"
|
|
58
|
-
"jest": "^29.7.0",
|
|
59
|
-
"lint-staged": "^15.2.10",
|
|
56
|
+
"@types/yargs": "^17.0.35",
|
|
57
|
+
"husky": "^9.1.7",
|
|
58
|
+
"lint-staged": "^16.2.7",
|
|
60
59
|
"npm-run-all": "^4.1.5",
|
|
61
|
-
"prettier": "^3.
|
|
62
|
-
"pretty-quick": "^4.
|
|
63
|
-
"ts-
|
|
64
|
-
"
|
|
60
|
+
"prettier": "^3.8.1",
|
|
61
|
+
"pretty-quick": "^4.2.2",
|
|
62
|
+
"ts-node": "^10.9.2",
|
|
63
|
+
"tsx": "^4.21.0",
|
|
64
|
+
"vitest": "^4.0.18"
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"chalk": "^
|
|
68
|
-
"fs-extra": "^11.
|
|
69
|
-
"glob": "^
|
|
70
|
-
"ora": "^
|
|
71
|
-
"tslib": "^2.
|
|
72
|
-
"typescript": "^5.
|
|
73
|
-
"yargs": "^
|
|
67
|
+
"chalk": "^5.6.2",
|
|
68
|
+
"fs-extra": "^11.3.3",
|
|
69
|
+
"glob": "^13.0.0",
|
|
70
|
+
"ora": "^9.1.0",
|
|
71
|
+
"tslib": "^2.8.1",
|
|
72
|
+
"typescript": "^5.9.3",
|
|
73
|
+
"yargs": "^18.0.0"
|
|
74
74
|
},
|
|
75
75
|
"lint-staged": {
|
|
76
76
|
"**/*": "prettier --write --ignore-unknown"
|
|
@@ -88,5 +88,5 @@
|
|
|
88
88
|
"arrowParens": "always",
|
|
89
89
|
"endOfLine": "lf"
|
|
90
90
|
},
|
|
91
|
-
"packageManager": "yarn@1.22.
|
|
91
|
+
"packageManager": "yarn@1.22.22"
|
|
92
92
|
}
|
package/src/bin/dpdm.ts
CHANGED
|
@@ -22,9 +22,39 @@ import {
|
|
|
22
22
|
prettyWarning,
|
|
23
23
|
simpleResolver,
|
|
24
24
|
} from '../utils';
|
|
25
|
+
import type { SkippedImport } from '../utils';
|
|
26
|
+
import { hideBin } from 'yargs/helpers';
|
|
27
|
+
|
|
28
|
+
function splitSkipImportValue(value: string): string[] {
|
|
29
|
+
return value.split(',').filter(Boolean);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function normalizeCircularId(context: string, id: string) {
|
|
33
|
+
const fullPath = path.isAbsolute(id) ? id : path.resolve(context, id);
|
|
34
|
+
return path.relative(context, fullPath);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function parseSkipImports(
|
|
38
|
+
skipImports: string[],
|
|
39
|
+
context: string,
|
|
40
|
+
): SkippedImport[] {
|
|
41
|
+
return skipImports.map((item) => {
|
|
42
|
+
const parts = item.split(':');
|
|
43
|
+
if (parts.length !== 2 || !parts[0] || !parts[1]) {
|
|
44
|
+
throw new TypeError(
|
|
45
|
+
`skip import should be in the format ISSUER:DEPENDENCY`,
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
return [
|
|
49
|
+
normalizeCircularId(context, parts[0]),
|
|
50
|
+
normalizeCircularId(context, parts[1]),
|
|
51
|
+
];
|
|
52
|
+
});
|
|
53
|
+
}
|
|
25
54
|
|
|
26
55
|
async function main() {
|
|
27
|
-
const
|
|
56
|
+
const y = yargs(hideBin(process.argv));
|
|
57
|
+
const argv = await y
|
|
28
58
|
.strict()
|
|
29
59
|
.usage(
|
|
30
60
|
'$0 [options] <files...>',
|
|
@@ -114,8 +144,14 @@ async function main() {
|
|
|
114
144
|
choices: ['tree', 'circular'],
|
|
115
145
|
desc: 'Skip parse import(...) statement.',
|
|
116
146
|
})
|
|
147
|
+
.option('skip-imports', {
|
|
148
|
+
type: 'string',
|
|
149
|
+
array: true,
|
|
150
|
+
desc: 'Skip import edges from circular checks. Values are regexp ISSUER:DEPENDENCY pairs.',
|
|
151
|
+
})
|
|
117
152
|
.alias('h', 'help')
|
|
118
|
-
.wrap(Math.min(
|
|
153
|
+
.wrap(Math.min(y.terminalWidth(), 100))
|
|
154
|
+
.parseAsync();
|
|
119
155
|
|
|
120
156
|
const files = argv.files as string[];
|
|
121
157
|
|
|
@@ -147,6 +183,12 @@ async function main() {
|
|
|
147
183
|
let current = '';
|
|
148
184
|
|
|
149
185
|
const context = argv.context || process.cwd();
|
|
186
|
+
const skippedImports = parseSkipImports(
|
|
187
|
+
((argv.skipImports as string[] | undefined) || []).flatMap(
|
|
188
|
+
splitSkipImportValue,
|
|
189
|
+
),
|
|
190
|
+
context,
|
|
191
|
+
);
|
|
150
192
|
|
|
151
193
|
function onProgress(event: 'start' | 'end', target: string) {
|
|
152
194
|
switch (event) {
|
|
@@ -197,6 +239,7 @@ async function main() {
|
|
|
197
239
|
const circulars = parseCircular(
|
|
198
240
|
tree,
|
|
199
241
|
argv.skipDynamicImports === 'circular',
|
|
242
|
+
skippedImports,
|
|
200
243
|
);
|
|
201
244
|
if (argv.output) {
|
|
202
245
|
await fs.outputJSON(
|
package/src/utils.spec.ts
CHANGED
|
@@ -61,11 +61,15 @@ describe('util', () => {
|
|
|
61
61
|
});
|
|
62
62
|
|
|
63
63
|
describe('When parsing circular', () => {
|
|
64
|
-
function dependencyFactory(
|
|
64
|
+
function dependencyFactory(
|
|
65
|
+
id: string,
|
|
66
|
+
issuer: string = '',
|
|
67
|
+
kind = DependencyKind.StaticImport,
|
|
68
|
+
): Dependency {
|
|
65
69
|
return {
|
|
66
|
-
issuer
|
|
70
|
+
issuer,
|
|
67
71
|
request: '',
|
|
68
|
-
kind
|
|
72
|
+
kind,
|
|
69
73
|
id,
|
|
70
74
|
};
|
|
71
75
|
}
|
|
@@ -225,5 +229,62 @@ describe('util', () => {
|
|
|
225
229
|
expect(actual[1]).toMatchObject(['start', 'mid', 'right']);
|
|
226
230
|
});
|
|
227
231
|
});
|
|
232
|
+
|
|
233
|
+
describe('When skip imports are specified', () => {
|
|
234
|
+
it('Should not skip imports when the skip list is empty', () => {
|
|
235
|
+
const tree = {
|
|
236
|
+
a: [dependencyFactory('b', 'a')],
|
|
237
|
+
b: [dependencyFactory('a', 'b')],
|
|
238
|
+
};
|
|
239
|
+
|
|
240
|
+
expect(parseCircular(tree, false, [])).toEqual([['a', 'b']]);
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
it('Should ignore a matching import edge when parsing circulars', () => {
|
|
244
|
+
const tree = {
|
|
245
|
+
a: [dependencyFactory('b', 'a')],
|
|
246
|
+
b: [dependencyFactory('a', 'b')],
|
|
247
|
+
};
|
|
248
|
+
|
|
249
|
+
expect(parseCircular(tree, false, [['b', 'a']])).toEqual([]);
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
it('Should only ignore the specified import edge', () => {
|
|
253
|
+
const tree = {
|
|
254
|
+
start: [
|
|
255
|
+
dependencyFactory('left', 'start'),
|
|
256
|
+
dependencyFactory('right', 'start'),
|
|
257
|
+
],
|
|
258
|
+
left: [dependencyFactory('start', 'left')],
|
|
259
|
+
right: [dependencyFactory('start', 'right')],
|
|
260
|
+
};
|
|
261
|
+
|
|
262
|
+
const actual = parseCircular(tree, false, [['left', 'start']]);
|
|
263
|
+
expect(actual).toHaveLength(1);
|
|
264
|
+
expect(actual[0]).toMatchObject(['start', 'right']);
|
|
265
|
+
});
|
|
266
|
+
|
|
267
|
+
it('Should support regexp patterns for skipped imports', () => {
|
|
268
|
+
const tree = {
|
|
269
|
+
'src/a.js': [
|
|
270
|
+
dependencyFactory('src/b.js', 'src/a.js'),
|
|
271
|
+
dependencyFactory('src/c.js', 'src/a.js'),
|
|
272
|
+
],
|
|
273
|
+
'src/b.js': [dependencyFactory('src/a.js', 'src/b.js')],
|
|
274
|
+
'src/c.js': [dependencyFactory('src/a.js', 'src/c.js')],
|
|
275
|
+
};
|
|
276
|
+
|
|
277
|
+
expect(parseCircular(tree, false, [['src/a.js', '.*']])).toEqual([]);
|
|
278
|
+
});
|
|
279
|
+
|
|
280
|
+
it('Should not match skipped imports by prefix', () => {
|
|
281
|
+
const tree = {
|
|
282
|
+
a: [dependencyFactory('bc', 'a')],
|
|
283
|
+
bc: [dependencyFactory('a', 'bc')],
|
|
284
|
+
};
|
|
285
|
+
|
|
286
|
+
expect(parseCircular(tree, false, [['a', 'b']])).toEqual([['a', 'bc']]);
|
|
287
|
+
});
|
|
288
|
+
});
|
|
228
289
|
});
|
|
229
290
|
});
|
package/src/utils.ts
CHANGED
|
@@ -12,6 +12,19 @@ import { Dependency, DependencyTree, ParseOptions } from './types';
|
|
|
12
12
|
|
|
13
13
|
const allBuiltins = new Set(builtinModules);
|
|
14
14
|
|
|
15
|
+
export type SkippedImport = readonly [string, string];
|
|
16
|
+
|
|
17
|
+
function createSkippedImportsRegExp(
|
|
18
|
+
skipImports: readonly SkippedImport[],
|
|
19
|
+
): RegExp {
|
|
20
|
+
if (skipImports.length === 0) {
|
|
21
|
+
return /$./;
|
|
22
|
+
}
|
|
23
|
+
return new RegExp(
|
|
24
|
+
`^(?:${skipImports.map((item) => item.join(':')).join('|')})$`,
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
|
|
15
28
|
export const defaultOptions: ParseOptions = {
|
|
16
29
|
context: process.cwd(),
|
|
17
30
|
extensions: ['', '.ts', '.tsx', '.mjs', '.js', '.jsx', '.json'],
|
|
@@ -130,8 +143,10 @@ export function shortenTree(
|
|
|
130
143
|
export function parseCircular(
|
|
131
144
|
tree: DependencyTree,
|
|
132
145
|
skipDynamicImports: boolean = false,
|
|
146
|
+
skipImports: readonly SkippedImport[] = [],
|
|
133
147
|
): string[][] {
|
|
134
148
|
const circulars: string[][] = [];
|
|
149
|
+
const skippedImports = createSkippedImportsRegExp(skipImports);
|
|
135
150
|
|
|
136
151
|
tree = { ...tree };
|
|
137
152
|
|
|
@@ -147,7 +162,9 @@ export function parseCircular(
|
|
|
147
162
|
deps.forEach((dep) => {
|
|
148
163
|
if (
|
|
149
164
|
dep.id &&
|
|
150
|
-
(!skipDynamicImports ||
|
|
165
|
+
(!skipDynamicImports ||
|
|
166
|
+
dep.kind !== DependencyKind.DynamicImport) &&
|
|
167
|
+
!skippedImports.test(`${dep.issuer}:${dep.id}`)
|
|
151
168
|
) {
|
|
152
169
|
visit(dep.id, used.slice());
|
|
153
170
|
}
|