@rxap/schematic-composer 16.1.0-dev.2 → 16.1.0-dev.4
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 +19 -19
- package/src/schematics/compose/index.js +17 -8
- package/src/schematics/compose/index.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
|
+
# [16.1.0-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@16.1.0-dev.3...@rxap/schematic-composer@16.1.0-dev.4) (2024-04-03)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- ensure add packages are installed ([a842e7f](https://gitlab.com/rxap/packages/commit/a842e7f60fa16885159ad4cec6f1536a3be8a004))
|
|
11
|
+
|
|
12
|
+
# [16.1.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@16.1.0-dev.2...@rxap/schematic-composer@16.1.0-dev.3) (2024-04-03)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- support schematics without project parameter ([3a054cc](https://gitlab.com/rxap/packages/commit/3a054ccaea181f6bd4f158bbcbdc5ee472546c64))
|
|
17
|
+
|
|
6
18
|
# [16.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@16.1.0-dev.1...@rxap/schematic-composer@16.1.0-dev.2) (2024-04-01)
|
|
7
19
|
|
|
8
20
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematic-composer
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.24 @rxap/schematics-utilities@^16.0
|
|
20
|
+
yarn add @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.24 @rxap/schematics-utilities@^16.1.0-dev.0 @rxap/utilities@^16.1.0-dev.8 @rxap/workspace-utilities@^16.1.0-dev.7 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.4",
|
|
3
3
|
"name": "@rxap/schematic-composer",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -15,33 +15,33 @@
|
|
|
15
15
|
"peerDependencies": {
|
|
16
16
|
"@angular-devkit/schematics": "^16.1.4",
|
|
17
17
|
"@rxap/schematics-ts-morph": "^16.1.0-dev.24",
|
|
18
|
-
"@rxap/schematics-utilities": "^16.0
|
|
18
|
+
"@rxap/schematics-utilities": "^16.1.0-dev.0",
|
|
19
19
|
"@rxap/utilities": "^16.1.0-dev.8",
|
|
20
|
-
"@rxap/workspace-utilities": "^16.1.0-dev.
|
|
20
|
+
"@rxap/workspace-utilities": "^16.1.0-dev.7",
|
|
21
21
|
"tslib": "2.6.2",
|
|
22
22
|
"@apidevtools/json-schema-ref-parser": "9.0.9",
|
|
23
23
|
"@rxap/generator-ts-morph": "1.0.2-dev.0",
|
|
24
24
|
"@rxap/json-schema-to-typescript": "16.0.1-dev.5",
|
|
25
25
|
"@rxap/mixin": "16.0.1-dev.1",
|
|
26
26
|
"@rxap/node-utilities": "1.2.0-dev.1",
|
|
27
|
-
"@rxap/plugin-angular": "16.2.0-dev.
|
|
28
|
-
"@rxap/plugin-application": "16.2.0-dev.
|
|
27
|
+
"@rxap/plugin-angular": "16.2.0-dev.5",
|
|
28
|
+
"@rxap/plugin-application": "16.2.0-dev.4",
|
|
29
29
|
"@rxap/plugin-docker": "16.1.0-dev.9",
|
|
30
30
|
"@rxap/plugin-gitlab-ci": "16.1.0",
|
|
31
31
|
"@rxap/plugin-gpt": "16.0.2-dev.1",
|
|
32
32
|
"@rxap/plugin-library": "16.1.0-dev.9",
|
|
33
33
|
"@rxap/plugin-localazy": "16.1.1-dev.2",
|
|
34
|
-
"@rxap/plugin-nestjs": "16.2.0-dev.
|
|
35
|
-
"@rxap/plugin-open-api": "16.
|
|
34
|
+
"@rxap/plugin-nestjs": "16.2.0-dev.11",
|
|
35
|
+
"@rxap/plugin-open-api": "16.2.0-dev.0",
|
|
36
36
|
"@rxap/plugin-utilities": "16.1.1-dev.4",
|
|
37
37
|
"@rxap/plugin-web3-storage": "16.0.2-dev.0",
|
|
38
|
-
"@rxap/plugin-workspace": "16.2.0-dev.
|
|
38
|
+
"@rxap/plugin-workspace": "16.2.0-dev.6",
|
|
39
39
|
"@rxap/reflect-metadata": "1.0.2-dev.1",
|
|
40
40
|
"@rxap/schematic-angular": "16.2.0-dev.53",
|
|
41
41
|
"@rxap/schematic-nestjs": "16.0.2-dev.6",
|
|
42
42
|
"@rxap/schematics-open-api": "16.0.1-dev.0",
|
|
43
43
|
"@rxap/schematics-xml-parser": "16.0.1-dev.1",
|
|
44
|
-
"@rxap/ts-morph": "1.1.0-dev.
|
|
44
|
+
"@rxap/ts-morph": "1.1.0-dev.24",
|
|
45
45
|
"@rxap/workspace-open-api": "16.0.2-dev.2",
|
|
46
46
|
"@rxap/workspace-ts-morph": "16.0.2-dev.2",
|
|
47
47
|
"@rxap/xml-parser": "16.0.1-dev.1",
|
|
@@ -76,15 +76,15 @@
|
|
|
76
76
|
"packageGroup": [
|
|
77
77
|
{
|
|
78
78
|
"package": "@rxap/plugin-angular",
|
|
79
|
-
"version": "16.2.0-dev.
|
|
79
|
+
"version": "16.2.0-dev.4"
|
|
80
80
|
},
|
|
81
81
|
{
|
|
82
82
|
"package": "@rxap/plugin-application",
|
|
83
|
-
"version": "16.2.0-dev.
|
|
83
|
+
"version": "16.2.0-dev.4"
|
|
84
84
|
},
|
|
85
85
|
{
|
|
86
86
|
"package": "@rxap/plugin-docker",
|
|
87
|
-
"version": "16.1.0-dev.
|
|
87
|
+
"version": "16.1.0-dev.9"
|
|
88
88
|
},
|
|
89
89
|
{
|
|
90
90
|
"package": "@rxap/plugin-gitlab-ci",
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
},
|
|
105
105
|
{
|
|
106
106
|
"package": "@rxap/plugin-nestjs",
|
|
107
|
-
"version": "16.2.0-dev.
|
|
107
|
+
"version": "16.2.0-dev.10"
|
|
108
108
|
},
|
|
109
109
|
{
|
|
110
110
|
"package": "@rxap/plugin-open-api",
|
|
@@ -120,15 +120,15 @@
|
|
|
120
120
|
},
|
|
121
121
|
{
|
|
122
122
|
"package": "@rxap/plugin-workspace",
|
|
123
|
-
"version": "16.2.0-dev.
|
|
123
|
+
"version": "16.2.0-dev.6"
|
|
124
124
|
},
|
|
125
125
|
{
|
|
126
126
|
"package": "@rxap/schematic-angular",
|
|
127
|
-
"version": "16.2.0-dev.
|
|
127
|
+
"version": "16.2.0-dev.53"
|
|
128
128
|
},
|
|
129
129
|
{
|
|
130
130
|
"package": "@rxap/schematic-nestjs",
|
|
131
|
-
"version": "16.0.2-dev.
|
|
131
|
+
"version": "16.0.2-dev.6"
|
|
132
132
|
},
|
|
133
133
|
{
|
|
134
134
|
"package": "@rxap/schematics-open-api",
|
|
@@ -140,7 +140,7 @@
|
|
|
140
140
|
},
|
|
141
141
|
{
|
|
142
142
|
"package": "@rxap/schematics-utilities",
|
|
143
|
-
"version": "16.0
|
|
143
|
+
"version": "16.1.0-dev.0"
|
|
144
144
|
},
|
|
145
145
|
{
|
|
146
146
|
"package": "@rxap/schematics-xml-parser",
|
|
@@ -152,7 +152,7 @@
|
|
|
152
152
|
},
|
|
153
153
|
{
|
|
154
154
|
"package": "@rxap/workspace-utilities",
|
|
155
|
-
"version": "16.1.0-dev.
|
|
155
|
+
"version": "16.1.0-dev.7"
|
|
156
156
|
}
|
|
157
157
|
]
|
|
158
158
|
},
|
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
},
|
|
168
168
|
"schematics": "./collection.json",
|
|
169
169
|
"type": "commonjs",
|
|
170
|
-
"gitHead": "
|
|
170
|
+
"gitHead": "0276631a9cfe70681ea9081a434744cf07e4ee6c",
|
|
171
171
|
"main": "./src/index.js",
|
|
172
172
|
"types": "./src/index.d.ts"
|
|
173
173
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
4
5
|
const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
|
|
5
6
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
6
7
|
const utilities_1 = require("@rxap/utilities");
|
|
@@ -64,10 +65,7 @@ function executeSchematicCommandFile(host, schematicCommandFilePath, globalOptio
|
|
|
64
65
|
const options = Object.assign(Object.assign({}, globalOptions), command.options);
|
|
65
66
|
(_a = options.project) !== null && _a !== void 0 ? _a : (options.project = detectedProject(host, schematicCommandFilePath));
|
|
66
67
|
(_b = options.feature) !== null && _b !== void 0 ? _b : (options.feature = detectedFeature(schematicCommandFilePath));
|
|
67
|
-
if (
|
|
68
|
-
throw new schematics_1.SchematicsException(`The project option is required for the schematic command file '${schematicCommandFilePath}'`);
|
|
69
|
-
}
|
|
70
|
-
if ((0, schematics_utilities_1.HasProjectSourceRoot)(host, options.project)) {
|
|
68
|
+
if (options.project && (0, schematics_utilities_1.HasProjectSourceRoot)(host, options.project)) {
|
|
71
69
|
const projectSourceRoot = (0, schematics_utilities_1.GetProjectSourceRoot)(host, options.project);
|
|
72
70
|
const directoryParts = (0, path_1.relative)(projectSourceRoot, (0, path_1.dirname)(schematicCommandFilePath).replace(/^\//, '')).split('/');
|
|
73
71
|
if (options.feature) {
|
|
@@ -204,14 +202,25 @@ function default_1(options) {
|
|
|
204
202
|
feature: feature !== null && feature !== void 0 ? feature : undefined,
|
|
205
203
|
};
|
|
206
204
|
return (host) => {
|
|
205
|
+
let rule;
|
|
207
206
|
if (project) {
|
|
208
207
|
if (feature) {
|
|
209
|
-
|
|
208
|
+
rule = forFeature(host, project, feature, globalOptions, filter);
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
rule = forProject(host, project, globalOptions, filter);
|
|
210
212
|
}
|
|
211
|
-
return forProject(host, project, globalOptions, filter);
|
|
212
213
|
}
|
|
213
|
-
|
|
214
|
-
|
|
214
|
+
else {
|
|
215
|
+
rule = forWorkspace(host, globalOptions, filter);
|
|
216
|
+
}
|
|
217
|
+
return (0, schematics_1.chain)([
|
|
218
|
+
rule,
|
|
219
|
+
(0, schematics_utilities_1.AddPackageJsonDevDependencyRule)('@rxap/schematic-composer', 'latest', { soft: true }),
|
|
220
|
+
(_, context) => {
|
|
221
|
+
context.addTask(new tasks_1.NodePackageInstallTask({ packageManager: 'yarn' }));
|
|
222
|
+
},
|
|
223
|
+
]);
|
|
215
224
|
};
|
|
216
225
|
}
|
|
217
226
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/composer/src/schematics/compose/index.ts"],"names":[],"mappings":";;AAAA,2DAMoC;AACpC,mEAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/composer/src/schematics/compose/index.ts"],"names":[],"mappings":"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"}
|