@o3r/design 12.3.0-prerelease.47 → 12.3.0-prerelease.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/design",
-  "version": "12.3.0-prerelease.47",
+  "version": "12.3.0-prerelease.49",
   "publishConfig": {
     "access": "public"
   },
@@ -49,6 +49,7 @@
     "o3r-css-from-design-token": "./cli/generate-css-from-design-token.cli.cjs"
   },
   "dependencies": {
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "jsonschema": "~1.5.0",
     "minimatch": "~10.0.0",
     "minimist": "^1.2.6",
@@ -58,10 +59,10 @@
   "peerDependencies": {
     "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
     "@angular-devkit/schematics": "^19.0.0",
-    "@o3r/core": "^12.3.0-prerelease.47",
-    "@o3r/schematics": "^12.3.0-prerelease.47",
-    "@o3r/styling": "^12.3.0-prerelease.47",
-    "@o3r/telemetry": "^12.3.0-prerelease.47",
+    "@o3r/core": "^12.3.0-prerelease.49",
+    "@o3r/schematics": "^12.3.0-prerelease.49",
+    "@o3r/styling": "^12.3.0-prerelease.49",
+    "@o3r/telemetry": "^12.3.0-prerelease.49",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "sass": "^1.81.0"
@@ -116,13 +117,12 @@
     "@nx/eslint-plugin": "~20.8.0",
     "@nx/jest": "~20.8.0",
     "@nx/js": "~20.8.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.47",
-    "@o3r/core": "^12.3.0-prerelease.47",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.47",
-    "@o3r/schematics": "^12.3.0-prerelease.47",
-    "@o3r/styling": "^12.3.0-prerelease.47",
-    "@o3r/telemetry": "^12.3.0-prerelease.47",
-    "@o3r/test-helpers": "^12.3.0-prerelease.47",
+    "@o3r/build-helpers": "^12.3.0-prerelease.49",
+    "@o3r/core": "^12.3.0-prerelease.49",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.49",
+    "@o3r/styling": "^12.3.0-prerelease.49",
+    "@o3r/telemetry": "^12.3.0-prerelease.49",
+    "@o3r/test-helpers": "^12.3.0-prerelease.49",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@swc/helpers": "~0.5.0",
@@ -134,7 +134,7 @@
     "angular-eslint": "~19.3.0",
     "chokidar": "^4.0.3",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.24.0",
+    "eslint": "~9.25.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",

package/schematics/design-token-to-component/index.d.ts

@@ -9,5 +9,5 @@ export declare function ngAddDesignTokenFn(options: NgAddDesignTokenSchematicsSc
  * Add Design Token to an existing component
  * @param options
  */
-export declare const ngAddDesignToken: (options: NgAddDesignTokenSchematicsSchema) => () => Promise<Rule>;
+export declare const ngAddDesignToken: (options: NgAddDesignTokenSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/design-token-to-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/design-token-to-component/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EACV,gCAAgC,EACjC,MAAM,UAAU,CAAC;AAElB;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gCAAgC,GAAG,IAAI,CAelF;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,gCAAgC,wBAWzE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/design-token-to-component/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EACV,gCAAgC,EACjC,MAAM,UAAU,CAAC;AAElB;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gCAAgC,GAAG,IAAI,CAelF;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,gCAAgC,SAAsD,CAAC"}

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

@@ -4,6 +4,7 @@ exports.ngAddDesignToken = void 0;
 exports.ngAddDesignTokenFn = ngAddDesignTokenFn;
 const node_path_1 = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Add Design Token to an existing component
  * @param options
@@ -26,16 +27,6 @@ function ngAddDesignTokenFn(options) {
  * Add Design Token to an existing component
  * @param options
  */
-const ngAddDesignToken = (options) => async () => {
-    let createOtterSchematicWrapper = (fn) => fn;
-    try {
-        const { createOtterSchematic: wrapper } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        createOtterSchematicWrapper = wrapper;
-    }
-    catch {
-        // No @o3r/schematics detected
-    }
-    return createOtterSchematicWrapper(ngAddDesignTokenFn)(options);
-};
+const ngAddDesignToken = (options) => (0, schematics_2.createOtterSchematic)(ngAddDesignTokenFn)(options);
 exports.ngAddDesignToken = ngAddDesignToken;
 //# sourceMappingURL=index.js.map

package/schematics/extract-token/index.d.ts

@@ -4,5 +4,5 @@ import type { ExtractTokenSchematicsSchema } from './schema';
  * Extract the token from o3r mixin sass file
  * @param options
  */
-export declare const extractToken: (options: ExtractTokenSchematicsSchema) => () => Promise<Rule>;
+export declare const extractToken: (options: ExtractTokenSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/extract-token/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/extract-token/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAsGlB;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,SAAS,4BAA4B,wBAWjE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/extract-token/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAsGlB;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,SAAS,4BAA4B,SAAkD,CAAC"}

package/schematics/extract-token/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractToken = void 0;
 const node_path_1 = require("node:path");
+const schematics_1 = require("@o3r/schematics");
 const public_api_1 = require("../../src/public_api");
 const patternToDetect = 'o3r.var';
 /**
@@ -93,16 +94,6 @@ function extractTokenFn(options) {
  * Extract the token from o3r mixin sass file
  * @param options
  */
-const extractToken = (options) => async () => {
-    let createOtterSchematicWrapper = (fn) => fn;
-    try {
-        const { createOtterSchematic: wrapper } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        createOtterSchematicWrapper = wrapper;
-    }
-    catch {
-        // No @o3r/schematics detected
-    }
-    return createOtterSchematicWrapper(extractTokenFn)(options);
-};
+const extractToken = (options) => (0, schematics_1.createOtterSchematic)(extractTokenFn)(options);
 exports.extractToken = extractToken;
 //# sourceMappingURL=index.js.map

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

@@ -4,5 +4,5 @@ import type { GenerateCssSchematicsSchema } from './schema';
  * Generate CSS from Design Token files
  * @param options
  */
-export declare const generateCss: (options: GenerateCssSchematicsSchema) => () => Promise<Rule>;
+export declare const generateCss: (options: GenerateCssSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/generate-css/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/generate-css/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA2DlB;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,2BAA2B,wBAW/D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/generate-css/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AAyDlB;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,2BAA2B,SAAiD,CAAC"}

package/schematics/generate-css/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCss = void 0;
+const schematics_1 = require("@o3r/schematics");
 const design_1 = require("@o3r/design");
 /**
  * Generate CSS from Design Token files
@@ -26,8 +27,7 @@ function generateCssFn(options) {
             determineFileToUpdate,
             logger: context.logger
         };
-        const { globInTree } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const files = globInTree(tree, Array.isArray(options.designTokenFilePatterns) ? options.designTokenFilePatterns : [options.designTokenFilePatterns]);
+        const files = (0, schematics_1.globInTree)(tree, Array.isArray(options.designTokenFilePatterns) ? options.designTokenFilePatterns : [options.designTokenFilePatterns]);
         const duplicatedToken = [];
         const tokens = (await Promise.all(files.map(async (file) => ({ file, parsed: await (0, design_1.parseDesignTokenFile)(file) }))))
             .reduce((acc, { file, parsed }) => {
@@ -49,16 +49,6 @@ function generateCssFn(options) {
  * Generate CSS from Design Token files
  * @param options
  */
-const generateCss = (options) => async () => {
-    let createOtterSchematicWrapper = (fn) => fn;
-    try {
-        const { createOtterSchematic: wrapper } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        createOtterSchematicWrapper = wrapper;
-    }
-    catch {
-        // No @o3r/schematics detected
-    }
-    return createOtterSchematicWrapper(generateCssFn)(options);
-};
+const generateCss = (options) => (0, schematics_1.createOtterSchematic)(generateCssFn)(options);
 exports.generateCss = generateCss;
 //# sourceMappingURL=index.js.map

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;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAIlB;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAsB5D;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAkBtD,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;AAcpC,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,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -14,21 +14,20 @@ const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
  */
 function ngAddFn(options) {
     /* ng add rules */
-    return async (tree) => {
-        const { getPackageInstallConfig, setupDependencies, setupSchematicsParamsForProject } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return (tree) => {
         const schematicsDefaultOptions = {
             useOtterDesignToken: true
         };
         return (0, schematics_1.chain)([
             (0, register_generate_css_1.registerGenerateCssBuilder)(options.projectName),
-            setupSchematicsParamsForProject({
+            (0, schematics_2.setupSchematicsParamsForProject)({
                 '@o3r/core:component': schematicsDefaultOptions,
                 '@o3r/core:component-presenter': schematicsDefaultOptions,
                 '*:*': schematicsDefaultOptions
             }, options.projectName),
-            setupDependencies({
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies: getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion)
+                dependencies: (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion)
             }),
             options.extractDesignToken ? (0, extract_token_1.extractToken)({ componentFilePatterns: ['**/*.scss'], includeTags: true }) : schematics_1.noop,
             options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
@@ -39,24 +38,6 @@ function ngAddFn(options) {
  * Add Otter design to an Angular Project
  * @param options
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const missingSchematicDependencyMessage = 'Missing @o3r/schematics';
-    try {
-        const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(() => {
-            throw new Error(missingSchematicDependencyMessage);
-        });
-        return createOtterSchematic(ngAddFn)(options);
-    }
-    catch (err) {
-        if (err instanceof Error && err.message === missingSchematicDependencyMessage) {
-            logger.warn(`[WARNING]: The run of the ng-add schematics of @o3r/design has failed, the setup of default features will not be done.
-The failure is due to miss of the package '@o3r/schematics'.
-To get benefit of the setup scripts, please run 'ng add @o3r/schematics' before.`);
-        }
-        else {
-            throw err;
-        }
-    }
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/register-generate-css/register-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-task.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/register-generate-css/register-task.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAKpC;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,GAAI,cAAc,MAAM,EAAE,iBAAyB,KAAG,IAyE5F,CAAC"}
+{"version":3,"file":"register-task.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/register-generate-css/register-task.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AASpC;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,GAAI,cAAc,MAAM,EAAE,iBAAyB,KAAG,IAqE5F,CAAC"}

package/schematics/ng-add/register-generate-css/register-task.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerGenerateCssBuilder = void 0;
 const node_path_1 = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Register the Design Token CSS generator
  * @param projectName Project name
  * @param taskName name of the task to generate
  */
 const registerGenerateCssBuilder = (projectName, taskName = 'generate-css') => {
-    const registerBuilderRule = async (tree, { logger }) => {
-        const { getWorkspaceConfig, registerBuilder } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const workspace = getWorkspaceConfig(tree);
+    const registerBuilderRule = (tree, { logger }) => {
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
         const workspaceProject = projectName ? workspace?.projects[projectName] : undefined;
         const workspaceRootPath = workspaceProject?.root || '.';
         const srcBasePath = workspaceProject?.sourceRoot || node_path_1.posix.join(workspaceRootPath, 'src');
@@ -36,12 +36,11 @@ const registerGenerateCssBuilder = (projectName, taskName = 'generate-css') => {
             logger.warn(`No angular.json found, the task ${taskName} will not be created`);
             return;
         }
-        registerBuilder(workspaceProject, taskName, taskParameters);
+        (0, schematics_2.registerBuilder)(workspaceProject, taskName, taskParameters);
         tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
     };
-    const generateDesignTokenFilesRule = async (tree) => {
-        const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const workspaceProject = projectName ? getWorkspaceConfig(tree)?.projects[projectName] : undefined;
+    const generateDesignTokenFilesRule = (tree) => {
+        const workspaceProject = projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
         const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.join(workspaceProject.root, 'src') : './src');
         const themeFolder = node_path_1.posix.join(srcBasePath, 'style');
         return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./register-generate-css/templates'), [
@@ -50,9 +49,8 @@ const registerGenerateCssBuilder = (projectName, taskName = 'generate-css') => {
             (0, schematics_1.move)(themeFolder)
         ]), schematics_1.MergeStrategy.Overwrite);
     };
-    const generateTemplateFilesRule = async (tree) => {
-        const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const workspaceProject = projectName ? getWorkspaceConfig(tree)?.projects[projectName] : undefined;
+    const generateTemplateFilesRule = (tree) => {
+        const workspaceProject = projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
         const workspaceRootPath = workspaceProject?.root || '.';
         return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./register-generate-css/templates-workspace'), [
             (0, schematics_1.template)({}),
@@ -60,9 +58,8 @@ const registerGenerateCssBuilder = (projectName, taskName = 'generate-css') => {
             (0, schematics_1.move)(workspaceRootPath)
         ]), schematics_1.MergeStrategy.Overwrite);
     };
-    const importTheme = async (tree, context) => {
-        const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const workspaceProject = projectName ? getWorkspaceConfig(tree)?.projects[projectName] : undefined;
+    const importTheme = (tree, context) => {
+        const workspaceProject = projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
         const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.join(workspaceProject.root, 'src') : './src');
         const styleFile = node_path_1.posix.join(srcBasePath, 'styles.scss');
         if (!tree.exists(styleFile)) {