@rxap/schematic-composer 16.0.1 → 16.0.2-dev.1
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,14 @@
|
|
|
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.2-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@16.0.2-dev.0...@rxap/schematic-composer@16.0.2-dev.1) (2024-03-11)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rxap/schematic-composer
|
|
9
|
+
|
|
10
|
+
## [16.0.2-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@16.0.1...@rxap/schematic-composer@16.0.2-dev.0) (2024-02-25)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @rxap/schematic-composer
|
|
13
|
+
|
|
6
14
|
## [16.0.1](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@16.0.1-dev.0...@rxap/schematic-composer@16.0.1) (2024-02-07)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @rxap/schematic-composer
|
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.
|
|
20
|
+
yarn add @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.23 @rxap/schematics-utilities@^16.0.1-dev.2 @rxap/utilities@^16.1.0-dev.7 colors@^1.4.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.0.1",
|
|
2
|
+
"version": "16.0.2-dev.1",
|
|
3
3
|
"name": "@rxap/schematic-composer",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
|
+
"handlebars": "4.7.7",
|
|
6
7
|
"ignore": "5.2.4",
|
|
7
8
|
"process": "0.11.10",
|
|
8
9
|
"semver": "7.5.3",
|
|
@@ -12,15 +13,37 @@
|
|
|
12
13
|
},
|
|
13
14
|
"peerDependencies": {
|
|
14
15
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
|
-
"@rxap/schematics-ts-morph": "^16.0.
|
|
16
|
-
"@rxap/schematics-utilities": "^16.0.
|
|
17
|
-
"@rxap/utilities": "^16.0.
|
|
16
|
+
"@rxap/schematics-ts-morph": "^16.1.0-dev.23",
|
|
17
|
+
"@rxap/schematics-utilities": "^16.0.1-dev.2",
|
|
18
|
+
"@rxap/utilities": "^16.1.0-dev.7",
|
|
19
|
+
"colors": "^1.4.0",
|
|
18
20
|
"tslib": "2.6.2",
|
|
19
|
-
"@
|
|
20
|
-
"@rxap/
|
|
21
|
-
"@rxap/
|
|
22
|
-
"@rxap/
|
|
23
|
-
"@rxap/
|
|
21
|
+
"@apidevtools/json-schema-ref-parser": "9.0.9",
|
|
22
|
+
"@rxap/generator-ts-morph": "1.0.2-dev.0",
|
|
23
|
+
"@rxap/generator-utilities": "1.1.1-dev.1",
|
|
24
|
+
"@rxap/json-schema-to-typescript": "16.0.1-dev.0",
|
|
25
|
+
"@rxap/mixin": "16.0.1-dev.1",
|
|
26
|
+
"@rxap/node-utilities": "1.2.0-dev.0",
|
|
27
|
+
"@rxap/plugin-application": "16.1.1-dev.2",
|
|
28
|
+
"@rxap/plugin-docker": "16.1.0-dev.3",
|
|
29
|
+
"@rxap/plugin-library": "16.1.0-dev.5",
|
|
30
|
+
"@rxap/plugin-nestjs": "16.2.0-dev.2",
|
|
31
|
+
"@rxap/plugin-utilities": "16.1.1-dev.2",
|
|
32
|
+
"@rxap/reflect-metadata": "1.0.2-dev.1",
|
|
33
|
+
"@rxap/schematic-angular": "16.2.0-dev.46",
|
|
34
|
+
"@rxap/schematic-nestjs": "16.0.2-dev.1",
|
|
35
|
+
"@rxap/schematics-open-api": "16.0.1-dev.0",
|
|
36
|
+
"@rxap/schematics-xml-parser": "16.0.1-dev.1",
|
|
37
|
+
"@rxap/ts-morph": "1.1.0-dev.18",
|
|
38
|
+
"@rxap/workspace-ts-morph": "16.0.2-dev.2",
|
|
39
|
+
"@rxap/workspace-utilities": "16.1.0-dev.1",
|
|
40
|
+
"@rxap/xml-parser": "16.0.1-dev.1",
|
|
41
|
+
"fs-extra": "11.1.1",
|
|
42
|
+
"glob": "10.3.10",
|
|
43
|
+
"openapi-types": "10.0.0",
|
|
44
|
+
"reflect-metadata": "0.1.13",
|
|
45
|
+
"util": "0.12.5",
|
|
46
|
+
"xmldom": "0.6.0"
|
|
24
47
|
},
|
|
25
48
|
"author": {
|
|
26
49
|
"name": "Merzough Münker",
|
|
@@ -42,19 +65,19 @@
|
|
|
42
65
|
"packageGroup": [
|
|
43
66
|
{
|
|
44
67
|
"package": "@rxap/schematic-angular",
|
|
45
|
-
"version": "16.
|
|
68
|
+
"version": "16.2.0-dev.7"
|
|
46
69
|
},
|
|
47
70
|
{
|
|
48
71
|
"package": "@rxap/schematics-ts-morph",
|
|
49
|
-
"version": "16.0.
|
|
72
|
+
"version": "16.1.0-dev.2"
|
|
50
73
|
},
|
|
51
74
|
{
|
|
52
75
|
"package": "@rxap/schematics-utilities",
|
|
53
|
-
"version": "16.0.0"
|
|
76
|
+
"version": "16.0.1-dev.0"
|
|
54
77
|
},
|
|
55
78
|
{
|
|
56
79
|
"package": "@rxap/utilities",
|
|
57
|
-
"version": "16.0.
|
|
80
|
+
"version": "16.1.0-dev.1"
|
|
58
81
|
}
|
|
59
82
|
]
|
|
60
83
|
},
|
|
@@ -69,6 +92,7 @@
|
|
|
69
92
|
},
|
|
70
93
|
"schematics": "./collection.json",
|
|
71
94
|
"type": "commonjs",
|
|
95
|
+
"gitHead": "67bc7956fc88110f26bacf9c78884454a3714aa7",
|
|
72
96
|
"main": "./src/index.js",
|
|
73
97
|
"types": "./src/index.d.ts"
|
|
74
98
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Rule, Tree } from '@angular-devkit/schematics';
|
|
2
2
|
import { Normalized } from '@rxap/utilities';
|
|
3
3
|
import { ComposeSchematicSchema } from './schema';
|
|
4
|
+
import 'colors';
|
|
4
5
|
export interface NormalizedComposeSchematicSchema extends Readonly<Normalized<ComposeSchematicSchema>> {
|
|
5
6
|
feature: string | null;
|
|
6
7
|
project: string | null;
|
|
@@ -6,6 +6,7 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
6
6
|
const utilities_1 = require("@rxap/utilities");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const yaml_1 = require("yaml");
|
|
9
|
+
require("colors");
|
|
9
10
|
function detectedFeature(path) {
|
|
10
11
|
const fragments = path.split('/').reverse();
|
|
11
12
|
let last = fragments.pop();
|
|
@@ -60,16 +61,16 @@ function executeSchematicCommandFile(host, schematicCommandFilePath, globalOptio
|
|
|
60
61
|
options.directory = directoryParts.join('/');
|
|
61
62
|
}
|
|
62
63
|
ruleList.push((0, schematics_1.chain)([
|
|
63
|
-
() => console.log(`Execute schematic '${command.package}:${command.name}'
|
|
64
|
-
() => console.log(
|
|
64
|
+
() => console.log(`Execute schematic '${command.package}:${command.name}'`.green),
|
|
65
|
+
() => console.log(`Input Options: ${JSON.stringify(options)}`.grey),
|
|
65
66
|
() => {
|
|
66
67
|
try {
|
|
67
68
|
return (0, schematics_1.externalSchematic)(command.package, command.name, options);
|
|
68
69
|
}
|
|
69
70
|
catch (e) {
|
|
70
|
-
console.error(`Error while executing schematic '${command.package}:${command.name}'
|
|
71
|
-
console.log('Retry with this schematic with the command:');
|
|
72
|
-
console.log(`nx g @rxap/schematic-composer:compose --project ${options.project} --feature ${options.feature} --filter ${(0, path_1.dirname)(schematicCommandFilePath).split('/').pop()}
|
|
71
|
+
console.error(`Error while executing schematic '${command.package}:${command.name}'`.red);
|
|
72
|
+
console.log('Retry with this schematic with the command:'.grey);
|
|
73
|
+
console.log(`nx g @rxap/schematic-composer:compose --project ${options.project} --feature ${options.feature} --filter ${(0, path_1.dirname)(schematicCommandFilePath).split('/').pop()}`.grey);
|
|
73
74
|
throw e;
|
|
74
75
|
}
|
|
75
76
|
},
|
|
@@ -105,7 +106,7 @@ function getSchematicCommandRuleList(host, schematicCommandList, globalOptions,
|
|
|
105
106
|
const ruleList = [];
|
|
106
107
|
for (const schematicCommandFilePath of schematicCommandList) {
|
|
107
108
|
ruleList.push((0, schematics_1.chain)([
|
|
108
|
-
() => console.log(`Execute schematic command file '${schematicCommandFilePath}'
|
|
109
|
+
() => console.log(`Execute schematic command file '${schematicCommandFilePath}'`.blue),
|
|
109
110
|
executeSchematicCommandFile(host, schematicCommandFilePath, globalOptions, projectSourceRoot),
|
|
110
111
|
]));
|
|
111
112
|
}
|
|
@@ -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,qEAGoC;AACpC,+CAIyB;AACzB,+BAIc;AACd,+BAA6B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/composer/src/schematics/compose/index.ts"],"names":[],"mappings":"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"}
|