@o3r/schematics 12.1.0-prerelease.21 → 12.1.0-prerelease.23
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 +23 -20
- package/schematics/ng-add/index.js +1 -1
- package/src/rule-factories/options/index.d.ts +1 -0
- package/src/rule-factories/options/index.d.ts.map +1 -1
- package/src/rule-factories/options/index.js +5 -3
- package/src/rule-factories/options/index.js.map +1 -1
- 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.23",
|
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.23",
|
34
|
+
"@o3r/telemetry": "^12.1.0-prerelease.23",
|
35
35
|
"@schematics/angular": "^19.0.0",
|
36
36
|
"eslint": "^9.14.0",
|
37
37
|
"rxjs": "^7.8.1",
|
@@ -73,18 +73,21 @@
|
|
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",
|
@@ -93,10 +96,10 @@
|
|
93
96
|
"@nx/eslint-plugin": "~20.2.0",
|
94
97
|
"@nx/jest": "~20.2.0",
|
95
98
|
"@nx/js": "~20.2.0",
|
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.
|
99
|
+
"@o3r/build-helpers": "^12.1.0-prerelease.23",
|
100
|
+
"@o3r/eslint-plugin": "^12.1.0-prerelease.23",
|
101
|
+
"@o3r/telemetry": "^12.1.0-prerelease.23",
|
102
|
+
"@schematics/angular": "~19.1.0",
|
100
103
|
"@stylistic/eslint-plugin": "~3.0.0",
|
101
104
|
"@swc/helpers": "~0.5.0",
|
102
105
|
"@types/jest": "~29.5.2",
|
@@ -125,7 +128,7 @@
|
|
125
128
|
"ts-jest": "~29.2.5",
|
126
129
|
"ts-node": "~10.9.2",
|
127
130
|
"type-fest": "^4.30.1",
|
128
|
-
"typescript": "~5.
|
131
|
+
"typescript": "~5.7.3",
|
129
132
|
"typescript-eslint": "~8.23.0",
|
130
133
|
"zone.js": "~0.15.0"
|
131
134
|
},
|
@@ -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
|
@@ -6,6 +6,7 @@ import type { Rule } from '@angular-devkit/schematics';
|
|
6
6
|
type SchematicWrapperFn<S extends Record<string, any>> = (options: S) => Rule;
|
7
7
|
/**
|
8
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
|
9
10
|
* @param schematicFn
|
10
11
|
*/
|
11
12
|
export declare function createSchematicWithOptionsFromWorkspace<S extends Record<string, any>>(schematicFn: SchematicWrapperFn<S>): SchematicWrapperFn<S>;
|
@@ -1 +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;
|
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"}
|
@@ -1,15 +1,17 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.createSchematicWithOptionsFromWorkspace = createSchematicWithOptionsFromWorkspace;
|
4
|
-
const
|
4
|
+
const collection_1 = require("../../utility/collection");
|
5
|
+
const loaders_1 = require("../../utility/loaders");
|
5
6
|
/**
|
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
|
7
9
|
* @param schematicFn
|
8
10
|
*/
|
9
11
|
function createSchematicWithOptionsFromWorkspace(schematicFn) {
|
10
12
|
return (options) => (tree, context) => {
|
11
|
-
const workspace = (0,
|
12
|
-
const workspaceOptions = (0,
|
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 });
|
13
15
|
const schematicOptionsWithoutUndefined = Object.entries(options).reduce((acc, [key, value]) => {
|
14
16
|
if (typeof value !== 'undefined') {
|
15
17
|
acc[key] = value;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/options/index.ts"],"names":[],"mappings":";;
|
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":"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"}
|