@rxap/schematics-ts-morph 16.0.0-dev.29 → 16.0.0-dev.30
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 +6 -0
- package/README.md +1 -1
- package/package.json +6 -5
- package/src/lib/auto-import.js +2 -9
- package/src/lib/auto-import.js.map +1 -1
- package/src/lib/fix-missing-imports.js +2 -9
- package/src/lib/fix-missing-imports.js.map +1 -1
- package/src/lib/organize-imports.js +2 -9
- package/src/lib/organize-imports.js.map +1 -1
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
|
+
# [16.0.0-dev.30](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.29...@rxap/schematics-ts-morph@16.0.0-dev.30) (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
|
# [16.0.0-dev.29](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.28...@rxap/schematics-ts-morph@16.0.0-dev.29) (2023-10-12)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.0-dev.21 @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-ts-morph@^0.1.0-dev.11 ts-morph@^18.0.0 tslib@2.6.2
|
|
20
|
+
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.0-dev.21 @rxap/ts-morph@* @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-ts-morph@^0.1.0-dev.11 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,23 +1,24 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.0.0-dev.
|
|
2
|
+
"version": "16.0.0-dev.30",
|
|
3
3
|
"name": "@rxap/schematics-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
12
|
"@angular-devkit/core": "^16.1.4",
|
|
13
13
|
"@angular-devkit/schematics": "^16.1.4",
|
|
14
14
|
"@rxap/schematics-utilities": "^16.0.0-dev.21",
|
|
15
|
+
"@rxap/ts-morph": "*",
|
|
15
16
|
"@rxap/utilities": "^16.0.0-dev.23",
|
|
16
17
|
"@rxap/workspace-ts-morph": "^0.1.0-dev.11",
|
|
17
18
|
"ts-morph": "^18.0.0",
|
|
18
19
|
"tslib": "2.6.2",
|
|
19
20
|
"@rxap/node-utilities": "1.1.0-dev.15",
|
|
20
|
-
"@rxap/workspace-utilities": "0.1.0-dev.
|
|
21
|
+
"@rxap/workspace-utilities": "0.1.0-dev.24"
|
|
21
22
|
},
|
|
22
23
|
"author": {
|
|
23
24
|
"name": "Merzough Münker",
|
|
@@ -61,7 +62,7 @@
|
|
|
61
62
|
"directory": "packages/schematic/ts-morph"
|
|
62
63
|
},
|
|
63
64
|
"type": "commonjs",
|
|
64
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "4618ff1e4cbe6cfd826a154d0f361f83c934900a",
|
|
65
66
|
"main": "./src/index.js",
|
|
66
67
|
"types": "./src/index.d.ts"
|
|
67
68
|
}
|
package/src/lib/auto-import.js
CHANGED
|
@@ -1,21 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AutoImport = void 0;
|
|
4
|
-
const ts_morph_1 = require("ts-morph");
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
5
|
const add_dir_1 = require("./add-dir");
|
|
6
6
|
/**
|
|
7
7
|
* @deprecated use FixMissingImports instead
|
|
8
8
|
*/
|
|
9
9
|
function AutoImport(basePath, autoImportBasePath = basePath) {
|
|
10
10
|
return tree => {
|
|
11
|
-
const project =
|
|
12
|
-
useInMemoryFileSystem: true,
|
|
13
|
-
manipulationSettings: {
|
|
14
|
-
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
15
|
-
quoteKind: ts_morph_1.QuoteKind.Single,
|
|
16
|
-
useTrailingCommas: true,
|
|
17
|
-
},
|
|
18
|
-
});
|
|
11
|
+
const project = (0, ts_morph_1.CreateProject)();
|
|
19
12
|
(0, add_dir_1.AddDir)(tree.getDir(basePath), project, basePath, pf => !!pf.match(/\.ts$/));
|
|
20
13
|
console.debug('auto import for ts files');
|
|
21
14
|
project.getSourceFiles()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-import.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/auto-import.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"auto-import.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/auto-import.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAO/C,uCAAmC;AAEnC;;GAEG;AACH,SAAgB,UAAU,CAAC,QAAgB,EAAE,qBAA6B,QAAQ;IAChF,OAAO,IAAI,CAAC,EAAE;QACZ,MAAM,OAAO,GAAG,IAAA,wBAAa,GAAE,CAAC;QAChC,IAAA,gBAAM,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC1C,OAAO,CAAC,cAAc,EAAE;aAChB,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;aAC3E,OAAO,CAAC,UAAU,CAAC,EAAE;YACpB,UAAU,CAAC,iBAAiB,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAZD,gCAYC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FixMissingImports = void 0;
|
|
4
|
-
const ts_morph_1 = require("ts-morph");
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
/**
|
|
7
7
|
*
|
|
@@ -10,14 +10,7 @@ const path_1 = require("path");
|
|
|
10
10
|
*/
|
|
11
11
|
function FixMissingImports(basePath) {
|
|
12
12
|
return (tree) => {
|
|
13
|
-
const project =
|
|
14
|
-
useInMemoryFileSystem: true,
|
|
15
|
-
manipulationSettings: {
|
|
16
|
-
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
17
|
-
quoteKind: ts_morph_1.QuoteKind.Single,
|
|
18
|
-
useTrailingCommas: true,
|
|
19
|
-
},
|
|
20
|
-
});
|
|
13
|
+
const project = (0, ts_morph_1.CreateProject)();
|
|
21
14
|
console.debug('fix missing imports for ts files');
|
|
22
15
|
function AddFiles(dir) {
|
|
23
16
|
for (const file of dir.subfiles) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-missing-imports.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/fix-missing-imports.ts"],"names":[],"mappings":";;;AAKA,
|
|
1
|
+
{"version":3,"file":"fix-missing-imports.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/fix-missing-imports.ts"],"names":[],"mappings":";;;AAKA,6CAA+C;AAM/C,+BAA4B;AAE5B;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,wBAAa,GAAE,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAElD,SAAS,QAAQ,CAAC,GAAa;YAC7B,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAC/B,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;oBACrD,OAAO,CAAC,gBAAgB,CACtB,IAAA,WAAI,EAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EACzC,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;iBACH;aACF;YACD,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE;gBAChC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;aAC3B;QACH,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;YACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;gBAEnB,KAAK,GAAG,CAAC;gBACT,KAAK,GAAG;oBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;wBAC9B,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC9F;oBACD,MAAM;aAET;SACF;QAED,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEhC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;gBACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;oBAEnB,KAAK,GAAG,CAAC;oBACT,KAAK,GAAG;wBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;4BAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;4BACtD,IAAI,UAAU,EAAE;gCACd,UAAU,CAAC,iBAAiB,EAAE,CAAC;gCAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;6BACvD;iCAAM;gCACL,OAAO,CAAC,IAAI,CAAC,4CAA6C,MAAM,CAAC,IAAK,IAAI,CAAC,CAAC;6BAC7E;yBACF;wBACD,MAAM;iBAET;aACF;SAEF;aAAM;YACL,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC5C,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AA9DD,8CA8DC"}
|
|
@@ -1,17 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OrganizeImports = void 0;
|
|
4
|
-
const ts_morph_1 = require("ts-morph");
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
5
|
function OrganizeImports() {
|
|
6
6
|
return (tree) => {
|
|
7
|
-
const project =
|
|
8
|
-
useInMemoryFileSystem: true,
|
|
9
|
-
manipulationSettings: {
|
|
10
|
-
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
11
|
-
quoteKind: ts_morph_1.QuoteKind.Single,
|
|
12
|
-
useTrailingCommas: true,
|
|
13
|
-
},
|
|
14
|
-
});
|
|
7
|
+
const project = (0, ts_morph_1.CreateProject)();
|
|
15
8
|
console.debug('organize imports for ts files');
|
|
16
9
|
for (const action of tree.actions.slice()) {
|
|
17
10
|
switch (action.kind) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organize-imports.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/organize-imports.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"organize-imports.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/organize-imports.ts"],"names":[],"mappings":";;;AAIA,6CAA+C;AAO/C,SAAgB,eAAe;IAC7B,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,wBAAa,GAAE,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAE/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;YACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;gBAEnB,KAAK,GAAG,CAAC;gBACT,KAAK,GAAG;oBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;wBAC9B,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC9F;oBACD,MAAM;aAET;SACF;QAED,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC5C,UAAU,CAAC,eAAe,EAAE,CAAC;YAC7B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAvBD,0CAuBC"}
|