@rxap/workspace-ts-morph 19.1.9-dev.0 → 19.1.9-dev.10

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,48 @@
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
+ ## [19.1.9-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.9...@rxap/workspace-ts-morph@19.1.9-dev.10) (2025-02-10)
7
+
8
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
9
+
10
+ ## [19.1.9-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.8...@rxap/workspace-ts-morph@19.1.9-dev.9) (2025-02-07)
11
+
12
+ ### Bug Fixes
13
+
14
+ - support async callback function ([fca7fab](https://gitlab.com/rxap/packages/commit/fca7fab364c5bec4dae262cddc18720e21bbd5ef))
15
+
16
+ ## [19.1.9-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.7...@rxap/workspace-ts-morph@19.1.9-dev.8) (2025-01-30)
17
+
18
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
19
+
20
+ ## [19.1.9-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.6...@rxap/workspace-ts-morph@19.1.9-dev.7) (2025-01-29)
21
+
22
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
23
+
24
+ ## [19.1.9-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.5...@rxap/workspace-ts-morph@19.1.9-dev.6) (2025-01-29)
25
+
26
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
27
+
28
+ ## [19.1.9-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.4...@rxap/workspace-ts-morph@19.1.9-dev.5) (2025-01-29)
29
+
30
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
31
+
32
+ ## [19.1.9-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.3...@rxap/workspace-ts-morph@19.1.9-dev.4) (2025-01-28)
33
+
34
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
35
+
36
+ ## [19.1.9-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.2...@rxap/workspace-ts-morph@19.1.9-dev.3) (2025-01-28)
37
+
38
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
39
+
40
+ ## [19.1.9-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.1...@rxap/workspace-ts-morph@19.1.9-dev.2) (2025-01-22)
41
+
42
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
43
+
44
+ ## [19.1.9-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.9-dev.0...@rxap/workspace-ts-morph@19.1.9-dev.1) (2025-01-21)
45
+
46
+ **Note:** Version bump only for package @rxap/workspace-ts-morph
47
+
6
48
  ## [19.1.9-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/workspace-ts-morph@19.1.8...@rxap/workspace-ts-morph@19.1.9-dev.0) (2025-01-08)
7
49
 
8
50
  **Note:** Version bump only for package @rxap/workspace-ts-morph
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
- "version": "19.1.9-dev.0",
2
+ "version": "19.1.9-dev.10",
3
3
  "name": "@rxap/workspace-ts-morph",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
6
- "@nx/devkit": "20.3.1",
7
- "@rxap/ts-morph": "^1.5.3-dev.0",
8
- "@rxap/utilities": "^16.4.2-dev.0",
9
- "@rxap/workspace-utilities": "^19.6.1-dev.0",
6
+ "@nx/devkit": "20.4.2",
7
+ "@rxap/ts-morph": "^1.5.3-dev.5",
8
+ "@rxap/utilities": "^16.4.2-dev.4",
9
+ "@rxap/workspace-utilities": "^19.6.1-dev.9",
10
10
  "ts-morph": "^18.0.0",
11
11
  "tslib": "2.6.2"
12
12
  },
@@ -38,7 +38,7 @@
38
38
  "directory": "packages/workspace/ts-morph"
39
39
  },
40
40
  "type": "commonjs",
41
- "gitHead": "3fb11056505011351451e412704f25a645e517ce",
41
+ "gitHead": "3c5aef907af80a815e7c9a404878c2eda2596cf4",
42
42
  "types": "./src/index.d.ts",
43
43
  "main": "./src/index.js"
44
44
  }
@@ -1,6 +1,7 @@
1
1
  import { BuildAngularBasePathOptions, TreeLike } from '@rxap/workspace-utilities';
2
2
  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
+ export type AsyncTsMorphTransformCallback = ((project: Project, sourceFile: undefined) => Promise<void>) | ((project: Project, sourceFile: SourceFile) => Promise<void>) | ((project: Project, sourceFile: SourceFile[]) => Promise<void>);
4
5
  export interface TsMorphTransformOptions {
5
6
  replace?: boolean;
6
7
  /**
@@ -9,10 +10,17 @@ export interface TsMorphTransformOptions {
9
10
  * default: true
10
11
  */
11
12
  filter?: boolean;
13
+ /**
14
+ * false - files that are not typescript files will be excluded
15
+ */
16
+ includeNonTsFiles?: boolean;
12
17
  }
13
18
  export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: SourceFile[]) => void, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: string[]): void;
14
19
  export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: SourceFile) => void, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: string): void;
15
20
  export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: undefined) => void, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: undefined): void;
21
+ export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: SourceFile[]) => Promise<void>, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: string[]): Promise<void>;
22
+ export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: SourceFile) => Promise<void>, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: string): Promise<void>;
23
+ export declare function TsMorphTransform(tree: TreeLike, sourceRoot: string, cb: (project: Project, sourceFile: undefined) => Promise<void>, options?: TsMorphTransformOptions, projectOptions?: Partial<ProjectOptions>, filePath?: undefined): Promise<void>;
16
24
  export interface TsMorphNestProjectTransformOptions extends TsMorphTransformOptions {
17
25
  project: string;
18
26
  feature?: string | null;
@@ -46,14 +46,21 @@ function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {
46
46
  console.log(`TsMorphTransform for sourceRoot '${sourceRoot}' with fileList: [ ${(0, utilities_1.coerceArray)(filePathFilter).join(', ')} ]`.grey);
47
47
  if (!replace) {
48
48
  (0, add_dir_1.AddDir)(tree, sourceRoot, project, (fileName, dirPath) => {
49
+ let include = false;
49
50
  if (!filePath || !filter) {
50
- return true;
51
+ include = true;
51
52
  }
52
- const fullPath = (0, path_1.join)(dirPath, fileName);
53
- if (dirPath.endsWith(fileName)) {
54
- throw new Error(`The dirPath '${dirPath}' ends with the fileName '${fileName}'`);
53
+ else {
54
+ const fullPath = (0, path_1.join)(dirPath, fileName);
55
+ if (dirPath.endsWith(fileName)) {
56
+ throw new Error(`The dirPath '${dirPath}' ends with the fileName '${fileName}'`);
57
+ }
58
+ include = filePath.map(f => f.replace(/\?$/, '')).some(f => fullPath.endsWith(f));
59
+ }
60
+ if (include && !options.includeNonTsFiles && !fileName.endsWith('.ts')) {
61
+ include = false;
55
62
  }
56
- return filePath.map(f => f.replace(/\?$/, '')).some(f => fullPath.endsWith(f));
63
+ return include;
57
64
  });
58
65
  }
59
66
  let sourceFile = undefined;
@@ -92,8 +99,15 @@ function TsMorphTransform(tree, sourceRoot, cb, options = {}, projectOptions = {
92
99
  }
93
100
  }
94
101
  }
95
- cb(project, sourceFile);
96
- (0, apply_ts_morph_project_1.ApplyTsMorphProject)(tree, project, sourceRoot, false);
102
+ const result = cb(project, sourceFile);
103
+ if ((0, utilities_1.isPromise)(result)) {
104
+ return result.then(() => {
105
+ (0, apply_ts_morph_project_1.ApplyTsMorphProject)(tree, project, sourceRoot, false);
106
+ });
107
+ }
108
+ else {
109
+ (0, apply_ts_morph_project_1.ApplyTsMorphProject)(tree, project, sourceRoot, false);
110
+ }
97
111
  }
98
112
  /**
99
113
  * Transforms a NestJS project using TypeScript morph transformations.
@@ -1 +1 @@
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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"}
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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"}