@o3r/schematics 12.1.0-prerelease.15 → 12.1.0-prerelease.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "12.1.0-prerelease.15",
+  "version": "12.1.0-prerelease.16",
   "publishConfig": {
     "access": "public"
   },
@@ -30,8 +30,8 @@
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics": "^19.0.0",
     "@angular/cli": "^19.0.0",
-    "@o3r/core": "^12.1.0-prerelease.15",
-    "@o3r/telemetry": "^12.1.0-prerelease.15",
+    "@o3r/core": "^12.1.0-prerelease.16",
+    "@o3r/telemetry": "^12.1.0-prerelease.16",
     "@schematics/angular": "^19.0.0",
     "eslint": "^9.14.0",
     "rxjs": "^7.8.1",
@@ -93,9 +93,9 @@
     "@nx/eslint-plugin": "~20.2.0",
     "@nx/jest": "~20.2.0",
     "@nx/js": "~20.2.0",
-    "@o3r/build-helpers": "^12.1.0-prerelease.15",
-    "@o3r/eslint-plugin": "^12.1.0-prerelease.15",
-    "@o3r/telemetry": "^12.1.0-prerelease.15",
+    "@o3r/build-helpers": "^12.1.0-prerelease.16",
+    "@o3r/eslint-plugin": "^12.1.0-prerelease.16",
+    "@o3r/telemetry": "^12.1.0-prerelease.16",
     "@schematics/angular": "~19.0.0",
     "@stylistic/eslint-plugin": "~3.0.0",
     "@swc/helpers": "~0.5.0",

package/src/rule-factories/index.d.ts

@@ -4,6 +4,7 @@ export * from './dev-tools/index';
 export * from './eslint-fix/index';
 export * from './get-test-frameworks/index';
 export * from './ng-add/index';
+export * from './options/index';
 export * from './remove-packages/index';
 export * from './update-imports/index';
 export * from './vscode-extensions/index';

package/src/rule-factories/index.d.ts.map

@@ -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"}
+{"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"}

package/src/rule-factories/index.js

@@ -7,6 +7,7 @@ tslib_1.__exportStar(require("./dev-tools/index"), exports);
 tslib_1.__exportStar(require("./eslint-fix/index"), exports);
 tslib_1.__exportStar(require("./get-test-frameworks/index"), exports);
 tslib_1.__exportStar(require("./ng-add/index"), exports);
+tslib_1.__exportStar(require("./options/index"), exports);
 tslib_1.__exportStar(require("./remove-packages/index"), exports);
 tslib_1.__exportStar(require("./update-imports/index"), exports);
 tslib_1.__exportStar(require("./vscode-extensions/index"), exports);

package/src/rule-factories/index.js.map

@@ -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"}
+{"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"}

package/src/rule-factories/options/index.d.ts

@@ -0,0 +1,13 @@
+import type { Rule } from '@angular-devkit/schematics';
+/**
+ * Factory of the schematic to wrap
+ * @param options Options of the factory
+ */
+type SchematicWrapperFn<S extends Record<string, any>> = (options: S) => Rule;
+/**
+ * Wrapper method of a schematic to retrieve options from workspace and merge it with the one from the run of the schematic
+ * @param schematicFn
+ */
+export declare function createSchematicWithOptionsFromWorkspace<S extends Record<string, any>>(schematicFn: SchematicWrapperFn<S>): SchematicWrapperFn<S>;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/src/rule-factories/options/index.d.ts.map

@@ -0,0 +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;AAMpC;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAE9E;;;GAGG;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"}

package/src/rule-factories/options/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSchematicWithOptionsFromWorkspace = createSchematicWithOptionsFromWorkspace;
+const utility_1 = require("../../utility");
+/**
+ * Wrapper method of a schematic to retrieve options from workspace and merge it with the one from the run of the schematic
+ * @param schematicFn
+ */
+function createSchematicWithOptionsFromWorkspace(schematicFn) {
+    return (options) => (tree, context) => {
+        const workspace = (0, utility_1.getWorkspaceConfig)(tree);
+        const workspaceOptions = (0, utility_1.getDefaultOptionsForSchematic)(workspace, context.schematic.description.collection.name, context.schematic.description.name, { projectName: undefined, ...options });
+        const schematicOptionsWithoutUndefined = Object.entries(options).reduce((acc, [key, value]) => {
+            if (typeof value !== 'undefined') {
+                acc[key] = value;
+            }
+            return acc;
+        }, {});
+        const schematicOptions = {
+            ...workspaceOptions,
+            ...schematicOptionsWithoutUndefined
+        };
+        return schematicFn(schematicOptions);
+    };
+}
+//# sourceMappingURL=index.js.map

package/src/rule-factories/options/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/options/index.ts"],"names":[],"mappings":";;AAkBA,0FAqBC;AApCD,2CAGuB;AAQvB;;;GAGG;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,uCAA6B,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"}