@rxap/workspace-ts-morph 0.1.0-dev.1 → 0.1.0-dev.3
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 +12 -0
- package/README.md +1 -1
- package/package.json +10 -9
- package/src/index.js +6 -3
- package/src/index.js.map +1 -1
- package/src/lib/add-dir.js +16 -12
- package/src/lib/add-dir.js.map +1 -1
- package/src/lib/apply-ts-morph-project.js +11 -7
- package/src/lib/apply-ts-morph-project.js.map +1 -1
- package/src/lib/ts-morph-transform.js +26 -19
- package/src/lib/ts-morph-transform.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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
|
+
# [0.1.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@0.1.0-dev.2...@rxap/workspace-ts-morph@0.1.0-dev.3) (2023-08-31)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- ensure the project name is not included in the project tag list ([b131ac3](https://gitlab.com/rxap/packages/commit/b131ac3bd92b3b8799d62f15bbd30a1997d7c753))
|
|
11
|
+
|
|
12
|
+
# [0.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@0.1.0-dev.1...@rxap/workspace-ts-morph@0.1.0-dev.2) (2023-08-17)
|
|
13
|
+
|
|
14
|
+
### Reverts
|
|
15
|
+
|
|
16
|
+
- change from commonjs to es2022 ([747a381](https://gitlab.com/rxap/packages/commit/747a381a090f0a276cf363da61bb19ed0c9cb5b7))
|
|
17
|
+
|
|
6
18
|
# [0.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@0.1.0-dev.0...@rxap/workspace-ts-morph@0.1.0-dev.1) (2023-08-16)
|
|
7
19
|
|
|
8
20
|
### 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/utilities@^16.0.0-dev.
|
|
20
|
+
yarn add @rxap/utilities@^16.0.0-dev.13 @rxap/workspace-utilities@^0.1.0-dev.6 ts-morph@^18.0.0
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rxap/workspace-ts-morph",
|
|
3
|
-
"version": "0.1.0-dev.
|
|
4
|
-
"type": "
|
|
3
|
+
"version": "0.1.0-dev.3",
|
|
4
|
+
"type": "commonjs",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
7
7
|
"directory": "../../../dist/packages/workspace/ts-morph"
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
"rxap",
|
|
11
11
|
"packages",
|
|
12
12
|
"workspace",
|
|
13
|
-
"ts-morph"
|
|
13
|
+
"ts-morph",
|
|
14
|
+
"workspace-ts-morph"
|
|
14
15
|
],
|
|
15
16
|
"homepage": "https:/gitlab.com/rxap/packages/packages/workspace/ts-morph",
|
|
16
17
|
"bugs": {
|
|
@@ -34,24 +35,24 @@
|
|
|
34
35
|
"tslib": "2.6.1"
|
|
35
36
|
},
|
|
36
37
|
"peerDependencies": {
|
|
37
|
-
"@rxap/utilities": "^16.0.0-dev.
|
|
38
|
-
"@rxap/workspace-utilities": "^0.1.0-dev.
|
|
38
|
+
"@rxap/utilities": "^16.0.0-dev.13",
|
|
39
|
+
"@rxap/workspace-utilities": "^0.1.0-dev.6",
|
|
39
40
|
"ts-morph": "^18.0.0",
|
|
40
|
-
"@rxap/node-utilities": "1.1.0-dev.
|
|
41
|
+
"@rxap/node-utilities": "1.1.0-dev.4"
|
|
41
42
|
},
|
|
42
43
|
"nx-migrations": {
|
|
43
44
|
"packageGroup": [
|
|
44
45
|
{
|
|
45
46
|
"package": "@rxap/utilities",
|
|
46
|
-
"version": "16.0.0-dev.
|
|
47
|
+
"version": "16.0.0-dev.13"
|
|
47
48
|
},
|
|
48
49
|
{
|
|
49
50
|
"package": "@rxap/workspace-utilities",
|
|
50
|
-
"version": "0.1.0-dev.
|
|
51
|
+
"version": "0.1.0-dev.6"
|
|
51
52
|
}
|
|
52
53
|
]
|
|
53
54
|
},
|
|
54
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "3d49d0a2548a0c403ad55c564108b54ba734a677",
|
|
55
56
|
"main": "./src/index.js",
|
|
56
57
|
"types": "./src/index.d.ts"
|
|
57
58
|
}
|
package/src/index.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
1
4
|
// region
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
+
tslib_1.__exportStar(require("./lib/add-dir"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./lib/apply-ts-morph-project"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./lib/ts-morph-transform"), exports);
|
|
5
8
|
// endregion
|
|
6
9
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/workspace/ts-morph/src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/workspace/ts-morph/src/index.ts"],"names":[],"mappings":";;;AAAA,UAAU;AACV,wDAA8B;AAC9B,uEAA6C;AAC7C,mEAAyC;AACzC,YAAY"}
|
package/src/lib/add-dir.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AddDir = void 0;
|
|
4
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
|
+
const path_1 = require("path");
|
|
3
6
|
/**
|
|
4
7
|
* Adds all files recursively from a specify path to the project.
|
|
5
8
|
* @param tree A nx Tree instance
|
|
@@ -7,31 +10,32 @@ import { join, relative, } from 'path';
|
|
|
7
10
|
* @param project A ts-morph Project instance
|
|
8
11
|
* @param filter A filter function base on the pathFragment and dirEntry
|
|
9
12
|
*/
|
|
10
|
-
|
|
11
|
-
if (IsSchematicTreeLike(tree)) {
|
|
13
|
+
function AddDir(tree, directoryPath, project, filter = path => path.endsWith('.ts'), basePath = directoryPath) {
|
|
14
|
+
if ((0, workspace_utilities_1.IsSchematicTreeLike)(tree)) {
|
|
12
15
|
return SchematicAddDir(tree.getDir(directoryPath), project, '', (pathFragment, dirEntry) => filter(pathFragment, dirEntry.path));
|
|
13
16
|
}
|
|
14
|
-
if (IsGeneratorTreeLike(tree)) {
|
|
17
|
+
if ((0, workspace_utilities_1.IsGeneratorTreeLike)(tree)) {
|
|
15
18
|
if (tree.isFile(directoryPath)) {
|
|
16
19
|
throw new Error(`The path '${directoryPath}' does not point to a dir entry`);
|
|
17
20
|
}
|
|
18
21
|
const children = tree.children(directoryPath);
|
|
19
|
-
const files = children.filter(fileOrDirectoryName => tree.isFile(join(directoryPath, fileOrDirectoryName)));
|
|
22
|
+
const files = children.filter(fileOrDirectoryName => tree.isFile((0, path_1.join)(directoryPath, fileOrDirectoryName)));
|
|
20
23
|
const includeFiles = files.filter(fileName => filter(fileName, directoryPath));
|
|
21
24
|
for (const fileName of includeFiles) {
|
|
22
|
-
const filePath = join(directoryPath, fileName);
|
|
23
|
-
const projectFilePath = relative(basePath, filePath);
|
|
25
|
+
const filePath = (0, path_1.join)(directoryPath, fileName);
|
|
26
|
+
const projectFilePath = (0, path_1.relative)(basePath, filePath);
|
|
24
27
|
if (!project.getSourceFile(projectFilePath)) {
|
|
25
28
|
project.createSourceFile(projectFilePath, tree.read(filePath).toString('utf-8'));
|
|
26
29
|
}
|
|
27
30
|
}
|
|
28
|
-
for (const dirName of tree.children(directoryPath).filter(pf => !tree.isFile(join(directoryPath, pf)))) {
|
|
29
|
-
AddDir(tree, join(directoryPath, dirName), project, filter, basePath);
|
|
31
|
+
for (const dirName of tree.children(directoryPath).filter(pf => !tree.isFile((0, path_1.join)(directoryPath, pf)))) {
|
|
32
|
+
AddDir(tree, (0, path_1.join)(directoryPath, dirName), project, filter, basePath);
|
|
30
33
|
}
|
|
31
34
|
return;
|
|
32
35
|
}
|
|
33
36
|
throw new Error('The tree is not a valid nx or angular schematic tree');
|
|
34
37
|
}
|
|
38
|
+
exports.AddDir = AddDir;
|
|
35
39
|
/**
|
|
36
40
|
* Adds all files recursively from a specify DirEntry to the project.
|
|
37
41
|
* @param dir A schematic DirEntry instance
|
|
@@ -43,7 +47,7 @@ function SchematicAddDir(dir, project, parentPath = '', filter = pathFragment =>
|
|
|
43
47
|
for (const pathFragment of dir.subfiles.filter(pf => filter(pf, dir))) {
|
|
44
48
|
const fileEntry = dir.file(pathFragment);
|
|
45
49
|
if (fileEntry) {
|
|
46
|
-
const filePath = join(parentPath, pathFragment);
|
|
50
|
+
const filePath = (0, path_1.join)(parentPath, pathFragment);
|
|
47
51
|
if (!project.getSourceFile(filePath)) {
|
|
48
52
|
project.createSourceFile(filePath, fileEntry.content.toString('utf-8'));
|
|
49
53
|
}
|
|
@@ -55,7 +59,7 @@ function SchematicAddDir(dir, project, parentPath = '', filter = pathFragment =>
|
|
|
55
59
|
for (const pathFragment of dir.subdirs) {
|
|
56
60
|
const dirEntry = dir.dir(pathFragment);
|
|
57
61
|
if (dirEntry) {
|
|
58
|
-
SchematicAddDir(dirEntry, project, join(parentPath, pathFragment), filter);
|
|
62
|
+
SchematicAddDir(dirEntry, project, (0, path_1.join)(parentPath, pathFragment), filter);
|
|
59
63
|
}
|
|
60
64
|
else {
|
|
61
65
|
throw new Error('The path fragment does not point to a dir entry');
|
package/src/lib/add-dir.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-dir.js","sourceRoot":"","sources":["../../../../../../packages/workspace/ts-morph/src/lib/add-dir.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"add-dir.js","sourceRoot":"","sources":["../../../../../../packages/workspace/ts-morph/src/lib/add-dir.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ApplyTsMorphProject = void 0;
|
|
4
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const ts_morph_1 = require("ts-morph");
|
|
4
7
|
function areSame(sourceFile1, sourceFile2) {
|
|
5
8
|
const leafNodes1 = getLeafNodes(sourceFile1);
|
|
6
9
|
const leafNodes2 = getLeafNodes(sourceFile2);
|
|
@@ -33,7 +36,7 @@ function areSame(sourceFile1, sourceFile2) {
|
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
|
-
|
|
39
|
+
function ApplyTsMorphProject(tree, project, basePath = '', organizeImports = true, fixMissingImports = false) {
|
|
37
40
|
if (organizeImports || fixMissingImports) {
|
|
38
41
|
project
|
|
39
42
|
.getSourceFiles()
|
|
@@ -46,14 +49,14 @@ export function ApplyTsMorphProject(tree, project, basePath = '', organizeImport
|
|
|
46
49
|
}
|
|
47
50
|
});
|
|
48
51
|
}
|
|
49
|
-
const treeAdapter = new TreeAdapter(tree);
|
|
52
|
+
const treeAdapter = new workspace_utilities_1.TreeAdapter(tree);
|
|
50
53
|
project
|
|
51
54
|
.getSourceFiles()
|
|
52
55
|
.forEach(sourceFile => {
|
|
53
|
-
const filePath = join(basePath, sourceFile.getFilePath());
|
|
56
|
+
const filePath = (0, path_1.join)(basePath, sourceFile.getFilePath());
|
|
54
57
|
if (tree.exists(filePath)) {
|
|
55
58
|
const currentContent = treeAdapter.read(filePath).toString('utf-8');
|
|
56
|
-
const tmpProject = new Project();
|
|
59
|
+
const tmpProject = new ts_morph_1.Project();
|
|
57
60
|
const newContent = sourceFile.getFullText();
|
|
58
61
|
if (!areSame(sourceFile, tmpProject.createSourceFile('/tmp.ts', currentContent))) {
|
|
59
62
|
treeAdapter.overwrite(filePath, newContent);
|
|
@@ -64,4 +67,5 @@ export function ApplyTsMorphProject(tree, project, basePath = '', organizeImport
|
|
|
64
67
|
}
|
|
65
68
|
});
|
|
66
69
|
}
|
|
70
|
+
exports.ApplyTsMorphProject = ApplyTsMorphProject;
|
|
67
71
|
//# sourceMappingURL=apply-ts-morph-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-ts-morph-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/ts-morph/src/lib/apply-ts-morph-project.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"apply-ts-morph-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/ts-morph/src/lib/apply-ts-morph-project.ts"],"names":[],"mappings":";;;AAAA,mEAGmC;AACnC,+BAA4B;AAC5B,uCAIkB;AAElB,SAAS,OAAO,CAAC,WAAuB,EAAE,WAAuB;IAC/D,MAAM,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE7C,iDAAiD;IACjD,OAAO,IAAI,EAAE;QACX,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QACD,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE;YAC5B,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE;YACnD,OAAO,KAAK,CAAC;SACd;KACF;IAED,QAAQ,CAAC,CAAC,YAAY,CAAC,UAAsB;QAC3C,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE9B,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAU;YAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzB,MAAM,IAAI,CAAC;aACZ;iBAAM;gBACL,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;oBAC5B,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;iBAC1B;aACF;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAgB,mBAAmB,CACjC,IAAc,EACd,OAAgB,EAChB,QAAQ,GAAG,EAAE,EACb,eAAe,GAAG,IAAI,EACtB,iBAAiB,GAAG,KAAK;IAEzB,IAAI,eAAe,IAAI,iBAAiB,EAAE;QACxC,OAAO;aACJ,cAAc,EAAE;aAChB,OAAO,CAAC,UAAU,CAAC,EAAE;YACpB,IAAI,iBAAiB,EAAE;gBACrB,UAAU,CAAC,iBAAiB,EAAE,CAAC;aAChC;YACD,IAAI,eAAe,EAAE;gBACnB,UAAU,CAAC,eAAe,EAAE,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;KACN;IAED,MAAM,WAAW,GAAG,IAAI,iCAAW,CAAC,IAAI,CAAC,CAAC;IAE1C,OAAO;SACJ,cAAc,EAAE;SAChB,OAAO,CAAC,UAAU,CAAC,EAAE;QAEpB,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACzB,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACrE,MAAM,UAAU,GAAG,IAAI,kBAAO,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE;gBAChF,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;aAC7C;SACF;aAAM;YACL,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;SACxD;IAEH,CAAC,CAAC,CAAC;AACP,CAAC;AAxCD,kDAwCC"}
|
|
@@ -1,26 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TsMorphAngularProjectTransform = exports.TsMorphNestProjectTransform = exports.TsMorphTransform = void 0;
|
|
4
|
+
const utilities_1 = require("@rxap/utilities");
|
|
5
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const ts_morph_1 = require("ts-morph");
|
|
8
|
+
const add_dir_1 = require("./add-dir");
|
|
9
|
+
const apply_ts_morph_project_1 = require("./apply-ts-morph-project");
|
|
10
|
+
function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {}, filePathFilter) {
|
|
8
11
|
const filePath = filePathFilter ?
|
|
9
12
|
Array.isArray(filePathFilter) ?
|
|
10
13
|
filePathFilter.map(f => f.replace(/\?$/, '')) :
|
|
11
14
|
[filePathFilter.replace(/\?$/, '')] :
|
|
12
15
|
undefined;
|
|
13
|
-
const project = new Project(deepMerge({
|
|
16
|
+
const project = new ts_morph_1.Project((0, utilities_1.deepMerge)({
|
|
14
17
|
manipulationSettings: {
|
|
15
|
-
indentationText: IndentationText.TwoSpaces,
|
|
16
|
-
quoteKind: QuoteKind.Single,
|
|
18
|
+
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
19
|
+
quoteKind: ts_morph_1.QuoteKind.Single,
|
|
17
20
|
},
|
|
18
21
|
useInMemoryFileSystem: true,
|
|
19
22
|
}, projectOptions));
|
|
20
23
|
if (!options.replace) {
|
|
21
|
-
AddDir(tree, sourceRoot, project, filePath ?
|
|
24
|
+
(0, add_dir_1.AddDir)(tree, sourceRoot, project, filePath ?
|
|
22
25
|
(fileName, dirPath) => {
|
|
23
|
-
const fullPath = join(dirPath, fileName);
|
|
26
|
+
const fullPath = (0, path_1.join)(dirPath, fileName);
|
|
24
27
|
if (dirPath.endsWith(fileName)) {
|
|
25
28
|
throw new Error(`The dirPath '${dirPath}' ends with the fileName '${fileName}'`);
|
|
26
29
|
}
|
|
@@ -32,10 +35,11 @@ export function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOpti
|
|
|
32
35
|
if (filePath) {
|
|
33
36
|
if (Array.isArray(filePath)) {
|
|
34
37
|
sourceFile = filePath.map((f, index) => {
|
|
38
|
+
var _a;
|
|
35
39
|
let sf = project.getSourceFile(f);
|
|
36
40
|
if (!sf) {
|
|
37
41
|
if (Array.isArray(filePathFilter)) {
|
|
38
|
-
if (options.replace || filePathFilter[index]
|
|
42
|
+
if (options.replace || ((_a = filePathFilter[index]) === null || _a === void 0 ? void 0 : _a.endsWith('?'))) {
|
|
39
43
|
sf = project.createSourceFile(f, '');
|
|
40
44
|
}
|
|
41
45
|
else {
|
|
@@ -47,7 +51,7 @@ export function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOpti
|
|
|
47
51
|
if (index !== 0) {
|
|
48
52
|
throw new Error('FATAL: The filePathFilter is not an array and the index is not 0');
|
|
49
53
|
}
|
|
50
|
-
if (options.replace || filePathFilter
|
|
54
|
+
if (options.replace || (filePathFilter === null || filePathFilter === void 0 ? void 0 : filePathFilter.endsWith('?'))) {
|
|
51
55
|
sf = project.createSourceFile(f, '');
|
|
52
56
|
}
|
|
53
57
|
else {
|
|
@@ -63,14 +67,17 @@ export function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOpti
|
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
cb(project, sourceFile);
|
|
66
|
-
ApplyTsMorphProject(tree, project, sourceRoot, false);
|
|
70
|
+
(0, apply_ts_morph_project_1.ApplyTsMorphProject)(tree, project, sourceRoot, false);
|
|
67
71
|
}
|
|
68
|
-
|
|
69
|
-
|
|
72
|
+
exports.TsMorphTransform = TsMorphTransform;
|
|
73
|
+
function TsMorphNestProjectTransform(tree, options, cb, filePath) {
|
|
74
|
+
const basePath = (0, workspace_utilities_1.BuildNestBasePath)(tree, options);
|
|
70
75
|
return TsMorphTransform(tree, basePath, cb, { replace: options.replace }, options.projectOptions, filePath);
|
|
71
76
|
}
|
|
72
|
-
|
|
73
|
-
|
|
77
|
+
exports.TsMorphNestProjectTransform = TsMorphNestProjectTransform;
|
|
78
|
+
function TsMorphAngularProjectTransform(tree, options, cb, filePath) {
|
|
79
|
+
const basePath = (0, workspace_utilities_1.BuildAngularBasePath)(tree, options);
|
|
74
80
|
return TsMorphTransform(tree, basePath, cb, { replace: options.replace }, options.projectOptions, filePath);
|
|
75
81
|
}
|
|
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
|
|
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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"}
|