@o3r/schematics 12.1.0-prerelease.6 → 12.1.0-prerelease.61
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/package.json +39 -36
- package/schematics/ng-add/index.js +1 -1
- package/src/rule-factories/index.d.ts +1 -0
- package/src/rule-factories/index.d.ts.map +1 -1
- package/src/rule-factories/index.js +1 -0
- package/src/rule-factories/index.js.map +1 -1
- package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
- package/src/rule-factories/ng-add/dependencies.js +4 -1
- package/src/rule-factories/ng-add/dependencies.js.map +1 -1
- package/src/rule-factories/options/index.d.ts +14 -0
- package/src/rule-factories/options/index.d.ts.map +1 -0
- package/src/rule-factories/options/index.js +28 -0
- package/src/rule-factories/options/index.js.map +1 -0
- package/src/utility/wrapper.d.ts +8 -1
- package/src/utility/wrapper.d.ts.map +1 -1
- package/src/utility/wrapper.js +10 -2
- package/src/utility/wrapper.js.map +1 -1
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@o3r/schematics",
|
3
|
-
"version": "12.1.0-prerelease.
|
3
|
+
"version": "12.1.0-prerelease.61",
|
4
4
|
"publishConfig": {
|
5
5
|
"access": "public"
|
6
6
|
},
|
@@ -26,12 +26,12 @@
|
|
26
26
|
"o3r-environment": "./cli/environment.js"
|
27
27
|
},
|
28
28
|
"peerDependencies": {
|
29
|
-
"@angular-devkit/architect": "
|
29
|
+
"@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
|
30
30
|
"@angular-devkit/core": "^19.0.0",
|
31
31
|
"@angular-devkit/schematics": "^19.0.0",
|
32
32
|
"@angular/cli": "^19.0.0",
|
33
|
-
"@o3r/core": "^12.1.0-prerelease.
|
34
|
-
"@o3r/telemetry": "^12.1.0-prerelease.
|
33
|
+
"@o3r/core": "^12.1.0-prerelease.61",
|
34
|
+
"@o3r/telemetry": "^12.1.0-prerelease.61",
|
35
35
|
"@schematics/angular": "^19.0.0",
|
36
36
|
"eslint": "^9.14.0",
|
37
37
|
"rxjs": "^7.8.1",
|
@@ -73,60 +73,63 @@
|
|
73
73
|
"semver": "^7.5.2",
|
74
74
|
"tslib": "^2.6.2"
|
75
75
|
},
|
76
|
+
"generatorDependencies": {
|
77
|
+
"@schematics/angular": "~19.1.0"
|
78
|
+
},
|
76
79
|
"devDependencies": {
|
77
|
-
"@angular-devkit/build-angular": "~19.
|
78
|
-
"@angular-devkit/core": "~19.
|
79
|
-
"@angular-devkit/schematics": "~19.
|
80
|
-
"@angular/animations": "~19.
|
81
|
-
"@angular/cli": "~19.
|
82
|
-
"@angular/common": "~19.
|
83
|
-
"@angular/compiler": "~19.
|
84
|
-
"@angular/compiler-cli": "~19.
|
85
|
-
"@angular/core": "~19.
|
86
|
-
"@angular/platform-browser": "~19.
|
87
|
-
"@angular/platform-browser-dynamic": "~19.
|
80
|
+
"@angular-devkit/build-angular": "~19.1.0",
|
81
|
+
"@angular-devkit/core": "~19.1.0",
|
82
|
+
"@angular-devkit/schematics": "~19.1.0",
|
83
|
+
"@angular/animations": "~19.1.0",
|
84
|
+
"@angular/cli": "~19.1.0",
|
85
|
+
"@angular/common": "~19.1.0",
|
86
|
+
"@angular/compiler": "~19.1.0",
|
87
|
+
"@angular/compiler-cli": "~19.1.0",
|
88
|
+
"@angular/core": "~19.1.0",
|
89
|
+
"@angular/platform-browser": "~19.1.0",
|
90
|
+
"@angular/platform-browser-dynamic": "~19.1.0",
|
88
91
|
"@babel/core": "~7.26.0",
|
89
92
|
"@babel/preset-typescript": "~7.26.0",
|
90
93
|
"@compodoc/compodoc": "^1.1.19",
|
91
94
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
92
|
-
"@nx/eslint": "~20.
|
93
|
-
"@nx/eslint-plugin": "~20.
|
94
|
-
"@nx/jest": "~20.
|
95
|
-
"@nx/js": "~20.
|
96
|
-
"@o3r/build-helpers": "^12.1.0-prerelease.
|
97
|
-
"@o3r/eslint-plugin": "^12.1.0-prerelease.
|
98
|
-
"@o3r/telemetry": "^12.1.0-prerelease.
|
99
|
-
"@schematics/angular": "~19.
|
100
|
-
"@stylistic/eslint-plugin": "~3.
|
95
|
+
"@nx/eslint": "~20.4.0",
|
96
|
+
"@nx/eslint-plugin": "~20.4.0",
|
97
|
+
"@nx/jest": "~20.4.0",
|
98
|
+
"@nx/js": "~20.4.0",
|
99
|
+
"@o3r/build-helpers": "^12.1.0-prerelease.61",
|
100
|
+
"@o3r/eslint-plugin": "^12.1.0-prerelease.61",
|
101
|
+
"@o3r/telemetry": "^12.1.0-prerelease.61",
|
102
|
+
"@schematics/angular": "~19.1.0",
|
103
|
+
"@stylistic/eslint-plugin": "~3.1.0",
|
101
104
|
"@swc/helpers": "~0.5.0",
|
102
105
|
"@types/jest": "~29.5.2",
|
103
106
|
"@types/node": "^20.0.0",
|
104
107
|
"@types/semver": "^7.3.13",
|
105
|
-
"@typescript-eslint/parser": "~8.
|
106
|
-
"angular-eslint": "~19.
|
108
|
+
"@typescript-eslint/parser": "~8.25.0",
|
109
|
+
"angular-eslint": "~19.1.0",
|
107
110
|
"cpy-cli": "^5.0.0",
|
108
|
-
"eslint": "~9.
|
109
|
-
"eslint-import-resolver-node": "
|
110
|
-
"eslint-import-resolver-typescript": "
|
111
|
-
"eslint-plugin-import": "
|
112
|
-
"eslint-plugin-import-newlines": "
|
111
|
+
"eslint": "~9.21.0",
|
112
|
+
"eslint-import-resolver-node": "~0.3.9",
|
113
|
+
"eslint-import-resolver-typescript": "~3.8.0",
|
114
|
+
"eslint-plugin-import": "~2.31.0",
|
115
|
+
"eslint-plugin-import-newlines": "~1.4.0",
|
113
116
|
"eslint-plugin-jest": "~28.11.0",
|
114
117
|
"eslint-plugin-jsdoc": "~50.6.0",
|
115
118
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
116
|
-
"eslint-plugin-unicorn": "
|
117
|
-
"eslint-plugin-unused-imports": "
|
119
|
+
"eslint-plugin-unicorn": "~56.0.0",
|
120
|
+
"eslint-plugin-unused-imports": "~4.1.4",
|
118
121
|
"globals": "^15.9.0",
|
119
122
|
"jest": "~29.7.0",
|
120
123
|
"jest-junit": "~16.0.0",
|
121
124
|
"jsonc-eslint-parser": "~2.4.0",
|
122
125
|
"jsonschema": "~1.5.0",
|
123
|
-
"nx": "~20.
|
126
|
+
"nx": "~20.4.0",
|
124
127
|
"rxjs": "^7.8.1",
|
125
128
|
"ts-jest": "~29.2.5",
|
126
129
|
"ts-node": "~10.9.2",
|
127
130
|
"type-fest": "^4.30.1",
|
128
|
-
"typescript": "~5.
|
129
|
-
"typescript-eslint": "~8.
|
131
|
+
"typescript": "~5.7.3",
|
132
|
+
"typescript-eslint": "~8.25.0",
|
130
133
|
"zone.js": "~0.15.0"
|
131
134
|
},
|
132
135
|
"engines": {
|
@@ -42,7 +42,7 @@ function ngAddFn(options) {
|
|
42
42
|
* @param options
|
43
43
|
*/
|
44
44
|
const ngAdd = (options) => () => {
|
45
|
-
return (0, public_api_1.
|
45
|
+
return (0, public_api_1.createOtterSchematic)(ngAddFn)(options);
|
46
46
|
};
|
47
47
|
exports.ngAdd = ngAdd;
|
48
48
|
//# sourceMappingURL=index.js.map
|
@@ -4,6 +4,7 @@ export * from './dev-tools/index';
|
|
4
4
|
export * from './eslint-fix/index';
|
5
5
|
export * from './get-test-frameworks/index';
|
6
6
|
export * from './ng-add/index';
|
7
|
+
export * from './options/index';
|
7
8
|
export * from './remove-packages/index';
|
8
9
|
export * from './update-imports/index';
|
9
10
|
export * from './vscode-extensions/index';
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
|
@@ -7,6 +7,7 @@ tslib_1.__exportStar(require("./dev-tools/index"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./eslint-fix/index"), exports);
|
8
8
|
tslib_1.__exportStar(require("./get-test-frameworks/index"), exports);
|
9
9
|
tslib_1.__exportStar(require("./ng-add/index"), exports);
|
10
|
+
tslib_1.__exportStar(require("./options/index"), exports);
|
10
11
|
tslib_1.__exportStar(require("./remove-packages/index"), exports);
|
11
12
|
tslib_1.__exportStar(require("./update-imports/index"), exports);
|
12
13
|
tslib_1.__exportStar(require("./vscode-extensions/index"), exports);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,uEAA6C;AAC7C,4DAAkC;AAClC,6DAAmC;AACnC,sEAA4C;AAC5C,yDAA+B;AAC/B,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C"}
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,uEAA6C;AAC7C,4DAAkC;AAClC,6DAAmC;AACnC,sEAA4C;AAC5C,yDAA+B;AAC/B,0DAAgC;AAChC,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EAEJ,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,eAAe,CAAC;
|
1
|
+
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EAEJ,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,eAAe,CAAC;AAUvB;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,yEAAyE;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iDAAiD;IACjD,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,uDAAuD;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,0DAA0D;IAC1D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACjC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,sCAAsC;IACtC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,sDAAsD;IACtD,oBAAoB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,+DAA+D;AAC/D,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,YAAa,gBAAgB,KAAG,OAAO,IAAI,gBAAgB,GAAG;IAAE,iBAAiB,EAAE,uBAAuB,CAAA;CAEzI,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,MAAM,QAAQ,IAAI,gBAAgB,MAAM,sBAAsB,OAAO,oBAAoB,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAiBzL,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,uBAE/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,YAAa,wBAAwB,KAAG,IAyIrE,CAAC"}
|
@@ -62,7 +62,10 @@ const setupDependencies = (options) => {
|
|
62
62
|
const ngAddToRun = new Set(Object.keys(options.dependencies)
|
63
63
|
.filter((dep) => options.ngAddToRun?.some((pattern) => typeof pattern === 'string' ? pattern === dep : pattern.test(dep))));
|
64
64
|
const isInstallRequired = Object.values(options.dependencies).some(({ requireInstall }) => requireInstall);
|
65
|
-
const isInstallNeeded = () =>
|
65
|
+
const isInstallNeeded = () => {
|
66
|
+
const needsInstall = Array.from(ngAddToRun).some((packageName) => !(0, package_manager_runner_1.isPackageInstalled)(packageName));
|
67
|
+
return needsInstall || (options.skipInstall === undefined ? (ngAddToRun.size > 0 || isInstallRequired) : !options.skipInstall);
|
68
|
+
};
|
66
69
|
const editPackageJson = (packageJsonPath, packageToInstall, dependency, updateLists) => {
|
67
70
|
return (tree, context) => {
|
68
71
|
if (!tree.exists(packageJsonPath)) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,kCAAkC;AAClC,2DAOoC;AACpC,4DAG0C;AAC1C,2EAEkD;AAClD,iCAAiC;AAOjC,mDAG+B;AAC/B,
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
import type { Rule } from '@angular-devkit/schematics';
|
2
|
+
/**
|
3
|
+
* Factory of the schematic to wrap
|
4
|
+
* @param options Options of the factory
|
5
|
+
*/
|
6
|
+
type SchematicWrapperFn<S extends Record<string, any>> = (options: S) => Rule;
|
7
|
+
/**
|
8
|
+
* Wrapper method of a schematic to retrieve options from workspace and merge it with the one from the run of the schematic
|
9
|
+
* NOTE: please do not use it directly, instead use {@link createOtterSchematic} to wrap your schematic
|
10
|
+
* @param schematicFn
|
11
|
+
*/
|
12
|
+
export declare function createSchematicWithOptionsFromWorkspace<S extends Record<string, any>>(schematicFn: SchematicWrapperFn<S>): SchematicWrapperFn<S>;
|
13
|
+
export {};
|
14
|
+
//# sourceMappingURL=index.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/options/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAQpC;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAE9E;;;;GAIG;AACH,wBAAgB,uCAAuC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAqBhJ"}
|
@@ -0,0 +1,28 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.createSchematicWithOptionsFromWorkspace = createSchematicWithOptionsFromWorkspace;
|
4
|
+
const collection_1 = require("../../utility/collection");
|
5
|
+
const loaders_1 = require("../../utility/loaders");
|
6
|
+
/**
|
7
|
+
* Wrapper method of a schematic to retrieve options from workspace and merge it with the one from the run of the schematic
|
8
|
+
* NOTE: please do not use it directly, instead use {@link createOtterSchematic} to wrap your schematic
|
9
|
+
* @param schematicFn
|
10
|
+
*/
|
11
|
+
function createSchematicWithOptionsFromWorkspace(schematicFn) {
|
12
|
+
return (options) => (tree, context) => {
|
13
|
+
const workspace = (0, loaders_1.getWorkspaceConfig)(tree);
|
14
|
+
const workspaceOptions = (0, collection_1.getDefaultOptionsForSchematic)(workspace, context.schematic.description.collection.name, context.schematic.description.name, { projectName: undefined, ...options });
|
15
|
+
const schematicOptionsWithoutUndefined = Object.entries(options).reduce((acc, [key, value]) => {
|
16
|
+
if (typeof value !== 'undefined') {
|
17
|
+
acc[key] = value;
|
18
|
+
}
|
19
|
+
return acc;
|
20
|
+
}, {});
|
21
|
+
const schematicOptions = {
|
22
|
+
...workspaceOptions,
|
23
|
+
...schematicOptionsWithoutUndefined
|
24
|
+
};
|
25
|
+
return schematicFn(schematicOptions);
|
26
|
+
};
|
27
|
+
}
|
28
|
+
//# sourceMappingURL=index.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/options/index.ts"],"names":[],"mappings":";;AAqBA,0FAqBC;AAvCD,yDAEkC;AAClC,mDAE+B;AAQ/B;;;;GAIG;AACH,SAAgB,uCAAuC,CAAgC,WAAkC;IACvH,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACpC,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,gBAAgB,GAAG,IAAA,0CAA6B,EACpD,SAAS,EACT,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAC7C,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAClC,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CACvC,CAAC;QACF,MAAM,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAwB,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACjH,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;gBACjC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACnB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAM,CAAC;QACZ,MAAM,gBAAgB,GAAG;YACvB,GAAG,gBAAgB;YACnB,GAAG,gCAAgC;SACpC,CAAC;QACF,OAAO,WAAW,CAAC,gBAA4B,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC"}
|
package/src/utility/wrapper.d.ts
CHANGED
@@ -1,8 +1,15 @@
|
|
1
|
+
import { type Rule } from '@angular-devkit/schematics';
|
1
2
|
import type { SchematicWrapper } from '@o3r/telemetry';
|
2
3
|
/**
|
3
4
|
* Wrapper method of a schematic to retrieve some metrics around the schematic run
|
4
|
-
* if
|
5
|
+
* if `@o3r/telemetry` is installed
|
6
|
+
* NOTE: please do not use it directly, instead use {@link createOtterSchematic} to wrap your schematic
|
5
7
|
* @param schematicFn
|
6
8
|
*/
|
7
9
|
export declare const createSchematicWithMetricsIfInstalled: SchematicWrapper;
|
10
|
+
/**
|
11
|
+
* Wrapper method of an Otter schematics
|
12
|
+
* @param schematicFn
|
13
|
+
*/
|
14
|
+
export declare const createOtterSchematic: (schematicFn: (options: any) => Rule) => (options: any) => Rule;
|
8
15
|
//# sourceMappingURL=wrapper.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AA+CxB;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBA0CnD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,2BAAgG,CAAC"}
|
package/src/utility/wrapper.js
CHANGED
@@ -1,12 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.createSchematicWithMetricsIfInstalled = void 0;
|
3
|
+
exports.createOtterSchematic = exports.createSchematicWithMetricsIfInstalled = void 0;
|
4
4
|
const node_fs_1 = require("node:fs");
|
5
5
|
const path = require("node:path");
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
7
7
|
const confirm_1 = require("@inquirer/confirm");
|
8
8
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
9
9
|
const dependencies_2 = require("../rule-factories/ng-add/dependencies");
|
10
|
+
const index_1 = require("../rule-factories/options/index");
|
10
11
|
const noopSchematicWrapper = (fn) => fn;
|
11
12
|
const PACKAGE_JSON_PATH = 'package.json';
|
12
13
|
const setupO3rMetricsInPackageJson = (activated) => (tree) => {
|
@@ -38,7 +39,8 @@ const setupTelemetry = ({ workingDirectory, runNgAdd, exactO3rVersion }) => (_,
|
|
38
39
|
};
|
39
40
|
/**
|
40
41
|
* Wrapper method of a schematic to retrieve some metrics around the schematic run
|
41
|
-
* if
|
42
|
+
* if `@o3r/telemetry` is installed
|
43
|
+
* NOTE: please do not use it directly, instead use {@link createOtterSchematic} to wrap your schematic
|
42
44
|
* @param schematicFn
|
43
45
|
*/
|
44
46
|
const createSchematicWithMetricsIfInstalled = (schematicFn) => (opts) => async (tree, context) => {
|
@@ -82,4 +84,10 @@ For more details and instructions on how to change these settings, see https://g
|
|
82
84
|
return wrapper(() => rule)(opts);
|
83
85
|
};
|
84
86
|
exports.createSchematicWithMetricsIfInstalled = createSchematicWithMetricsIfInstalled;
|
87
|
+
/**
|
88
|
+
* Wrapper method of an Otter schematics
|
89
|
+
* @param schematicFn
|
90
|
+
*/
|
91
|
+
const createOtterSchematic = (schematicFn) => (0, index_1.createSchematicWithOptionsFromWorkspace)((0, exports.createSchematicWithMetricsIfInstalled)(schematicFn));
|
92
|
+
exports.createOtterSchematic = createOtterSchematic;
|
85
93
|
//# sourceMappingURL=wrapper.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,kCAAkC;AAIlC,2DAKoC;AACpC,+CAAwC;AAIxC,2EAEkD;AAClD,wEAG+C;
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,kCAAkC;AAIlC,2DAKoC;AACpC,+CAAwC;AAIxC,2EAEkD;AAClD,wEAG+C;AAC/C,2DAEyC;AAEzC,MAAM,oBAAoB,GAAqB,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;AAE1D,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAEzC,MAAM,4BAA4B,GAAiC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;IACzF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAe,CAAC;QAEnE,WAAW,CAAC,MAAM,KAAK,EAAE,CAAC;QACzB,WAAW,CAAC,MAAqB,CAAC,GAAG,KAAK,EAAE,CAAC;QAC5C,WAAW,CAAC,MAAqB,CAAC,GAAkB,CAAC,SAAS,GAAG,SAAS,CAAC;QAE7E,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAiG,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;IACvL,MAAM,kBAAkB,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACxG,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3G,OAAO,IAAA,gCAAiB,EAAC;QACvB,YAAY,EAAE;YACZ,gBAAgB,EAAE;gBAChB,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,EAAE;wBAChD,KAAK,EAAE,CAAC,iCAAkB,CAAC,GAAG,CAAC;qBAChC,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE;aAClC;SACF;QACD,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAC9C,aAAa,EAAE,kBAAkB;QACjC,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACI,MAAM,qCAAqC,GAAqB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IACxH,IAAI,OAAO,GAAqB,oBAAoB,CAAC;IACrD,IAAI,sBAA2C,CAAC;IAChD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACzG,IAAI,CAAC;QACH,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CAAa,gBAAgB,EAAC,CAAC;QACtE,OAAO,GAAG,0BAA0B,CAAC;IACvC,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,mDAAmD;QACnD,IACE,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM,CAAC;eACzE,OAAO,CAAC,WAAW;eACnB,OAAS,WAAW,CAAC,MAAqB,EAAE,GAAkB,EAAE,SAAS,KAAK,WAAW;eACzF,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,OAAO;eAClC,IAAY,CAAC,UAAU,KAAK,KAAK;eAClC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,OAAO,CAAC,EAClD,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE1G,sBAAsB,GAAG,MAAM,IAAA,iBAAO,EAAC;gBACrC,OAAO,EAAE;;;;SAIR;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAE,IAAY,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7J,MAAM,IAAI,GAAG,IAAA,kBAAK,EAAC;QACjB,OAAO,sBAAsB,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,EAAC,gBAAgB,EAAE,CAAC,4BAA4B,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACnJ,WAAW,CAAC,IAAI,CAAC;QACjB,sBAAsB;YACpB,CAAC,CAAC,IAAA,2BAAc,EAAC,gBAAgB,EAAE;gBACjC,cAAc,CAAC,EAAE,gBAAgB,EAAE,gBAAgB,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC,gBAAgB,EAAE,eAAe,EAAG,IAAY,CAAC,eAAe,EAAE,CAAC;aACjJ,CAAC;YACF,CAAC,CAAC,IAAA,iBAAI,GAAE;QACV,OAAO,sBAAsB,KAAK,WAAW,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAA,2BAAc,EAAC,gBAAgB,EAAE,CAAC,4BAA4B,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;KACtK,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AA1CW,QAAA,qCAAqC,yCA0ChD;AAEF;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAC,WAAmC,EAAE,EAAE,CAAC,IAAA,+CAAuC,EAAC,IAAA,6CAAqC,EAAC,WAAW,CAAC,CAAC,CAAC;AAA5J,QAAA,oBAAoB,wBAAwI"}
|