@rxap/plugin-library 16.1.0-dev.1 → 16.1.0-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 +60 -0
- package/README.md +15 -1
- package/executors.json +5 -0
- package/package.json +20 -23
- package/src/executors/check-version/executor.js +14 -2
- package/src/executors/check-version/executor.js.map +1 -1
- package/src/executors/node-modules-linking/executor.d.ts +5 -0
- package/src/executors/node-modules-linking/executor.js +57 -0
- package/src/executors/node-modules-linking/executor.js.map +1 -0
- package/src/executors/node-modules-linking/schema.d.ts +1 -0
- package/src/executors/node-modules-linking/schema.json +9 -0
- package/src/executors/readme/executor.js.map +1 -1
- package/src/executors/run-generator/executor.js +19 -4
- package/src/executors/run-generator/executor.js.map +1 -1
- package/src/generators/bundle-json-schema/generator.js +34 -11
- package/src/generators/bundle-json-schema/generator.js.map +1 -1
- package/src/generators/expose-as-schematic/generator.js +2 -3
- package/src/generators/expose-as-schematic/generator.js.map +1 -1
- package/src/generators/fix-dependencies/generator.d.ts +3 -2
- package/src/generators/fix-dependencies/generator.js +31 -22
- package/src/generators/fix-dependencies/generator.js.map +1 -1
- package/src/generators/index-export/generator.js +16 -7
- package/src/generators/index-export/generator.js.map +1 -1
- package/src/generators/index-json-schema/generator.js +3 -4
- package/src/generators/index-json-schema/generator.js.map +1 -1
- package/src/generators/init/generator.d.ts +1 -0
- package/src/generators/init/generator.js +14 -66
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init/init-project.d.ts +3 -0
- package/src/generators/init/init-project.js +28 -0
- package/src/generators/init/init-project.js.map +1 -0
- package/src/generators/init/init-workspace.d.ts +3 -0
- package/src/generators/init/init-workspace.js +16 -0
- package/src/generators/init/init-workspace.js.map +1 -0
- package/src/generators/init/schema.d.ts +2 -0
- package/src/generators/init/schema.json +8 -1
- package/src/generators/init/update-default-project-targets.d.ts +2 -0
- package/src/generators/init/update-default-project-targets.js +29 -0
- package/src/generators/init/update-default-project-targets.js.map +1 -0
- package/src/generators/init/update-project-tags.d.ts +2 -0
- package/src/generators/init/update-project-tags.js +22 -0
- package/src/generators/init/update-project-tags.js.map +1 -0
- package/src/generators/init/update-project-targets.d.ts +3 -0
- package/src/generators/init/update-project-targets.js +14 -0
- package/src/generators/init/update-project-targets.js.map +1 -0
- package/src/generators/init-buildable/generator.js +6 -19
- package/src/generators/init-buildable/generator.js.map +1 -1
- package/src/generators/init-buildable/init-project.d.ts +3 -0
- package/src/generators/init-buildable/init-project.js +10 -0
- package/src/generators/init-buildable/init-project.js.map +1 -0
- package/src/generators/init-buildable/init-workspace.d.ts +3 -0
- package/src/generators/init-buildable/init-workspace.js +10 -0
- package/src/generators/init-buildable/init-workspace.js.map +1 -0
- package/src/generators/init-buildable/update-general-target-defaults.d.ts +2 -0
- package/src/generators/init-buildable/update-general-target-defaults.js +15 -0
- package/src/generators/init-buildable/update-general-target-defaults.js.map +1 -0
- package/src/generators/init-buildable/update-project-targets.d.ts +2 -0
- package/src/generators/init-buildable/update-project-targets.js +14 -0
- package/src/generators/init-buildable/update-project-targets.js.map +1 -0
- package/src/generators/init-plugin/generator.js +6 -41
- package/src/generators/init-plugin/generator.js.map +1 -1
- package/src/generators/init-plugin/init-project.d.ts +3 -0
- package/src/generators/init-plugin/init-project.js +15 -0
- package/src/generators/init-plugin/init-project.js.map +1 -0
- package/src/generators/init-plugin/init-workspace.d.ts +3 -0
- package/src/generators/init-plugin/init-workspace.js +10 -0
- package/src/generators/init-plugin/init-workspace.js.map +1 -0
- package/src/generators/init-plugin/update-general-target-defaults.d.ts +2 -0
- package/src/generators/init-plugin/update-general-target-defaults.js +16 -0
- package/src/generators/init-plugin/update-general-target-defaults.js.map +1 -0
- package/src/generators/init-plugin/update-package-json.d.ts +2 -0
- package/src/generators/init-plugin/update-package-json.js +18 -0
- package/src/generators/init-plugin/update-package-json.js.map +1 -0
- package/src/generators/init-plugin/update-project-targets.d.ts +2 -0
- package/src/generators/init-plugin/update-project-targets.js +22 -0
- package/src/generators/init-plugin/update-project-targets.js.map +1 -0
- package/src/generators/init-publishable/generator.js +6 -100
- package/src/generators/init-publishable/generator.js.map +1 -1
- package/src/generators/init-publishable/init-project.d.ts +3 -0
- package/src/generators/init-publishable/init-project.js +32 -0
- package/src/generators/init-publishable/init-project.js.map +1 -0
- package/src/generators/init-publishable/init-workspace.d.ts +3 -0
- package/src/generators/init-publishable/init-workspace.js +10 -0
- package/src/generators/init-publishable/init-workspace.js.map +1 -0
- package/src/generators/init-publishable/update-general-target-defaults.d.ts +2 -0
- package/src/generators/init-publishable/update-general-target-defaults.js +31 -0
- package/src/generators/init-publishable/update-general-target-defaults.js.map +1 -0
- package/src/generators/init-publishable/update-project-package-json.d.ts +3 -0
- package/src/generators/init-publishable/update-project-package-json.js +57 -0
- package/src/generators/init-publishable/update-project-package-json.js.map +1 -0
- package/src/generators/init-publishable/update-project-targets.d.ts +2 -0
- package/src/generators/init-publishable/update-project-targets.js +24 -0
- package/src/generators/init-publishable/update-project-targets.js.map +1 -0
- package/src/index.d.ts +2 -0
- package/src/index.js +5 -1
- package/src/index.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,66 @@
|
|
|
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.1.0-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.9...@rxap/plugin-library@16.1.0-dev.10) (2024-04-07)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- only set license if not defined ([bdfd74b](https://gitlab.com/rxap/packages/commit/bdfd74b6f00a794687782d6bc6d1d0e46cdf75d3))
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
- add index-export option ([801b4a4](https://gitlab.com/rxap/packages/commit/801b4a42034defa9bfe00683c71a04e859063ad0))
|
|
15
|
+
|
|
16
|
+
# [16.1.0-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.8...@rxap/plugin-library@16.1.0-dev.9) (2024-03-31)
|
|
17
|
+
|
|
18
|
+
**Note:** Version bump only for package @rxap/plugin-library
|
|
19
|
+
|
|
20
|
+
# [16.1.0-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.7...@rxap/plugin-library@16.1.0-dev.8) (2024-03-15)
|
|
21
|
+
|
|
22
|
+
**Note:** Version bump only for package @rxap/plugin-library
|
|
23
|
+
|
|
24
|
+
# [16.1.0-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.6...@rxap/plugin-library@16.1.0-dev.7) (2024-03-15)
|
|
25
|
+
|
|
26
|
+
### Features
|
|
27
|
+
|
|
28
|
+
- exclude marked files from index export ([51f2afc](https://gitlab.com/rxap/packages/commit/51f2afc3f30c87e391d7e6fcfc430db411da9d21))
|
|
29
|
+
|
|
30
|
+
# [16.1.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.5...@rxap/plugin-library@16.1.0-dev.6) (2024-03-14)
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
- add missing nx json write ([4de8ffc](https://gitlab.com/rxap/packages/commit/4de8ffc544f169c0a08a087d4b4db207053f7e07))
|
|
35
|
+
|
|
36
|
+
# [16.1.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.4...@rxap/plugin-library@16.1.0-dev.5) (2024-03-11)
|
|
37
|
+
|
|
38
|
+
### Bug Fixes
|
|
39
|
+
|
|
40
|
+
- link dependent project on the fly ([ffb247e](https://gitlab.com/rxap/packages/commit/ffb247eada915b9e547fd63a323fcb9ded9f239c))
|
|
41
|
+
- resolve inverse dependency ([3e06851](https://gitlab.com/rxap/packages/commit/3e06851cd1432f596a4ecf6f34d077eb76d225dc))
|
|
42
|
+
|
|
43
|
+
# [16.1.0-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.3...@rxap/plugin-library@16.1.0-dev.4) (2024-03-09)
|
|
44
|
+
|
|
45
|
+
### Bug Fixes
|
|
46
|
+
|
|
47
|
+
- support complex data properties ([3405885](https://gitlab.com/rxap/packages/commit/34058851b85062956effea40aec201e4581d9780))
|
|
48
|
+
|
|
49
|
+
# [16.1.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.2...@rxap/plugin-library@16.1.0-dev.3) (2024-03-05)
|
|
50
|
+
|
|
51
|
+
### Bug Fixes
|
|
52
|
+
|
|
53
|
+
- add dependent linking targets to task queue ([91f7e18](https://gitlab.com/rxap/packages/commit/91f7e18ad41690a9a63f041726a0a01aea038c4c))
|
|
54
|
+
- link packages into the dist folder ([a28b2d2](https://gitlab.com/rxap/packages/commit/a28b2d29951ca6ce204baf9d9316925c70437bea))
|
|
55
|
+
|
|
56
|
+
### Features
|
|
57
|
+
|
|
58
|
+
- add node-modules-linking executor ([88f3d9c](https://gitlab.com/rxap/packages/commit/88f3d9c1e6259e3620eaf5c9e3e449219afe1cc9))
|
|
59
|
+
|
|
60
|
+
# [16.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.1...@rxap/plugin-library@16.1.0-dev.2) (2024-03-04)
|
|
61
|
+
|
|
62
|
+
### Bug Fixes
|
|
63
|
+
|
|
64
|
+
- generate valid schema ([aff3e0e](https://gitlab.com/rxap/packages/commit/aff3e0e0e340f1f2fbb6d08483a6199a1cabeb32))
|
|
65
|
+
|
|
6
66
|
# [16.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.0...@rxap/plugin-library@16.1.0-dev.1) (2024-02-28)
|
|
7
67
|
|
|
8
68
|
### Features
|
package/README.md
CHANGED
|
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
|
|
|
19
19
|
```
|
|
20
20
|
**Install peer dependencies:**
|
|
21
21
|
```bash
|
|
22
|
-
yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.
|
|
22
|
+
yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.2-dev.0 @rxap/node-utilities@^1.2.0-dev.1 @rxap/plugin-utilities@^16.1.1-dev.4 @rxap/ts-morph@^1.1.0-dev.22 @rxap/utilities@^16.1.0-dev.8 @rxap/workspace-utilities@^16.1.0-dev.5 nx@^16.5.0 ts-morph@^18.0.0 tslib@2.6.2
|
|
23
23
|
```
|
|
24
24
|
**Execute the init generator:**
|
|
25
25
|
```bash
|
|
@@ -224,3 +224,17 @@ yarn nx g @rxap/plugin-library:index-json-schema
|
|
|
224
224
|
}
|
|
225
225
|
```
|
|
226
226
|
|
|
227
|
+
## node-modules-linking
|
|
228
|
+
> node-modules-linking executor
|
|
229
|
+
|
|
230
|
+
**project.json**
|
|
231
|
+
```json
|
|
232
|
+
{
|
|
233
|
+
"targets": {
|
|
234
|
+
"node-modules-linking": {
|
|
235
|
+
"executor": "@rxap/plugin-library:node-modules-linking"
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
```
|
|
240
|
+
|
package/executors.json
CHANGED
|
@@ -24,6 +24,11 @@
|
|
|
24
24
|
"implementation": "./src/executors/check-version/executor",
|
|
25
25
|
"schema": "./src/executors/check-version/schema.json",
|
|
26
26
|
"description": "check-version executor"
|
|
27
|
+
},
|
|
28
|
+
"node-modules-linking": {
|
|
29
|
+
"implementation": "./src/executors/node-modules-linking/executor",
|
|
30
|
+
"schema": "./src/executors/node-modules-linking/schema.json",
|
|
31
|
+
"description": "node-modules-linking executor"
|
|
27
32
|
}
|
|
28
33
|
}
|
|
29
34
|
}
|
package/package.json
CHANGED
|
@@ -1,32 +1,29 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.10",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@apidevtools/json-schema-ref-parser": "9.0.9",
|
|
7
|
+
"colors": "^1.4.0",
|
|
8
|
+
"handlebars": "^4.7.7",
|
|
7
9
|
"ignore": "5.2.4",
|
|
8
10
|
"process": "0.11.10",
|
|
11
|
+
"semver": "^7.5.3",
|
|
9
12
|
"tslib": "2.6.2",
|
|
10
13
|
"yaml": "2.3.1"
|
|
11
14
|
},
|
|
12
15
|
"peerDependencies": {
|
|
13
16
|
"@nx/devkit": "^16.5.0",
|
|
14
|
-
"@rxap/generator-ts-morph": "^1.0.
|
|
15
|
-
"@rxap/
|
|
16
|
-
"@rxap/
|
|
17
|
-
"@rxap/
|
|
18
|
-
"@rxap/
|
|
19
|
-
"@rxap/
|
|
20
|
-
"@rxap/ts-morph": "^1.1.0-dev.2",
|
|
21
|
-
"@rxap/utilities": "^16.1.0-dev.1",
|
|
22
|
-
"@rxap/workspace-utilities": "^16.0.1",
|
|
23
|
-
"handlebars": "^4.7.7",
|
|
17
|
+
"@rxap/generator-ts-morph": "^1.0.2-dev.0",
|
|
18
|
+
"@rxap/node-utilities": "^1.2.0-dev.1",
|
|
19
|
+
"@rxap/plugin-utilities": "^16.1.1-dev.4",
|
|
20
|
+
"@rxap/ts-morph": "^1.1.0-dev.22",
|
|
21
|
+
"@rxap/utilities": "^16.1.0-dev.8",
|
|
22
|
+
"@rxap/workspace-utilities": "^16.1.0-dev.5",
|
|
24
23
|
"nx": "^16.5.0",
|
|
25
|
-
"semver": "^7.5.3",
|
|
26
24
|
"ts-morph": "^18.0.0",
|
|
27
25
|
"tslib": "2.6.2",
|
|
28
|
-
"@rxap/
|
|
29
|
-
"@rxap/workspace-ts-morph": "16.0.2-dev.0"
|
|
26
|
+
"@rxap/workspace-ts-morph": "16.0.2-dev.2"
|
|
30
27
|
},
|
|
31
28
|
"author": {
|
|
32
29
|
"name": "Merzough Münker",
|
|
@@ -50,15 +47,15 @@
|
|
|
50
47
|
"packageGroup": [
|
|
51
48
|
{
|
|
52
49
|
"package": "@rxap/generator-ts-morph",
|
|
53
|
-
"version": "1.0.
|
|
50
|
+
"version": "1.0.2-dev.0"
|
|
54
51
|
},
|
|
55
52
|
{
|
|
56
53
|
"package": "@rxap/generator-utilities",
|
|
57
|
-
"version": "1.1.
|
|
54
|
+
"version": "1.1.1-dev.1"
|
|
58
55
|
},
|
|
59
56
|
{
|
|
60
57
|
"package": "@rxap/node-utilities",
|
|
61
|
-
"version": "1.
|
|
58
|
+
"version": "1.2.0-dev.1"
|
|
62
59
|
},
|
|
63
60
|
{
|
|
64
61
|
"package": "@rxap/plugin-angular",
|
|
@@ -66,11 +63,11 @@
|
|
|
66
63
|
},
|
|
67
64
|
{
|
|
68
65
|
"package": "@rxap/plugin-nestjs",
|
|
69
|
-
"version": "16.
|
|
66
|
+
"version": "16.2.0-dev.0"
|
|
70
67
|
},
|
|
71
68
|
{
|
|
72
69
|
"package": "@rxap/plugin-utilities",
|
|
73
|
-
"version": "16.1.
|
|
70
|
+
"version": "16.1.1-dev.4"
|
|
74
71
|
},
|
|
75
72
|
{
|
|
76
73
|
"package": "@rxap/schematics-utilities",
|
|
@@ -78,15 +75,15 @@
|
|
|
78
75
|
},
|
|
79
76
|
{
|
|
80
77
|
"package": "@rxap/ts-morph",
|
|
81
|
-
"version": "1.1.0-dev.
|
|
78
|
+
"version": "1.1.0-dev.22"
|
|
82
79
|
},
|
|
83
80
|
{
|
|
84
81
|
"package": "@rxap/utilities",
|
|
85
|
-
"version": "16.1.0-dev.
|
|
82
|
+
"version": "16.1.0-dev.8"
|
|
86
83
|
},
|
|
87
84
|
{
|
|
88
85
|
"package": "@rxap/workspace-utilities",
|
|
89
|
-
"version": "16.0.
|
|
86
|
+
"version": "16.1.0-dev.5"
|
|
90
87
|
}
|
|
91
88
|
]
|
|
92
89
|
},
|
|
@@ -101,7 +98,7 @@
|
|
|
101
98
|
},
|
|
102
99
|
"schematics": "./generators.json",
|
|
103
100
|
"type": "commonjs",
|
|
104
|
-
"gitHead": "
|
|
101
|
+
"gitHead": "58b5fef9136ddc5664431a48e3efc9095c716952",
|
|
105
102
|
"main": "./src/index.js",
|
|
106
103
|
"types": "./src/index.d.ts"
|
|
107
104
|
}
|
|
@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
5
5
|
const semver_1 = require("semver");
|
|
6
6
|
function runExecutor(options, context) {
|
|
7
|
-
var _a;
|
|
7
|
+
var _a, _b, _c;
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
console.log('Executor ran for CheckVersion', options);
|
|
10
10
|
const projectJson = (0, plugin_utilities_1.readPackageJsonForProject)(context);
|
|
11
11
|
const rootPackageJson = (0, plugin_utilities_1.readPackageJsonForProject)(context, 'workspace');
|
|
12
|
-
let targetVersion = (_a = rootPackageJson.devDependencies[options.packageName]) !== null &&
|
|
12
|
+
let targetVersion = (_b = (_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[options.packageName]) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.dependencies) === null || _c === void 0 ? void 0 : _c[options.packageName];
|
|
13
13
|
if (!targetVersion) {
|
|
14
14
|
console.error(`The package ${options.packageName} is not installed in the root package.json`);
|
|
15
15
|
return {
|
|
@@ -20,7 +20,19 @@ function runExecutor(options, context) {
|
|
|
20
20
|
console.log(`Current '${options.packageName}' version: ${targetVersion}`);
|
|
21
21
|
console.log(`Project version: ${projectJson.version}`);
|
|
22
22
|
const version = (0, semver_1.parse)(targetVersion);
|
|
23
|
+
if (!version) {
|
|
24
|
+
console.error(`Can't parse version: ${targetVersion}`);
|
|
25
|
+
return {
|
|
26
|
+
success: false,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
23
29
|
const versionRange = `>=${version.major}`;
|
|
30
|
+
if (!projectJson.version) {
|
|
31
|
+
console.error(`The project version is not defined`);
|
|
32
|
+
return {
|
|
33
|
+
success: false,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
24
36
|
const normalizedVersion = projectJson.version.replace(/-.*$/, '');
|
|
25
37
|
if (!(0, semver_1.satisfies)(normalizedVersion, versionRange)) {
|
|
26
38
|
console.error(`The project version '${projectJson.version}' normalized '${normalizedVersion}' is not compatible with the '${options.packageName}' version '${targetVersion}' with the range '${versionRange}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/check-version/executor.ts"],"names":[],"mappings":";;;AACA,6DAAmE;AACnE,mCAGgB;AAGhB,SAA8B,WAAW,CACvC,OAAmC,EACnC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAA,4CAAyB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAExE,IAAI,aAAa,GAAG,MAAA,eAAe,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/check-version/executor.ts"],"names":[],"mappings":";;;AACA,6DAAmE;AACnE,mCAGgB;AAGhB,SAA8B,WAAW,CACvC,OAAmC,EACnC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAA,4CAAyB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAExE,IAAI,aAAa,GAAG,MAAA,MAAA,eAAe,CAAC,eAAe,0CAAG,OAAO,CAAC,WAAW,CAAC,mCACxE,MAAA,eAAe,CAAC,YAAY,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAEtD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,eAAgB,OAAO,CAAC,WAAY,4CAA4C,CAAC,CAAC;YAChG,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEnD,OAAO,CAAC,GAAG,CAAC,YAAa,OAAO,CAAC,WAAY,cAAe,aAAc,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,oBAAqB,WAAW,CAAC,OAAQ,EAAE,CAAC,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC;QAErC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,wBAAyB,aAAc,EAAE,CAAC,CAAC;YACzD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,MAAM,YAAY,GAAG,KAAM,OAAO,CAAC,KAAM,EAAE,CAAC;QAE5C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,IAAA,kBAAS,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE;YAC/C,OAAO,CAAC,KAAK,CAAC,wBAAyB,WAAW,CAAC,OAAQ,iBAAkB,iBAAkB,iCAAkC,OAAO,CAAC,WAAY,cAAe,aAAc,qBAAsB,YAAa,GAAG,CAAC,CAAC;YAC1N,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;gBACjC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBACjD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aAC1B;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA1DD,8BA0DC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
function createSymlink(target, link) {
|
|
8
|
+
try {
|
|
9
|
+
(0, fs_1.symlinkSync)(target, link, 'junction'); // 'junction' for directories on Windows, use 'dir' for POSIX
|
|
10
|
+
console.log(`Symlink created: ${link} -> ${target}`);
|
|
11
|
+
}
|
|
12
|
+
catch (error) {
|
|
13
|
+
console.error('Error creating symlink:', error);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
function checkSymlinkExists(linkPath) {
|
|
17
|
+
try {
|
|
18
|
+
const stats = (0, fs_1.lstatSync)(linkPath);
|
|
19
|
+
return stats.isSymbolicLink();
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
if (error.code === 'ENOENT') {
|
|
23
|
+
// Link does not exist
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
throw error; // Rethrow if it's an unexpected error
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
function runExecutor(options, context) {
|
|
30
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
31
|
+
console.log('Executor ran for NodeModulesLinking', options);
|
|
32
|
+
const outputPath = (0, plugin_utilities_1.GuessOutputPathFromContext)(context);
|
|
33
|
+
const packageJsonPath = (0, path_1.join)(context.root, outputPath, 'package.json');
|
|
34
|
+
if (!(0, fs_1.existsSync)(packageJsonPath)) {
|
|
35
|
+
console.log('package.json does not exist at', packageJsonPath);
|
|
36
|
+
return { success: false };
|
|
37
|
+
}
|
|
38
|
+
const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, 'utf-8'));
|
|
39
|
+
const packageName = packageJson.name.replace(/@rxap\//, '');
|
|
40
|
+
const nodeModulesDir = (0, path_1.join)(context.root, 'dist', 'node_modules', '@rxap');
|
|
41
|
+
(0, fs_1.mkdirSync)(nodeModulesDir, { recursive: true });
|
|
42
|
+
const link = (0, path_1.join)(nodeModulesDir, packageName);
|
|
43
|
+
const target = (0, path_1.join)('../../../', outputPath);
|
|
44
|
+
if (!checkSymlinkExists(link)) {
|
|
45
|
+
console.log('Creating symlink:', link, '->', target);
|
|
46
|
+
createSymlink(target, link);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
console.log('Symlink already exists:', link);
|
|
50
|
+
}
|
|
51
|
+
return {
|
|
52
|
+
success: true,
|
|
53
|
+
};
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
exports.default = runExecutor;
|
|
57
|
+
//# sourceMappingURL=executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/node-modules-linking/executor.ts"],"names":[],"mappings":";;;AACA,6DAAoE;AACpE,2BAMY;AACZ,+BAA4B;AAG5B,SAAS,aAAa,CAAC,MAAc,EAAE,IAAY;IACjD,IAAI;QACF,IAAA,gBAAW,EAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,6DAA6D;QACpG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,MAAM,EAAE,CAAC,CAAC;KACtD;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,IAAI;QACF,MAAM,KAAK,GAAG,IAAA,cAAS,EAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,KAAK,CAAC,cAAc,EAAE,CAAC;KAC/B;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,sBAAsB;YACtB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,KAAK,CAAC,CAAC,sCAAsC;KACpD;AACH,CAAC;AAED,SAA8B,WAAW,CACvC,OAAyC,EACzC,OAAwB;;QAExB,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,UAAU,GAAG,IAAA,6CAA0B,EAAC,OAAO,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QAEvE,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,eAAe,CAAC,CAAC;YAC/D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAC3E,IAAA,cAAS,EAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE/C,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAE7C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YAC7B,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACrD,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SAC7B;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;SAC9C;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AAhCD,8BAgCC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export interface NodeModulesLinkingExecutorSchema {} // eslint-disable-line
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/readme/executor.ts"],"names":[],"mappings":";;;AAAA,yGAA6D;AAC7D,uCAGoB;AACpB,6DAKgC;AAChC,+CAGyB;AACzB,+DAAyC;AACzC,+BAIc;AAGd,SAAS,kBAAkB,CAAC,OAAwB;IAClD,sEAAsE;IACtE,OAAO,IAAA,0CAAuB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAwB;IAChD,OAAO,IAAA,0CAAuB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,WAAW,CAAC,OAAwB;IAC3C,MAAM,kBAAkB,GAAG,IAAA,0CAAuB,EAAC,OAAO,EAAE,sBAAsB,EAAE,IAAI,CAAC,CAAC;IAE1F,OAAO,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAChD,CAAC;AAcD,SAAe,eAAe,CAC5B,OAAwB,EACxB,MAA6B,EAC7B,QAAgB;;;QAGhB,MAAM,GAAG,MAAM,gCAAU,CAAC,MAAM,CAAC,MAAM,EAAE;YACvC,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE;oBACJ,OAAO,EAAE,eAAe;oBACxB,IAAI,CACF,IAAyB;wBAEzB,0EAA0E;wBAC1E,+EAA+E;wBAC/E,iFAAiF;wBACjF,iFAAiF;wBACjF,0DAA0D;wBAC1D,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;wBACrD,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;wBACnD,OAAO,IAAA,0CAAuB,EAAC,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;oBAChE,CAAC;iBACF;aACF;SACF,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;YACvB,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC/B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC5B,MAAM,CAAC,UAAU,GAAG,IAAA,qBAAS,EAAC,MAAM,CAAC,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;oBACxE,MAAM,CAAC,QAAQ,GAAG;wBAChB,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,CACrB,OAAO,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAC9D;qBACF,CAAC,MAAM,CAAC,IAAA,kBAAM,GAAE,CAAC,CAAC;iBACpB;aACF;SACF;QAED,8CAA8C;QAC9C,MAAA,MAAM,CAAC,UAAU,oCAAjB,MAAM,CAAC,UAAU,GAAK,EAAE,EAAC;QAEzB,OAAO,MAAM,CAAC;;CACf;AAED,SAAe,aAAa,CAAC,OAAwB;;;QACnD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,EAAE,CAAC;SACX;QACD,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAG,IAAA,qBAAY,EAAoD,IAAA,WAAI,EACzF,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,UAAU,CACX,CAAC,CAAC;QACH,MAAM,aAAa,GAAgB,EAAE,CAAC;QACtC,KAAK,MAAM,CAAE,SAAS,EAAE,MAAM,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,cAAc,CAAC,UAAU,mCAAI,EAAE,CAAC,EAAE;YACnF,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,MAAM,EAAE,MAAM,eAAe,CAC3B,OAAO,EAAE,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAA,cAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aACjG,CAAC,CAAC;SACJ;QACD,OAAO,aAAa,CAAC;;CACtB;AAED,SAAe,aAAa,CAAC,OAAwB;;;QACnD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,EAAE,CAAC;SACX;QACD,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAG,IAAA,qBAAY,EAAoD,IAAA,WAAI,EACzF,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,UAAU,CACX,CAAC,CAAC;QACH,MAAM,aAAa,GAAgB,EAAE,CAAC;QACtC,KAAK,MAAM,CAAE,SAAS,EAAE,MAAM,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,cAAc,CAAC,UAAU,mCAAI,EAAE,CAAC,EAAE;YACnF,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,MAAM,EAAE,MAAM,eAAe,CAC3B,OAAO,EAAE,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAA,cAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aACjG,CAAC,CAAC;SACJ;QACD,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,CAAE,GAAG,aAAa,EAAE,GAAG,aAAa,CAAE,CAAC;;CAC/C;AAED,SAAe,WAAW,CAAC,OAAwB;;;QACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,IAAA,qBAAY,EAAkD,IAAA,WAAI,EACrF,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,QAAQ,CACT,CAAC,CAAC;QACH,MAAM,WAAW,GAAe,EAAE,CAAC;QACnC,KAAK,MAAM,CAAE,OAAO,EAAE,MAAM,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE,CAAC,EAAE;YAC7E,WAAW,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,MAAM,EAAE,MAAM,eAAe,CAC3B,OAAO,EAAE,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAA,cAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aACjG,CAAC,CAAC;SACJ;QACD,OAAO,WAAW,CAAC;;CACpB;AAED,SAAe,YAAY,CAAC,OAAwB;;;QAClD,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,EAAE,CAAC;SACX;QACD,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,IAAA,qBAAY,EAAmD,IAAA,WAAI,EACvF,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,SAAS,CACV,CAAC,CAAC;QACH,MAAM,YAAY,GAAe,EAAE,CAAC;QACpC,KAAK,MAAM,CAAE,QAAQ,EAAE,MAAM,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,aAAa,CAAC,SAAS,mCAAI,EAAE,CAAC,EAAE;YAChF,YAAY,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,MAAM,EAAE,MAAM,eAAe,CAC3B,OAAO,EAAE,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAA,cAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aACjG,CAAC,CAAC;SACJ;QACD,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;QAC/C,OAAO,CAAE,GAAG,YAAY,EAAE,GAAG,WAAW,CAAE,CAAC;;CAC5C;AAED,SAAS,qBAAqB,CAAC,OAAwB;;IACrD,MAAM,WAAW,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;IACvD,MAAM,kBAAkB,GAA6C,EAAE,CAAC;IAExE,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CACnD,MAAA,WAAW,CAAC,gBAAgB,mCAAI,EAAE,CACnC,EAAE;QACD,kBAAkB,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,WAAW;YACjB,OAAO;SACR,CAAC,CAAC;KACJ;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,UAAU,CAAC,cAAc,CAAC,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/readme/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,8 +64,8 @@ function extractFlattenOptions(options) {
|
|
|
64
64
|
return extracted;
|
|
65
65
|
}
|
|
66
66
|
function runExecutor(options, context) {
|
|
67
|
-
var _a, _b;
|
|
68
|
-
var
|
|
67
|
+
var _a, _b, _c;
|
|
68
|
+
var _d;
|
|
69
69
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
70
70
|
console.log('Executor ran for RunGenerator', options);
|
|
71
71
|
let command = `nx g ${options.generator}`;
|
|
@@ -76,14 +76,29 @@ function runExecutor(options, context) {
|
|
|
76
76
|
}
|
|
77
77
|
(_a = options.options) !== null && _a !== void 0 ? _a : (options.options = {});
|
|
78
78
|
if (!options.withoutProjectArgument) {
|
|
79
|
-
(_b = (
|
|
79
|
+
(_b = (_d = options.options)['project']) !== null && _b !== void 0 ? _b : (_d['project'] = context.projectName);
|
|
80
|
+
}
|
|
81
|
+
if (!context.projectName) {
|
|
82
|
+
console.error(`No project name found in the context`);
|
|
83
|
+
return {
|
|
84
|
+
success: false,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
if (!context.targetName) {
|
|
88
|
+
console.error(`No target name found in the context`);
|
|
89
|
+
return {
|
|
90
|
+
success: false,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
if (!context.configurationName) {
|
|
94
|
+
console.warn(`No configuration name found in the context`);
|
|
80
95
|
}
|
|
81
96
|
stringInterpolation(options.options, {
|
|
82
97
|
workspaceRoot: context.root,
|
|
83
98
|
projectRoot: (0, plugin_utilities_1.GetProjectRoot)(context),
|
|
84
99
|
projectSourceRoot: (0, plugin_utilities_1.GetProjectSourceRoot)(context),
|
|
85
100
|
projectName: context.projectName,
|
|
86
|
-
configurationName: context.configurationName,
|
|
101
|
+
configurationName: (_c = context.configurationName) !== null && _c !== void 0 ? _c : '',
|
|
87
102
|
cwd: context.cwd,
|
|
88
103
|
targetName: context.targetName,
|
|
89
104
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,14 +7,32 @@ const utilities_1 = require("@rxap/utilities");
|
|
|
7
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const generator_1 = require("../index-json-schema/generator");
|
|
10
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Remove the definitions and $id and $schema properties from the schema and normalize the $ref properties to only have
|
|
12
|
+
* the prefix '#/definitions/' before the definition name
|
|
13
|
+
* @param tree
|
|
14
|
+
* @param projectSourceRoot
|
|
15
|
+
* @param $ref
|
|
16
|
+
*/
|
|
17
|
+
function loadCleanDefinition(tree, projectSourceRoot, { $ref }) {
|
|
11
18
|
const filePath = (0, path_1.join)(projectSourceRoot, $ref);
|
|
12
19
|
if (!tree.exists(filePath)) {
|
|
13
20
|
throw new Error(`The file '${filePath}' does not exist!`);
|
|
14
21
|
}
|
|
15
22
|
const schema = JSON.parse(tree.read(filePath).toString());
|
|
23
|
+
return cleanupDefinition(schema);
|
|
24
|
+
}
|
|
25
|
+
function cleanupDefinition(schema) {
|
|
16
26
|
if (schema['definitions']) {
|
|
17
|
-
|
|
27
|
+
schema['definitions'] = Object.entries(schema['definitions']).reduce((acc, [key, value]) => {
|
|
28
|
+
if (!value['$ref']) {
|
|
29
|
+
acc[key] = cleanupDefinition(value);
|
|
30
|
+
}
|
|
31
|
+
return acc;
|
|
32
|
+
}, {});
|
|
33
|
+
if (Object.keys(schema['definitions']).length === 0) {
|
|
34
|
+
delete schema['definitions'];
|
|
35
|
+
}
|
|
18
36
|
}
|
|
19
37
|
if (schema['$schema']) {
|
|
20
38
|
delete schema['$schema'];
|
|
@@ -25,27 +43,25 @@ function resolveDefinition(tree, projectSourceRoot, { $ref }) {
|
|
|
25
43
|
for (const { key, value, propertyPath, parent } of (0, utilities_1.EachProperty)(schema)) {
|
|
26
44
|
if (key === '$ref') {
|
|
27
45
|
if (typeof value === 'string') {
|
|
28
|
-
parent[key] = value.replace(/^#\/definitions\//, '#/definitions/');
|
|
46
|
+
(parent !== null && parent !== void 0 ? parent : schema)[key] = value.replace(/^#\/definitions\//, '#/definitions/');
|
|
29
47
|
}
|
|
30
48
|
}
|
|
31
49
|
}
|
|
32
|
-
// removeProperty(schema, 'definitions');
|
|
33
|
-
// removeProperty(schema, '$id');
|
|
34
|
-
// removeProperty(schema, '$schema');
|
|
35
50
|
return schema;
|
|
36
51
|
}
|
|
37
|
-
function
|
|
52
|
+
function getCleanDefinitionMap(tree, projectSourceRoot, definitions) {
|
|
38
53
|
const resolvedDefinitions = {};
|
|
39
54
|
for (const [key, definition] of Object.entries(definitions)) {
|
|
40
|
-
resolvedDefinitions[key] =
|
|
55
|
+
resolvedDefinitions[key] = loadCleanDefinition(tree, projectSourceRoot, definition);
|
|
41
56
|
}
|
|
42
57
|
return resolvedDefinitions;
|
|
43
58
|
}
|
|
44
59
|
function bundleJsonSchemaGenerator(tree, options) {
|
|
60
|
+
var _a;
|
|
45
61
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
46
62
|
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, options.project);
|
|
47
63
|
const workspaceRoot = tree.root;
|
|
48
|
-
const definitions =
|
|
64
|
+
const definitions = getCleanDefinitionMap(tree, projectSourceRoot, (0, generator_1.GenerateDefinitionsMap)(tree, options));
|
|
49
65
|
for (const file of (0, workspace_utilities_1.SearchFile)(tree, projectSourceRoot)) {
|
|
50
66
|
if (file.path.endsWith('template.schema.json')) {
|
|
51
67
|
const relativePathFromProjectSourceRoot = (0, path_1.dirname)((0, path_1.relative)(projectSourceRoot, file.path));
|
|
@@ -76,6 +92,11 @@ function bundleJsonSchemaGenerator(tree, options) {
|
|
|
76
92
|
// removeProperty(bundledSchema, '$schema');
|
|
77
93
|
bundledSchema['definitions'] = Object.assign(Object.assign({}, bundledSchema['definitions']), definitions);
|
|
78
94
|
fixNestaedDefinitions(bundledSchema);
|
|
95
|
+
for (const [, definition] of Object.entries(bundledSchema['definitions'])) {
|
|
96
|
+
cleanupDefinition(definition);
|
|
97
|
+
}
|
|
98
|
+
(_a = bundledSchema['definitions']) !== null && _a !== void 0 ? _a : (bundledSchema['definitions'] = {});
|
|
99
|
+
bundledSchema['definitions'] = Object.entries(bundledSchema['definitions']).sort(([a], [b]) => a.localeCompare(b)).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [key]: value })), {});
|
|
79
100
|
tree.write(file.path.replace('template.schema.json', 'schema.json'), JSON.stringify(bundledSchema, null, 2));
|
|
80
101
|
}
|
|
81
102
|
}
|
|
@@ -122,7 +143,9 @@ function fixNestaedDefinitions(schema) {
|
|
|
122
143
|
(0, utilities_1.CoerceArrayItems)(usedDefinitions, getUsedDefinitions(item));
|
|
123
144
|
}
|
|
124
145
|
let removeList = Object.keys(schema.definitions).filter((key) => !usedDefinitions.includes(key));
|
|
125
|
-
|
|
146
|
+
let removeListLength = 0;
|
|
147
|
+
do {
|
|
148
|
+
removeListLength = removeList.length;
|
|
126
149
|
// check for each definition that will not be removed if it is using another definition that should be removed
|
|
127
150
|
// if yes remove this from the list of definitions to remove
|
|
128
151
|
for (const [key, item] of Object.entries((_a = schema.definitions) !== null && _a !== void 0 ? _a : {})) {
|
|
@@ -132,7 +155,7 @@ function fixNestaedDefinitions(schema) {
|
|
|
132
155
|
(0, utilities_1.CoerceArrayItems)(usedDefinitions, getUsedDefinitions(item));
|
|
133
156
|
}
|
|
134
157
|
removeList = removeList.filter((key) => !usedDefinitions.includes(key));
|
|
135
|
-
}
|
|
158
|
+
} while (removeListLength !== removeList.length);
|
|
136
159
|
for (const key of removeList) {
|
|
137
160
|
delete schema.definitions[key];
|
|
138
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/bundle-json-schema/generator.ts"],"names":[],"mappings":";;;;AAAA,yGAA6D;AAE7D,+
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/bundle-json-schema/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.exposeAsSchematicGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
7
6
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
7
|
const path_1 = require("path");
|
|
9
8
|
function skipProject(tree, options, project, projectName) {
|
|
10
|
-
if ((0,
|
|
9
|
+
if ((0, workspace_utilities_1.SkipNonGeneratorsProject)(tree, options, project, projectName)) {
|
|
11
10
|
return true;
|
|
12
11
|
}
|
|
13
12
|
return false;
|
|
@@ -20,7 +19,7 @@ function exposeAsSchematicGenerator(tree, options) {
|
|
|
20
19
|
continue;
|
|
21
20
|
}
|
|
22
21
|
console.log(`expose as schematic for project: ${projectName}`);
|
|
23
|
-
(0,
|
|
22
|
+
(0, workspace_utilities_1.UpdateGenerators)(tree, project, (generators) => {
|
|
24
23
|
var _a;
|
|
25
24
|
(_a = generators.schematics) !== null && _a !== void 0 ? _a : (generators.schematics = {});
|
|
26
25
|
for (const [name, generator] of Object.entries(generators.generators)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/expose-as-schematic/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/expose-as-schematic/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAImC;AACnC,+BAGc;AAGd,SAAS,WAAW,CAClB,IAAU,EACV,OAAyC,EACzC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,8CAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QACjE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAAyC;;QAEzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,oCAAqC,WAAY,EAAE,CAAC,CAAC;YAEjE,IAAA,sCAAgB,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;;gBAE7C,MAAA,UAAU,CAAC,UAAU,oCAArB,UAAU,CAAC,UAAU,GAAK,EAAE,EAAC;gBAE7B,KAAK,MAAM,CAAE,IAAI,EAAE,SAAS,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;oBACvE,IAAI,CAAC,KAAK,CACR,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,EACzD,yKAAyK,CAC1K,CAAC;oBACF,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;wBAC5B,OAAO,EAAE,GAAI,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAE,QAAQ;wBAC/C,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,WAAW,EAAE,SAAS,CAAC,WAAW;qBACnC,CAAC;iBACH;gBAED,OAAO,UAAU,CAAC;YAEpB,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;gBACnD,WAAW,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;YACxD,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;SAErB;IACH,CAAC;CAAA;AAvCD,gEAuCC;AAED,kBAAe,0BAA0B,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Tree } from '@nx/devkit';
|
|
2
2
|
import { ProjectPackageJson } from '@rxap/plugin-utilities';
|
|
3
|
+
import { Dependency } from '@rxap/workspace-utilities';
|
|
3
4
|
import { FixDependenciesGeneratorSchema } from './schema';
|
|
4
|
-
export declare function resolveLatestPackageVersion(packageName: string): Promise<string>;
|
|
5
|
+
export declare function resolveLatestPackageVersion(packageName: string): Promise<string | null>;
|
|
5
6
|
export declare function replaceLatestPackageVersionForProject(tree: Tree, projectName: string): Promise<void>;
|
|
6
|
-
export declare function removePackageFromDependencies(packageName: string, dependencies:
|
|
7
|
+
export declare function removePackageFromDependencies(packageName: string, dependencies: Dependency | undefined): void;
|
|
7
8
|
export declare function removeSelfReferenceFromDependencies(projectName: string, { dependencies, peerDependencies, devDependencies, optionalDependencies, }: ProjectPackageJson): void;
|
|
8
9
|
/**
|
|
9
10
|
* This generator tries to fix the dependencies in the project.json of the project
|