@rxap/workspace-ts-morph 0.1.0-dev.11 → 0.1.0-dev.12
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
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
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.12](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@0.1.0-dev.11...@rxap/workspace-ts-morph@0.1.0-dev.12) (2023-10-16)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- use utility CreateProject function to create a ts-morph Project instance ([78b308f](https://gitlab.com/rxap/packages/commit/78b308fd10747616c7c7f27e81501a4ad5052a77))
|
|
11
|
+
|
|
6
12
|
# [0.1.0-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@0.1.0-dev.10...@rxap/workspace-ts-morph@0.1.0-dev.11) (2023-10-11)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @rxap/workspace-ts-morph
|
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.23 @rxap/workspace-utilities@^0.1.0-dev.23 ts-morph@^18.0.0 tslib@2.6.2
|
|
20
|
+
yarn add @rxap/ts-morph@* @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-utilities@^0.1.0-dev.23 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.1.0-dev.
|
|
2
|
+
"version": "0.1.0-dev.12",
|
|
3
3
|
"name": "@rxap/workspace-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"ignore": "
|
|
6
|
+
"ignore": "5.2.4",
|
|
7
7
|
"process": "0.11.10",
|
|
8
|
-
"semver": "
|
|
8
|
+
"semver": "7.5.3",
|
|
9
9
|
"tslib": "2.6.2"
|
|
10
10
|
},
|
|
11
11
|
"peerDependencies": {
|
|
12
|
+
"@rxap/ts-morph": "*",
|
|
12
13
|
"@rxap/utilities": "^16.0.0-dev.23",
|
|
13
14
|
"@rxap/workspace-utilities": "^0.1.0-dev.23",
|
|
14
15
|
"ts-morph": "^18.0.0",
|
|
@@ -53,7 +54,7 @@
|
|
|
53
54
|
"directory": "packages/workspace/ts-morph"
|
|
54
55
|
},
|
|
55
56
|
"type": "commonjs",
|
|
56
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "4618ff1e4cbe6cfd826a154d0f361f83c934900a",
|
|
57
58
|
"main": "./src/index.js",
|
|
58
59
|
"types": "./src/index.d.ts"
|
|
59
60
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ApplyTsMorphProject = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
4
5
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
6
|
const path_1 = require("path");
|
|
6
|
-
const ts_morph_1 = require("ts-morph");
|
|
7
7
|
function areSame(sourceFile1, sourceFile2) {
|
|
8
8
|
const leafNodes1 = getLeafNodes(sourceFile1);
|
|
9
9
|
const leafNodes2 = getLeafNodes(sourceFile2);
|
|
@@ -56,7 +56,7 @@ function ApplyTsMorphProject(tree, project, basePath = '', organizeImports = tru
|
|
|
56
56
|
const filePath = (0, path_1.join)(basePath, sourceFile.getFilePath());
|
|
57
57
|
if (tree.exists(filePath)) {
|
|
58
58
|
const currentContent = treeAdapter.read(filePath).toString('utf-8');
|
|
59
|
-
const tmpProject =
|
|
59
|
+
const tmpProject = (0, ts_morph_1.CreateProject)();
|
|
60
60
|
const newContent = sourceFile.getFullText();
|
|
61
61
|
if (!areSame(sourceFile, tmpProject.createSourceFile('/tmp.ts', currentContent))) {
|
|
62
62
|
treeAdapter.overwrite(filePath, newContent);
|
|
@@ -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,mEAGmC;AACnC,+BAA4B;
|
|
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,6CAA+C;AAC/C,mEAGmC;AACnC,+BAA4B;AAO5B,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,IAAA,wBAAa,GAAE,CAAC;YACnC,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,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TsMorphAngularProjectTransform = exports.TsMorphNestProjectTransform = exports.TsMorphTransform = void 0;
|
|
4
|
-
const
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
5
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const ts_morph_1 = require("ts-morph");
|
|
8
7
|
const add_dir_1 = require("./add-dir");
|
|
9
8
|
const apply_ts_morph_project_1 = require("./apply-ts-morph-project");
|
|
10
9
|
function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {}, filePathFilter) {
|
|
@@ -13,13 +12,7 @@ function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {
|
|
|
13
12
|
filePathFilter.map(f => f.replace(/\?$/, '')) :
|
|
14
13
|
[filePathFilter.replace(/\?$/, '')] :
|
|
15
14
|
undefined;
|
|
16
|
-
const project =
|
|
17
|
-
manipulationSettings: {
|
|
18
|
-
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
19
|
-
quoteKind: ts_morph_1.QuoteKind.Single,
|
|
20
|
-
},
|
|
21
|
-
useInMemoryFileSystem: true,
|
|
22
|
-
}, projectOptions));
|
|
15
|
+
const project = (0, ts_morph_1.CreateProject)(projectOptions);
|
|
23
16
|
if (!options.replace) {
|
|
24
17
|
(0, add_dir_1.AddDir)(tree, sourceRoot, project, filePath ?
|
|
25
18
|
(fileName, dirPath) => {
|
|
@@ -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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"}
|