@o3r/styling 12.1.0-prerelease.21 → 12.1.0-prerelease.3

package/builders/style-extractor/helpers/css-variable.extractor.d.ts

@@ -1,21 +1,14 @@
-import { CalculationValue, StringOptions } from 'sass-embedded';
+import { StringOptions } from 'sass';
 import type { StyleExtractorBuilderSchema } from '../schema';
 import type { CssMetadata, CssVariable } from '@o3r/styling';
-/**
- * This method will iterate on all characters in str and return the substring that is balanced which corresponds to a var declaration.
- * @param str
- */
-export declare const getVarDeclaration: (str: string) => string | null;
 /**
  * CSS Variable extractor
  */
 export declare class CssVariableExtractor {
-    defaultSassOptions?: StringOptions<"async"> | undefined;
+    defaultSassOptions?: StringOptions<"sync"> | undefined;
     private readonly builderOptions?;
-    private static readonly asyncCompiler;
-    private static readonly varRegex;
     private readonly cache;
-    constructor(defaultSassOptions?: StringOptions<"async"> | undefined, builderOptions?: Pick<StyleExtractorBuilderSchema, "ignoreInvalidValue"> | undefined);
+    constructor(defaultSassOptions?: StringOptions<"sync"> | undefined, builderOptions?: Pick<StyleExtractorBuilderSchema, "ignoreInvalidValue"> | undefined);
     /**
      * Parse the CSS variable as reported
      * @param name CSS Variable name
@@ -38,23 +31,18 @@ export declare class CssVariableExtractor {
      */
     private static getPackageName;
     private static extractTags;
-    static getCalcString(item: CalculationValue, isSubCalc: boolean): string;
     /**
      * Extract metadata from Sass Content
      * @param sassFilePath SCSS file URL
      * @param sassFileContent SCSS file content
      * @param additionalSassOptions
      */
-    extractFileContent(sassFilePath: string, sassFileContent: string, additionalSassOptions?: StringOptions<'async'>): Promise<CssVariable[]>;
-    /**
-     * Dispose the async compiler. Must be called once when extraction is done.
-     */
-    disposeAsyncCompiler(): Promise<void>;
+    extractFileContent(sassFilePath: string, sassFileContent: string, additionalSassOptions?: StringOptions<'sync'>): CssVariable[];
     /**
      * Extract metadata from Sass file
      * @param sassFilePath SCSS file to parse
      */
-    extractFile(sassFilePath: string): Promise<CssVariable[]>;
+    extractFile(sassFilePath: string): CssVariable[];
     /**
      * Extract metadata
      * @param libraries List of libraries

package/builders/style-extractor/helpers/css-variable.extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"css-variable.extractor.d.ts","sourceRoot":"","sources":["../../../../builders/style-extractor/helpers/css-variable.extractor.ts"],"names":[],"mappings":"AAWA,OAAO,EAIL,gBAAgB,EAUhB,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEZ,MAAM,cAAc,CAAC;AAEtB;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAS,MAAM,KAAG,MAAM,GAAG,IAqBxD,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAoB;IAKZ,kBAAkB,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC;IAAE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAJhG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAA+C;IACpF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAClE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;gBAE9B,kBAAkB,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,YAAA,EAAmB,cAAc,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,oBAAoB,CAAC,YAAA;IAEzJ;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA0BxB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAIhC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAM7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAO7B,OAAO,CAAC,MAAM,CAAC,WAAW;WAqBZ,aAAa,CAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM;IAe/E;;;;;OAKG;IACU,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC;IAiL7H;;OAEG;IACU,oBAAoB;IAIjC;;;OAGG;IACU,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAKtE;;;;OAIG;IACI,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,WAAW;CAcvE"}
+{"version":3,"file":"css-variable.extractor.d.ts","sourceRoot":"","sources":["../../../../builders/style-extractor/helpers/css-variable.extractor.ts"],"names":[],"mappings":"AAWA,OAAO,EAQL,aAAa,EAEd,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEZ,MAAM,cAAc,CAAC;AAUtB;;GAEG;AACH,qBAAa,oBAAoB;IAGZ,kBAAkB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC;IAAE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAF/F,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;gBAE9B,kBAAkB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,YAAA,EAAmB,cAAc,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,oBAAoB,CAAC,YAAA;IAExJ;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA6BxB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAIhC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAO7B,OAAO,CAAC,MAAM,CAAC,WAAW;IAqB1B;;;;;OAKG;IACI,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC;IAgLtH;;;OAGG;IACI,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,EAAE;IAKvD;;;;OAIG;IACI,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,WAAW;CAiBvE"}

package/builders/style-extractor/helpers/css-variable.extractor.js

@@ -1,43 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CssVariableExtractor = exports.getVarDeclaration = void 0;
+exports.CssVariableExtractor = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const node_url_1 = require("node:url");
 const extractors_1 = require("@o3r/extractors");
 const schematics_1 = require("@o3r/schematics");
-const sass_embedded_1 = require("sass-embedded");
-/**
- * This method will iterate on all characters in str and return the substring that is balanced which corresponds to a var declaration.
- * @param str
- */
-const getVarDeclaration = (str) => {
-    const varIndex = str.indexOf('var(');
-    if (varIndex === -1) {
-        return null;
-    }
-    let nbToClose = 0;
-    for (let i = varIndex + 3; i < str.length; i++) {
-        const char = str[i];
-        if (char === '(') {
-            nbToClose++;
-        }
-        else if (char === ')') {
-            nbToClose--;
-            if (nbToClose === 0) {
-                return str.substring(varIndex, i + 1);
-            }
-        }
-    }
-    return str.substring(varIndex);
-};
-exports.getVarDeclaration = getVarDeclaration;
+const sass_1 = require("sass");
 /**
  * CSS Variable extractor
  */
 class CssVariableExtractor {
-    static { this.asyncCompiler = (0, sass_embedded_1.initAsyncCompiler)(); }
-    static { this.varRegex = /var\(\s*--(.*?)\s*,\s*(.*)\)/; }
     constructor(defaultSassOptions, builderOptions) {
         this.defaultSassOptions = defaultSassOptions;
         this.builderOptions = builderOptions;
@@ -50,29 +23,30 @@ class CssVariableExtractor {
      */
     parseCssVariable(name, value = '') {
         const defaultValue = value.trim();
-        const resultingCssVariable = { name, defaultValue };
-        let remainingValue = defaultValue;
-        let referenceMatch;
-        const references = {};
-        do {
-            const varDeclaration = (0, exports.getVarDeclaration)(remainingValue);
-            if (varDeclaration === null) {
-                // No more var() references
-                break;
-            }
-            else {
-                referenceMatch = CssVariableExtractor.varRegex.exec(varDeclaration);
-                if (referenceMatch) {
-                    const refName = referenceMatch[1];
-                    references[refName] = this.parseCssVariable(refName, referenceMatch[2]);
-                    remainingValue = remainingValue.replace(varDeclaration, '');
+        const res = defaultValue.match(/^var\(\s*([^\s),]+)\s*(?:,\s*([^(),]+(?:\([^)]*\))?))*\s*\)$/);
+        const ret = { name, defaultValue };
+        if (res) {
+            ret.references = [
+                this.parseCssVariable(res[1].replace(/^--/, ''), res[2])
+            ];
+        }
+        else {
+            let findRef = defaultValue;
+            let ref;
+            const references = {};
+            do {
+                ref = /var\(\s*([^\s),]+)\s*(?:,\s*([^(),]+(\([^)]*\))?))*\s*\)/.exec(findRef);
+                if (ref) {
+                    const refName = ref[1].replace(/^--/, '');
+                    references[refName] = this.parseCssVariable(refName, ref[2]);
+                    findRef = findRef.replace(ref[0], '');
                 }
+            } while (ref);
+            if (Object.keys(references).length > 0) {
+                ret.references = Object.values(references);
             }
-        } while (referenceMatch);
-        if (Object.keys(references).length > 0) {
-            resultingCssVariable.references = Object.values(references);
         }
-        return resultingCssVariable;
+        return ret;
     }
     /**
      * Type predicate for SassCalculation
@@ -86,9 +60,7 @@ class CssVariableExtractor {
      * @param color Sass Color
      */
     static getColorString(color) {
-        return color.alpha === 1
-            ? `rgb(${color.channel('red')}, ${color.channel('green')}, ${color.channel('blue')})`
-            : `rgba(${color.channel('red')}, ${color.channel('green')}, ${color.channel('blue')}, ${color.alpha})`;
+        return color.alpha ? `rgba(${color.red}, ${color.green}, ${color.blue}, ${color.alpha})` : `rgb(${color.red}, ${color.green}, ${color.blue}})`;
     }
     /**
      * Returns the package name from an url
@@ -102,19 +74,19 @@ class CssVariableExtractor {
     }
     static extractTags(tags) {
         let contextTags;
-        if (tags instanceof sass_embedded_1.SassString) {
+        if (tags instanceof sass_1.SassString) {
             contextTags = [tags.text];
         }
-        else if (tags instanceof sass_embedded_1.SassList) {
+        else if (tags instanceof sass_1.SassList) {
             contextTags = [];
             for (let i = 0; i < tags.asList.size; i++) {
                 const item = tags.get(i);
-                if (item instanceof sass_embedded_1.SassString) {
+                if (item instanceof sass_1.SassString) {
                     contextTags.push(item.text);
                 }
             }
         }
-        else if (tags instanceof sass_embedded_1.SassMap) {
+        else if (tags instanceof sass_1.SassMap) {
             const value = tags.contents.toArray().find(([key]) => key.toString() === 'value');
             if (value) {
                 contextTags = CssVariableExtractor.extractTags(value[1]);
@@ -122,30 +94,13 @@ class CssVariableExtractor {
         }
         return contextTags;
     }
-    static getCalcString(item, isSubCalc) {
-        if (item instanceof sass_embedded_1.SassNumber) {
-            const value = item.value;
-            const unit = item.numeratorUnits.get(0) ?? '';
-            return value + unit;
-        }
-        else if (item instanceof sass_embedded_1.SassString) {
-            return item.text;
-        }
-        else if (item instanceof sass_embedded_1.CalculationOperation) {
-            return `${isSubCalc ? '(' : ''}${CssVariableExtractor.getCalcString(item.left, true)} ${item.operator} ${CssVariableExtractor.getCalcString(item.right, true)}${isSubCalc ? ')' : ''}`;
-        }
-        else if (item instanceof sass_embedded_1.CalculationInterpolation) {
-            return item.value;
-        }
-        return `calc(${item.arguments.toArray().map((arg) => CssVariableExtractor.getCalcString(arg, false)).join(' ')})`;
-    }
     /**
      * Extract metadata from Sass Content
      * @param sassFilePath SCSS file URL
      * @param sassFileContent SCSS file content
      * @param additionalSassOptions
      */
-    async extractFileContent(sassFilePath, sassFileContent, additionalSassOptions) {
+    extractFileContent(sassFilePath, sassFileContent, additionalSassOptions) {
         const cssVariables = [];
         const options = {
             ...this.defaultSassOptions,
@@ -187,30 +142,30 @@ class CssVariableExtractor {
                     let category;
                     let type;
                     if (details) {
-                        if (details instanceof sass_embedded_1.SassMap) {
+                        if (details instanceof sass_1.SassMap) {
                             for (const [key, value] of details.contents.toArray()) {
-                                if (key instanceof sass_embedded_1.SassString) {
+                                if (key instanceof sass_1.SassString) {
                                     switch (key.text) {
                                         case 'description': {
-                                            if (value instanceof sass_embedded_1.SassString) {
+                                            if (value instanceof sass_1.SassString) {
                                                 description = value.text;
                                             }
                                             break;
                                         }
                                         case 'label': {
-                                            if (value instanceof sass_embedded_1.SassString) {
+                                            if (value instanceof sass_1.SassString) {
                                                 label = value.text;
                                             }
                                             break;
                                         }
                                         case 'type': {
-                                            if (value instanceof sass_embedded_1.SassString) {
+                                            if (value instanceof sass_1.SassString) {
                                                 type = value.text;
                                             }
                                             break;
                                         }
                                         case 'category': {
-                                            if (value instanceof sass_embedded_1.SassString) {
+                                            if (value instanceof sass_1.SassString) {
                                                 category = value.text;
                                             }
                                             break;
@@ -232,32 +187,29 @@ class CssVariableExtractor {
                             contextTags = CssVariableExtractor.extractTags(details);
                         }
                     }
+                    if (!(varName instanceof sass_1.SassString)) {
+                        throw new schematics_1.O3rCliError('Invalid variable name');
+                    }
                     let parsedValue;
-                    if (varValue instanceof sass_embedded_1.SassString || varValue instanceof sass_embedded_1.SassNumber) {
+                    if (varValue instanceof sass_1.SassString || varValue instanceof sass_1.SassNumber || varValue instanceof sass_1.SassBoolean) {
                         parsedValue = varValue.toString();
                     }
-                    else if (varValue === sass_embedded_1.sassTrue || varValue === sass_embedded_1.sassFalse) {
-                        parsedValue = `${varValue.isTruthy}`;
-                    }
-                    else if (varValue instanceof sass_embedded_1.SassColor) {
+                    else if (varValue instanceof sass_1.SassColor) {
                         parsedValue = CssVariableExtractor.getColorString(varValue);
                     }
-                    else if (varValue instanceof sass_embedded_1.SassList) {
+                    else if (varValue instanceof sass_1.SassList) {
                         const invalidIndexes = [];
                         const parsedValueItems = [];
                         for (let i = 0; i < varValue.asList.size; i++) {
                             const item = varValue.get(i);
-                            if (item instanceof sass_embedded_1.SassString || item instanceof sass_embedded_1.SassNumber) {
+                            if (item instanceof sass_1.SassString || item instanceof sass_1.SassNumber || item instanceof sass_1.SassBoolean) {
                                 parsedValueItems.push(item.toString());
                             }
-                            else if (item === sass_embedded_1.sassTrue || item === sass_embedded_1.sassFalse) {
-                                parsedValueItems.push(`${item.isTruthy}`);
-                            }
-                            else if (item instanceof sass_embedded_1.SassColor) {
+                            else if (item instanceof sass_1.SassColor) {
                                 parsedValueItems.push(CssVariableExtractor.getColorString(item));
                             }
                             else if (CssVariableExtractor.isSassCalculation(item)) {
-                                parsedValueItems.push(`calc(${item.arguments.toArray().map((arg) => CssVariableExtractor.getCalcString(arg, false)).join(' ')})`);
+                                parsedValueItems.push(`calc(${item.$arguments[0]})`);
                             }
                             else {
                                 invalidIndexes.push(i);
@@ -276,14 +228,14 @@ class CssVariableExtractor {
                         }
                     }
                     else if (CssVariableExtractor.isSassCalculation(varValue)) {
-                        parsedValue = `calc(${varValue.arguments.toArray().map((arg) => CssVariableExtractor.getCalcString(arg, false)).join(' ')})`;
+                        parsedValue = `calc(${varValue.$arguments[0]})`;
                     }
                     else if (varValue.realNull) {
                         const message = `Invalid value for variable ${varName.text}.`;
                         if (this.builderOptions?.ignoreInvalidValue ?? true) {
                             // eslint-disable-next-line no-console -- no other logger available
                             console.warn(`${message} It will be ignored.`);
-                            return new sass_embedded_1.SassString(`[METADATA:VARIABLE] ${varName.text} : invalid value`);
+                            return new sass_1.SassString(`[METADATA:VARIABLE] ${varName.text} : invalid value`);
                         }
                         else {
                             throw new schematics_1.O3rCliError(message);
@@ -293,7 +245,7 @@ class CssVariableExtractor {
                         if (!details) {
                             // eslint-disable-next-line no-console -- no other logger available
                             console.warn(`The value "null" of ${varName.text} is available only for details override`);
-                            return new sass_embedded_1.SassString(`[METADATA:VARIABLE] ${varName.text} : invalid Null value`);
+                            return new sass_1.SassString(`[METADATA:VARIABLE] ${varName.text} : invalid Null value`);
                         }
                     }
                     const cssVariableObj = this.parseCssVariable(varName.text, parsedValue);
@@ -311,34 +263,28 @@ class CssVariableExtractor {
                                 ...cssVariables[cssVariableIndex],
                                 ...cssVariableDetails
                             };
-                            return new sass_embedded_1.SassString(`[METADATA:VARIABLE] update ${varName.text} details` + (contextTags ? ` (tags: ${contextTags.join(', ')})` : ''));
+                            return new sass_1.SassString(`[METADATA:VARIABLE] update ${varName.text} details` + (contextTags ? ` (tags: ${contextTags.join(', ')})` : ''));
                         }
-                        return new sass_embedded_1.SassString(`[METADATA:VARIABLE] ${varName.text} : Failed to update details of undefined variable`);
+                        return new sass_1.SassString(`[METADATA:VARIABLE] ${varName.text} : Failed to update details of undefined variable`);
                     }
                     cssVariables.push({
                         ...cssVariableObj,
                         ...cssVariableDetails
                     });
-                    return new sass_embedded_1.SassString(`[METADATA:VARIABLE] ${varName.text} : ${parsedValue}` + (contextTags ? ` (tags: ${contextTags.join(', ')})` : ''));
+                    return new sass_1.SassString(`[METADATA:VARIABLE] ${varName.text} : ${parsedValue}` + (contextTags ? ` (tags: ${contextTags.join(', ')})` : ''));
                 }
             }
         };
-        await (await CssVariableExtractor.asyncCompiler).compileStringAsync(sassFileContent, options);
+        (0, sass_1.compileString)(sassFileContent, options);
         return cssVariables;
     }
-    /**
-     * Dispose the async compiler. Must be called once when extraction is done.
-     */
-    async disposeAsyncCompiler() {
-        await (await CssVariableExtractor.asyncCompiler).dispose();
-    }
     /**
      * Extract metadata from Sass file
      * @param sassFilePath SCSS file to parse
      */
-    async extractFile(sassFilePath) {
+    extractFile(sassFilePath) {
         const sassFileContent = fs.readFileSync(sassFilePath, { encoding: 'utf8' });
-        return await this.extractFileContent(sassFilePath, sassFileContent);
+        return this.extractFileContent(sassFilePath, sassFileContent);
     }
     /**
      * Extract metadata
@@ -349,7 +295,10 @@ class CssVariableExtractor {
         return libraries
             .map((lib) => (0, extractors_1.getLibraryCmsMetadata)(lib))
             .filter(({ styleFilePath }) => !!styleFilePath)
-            .map(({ styleFilePath }) => JSON.parse(fs.readFileSync(styleFilePath, 'utf8')))
+            .map(({ styleFilePath }) => {
+            const libConfig = JSON.parse(fs.readFileSync(styleFilePath, 'utf8'));
+            return libConfig;
+        })
             .reduce((acc, libMetadata) => {
             return Object.keys(libMetadata.variables)
                 .filter((key) => !!acc.variables[key])

package/builders/style-extractor/index.js

@@ -46,10 +46,10 @@ exports.default = (0, architect_1.createBuilder)((0, extractors_1.createBuilderW
         /** CSS Metadata file to write */
         let cssMetadata = (
         // extract metadata for each file
-        await Promise.all(files.map(async (file, idx) => {
+        await Promise.all(files.map((file, idx) => {
             try {
                 context.reportProgress(idx, STEP_NUMBER, `Extracting ${file}`);
-                const variables = await cssVariableExtractor.extractFile(file);
+                const variables = cssVariableExtractor.extractFile(file);
                 const themeFileSuffix = '.style.theme.scss';
                 if (file.endsWith(themeFileSuffix)) {
                     const componentPath = path.join(path.dirname(file), `${path.basename(file, themeFileSuffix)}.component.ts`);
@@ -57,10 +57,7 @@ exports.default = (0, architect_1.createBuilder)((0, extractors_1.createBuilderW
                     const componentDeclaration = componentSourceFile.statements.find((s) => ts.isClassDeclaration(s) && (0, schematics_1.isO3rClassComponent)(s));
                     const componentName = componentDeclaration?.name?.escapedText.toString();
                     if (componentName) {
-                        for (const variable of variables) {
-                            variable.component = { library: libraryName, name: componentName };
-                        }
-                        return variables;
+                        return variables.map((variable) => ({ ...variable, component: { library: libraryName, name: componentName } }));
                     }
                 }
                 return variables;
@@ -70,12 +67,16 @@ exports.default = (0, architect_1.createBuilder)((0, extractors_1.createBuilderW
                 return [];
             }
         }))).reduce((acc, cssVarList) => {
-            for (const cssVar of cssVarList) {
-                if (!!acc.variables[cssVar.name] && !initialPreviousMetadata.variables[cssVar.name] && acc.variables[cssVar.name].defaultValue !== cssVar.defaultValue) {
-                    context.logger[options.ignoreDuplicateWarning ? 'debug' : 'warn'](`Duplicate "${cssVar.name}" (${acc.variables[cssVar.name].defaultValue} will be replaced by ${cssVar.defaultValue})`);
-                }
-                acc.variables[cssVar.name] = cssVar;
-            }
+            // Check duplicate CSS variable
+            cssVarList
+                .filter((cssVar) => !!acc.variables[cssVar.name])
+                .filter((cssVar) => !initialPreviousMetadata.variables[cssVar.name] && acc.variables[cssVar.name].defaultValue !== cssVar.defaultValue)
+                .forEach((cssVar) => context.logger[options.ignoreDuplicateWarning ? 'debug' : 'warn'](`Duplicate "${cssVar.name}" (${acc.variables[cssVar.name].defaultValue} will be replaced by ${cssVar.defaultValue})`));
+            // merge all variables form all the files
+            cssVarList
+                .forEach((item) => {
+                acc.variables[item.name] = item;
+            });
             return acc;
         }, initialPreviousMetadata);
         // exit on failure
@@ -181,7 +182,6 @@ exports.default = (0, architect_1.createBuilder)((0, extractors_1.createBuilderW
             }
         });
         context.addTeardown(async () => {
-            await cssVariableExtractor.disposeAsyncCompiler();
             await watcher.close();
             await metadataWatcher.close();
         });
@@ -191,9 +191,7 @@ exports.default = (0, architect_1.createBuilder)((0, extractors_1.createBuilderW
             .on('error', (err) => reject(err)));
     }
     else {
-        const result = execute(getAllFiles());
-        void cssVariableExtractor.disposeAsyncCompiler();
-        return result;
+        return execute(getAllFiles());
     }
 }));
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/styling",
-  "version": "12.1.0-prerelease.21",
+  "version": "12.1.0-prerelease.3",
   "publishConfig": {
     "access": "public"
   },
@@ -38,11 +38,11 @@
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",
     "@angular/material": "^19.0.0",
-    "@o3r/core": "^12.1.0-prerelease.21",
-    "@o3r/dynamic-content": "^12.1.0-prerelease.21",
-    "@o3r/extractors": "^12.1.0-prerelease.21",
-    "@o3r/logger": "^12.1.0-prerelease.21",
-    "@o3r/schematics": "^12.1.0-prerelease.21",
+    "@o3r/core": "^12.1.0-prerelease.3",
+    "@o3r/dynamic-content": "^12.1.0-prerelease.3",
+    "@o3r/extractors": "^12.1.0-prerelease.3",
+    "@o3r/logger": "^12.1.0-prerelease.3",
+    "@o3r/schematics": "^12.1.0-prerelease.3",
     "@schematics/angular": "^19.0.0",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",
@@ -53,7 +53,6 @@
     "globby": "^11.1.0",
     "rxjs": "^7.8.1",
     "sass": "^1.81.0",
-    "sass-embedded": "^1.81.0",
     "semver": "^7.5.2",
     "ts-node": "~10.9.2",
     "typescript": "^5.5.4"
@@ -116,9 +115,6 @@
     "sass": {
       "optional": true
     },
-    "sass-embedded": {
-      "optional": true
-    },
     "semver": {
       "optional": true
     },