@rxap/workspace-ts-morph 16.0.1-dev.0 → 16.0.2-dev.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/CHANGELOG.md +10 -0
- package/README.md +1 -1
- package/package.json +9 -9
- package/src/lib/ts-morph-transform.d.ts +6 -0
- package/src/lib/ts-morph-transform.js +32 -25
- package/src/lib/ts-morph-transform.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [16.0.2-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@16.0.1...@rxap/workspace-ts-morph@16.0.2-dev.0) (2024-02-26)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- support optional project file filtering ([05882fb](https://gitlab.com/rxap/packages/commit/05882fb91b5eaa47c664fc1ae258daf104134ffe))
|
|
11
|
+
|
|
12
|
+
## [16.0.1](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@16.0.1-dev.0...@rxap/workspace-ts-morph@16.0.1) (2024-02-07)
|
|
13
|
+
|
|
14
|
+
**Note:** Version bump only for package @rxap/workspace-ts-morph
|
|
15
|
+
|
|
6
16
|
## [16.0.1-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@0.1.0-dev.12...@rxap/workspace-ts-morph@16.0.1-dev.0) (2024-02-07)
|
|
7
17
|
|
|
8
18
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/workspace-ts-morph
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @rxap/ts-morph@^1.0.1
|
|
20
|
+
yarn add @rxap/ts-morph@^1.0.1 @rxap/workspace-utilities@^16.0.1 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.0.
|
|
2
|
+
"version": "16.0.2-dev.0",
|
|
3
3
|
"name": "@rxap/workspace-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
"yaml": "2.3.1"
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
|
-
"@rxap/ts-morph": "^1.0.1
|
|
14
|
-
"@rxap/utilities": "^16.0.
|
|
15
|
-
"@rxap/workspace-utilities": "^16.0.1-dev.0",
|
|
13
|
+
"@rxap/ts-morph": "^1.0.1",
|
|
14
|
+
"@rxap/workspace-utilities": "^16.0.1",
|
|
16
15
|
"ts-morph": "^18.0.0",
|
|
17
16
|
"tslib": "2.6.2",
|
|
18
|
-
"@rxap/node-utilities": "1.1.0
|
|
17
|
+
"@rxap/node-utilities": "1.1.0",
|
|
18
|
+
"@rxap/utilities": "16.1.0-dev.1"
|
|
19
19
|
},
|
|
20
20
|
"author": {
|
|
21
21
|
"name": "Merzough Münker",
|
|
@@ -37,15 +37,15 @@
|
|
|
37
37
|
"packageGroup": [
|
|
38
38
|
{
|
|
39
39
|
"package": "@rxap/ts-morph",
|
|
40
|
-
"version": "1.0.1
|
|
40
|
+
"version": "1.0.1"
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
"package": "@rxap/utilities",
|
|
44
|
-
"version": "16.0.0
|
|
44
|
+
"version": "16.0.0"
|
|
45
45
|
},
|
|
46
46
|
{
|
|
47
47
|
"package": "@rxap/workspace-utilities",
|
|
48
|
-
"version": "16.0.1
|
|
48
|
+
"version": "16.0.1"
|
|
49
49
|
}
|
|
50
50
|
]
|
|
51
51
|
},
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"directory": "packages/workspace/ts-morph"
|
|
60
60
|
},
|
|
61
61
|
"type": "commonjs",
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "c3d9e0e2a0cb35d82a96ca4e7a249ce0f06a3ee1",
|
|
63
63
|
"main": "./src/index.js",
|
|
64
64
|
"types": "./src/index.d.ts"
|
|
65
65
|
}
|
|
@@ -3,6 +3,12 @@ import { Project, ProjectOptions, SourceFile } from 'ts-morph';
|
|
|
3
3
|
export type TsMorphTransformCallback = ((project: Project, sourceFile: undefined) => void) | ((project: Project, sourceFile: SourceFile) => void) | ((project: Project, sourceFile: SourceFile[]) => void);
|
|
4
4
|
export interface TsMorphTransformOptions {
|
|
5
5
|
replace?: boolean;
|
|
6
|
+
/**
|
|
7
|
+
* true - if the filePath is set only this files will be included in the ts-morph project
|
|
8
|
+
* false - all files that are accessible from the sourceRoot will be included in the ts-morph project
|
|
9
|
+
* default: true
|
|
10
|
+
*/
|
|
11
|
+
filter?: boolean;
|
|
6
12
|
}
|
|
7
13
|
export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: SourceFile[]) => void, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: string[]): void;
|
|
8
14
|
export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: SourceFile) => void, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: string): void;
|
|
@@ -7,48 +7,55 @@ const path_1 = require("path");
|
|
|
7
7
|
const add_dir_1 = require("./add-dir");
|
|
8
8
|
const apply_ts_morph_project_1 = require("./apply-ts-morph-project");
|
|
9
9
|
function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {}, filePathFilter) {
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
const { replace = false, filter = true, } = options;
|
|
11
|
+
let filePath = undefined;
|
|
12
|
+
if (filePathFilter) {
|
|
13
|
+
if (Array.isArray(filePathFilter)) {
|
|
14
|
+
filePath = filePathFilter;
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
filePath = [filePathFilter];
|
|
18
|
+
}
|
|
19
|
+
}
|
|
15
20
|
const project = (0, ts_morph_1.CreateProject)(projectOptions);
|
|
16
|
-
if (!
|
|
17
|
-
(0, add_dir_1.AddDir)(tree, sourceRoot, project,
|
|
18
|
-
(
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
|
|
21
|
+
if (!replace) {
|
|
22
|
+
(0, add_dir_1.AddDir)(tree, sourceRoot, project, (fileName, dirPath) => {
|
|
23
|
+
if (!filePath || !filter) {
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
26
|
+
const fullPath = (0, path_1.join)(dirPath, fileName);
|
|
27
|
+
if (dirPath.endsWith(fileName)) {
|
|
28
|
+
throw new Error(`The dirPath '${dirPath}' ends with the fileName '${fileName}'`);
|
|
29
|
+
}
|
|
30
|
+
return filePath.map(f => f.replace(/\?$/, '')).some(f => fullPath.endsWith(f));
|
|
31
|
+
});
|
|
26
32
|
}
|
|
27
33
|
let sourceFile = undefined;
|
|
28
34
|
if (filePath) {
|
|
29
35
|
if (Array.isArray(filePath)) {
|
|
30
36
|
sourceFile = filePath.map((f, index) => {
|
|
31
|
-
|
|
32
|
-
|
|
37
|
+
const fileName = f.replace(/\?$/, '');
|
|
38
|
+
const isOptional = f.endsWith('?');
|
|
39
|
+
let sf = project.getSourceFile(fileName);
|
|
33
40
|
if (!sf) {
|
|
34
41
|
if (Array.isArray(filePathFilter)) {
|
|
35
|
-
if (
|
|
36
|
-
sf = project.createSourceFile(
|
|
42
|
+
if (replace || isOptional) {
|
|
43
|
+
sf = project.createSourceFile(fileName, '');
|
|
37
44
|
}
|
|
38
45
|
else {
|
|
39
46
|
console.log(project.getSourceFiles().map(f => f.getFilePath()));
|
|
40
|
-
throw new Error(`The file ${
|
|
47
|
+
throw new Error(`The file ${fileName} does not exists with the source root ${sourceRoot}`);
|
|
41
48
|
}
|
|
42
49
|
}
|
|
43
50
|
else {
|
|
44
51
|
if (index !== 0) {
|
|
45
52
|
throw new Error('FATAL: The filePathFilter is not an array and the index is not 0');
|
|
46
53
|
}
|
|
47
|
-
if (
|
|
48
|
-
sf = project.createSourceFile(
|
|
54
|
+
if (replace || isOptional) {
|
|
55
|
+
sf = project.createSourceFile(fileName, '');
|
|
49
56
|
}
|
|
50
57
|
else {
|
|
51
|
-
throw new Error(`The file ${
|
|
58
|
+
throw new Error(`The file ${fileName} does not exists with the source root ${sourceRoot}`);
|
|
52
59
|
}
|
|
53
60
|
}
|
|
54
61
|
}
|
|
@@ -65,12 +72,12 @@ function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {
|
|
|
65
72
|
exports.TsMorphTransform = TsMorphTransform;
|
|
66
73
|
function TsMorphNestProjectTransform(tree, options, cb, filePath) {
|
|
67
74
|
const basePath = (0, workspace_utilities_1.BuildNestBasePath)(tree, options);
|
|
68
|
-
return TsMorphTransform(tree, basePath, cb,
|
|
75
|
+
return TsMorphTransform(tree, basePath, cb, options, options.projectOptions, filePath);
|
|
69
76
|
}
|
|
70
77
|
exports.TsMorphNestProjectTransform = TsMorphNestProjectTransform;
|
|
71
78
|
function TsMorphAngularProjectTransform(tree, options, cb, filePath) {
|
|
72
79
|
const basePath = (0, workspace_utilities_1.BuildAngularBasePath)(tree, options);
|
|
73
|
-
return TsMorphTransform(tree, basePath, cb,
|
|
80
|
+
return TsMorphTransform(tree, basePath, cb, options, options.projectOptions, filePath);
|
|
74
81
|
}
|
|
75
82
|
exports.TsMorphAngularProjectTransform = TsMorphAngularProjectTransform;
|
|
76
83
|
//# sourceMappingURL=ts-morph-transform.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-morph-transform.js","sourceRoot":"","sources":["../../../../../../packages/workspace/ts-morph/src/lib/ts-morph-transform.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;
|
|
1
|
+
{"version":3,"file":"ts-morph-transform.js","sourceRoot":"","sources":["../../../../../../packages/workspace/ts-morph/src/lib/ts-morph-transform.ts"],"names":[],"mappings":"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"}
|