@o3r/design 12.1.0-prerelease.7 → 12.1.0-prerelease.71

package/builders/generate-css/index.d.ts

@@ -3,6 +3,6 @@ import type { GenerateCssSchematicsSchema } from './schema';
  * Generate CSS from Design Token files
  * @param options
  */
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<GenerateCssSchematicsSchema & import("@angular-devkit/core").JsonObject>;
+declare const _default: import("@angular-devkit/architect").Builder<GenerateCssSchematicsSchema & import("@angular-devkit/core").JsonObject>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/builders/generate-css/schema.json

@@ -42,7 +42,6 @@
     },
     "metadataIgnorePrivate": {
       "type": "boolean",
-      "default": false,
       "description": "Ignore the private variable in the Metadata generation."
     },
     "rootPath": {
@@ -51,12 +50,10 @@
     },
     "watch": {
       "type": "boolean",
-      "default": false,
       "description": "Enable Watch mode"
     },
     "failOnDuplicate": {
       "type": "boolean",
-      "default": false,
       "description": "Determine if the process should stop in case of Token duplication"
     },
     "templateFile": {
@@ -90,7 +87,6 @@
     },
     "failOnMissingReference": {
       "type": "boolean",
-      "default": false,
       "description": "Determine if the builder should fail if a missing Design Token reference is detected"
     }
   },

package/builders/generate-jsonschema/index.d.ts

@@ -3,6 +3,6 @@ import type { GenerateJsonSchemaSchematicsSchema } from './schema';
  * Generate Json Schema from Design Token files
  * @param options
  */
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<GenerateJsonSchemaSchematicsSchema & import("@angular-devkit/core").JsonObject>;
+declare const _default: import("@angular-devkit/architect").Builder<GenerateJsonSchemaSchematicsSchema & import("@angular-devkit/core").JsonObject>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/builders/generate-jsonschema/schema.json

@@ -21,12 +21,10 @@
     },
     "watch": {
       "type": "boolean",
-      "default": false,
       "description": "Enable Watch mode"
     },
     "failOnDuplicate": {
       "type": "boolean",
-      "default": false,
       "description": "Determine if the process should stop in case of Token duplication"
     },
     "schemaId": {

package/builders/generate-style/index.d.ts

@@ -3,6 +3,6 @@ import type { GenerateStyleSchematicsSchema } from './schema';
  * Generate CSS from Design Token files
  * @param options
  */
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<GenerateStyleSchematicsSchema & import("@angular-devkit/core").JsonObject>;
+declare const _default: import("@angular-devkit/architect").Builder<GenerateStyleSchematicsSchema & import("@angular-devkit/core").JsonObject>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/builders/generate-style/schema.json

@@ -51,7 +51,6 @@
     },
     "metadataIgnorePrivate": {
       "type": "boolean",
-      "default": false,
       "description": "Ignore private variables in the metadata generation."
     },
     "rootPath": {
@@ -60,12 +59,10 @@
     },
     "watch": {
       "type": "boolean",
-      "default": false,
       "description": "Enable watch mode"
     },
     "failOnDuplicate": {
       "type": "boolean",
-      "default": false,
       "description": "Determine if the process should stop in case of Design Token duplication"
     },
     "templateFile": {
@@ -100,7 +97,6 @@
     },
     "failOnMissingReference": {
       "type": "boolean",
-      "default": false,
       "description": "Determine if the builder should fail if a missing Design Token reference is detected"
     },
     "sortOrderPatternsFilePath": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/design",
-  "version": "12.1.0-prerelease.7",
+  "version": "12.1.0-prerelease.71",
   "publishConfig": {
     "access": "public"
   },
@@ -30,6 +30,10 @@
     "./schemas/*.json": {
       "default": "./schemas/*.json"
     },
+    "./builders/*": {
+      "types": "./builders/*.d.ts",
+      "default": "./builders/*"
+    },
     ".": {
       "module": "./src/public_api.js",
       "typings": "./src/public_api.d.ts",
@@ -53,12 +57,12 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/architect": "^0.1900.0",
+    "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
     "@angular-devkit/schematics": "^19.0.0",
-    "@o3r/core": "^12.1.0-prerelease.7",
-    "@o3r/schematics": "^12.1.0-prerelease.7",
-    "@o3r/styling": "^12.1.0-prerelease.7",
-    "@o3r/telemetry": "^12.1.0-prerelease.7",
+    "@o3r/core": "^12.1.0-prerelease.71",
+    "@o3r/schematics": "^12.1.0-prerelease.71",
+    "@o3r/styling": "^12.1.0-prerelease.71",
+    "@o3r/telemetry": "^12.1.0-prerelease.71",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "sass": "^1.81.0"
@@ -93,69 +97,69 @@
     }
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1900.0",
-    "@angular-devkit/build-angular": "~19.0.0",
-    "@angular-devkit/core": "~19.0.0",
-    "@angular-devkit/schematics": "~19.0.0",
-    "@angular/animations": "~19.0.0",
-    "@angular/cli": "~19.0.0",
-    "@angular/common": "~19.0.0",
-    "@angular/compiler": "~19.0.0",
-    "@angular/compiler-cli": "~19.0.0",
-    "@angular/core": "~19.0.0",
-    "@angular/platform-browser": "~19.0.0",
-    "@angular/platform-browser-dynamic": "~19.0.0",
+    "@angular-devkit/architect": "~0.1901.0",
+    "@angular-devkit/build-angular": "~19.1.0",
+    "@angular-devkit/core": "~19.1.0",
+    "@angular-devkit/schematics": "~19.1.0",
+    "@angular/animations": "~19.1.0",
+    "@angular/cli": "~19.1.0",
+    "@angular/common": "~19.1.0",
+    "@angular/compiler": "~19.1.0",
+    "@angular/compiler-cli": "~19.1.0",
+    "@angular/core": "~19.1.0",
+    "@angular/platform-browser": "~19.1.0",
+    "@angular/platform-browser-dynamic": "~19.1.0",
     "@babel/core": "~7.26.0",
     "@babel/preset-typescript": "~7.26.0",
     "@compodoc/compodoc": "^1.1.19",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@nx/eslint": "~20.2.0",
-    "@nx/eslint-plugin": "~20.2.0",
-    "@nx/jest": "~20.2.0",
-    "@nx/js": "~20.2.0",
-    "@o3r/build-helpers": "^12.1.0-prerelease.7",
-    "@o3r/core": "^12.1.0-prerelease.7",
-    "@o3r/eslint-plugin": "^12.1.0-prerelease.7",
-    "@o3r/schematics": "^12.1.0-prerelease.7",
-    "@o3r/styling": "^12.1.0-prerelease.7",
-    "@o3r/telemetry": "^12.1.0-prerelease.7",
-    "@o3r/test-helpers": "^12.1.0-prerelease.7",
-    "@schematics/angular": "~19.0.0",
-    "@stylistic/eslint-plugin": "~3.0.0",
+    "@nx/eslint": "~20.4.0",
+    "@nx/eslint-plugin": "~20.4.0",
+    "@nx/jest": "~20.4.0",
+    "@nx/js": "~20.4.0",
+    "@o3r/build-helpers": "^12.1.0-prerelease.71",
+    "@o3r/core": "^12.1.0-prerelease.71",
+    "@o3r/eslint-plugin": "^12.1.0-prerelease.71",
+    "@o3r/schematics": "^12.1.0-prerelease.71",
+    "@o3r/styling": "^12.1.0-prerelease.71",
+    "@o3r/telemetry": "^12.1.0-prerelease.71",
+    "@o3r/test-helpers": "^12.1.0-prerelease.71",
+    "@schematics/angular": "~19.1.0",
+    "@stylistic/eslint-plugin": "~3.1.0",
     "@swc/helpers": "~0.5.0",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.22.0",
-    "angular-eslint": "~19.0.0",
+    "@typescript-eslint/parser": "~8.25.0",
+    "angular-eslint": "~19.1.0",
     "chokidar": "^4.0.3",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.19.0",
-    "eslint-import-resolver-node": "^0.3.9",
-    "eslint-import-resolver-typescript": "^3.6.3",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-import-newlines": "^1.4.0",
+    "eslint": "~9.21.0",
+    "eslint-import-resolver-node": "~0.3.9",
+    "eslint-import-resolver-typescript": "~3.8.0",
+    "eslint-plugin-import": "~2.31.0",
+    "eslint-plugin-import-newlines": "~1.4.0",
     "eslint-plugin-jest": "~28.11.0",
     "eslint-plugin-jsdoc": "~50.6.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^56.0.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
+    "eslint-plugin-unicorn": "~56.0.0",
+    "eslint-plugin-unused-imports": "~4.1.4",
     "globals": "^15.9.0",
     "globby": "^11.1.0",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~20.2.0",
+    "nx": "~20.4.0",
     "pid-from-port": "^1.1.3",
     "rxjs": "^7.8.1",
-    "sass": "~1.83.0",
+    "sass": "~1.85.0",
     "semver": "^7.5.2",
     "ts-jest": "~29.2.5",
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
-    "typescript": "~5.6.2",
-    "typescript-eslint": "~8.22.0",
+    "typescript": "~5.7.3",
+    "typescript-eslint": "~8.25.0",
     "zone.js": "~0.15.0"
   },
   "engines": {

package/schematics/design-token-to-component/index.js

@@ -27,17 +27,15 @@ function ngAddDesignTokenFn(options) {
  * @param options
  */
 const ngAddDesignToken = (options) => async () => {
-    let createSchematicWithMetrics;
+    let createOtterSchematicWrapper = (fn) => fn;
     try {
-        ({ createSchematicWithMetricsIfInstalled: createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/schematics')));
+        const { createOtterSchematic: wrapper } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        createOtterSchematicWrapper = wrapper;
     }
     catch {
         // No @o3r/schematics detected
     }
-    if (!createSchematicWithMetrics) {
-        return ngAddDesignTokenFn(options);
-    }
-    return createSchematicWithMetrics(ngAddDesignTokenFn)(options);
+    return createOtterSchematicWrapper(ngAddDesignTokenFn)(options);
 };
 exports.ngAddDesignToken = ngAddDesignToken;
 //# sourceMappingURL=index.js.map

package/schematics/extract-token/index.js

@@ -29,12 +29,12 @@ function extractTokenFn(options) {
             const { filter } = await Promise.resolve().then(() => require('minimatch'));
             const filterFunctions = options.componentFilePatterns.map((pattern) => filter('/' + pattern.replace(/[/\\]+/g, '/'), { dot: true }));
             const sassParser = new CssVariableExtractor();
-            tree.visit((file) => {
+            tree.visit(async (file) => {
                 if (!filterFunctions.some((filterFunction) => filterFunction(file))) {
                     return;
                 }
                 const content = tree.readText(file);
-                const variables = sassParser.extractFileContent((0, node_path_1.resolve)(tree.root.path, file), content);
+                const variables = await sassParser.extractFileContent((0, node_path_1.resolve)(tree.root.path, file), content);
                 if (variables.length > 0 && options.includeTags) {
                     const newContent = updateFileContent(content);
                     tree.overwrite(file, newContent);
@@ -94,17 +94,15 @@ function extractTokenFn(options) {
  * @param options
  */
 const extractToken = (options) => async () => {
-    let createSchematicWithMetrics;
+    let createOtterSchematicWrapper = (fn) => fn;
     try {
-        ({ createSchematicWithMetricsIfInstalled: createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/schematics')));
+        const { createOtterSchematic: wrapper } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        createOtterSchematicWrapper = wrapper;
     }
     catch {
         // No @o3r/schematics detected
     }
-    if (!createSchematicWithMetrics) {
-        return extractTokenFn(options);
-    }
-    return createSchematicWithMetrics(extractTokenFn)(options);
+    return createOtterSchematicWrapper(extractTokenFn)(options);
 };
 exports.extractToken = extractToken;
 //# sourceMappingURL=index.js.map

package/schematics/generate-css/index.js

@@ -50,17 +50,15 @@ function generateCssFn(options) {
  * @param options
  */
 const generateCss = (options) => async () => {
-    let createSchematicWithMetrics;
+    let createOtterSchematicWrapper = (fn) => fn;
     try {
-        ({ createSchematicWithMetricsIfInstalled: createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/schematics')));
+        const { createOtterSchematic: wrapper } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        createOtterSchematicWrapper = wrapper;
     }
     catch {
         // No @o3r/schematics detected
     }
-    if (!createSchematicWithMetrics) {
-        return generateCssFn(options);
-    }
-    return createSchematicWithMetrics(generateCssFn)(options);
+    return createOtterSchematicWrapper(generateCssFn)(options);
 };
 exports.generateCss = generateCss;
 //# sourceMappingURL=index.js.map

package/schematics/generate-css/schema.json

@@ -32,7 +32,6 @@
     },
     "failOnDuplicate": {
       "type": "boolean",
-      "default": false,
       "description": "Determine if the process should stop in case of Token duplication"
     }
   },

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAIlB;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAqB5D;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAgBtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAIlB;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAqB5D;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAkBtD,CAAC"}

package/schematics/ng-add/index.js

@@ -40,10 +40,10 @@ function ngAddFn(options) {
 const ngAdd = (options) => async (_, { logger }) => {
     const missingSchematicDependencyMessage = 'Missing @o3r/schematics';
     try {
-        const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(() => {
+        const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(() => {
             throw new Error(missingSchematicDependencyMessage);
         });
-        return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+        return createOtterSchematic(ngAddFn)(options);
     }
     catch (err) {
         if (err instanceof Error && err.message === missingSchematicDependencyMessage) {

package/schematics/ng-add/schema.json

@@ -17,8 +17,7 @@
     },
     "exactO3rVersion": {
       "type": "boolean",
-      "description": "Use a pinned version for otter packages",
-      "default": false
+      "description": "Use a pinned version for otter packages"
     }
   },
   "additionalProperties": true,

package/schematics/ng-update/index.d.ts

@@ -2,5 +2,5 @@ import { Rule } from '@angular-devkit/schematics';
 /**
  * Update of Otter library V11.3
  */
-export declare const updateV11_3: (options: unknown) => Rule;
+export declare const updateV11_3: (options: any) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAsBpC;;GAEG;AAEH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAsBpC;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}

package/schematics/ng-update/index.js

@@ -20,5 +20,5 @@ function updateV11_3Fn() {
  * Update of Otter library V11.3
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
-exports.updateV11_3 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV11_3Fn);
+exports.updateV11_3 = (0, schematics_2.createOtterSchematic)(updateV11_3Fn);
 //# sourceMappingURL=index.js.map