@rxap/schematic-composer 0.0.2-dev.9 → 0.1.0-dev.0
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 +12 -12
- package/src/schematics/compose/index.d.ts +7 -0
- package/src/schematics/compose/index.js +13 -10
- package/src/schematics/compose/index.js.map +1 -1
- package/src/schematics/compose/schema.d.ts +1 -1
- package/src/schematics/compose/schema.json +11 -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
|
+
# [0.1.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@0.0.2-dev.9...@rxap/schematic-composer@0.1.0-dev.0) (2023-10-09)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- support overwrite array ([e528c87](https://gitlab.com/rxap/packages/commit/e528c87fd5fb49898583e0c08c191942e7e2f8e4))
|
|
11
|
+
|
|
6
12
|
## [0.0.2-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/schematic-composer@0.0.2-dev.8...@rxap/schematic-composer@0.0.2-dev.9) (2023-09-12)
|
|
7
13
|
|
|
8
14
|
### 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
|
|
20
|
+
yarn add @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.0.0-dev.19 @rxap/schematics-utilities@^16.0.0-dev.16 @rxap/utilities@^16.0.0-dev.17 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.0
|
|
2
|
+
"version": "0.1.0-dev.0",
|
|
3
3
|
"name": "@rxap/schematic-composer",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -11,14 +11,14 @@
|
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
13
|
"@angular-devkit/schematics": "^16.1.4",
|
|
14
|
-
"@rxap/schematics-ts-morph": "
|
|
15
|
-
"@rxap/schematics-utilities": "
|
|
16
|
-
"@rxap/utilities": "
|
|
14
|
+
"@rxap/schematics-ts-morph": "^16.0.0-dev.19",
|
|
15
|
+
"@rxap/schematics-utilities": "^16.0.0-dev.16",
|
|
16
|
+
"@rxap/utilities": "^16.0.0-dev.17",
|
|
17
17
|
"tslib": "2.6.2",
|
|
18
|
-
"@rxap/node-utilities": "1.1.0-dev.
|
|
19
|
-
"@rxap/schematic-angular": "16.1.0-dev.
|
|
20
|
-
"@rxap/workspace-ts-morph": "0.1.0-dev.
|
|
21
|
-
"@rxap/workspace-utilities": "0.1.0-dev.
|
|
18
|
+
"@rxap/node-utilities": "1.1.0-dev.13",
|
|
19
|
+
"@rxap/schematic-angular": "16.1.0-dev.22",
|
|
20
|
+
"@rxap/workspace-ts-morph": "0.1.0-dev.9",
|
|
21
|
+
"@rxap/workspace-utilities": "0.1.0-dev.20"
|
|
22
22
|
},
|
|
23
23
|
"author": {
|
|
24
24
|
"name": "Merzough Münker",
|
|
@@ -40,15 +40,15 @@
|
|
|
40
40
|
"packageGroup": [
|
|
41
41
|
{
|
|
42
42
|
"package": "@rxap/schematic-angular",
|
|
43
|
-
"version": "16.1.0-dev.
|
|
43
|
+
"version": "16.1.0-dev.14"
|
|
44
44
|
},
|
|
45
45
|
{
|
|
46
46
|
"package": "@rxap/schematics-ts-morph",
|
|
47
|
-
"version": "16.0.0-dev.
|
|
47
|
+
"version": "16.0.0-dev.19"
|
|
48
48
|
},
|
|
49
49
|
{
|
|
50
50
|
"package": "@rxap/schematics-utilities",
|
|
51
|
-
"version": "16.0.0-dev.
|
|
51
|
+
"version": "16.0.0-dev.16"
|
|
52
52
|
},
|
|
53
53
|
{
|
|
54
54
|
"package": "@rxap/utilities",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
},
|
|
68
68
|
"schematics": "./collection.json",
|
|
69
69
|
"type": "commonjs",
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "e74e74e04d2978364d8e781f5ec8a105f7c2443e",
|
|
71
71
|
"main": "./src/index.js",
|
|
72
72
|
"types": "./src/index.d.ts"
|
|
73
73
|
}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
import { Rule, Tree } from '@angular-devkit/schematics';
|
|
2
|
+
import { Normalized } from '@rxap/utilities';
|
|
2
3
|
import { ComposeSchematicSchema } from './schema';
|
|
4
|
+
export interface NormalizedComposeSchematicSchema extends Readonly<Normalized<ComposeSchematicSchema>> {
|
|
5
|
+
feature: string | null;
|
|
6
|
+
project: string | null;
|
|
7
|
+
filter: string | null;
|
|
8
|
+
overwrite: boolean | string[];
|
|
9
|
+
}
|
|
3
10
|
export default function (options: ComposeSchematicSchema): (host: Tree) => Rule;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
|
+
const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
|
|
4
5
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
6
|
const utilities_1 = require("@rxap/utilities");
|
|
6
7
|
const path_1 = require("path");
|
|
7
|
-
const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
|
|
8
8
|
function detectedFeature(path) {
|
|
9
9
|
const fragments = path.split('/').reverse();
|
|
10
10
|
let last = fragments.pop();
|
|
@@ -89,21 +89,24 @@ function forProject(host, projectName, globalOptions, filter) {
|
|
|
89
89
|
return executeSchematicCommand(host, projectSourceRoot, globalOptions, filter);
|
|
90
90
|
}
|
|
91
91
|
function NormalizeComposeOptions(options) {
|
|
92
|
-
var _a;
|
|
92
|
+
var _a, _b, _c;
|
|
93
93
|
return Object.seal({
|
|
94
|
-
project: options.project ? (0, utilities_1.dasherize)(options.project) :
|
|
95
|
-
feature: options.feature ? (0, utilities_1.dasherize)(options.feature) :
|
|
96
|
-
filter: (_a = options.filter) !== null && _a !== void 0 ? _a :
|
|
94
|
+
project: options.project ? (0, utilities_1.dasherize)(options.project) : null,
|
|
95
|
+
feature: options.feature ? (0, utilities_1.dasherize)(options.feature) : null,
|
|
96
|
+
filter: (_a = options.filter) !== null && _a !== void 0 ? _a : null,
|
|
97
|
+
overwrite: (_b = options.overwrite) !== null && _b !== void 0 ? _b : false,
|
|
98
|
+
replace: (_c = options.replace) !== null && _c !== void 0 ? _c : false,
|
|
97
99
|
});
|
|
98
100
|
}
|
|
99
101
|
function default_1(options) {
|
|
100
102
|
const normalizedOptions = NormalizeComposeOptions(options);
|
|
101
|
-
const { project, feature, filter, } = normalizedOptions;
|
|
103
|
+
const { project, feature, filter, overwrite, replace, } = normalizedOptions;
|
|
102
104
|
const globalOptions = {
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
105
|
+
// TODO : fix Normalized type support overwrite?: string[] | boolean;
|
|
106
|
+
overwrite: overwrite,
|
|
107
|
+
replace: replace,
|
|
108
|
+
project: project !== null && project !== void 0 ? project : undefined,
|
|
109
|
+
feature: feature !== null && feature !== void 0 ? feature : undefined,
|
|
107
110
|
};
|
|
108
111
|
return (host) => {
|
|
109
112
|
if (project) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/composer/src/schematics/compose/index.ts"],"names":[],"mappings":";;AAAA,2DAMoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/composer/src/schematics/compose/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,17 @@
|
|
|
12
12
|
},
|
|
13
13
|
"overwrite": {
|
|
14
14
|
"description": "Overwrite the existing file if it exists",
|
|
15
|
-
"
|
|
15
|
+
"anyOf": [
|
|
16
|
+
{
|
|
17
|
+
"type": "boolean"
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"type": "array",
|
|
21
|
+
"items": {
|
|
22
|
+
"type": "string"
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
]
|
|
16
26
|
},
|
|
17
27
|
"replace": {
|
|
18
28
|
"description": "Replace the existing file if it exists",
|