mage-obsidian 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mage-obsidian",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Mage Obsidian Ultis",
   "main": "./src/scripts/buildThemes.js",
   "keywords": [
@@ -29,7 +29,8 @@
     "deepmerge": "^4.3.1",
     "jest": "^29.7.0",
     "jest-environment-node": "^29.7.0",
-    "readline-sync": "^1.4.10"
+    "readline-sync": "^1.4.10",
+    "commander": "^13.1.0"
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"

package/src/__tests__/magento_scenarios/app/code/Vendor/ModuleNameA/view/frontend/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         theme: { extend: {} },
         plugins: [],

package/src/__tests__/magento_scenarios/app/code/Vendor/ModuleNameB/view/frontend/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         content: [
             '../templates/**/*.phtml'

package/src/__tests__/magento_scenarios/app/code/Vendor/ModuleNameC/view/frontend/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         content: [
             '../templates/**/*.phtml'

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         content: [
             '../templates/**/*.phtml',

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameB/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         content: [
             '../templates/**/*.phtml'

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameNoConfig/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         content: [
             '../templates/**/*.phtml',

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-a/web/{theme.config.cjs → theme.config.js}

@@ -1,8 +1,7 @@
-module.exports = {
+export default {
     tailwind: {
         theme: {
-            extend: {
-            },
+            extend: {},
         },
         plugins: [],
         content: [
@@ -13,6 +12,6 @@ module.exports = {
     },
     ignoredTailwindConfigFromModules: [],
     ignoredCssFromModules: [
-        'Vendor_ModuleNameA'
-    ]
-}
+        'Vendor_ModuleNameA',
+    ],
+};

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-b/web/{theme.config.cjs → theme.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         theme: {
             extend: {

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-c/Vendor_ModuleNameB/web/{module.config.cjs → module.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         plugins: ['test_from_theme'],
         content: [

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-c/web/{theme.config.cjs → theme.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         theme: {
             extend: {

package/src/__tests__/magento_scenarios/app/design/frontend/Vendor/theme-d/web/{theme.config.cjs → theme.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     tailwind: {
         theme: {
             extend: {

package/src/__tests__/magento_scenarios/app/etc/mage_obsidian_frontend_modules_a.json

@@ -46,8 +46,8 @@
         "ts"
     ],
     "MODULE_CSS_EXTEND_FILE": "module.extend.css",
-    "MODULE_CONFIG_FILE": "module.config.cjs",
-    "THEME_CONFIG_FILE": "theme.config.cjs",
+    "MODULE_CONFIG_FILE": "module.config.js",
+    "THEME_CONFIG_FILE": "theme.config.js",
     "THEME_CSS_SOURCE_FILE": "theme.source.css",
     "LIB_PATH": "lib"
 }

package/src/__tests__/magento_scenarios/app/etc/mage_obsidian_frontend_modules_b.json

@@ -43,8 +43,8 @@
         "ts"
     ],
     "MODULE_CSS_EXTEND_FILE": "module.extend.css",
-    "MODULE_CONFIG_FILE": "module.config.cjs",
-    "THEME_CONFIG_FILE": "theme.config.cjs",
+    "MODULE_CONFIG_FILE": "module.config.js",
+    "THEME_CONFIG_FILE": "theme.config.js",
     "THEME_CSS_SOURCE_FILE": "theme.source.css",
     "LIB_PATH": "lib"
 }

package/src/__tests__/service/inheritModuleResolver.test.js

@@ -21,26 +21,25 @@ let scenarios = [
 ];
 
 function mockConfigAndModules(scenario) {
-    jest.mock(
-        '#service/configResolver.cjs',
-        () => createMockConfigResolver(scenario).default
-    );
-    jest.unstable_mockModule(
-        '#service/moduleResolver.js',
-        () => ({
-            default: {
-                getAllJsVueFilesWithInheritanceCached: jest.fn(() => ({
-                    'Vendor_ModuleNameA/js/test': '/TEST/web/js/test.js',
-                })),
-            }
-        })
-    );
+    jest.unstable_mockModule('#service/configResolver.js', () => ({
+        __esModule: true,
+        default: createMockConfigResolver(scenario).default,
+    }));
+
+    jest.unstable_mockModule('#service/moduleResolver.js', () => ({
+        __esModule: true,
+        default: {
+            getAllJsVueFilesWithInheritanceCached: jest.fn(() => ({
+                'Vendor_ModuleNameA/js/test': '/TEST/web/js/test.js',
+            })),
+        }
+    }));
 }
 
 async function setupInheritModuleResolver(scenario) {
     mockConfigAndModules(scenario);
-    const resolver = await import('#service/inheritModuleResolver.js');
-    return resolver.default();
+    const { default: inheritModuleResolverFactory } = await import('#service/inheritModuleResolver.js');
+    return inheritModuleResolverFactory();
 }
 
 describe('inherit-resolver', () => {
@@ -57,13 +56,6 @@ describe('inherit-resolver', () => {
         inheritModuleResolver = await setupInheritModuleResolver(scenario);
         const result = await inheritModuleResolver.resolveId.handler(codeImport);
 
-        expect(result).toEqual(
-            expected,
-            `Scenario: "${scenario}"
-            Theme: "${code}"
-            Import: "${codeImport}"
-            Expected: ${JSON.stringify(expected, null, 2)}
-            Received: ${JSON.stringify(result, null, 2)}`
-        );
+        expect(result).toEqual(expected);
     });
 });

package/src/__tests__/service/moduleResolver.test.js

@@ -176,17 +176,19 @@ describe('getAllJsVueFilesWithInheritance', () => {
         themes.map(({ code, expected }) => ([ scenario, code, expected ]))
     ))('Scenario "%s", Theme "%s"', async (scenario, code, expected) => {
         jest.unstable_mockModule(
-            '#service/configResolver.cjs',
-            () => createMockConfigResolver(scenario)
+            '#service/configResolver.js',
+            () => ({
+                __esModule: true,
+                default: createMockConfigResolver(scenario).default
+            })
         );
-        moduleResolver = await import('#service/moduleResolver.js');
-        moduleResolver = moduleResolver.default;
+
+        const importedModule = await import('#service/moduleResolver.js');
+        moduleResolver = importedModule.default;
 
         const result = await moduleResolver.getAllJsVueFilesWithInheritance(code);
 
-        // Mensaje personalizado para errores
         expect(result).toEqual(expected, `Failed for scenario "${scenario}", theme "${code}"`);
     });
-
-
 });
+

package/src/__tests__/service/moduleResolverSync.test.js

@@ -74,56 +74,56 @@ let scenariosForResolveFileByTheme = [
             {
                 code: 'Vendor/theme-a',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: true,
-                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/module.config.cjs'
+                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/module.config.js'
             },
             {
                 code: 'Vendor/theme-a',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'no_exist_file.cjs',
+                filePath: 'no_exist_file.js',
                 includeTailwindConfigFromParentThemes: true,
                 expected: null
             },
             {
                 code: 'Vendor/theme-b',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: true,
-                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/module.config.cjs'
+                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/module.config.js'
             },
             {
                 code: 'Vendor/theme-b',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: false,
                 expected: null
             },
             {
                 code: 'Vendor/theme-c',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: true,
-                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/module.config.cjs'
+                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-a/Vendor_ModuleNameA/web/module.config.js'
             },
             {
                 code: 'Vendor/theme-c',
                 moduleName: 'Vendor_ModuleNameB',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: true,
-                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-c/Vendor_ModuleNameB/web/module.config.cjs'
+                expected: 'magento_scenarios/app/design/frontend/Vendor/theme-c/Vendor_ModuleNameB/web/module.config.js'
             },
             {
                 code: 'Vendor/theme-d',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: false,
                 expected: null
             },
             {
                 code: 'Vendor/theme-d',
                 moduleName: 'Vendor_ModuleNameA',
-                filePath: 'module.config.cjs',
+                filePath: 'module.config.js',
                 includeTailwindConfigFromParentThemes: true,
                 expected: null
             }
@@ -140,16 +140,17 @@ for (const scenario of scenariosForResolveFileByTheme) {
 }
 
 async function setupResolvers(scenario) {
-    jest.mock(
-        '#service/configResolver.cjs',
-        () => createMockConfigResolver(scenario).default
-    );
-    let moduleResolver = await import('#service/moduleResolverSync.cjs');
-    let themeResolver = await import('#service/themeResolverSync.cjs');
+    jest.unstable_mockModule('#service/configResolver.js', () => ({
+        __esModule: true,
+        default: createMockConfigResolver(scenario).default,
+    }));
+    const moduleResolver = await import('#service/moduleResolver.js');
+    const themeResolver = await import('#service/themeResolverSync.js');
 
-    return { themeResolver, moduleResolver };
+    return { moduleResolver, themeResolver };
 }
 
+
 describe('getModuleConfigByThemeConfig', () => {
     beforeEach(() => {
         jest.resetModules();

package/src/__tests__/service/themeResolverSync.test.js

@@ -112,14 +112,18 @@ for (const scenario of scenarios) {
 }
 
 async function setupThemeResolver(scenario) {
-    jest.mock(
-        '#service/configResolver.cjs',
-        () => createMockConfigResolver(scenario).default
-    );
-    let resolver = await import('#service/themeResolverSync.cjs');
+    const mock = createMockConfigResolver(scenario);
+
+    jest.unstable_mockModule('#service/configResolver.js', () => ({
+        ...mock,
+        __esModule: true,
+    }));
+
+    const resolver = await import('#service/themeResolverSync.js');
     return resolver.default;
 }
 
+
 describe('getThemeConfig', () => {
     let themeResolver;
 

package/src/config/default.js

@@ -0,0 +1,26 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const BASE_PATH = process.cwd();
+
+export const DEPENDENCY_CONFIG_FILENAME = 'mage_obsidian_frontend_modules.json';
+export const MAGENTO_CONFIG_RELATIVE_PATH = 'app/etc/';
+export const DEPENDENCY_CONFIG_FILE_PATH = path.resolve(
+    BASE_PATH,
+    '..',
+    MAGENTO_CONFIG_RELATIVE_PATH,
+    DEPENDENCY_CONFIG_FILENAME
+);
+
+export const MODULE_WEB_PATH = 'view/frontend/web/';
+export const THEME_MODULE_WEB_PATH = 'web/';
+export const MODULE_CSS_FOLDER = 'css';
+
+export const THEME_CSS_FOLDER = 'css';
+
+export const OUTPUT_THEME_DIR = 'web/generated';
+export const OUTPUT_JS_DIR = 'js/';
+export const OUTPUT_CSS_DIR = 'css/';
+export const PRECOMPILED_FOLDER = '.precompiled';
+
+export const ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME = 'allJsVueFilesWithInheritance.json';

package/src/scripts/buildThemes.js

@@ -5,7 +5,7 @@ import readlineSync from 'readline-sync';
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
-import configResolver from '../service/configResolver.cjs';
+import configResolver from '../service/configResolver.js';
 import dotenv from 'dotenv';
 dotenv.config();
 

package/src/service/configResolver.js

@@ -0,0 +1,41 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { DEPENDENCY_CONFIG_FILE_PATH, OUTPUT_THEME_DIR } from '../config/default.js';
+
+let MAGENTO_CONFIG;
+
+try {
+    const magentoConfigJson = fs.readFileSync(DEPENDENCY_CONFIG_FILE_PATH, 'utf-8');
+    MAGENTO_CONFIG = JSON.parse(magentoConfigJson);
+} catch (error) {
+    console.error(`Error reading or parsing configuration file at ${DEPENDENCY_CONFIG_FILE_PATH}:`, error.message);
+    console.error('Try running `devcore:frontend:config --generate` to generate the configuration file.');
+    process.exit(1);
+}
+
+export const getMagentoConfig = () => MAGENTO_CONFIG;
+
+export const getModulesConfigArray = () => Object.entries(MAGENTO_CONFIG.modules);
+export const getThemesConfigArray = () => Object.entries(MAGENTO_CONFIG.themes);
+export const getAllMagentoModulesEnabled = () => MAGENTO_CONFIG.allModules;
+export const isDev = () => MAGENTO_CONFIG.mode !== 'production';
+
+export const getOutputDirFromTheme = (themePath) =>
+    path.resolve(themePath, OUTPUT_THEME_DIR);
+
+export const getModuleDefinition = (moduleName) =>
+    MAGENTO_CONFIG.modules[moduleName];
+
+export const getThemeDefinition = (themeName) =>
+    MAGENTO_CONFIG.themes[themeName];
+
+export default {
+    getMagentoConfig,
+    getModulesConfigArray,
+    getThemesConfigArray,
+    getAllMagentoModulesEnabled,
+    isDev,
+    getOutputDirFromTheme,
+    getModuleDefinition,
+    getThemeDefinition
+};

package/src/service/cssResolver.js

@@ -1,13 +1,15 @@
-import themeResolver from "./themeResolverSync.cjs";
-import path from "path";
-import { MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_MODULE_WEB_PATH } from "../config/default.cjs";
-import { resolveFileByTheme } from "./moduleResolverSync.cjs";
-import configResolver from "./configResolver.cjs";
-import fs from "fs/promises";
-
-const { getMagentoConfig, getModuleDefinition, getThemeDefinition } = configResolver;
+import themeResolver from './themeResolverSync.js';
+import path from 'node:path';
+import { MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_MODULE_WEB_PATH } from '../config/default.js';
+import { resolveFileByTheme } from './moduleResolver.js';
+import configResolver from './configResolver.js';
+import fs from 'node:fs/promises';
+
+const { getMagentoConfig, getModuleDefinition, getThemeDefinition, getModulesConfigArray } = configResolver;
+
 const MODULE_CSS_EXTEND_FILE = getMagentoConfig().MODULE_CSS_EXTEND_FILE;
 const THEME_CSS_SOURCE_FILE = getMagentoConfig().THEME_CSS_SOURCE_FILE;
+
 async function getThemeImports(themeName, themeConfig) {
     if (!themeConfig) {
         themeConfig = themeResolver.getThemeConfig(themeName);
@@ -19,6 +21,7 @@ async function getThemeImports(themeName, themeConfig) {
     if (themeConfig.includeCssSourceFromParentThemes && themeDefinition.parent) {
         imports += await getThemeImports(themeDefinition.parent, themeConfig);
     }
+
     imports += `@import "${path.join(themePath, THEME_MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_CSS_SOURCE_FILE)}";\n`;
     return imports;
 }
@@ -31,11 +34,14 @@ function resolveModuleCssSourcePath(moduleName, themeName) {
     }
     return moduleConfigSourcePath;
 }
+
 async function getCssImports(themeName) {
     const themeConfig = themeResolver.getThemeConfig(themeName);
     const excludedModules = new Set(themeConfig.ignoredCssFromModules || []);
-    const modulesConfig = configResolver.getModulesConfigArray();
+    const modulesConfig = getModulesConfigArray();
+
     let cssImports = '';
+
     if (themeConfig.ignoredCssFromModules !== 'all') {
         for (const [moduleName, moduleConfig] of modulesConfig) {
             if (excludedModules.has(moduleName)) continue;
@@ -45,9 +51,11 @@ async function getCssImports(themeName) {
                 await fs.access(filePath);
                 cssImports += `@import "${filePath}";\n`;
             } catch {
+                // ignore if file doesn't exist
             }
         }
     }
+
     cssImports += await getThemeImports(themeName);
     return cssImports;
 }

package/src/service/inheritAssetsModuleResolver.js

@@ -1,5 +1,5 @@
 import path from "path";
-import configResolver from "./configResolver.cjs";
+import configResolver from "./configResolver.js";
 import fs from "fs";
 
 export default function customAssetsResolverPlugin() {

package/src/service/inheritModuleResolver.js

@@ -1,6 +1,6 @@
 import moduleResolver from "./moduleResolver.js";
 import path from "path";
-import configResolver from "./configResolver.cjs";
+import configResolver from "./configResolver.js";
 
 export default function customResolverPlugin() {
     const allComponents = moduleResolver.getAllJsVueFilesWithInheritanceCached();

package/src/service/moduleResolver.js

@@ -1,11 +1,11 @@
 import path from "path";
-import configResolver from "./configResolver.cjs";
+import configResolver from "./configResolver.js";
 import {
     ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME,
     MODULE_WEB_PATH,
     PRECOMPILED_FOLDER,
     THEME_MODULE_WEB_PATH
-} from "../config/default.cjs";
+} from "../config/default.js";
 import getFilesFromFolders from '../utils/findComponents.js'
 import fs from "fs";
 import deepmerge from "deepmerge";
@@ -97,7 +97,94 @@ async function getAllJsVueFilesWithInheritance(themeName) {
     return cachedModulesByTheme[themeName];
 }
 
+const moduleConfigByThemeCache = new Map();
+
+const MODULE_CONFIG_FILE = configResolver.getMagentoConfig().MODULE_CONFIG_FILE;
+
+/**
+ * Gets the theme configuration file path.
+ * @param {string} moduleSrc
+ * @returns {string} Full path to the configuration file.
+ */
+function getModuleConfigPath(moduleSrc) {
+    return path.join(moduleSrc, 'view/frontend/web/', MODULE_CONFIG_FILE);
+}
+
+function resolveFileByTheme(themeName, moduleName, filePath, includeTailwindConfigFromParentThemes) {
+    const theme = configResolver.getMagentoConfig().themes[themeName];
+    const fullFilePath = path.join(theme.src, moduleName, 'web', filePath);
+    if (fs.existsSync(fullFilePath)) {
+        return fullFilePath;
+    }
+
+    if (includeTailwindConfigFromParentThemes && theme.parent) {
+        return resolveFileByTheme(theme.parent, moduleName, filePath, includeTailwindConfigFromParentThemes);
+    }
+    return null;
+}
+
+async function resolveModuleConfig(moduleName, themeName, includeTailwindConfigFromParentThemes) {
+    const module = configResolver.getMagentoConfig().modules[moduleName];
+    let moduleConfigSourcePath = resolveFileByTheme(themeName, moduleName, MODULE_CONFIG_FILE, includeTailwindConfigFromParentThemes);
+
+    if (!moduleConfigSourcePath && !module) {
+        return null;
+    }
+    if (!moduleConfigSourcePath) {
+        moduleConfigSourcePath = getModuleConfigPath(module.src);
+    }
+    if (!fs.existsSync(moduleConfigSourcePath)) {
+        return null;
+    }
+
+    // Importación dinámica común en ESModules
+    const moduleConfig = await import(moduleConfigSourcePath);
+    return moduleConfig.default ?? moduleConfig;
+}
+
+/**
+ * Retrieves the Tailwind configuration for a theme synchronously.
+ * Uses a cache system to optimize performance.
+ * @param {string} themeName - Name of the theme.
+ * @param {object} themeConfig
+ * @returns {object|null} Tailwind configuration object.
+ */
+async function getModuleConfigByThemeConfig(themeName, themeConfig) {
+    if (moduleConfigByThemeCache.has(themeName)) {
+        return moduleConfigByThemeCache.get(themeName);
+    }
+    if (!themeConfig) return null;
+    const modules = configResolver.getAllMagentoModulesEnabled();
+    let modulesConfig = {};
+
+    for (const moduleName of modules) {
+        let moduleConfig = await resolveModuleConfig(moduleName, themeName, themeConfig.includeTailwindConfigFromParentThemes);
+        if (!moduleConfig) continue;
+        if (
+            themeConfig.ignoredTailwindConfigFromModules === 'all' ||
+            themeConfig.ignoredTailwindConfigFromModules.includes(moduleName)
+        ) {
+            moduleConfig.tailwind = {};
+        } else if (moduleConfig.tailwind?.content) {
+            const moduleSrc = configResolver.getMagentoConfig().modules[moduleName].src;
+            moduleConfig.tailwind.content = moduleConfig.tailwind.content.map((content) =>
+                path.join(moduleSrc, 'view/frontend/web', content)
+            );
+        }
+
+        modulesConfig = deepmerge(modulesConfig, moduleConfig);
+    }
+
+    moduleConfigByThemeCache.set(themeName, modulesConfig);
+    return modulesConfig;
+}
+
 export default {
     getAllJsVueFilesWithInheritance,
-    getAllJsVueFilesWithInheritanceCached
+    getAllJsVueFilesWithInheritanceCached,
+    getModuleConfigByThemeConfig,
+    resolveFileByTheme
 };
+
+export { getModuleConfigByThemeConfig, resolveFileByTheme };
+

package/src/service/preCompileFiles.js

@@ -4,7 +4,7 @@ import moduleResolver from "./moduleResolver.js";
 import {
     PRECOMPILED_FOLDER,
     ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME
-} from "../config/default.cjs";
+} from "../config/default.js";
 import getCssImports from "./cssResolver.js";
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);

package/src/service/tailwindResolver.js

@@ -0,0 +1,11 @@
+import themeResolver from './themeResolverSync.js';
+import moduleResolver from './moduleResolver.js';
+import deepmerge from 'deepmerge';
+
+export function getTailwindConfigByTheme(themeName) {
+    const themeConfig = themeResolver.getThemeConfig(themeName);
+    return deepmerge(
+        moduleResolver.getModuleConfigByThemeConfig(themeName, themeConfig)?.tailwind ?? {},
+        themeConfig?.tailwind ?? {}
+    );
+}

package/src/service/themeResolverSync.js

@@ -0,0 +1,85 @@
+import path from "path";
+import fs from "fs";
+import { fileURLToPath } from "url";
+import deepmerge from "deepmerge";
+import { THEME_MODULE_WEB_PATH } from "../config/default.js";
+import configResolver from "./configResolver.js";
+
+const themeConfigCache = new Map();
+const themeConfigPlainCache = new Map();
+
+function getThemeConfigPath(themeSrc) {
+  return path.join(
+    themeSrc,
+    THEME_MODULE_WEB_PATH,
+    configResolver.getMagentoConfig().THEME_CONFIG_FILE
+  );
+}
+
+async function loadThemeConfig(themeDefinition, themeName) {
+  if (!themeDefinition) return null;
+  if (themeConfigPlainCache.has(themeName)) return themeConfigPlainCache.get(themeName);
+
+  try {
+    const configPath = getThemeConfigPath(themeDefinition.src);
+    fs.accessSync(configPath, fs.constants.F_OK);
+
+    let themeConfig = await import(pathToFileUrl(configPath));
+    themeConfig = themeConfig.default ?? themeConfig;
+
+    themeConfigPlainCache.set(themeName, themeConfig);
+    return deepmerge({}, themeConfig);
+  } catch (error) {
+    console.error(`Failed to load configuration for theme "${themeName}":`, error.message);
+    return null;
+  }
+}
+
+function pathToFileUrl(filePath) {
+  const resolvedPath = path.resolve(filePath);
+  const fileUrl = new URL(`file://${resolvedPath}`);
+  return fileUrl.href;
+}
+
+export async function getThemeConfig(themeName) {
+  if (themeConfigCache.has(themeName)) return themeConfigCache.get(themeName);
+
+  const themeDefinition = configResolver.getMagentoConfig().themes[themeName];
+  if (!themeDefinition) return null;
+
+  let themeConfig = await loadThemeConfig(themeDefinition, themeName);
+  if (!themeConfig) return null;
+
+  themeConfig.includeTailwindConfigFromParentThemes ??= true;
+  themeConfig.includeCssSourceFromParentThemes ??= true;
+  themeConfig.ignoredCssFromModules ??= [];
+  themeConfig.ignoredTailwindConfigFromModules ??= [];
+  themeConfig.exposeNpmPackages ??= [];
+  themeConfig.tailwind ??= {};
+
+  if (themeConfig.tailwind?.content) {
+    themeConfig.tailwind.content = themeConfig.tailwind.content.map((content) =>
+      path.join(themeDefinition.src, "web", content)
+    );
+  }
+
+  const includeParent = themeConfig.includeTailwindConfigFromParentThemes;
+  if (includeParent && themeDefinition.parent) {
+    const parentConfig = await getThemeConfig(themeDefinition.parent);
+    themeConfig = deepmerge(parentConfig || {}, themeConfig);
+  }
+
+  themeConfigCache.set(themeName, themeConfig);
+  return themeConfig;
+}
+
+export async function getTailwindThemeConfig(themeName) {
+  const themeConfig = await getThemeConfig(themeName);
+  return themeConfig?.tailwind ?? {};
+}
+
+// Export default con todo
+export default {
+  getThemeConfig,
+  getTailwindThemeConfig
+};

package/src/config/default.cjs

@@ -1,41 +0,0 @@
-const path = require('path');
-const { fileURLToPath } = require('url');
-
-const BASE_PATH = process.cwd();
-
-const DEPENDENCY_CONFIG_FILENAME = 'mage_obsidian_frontend_modules.json';
-const MAGENTO_CONFIG_RELATIVE_PATH = 'app/etc/';
-const DEPENDENCY_CONFIG_FILE_PATH = path.resolve(
-    BASE_PATH,
-    '..',
-    MAGENTO_CONFIG_RELATIVE_PATH,
-    DEPENDENCY_CONFIG_FILENAME
-);
-
-const MODULE_WEB_PATH = 'view/frontend/web/';
-const THEME_MODULE_WEB_PATH = 'web/';
-const MODULE_CSS_FOLDER = 'css';
-
-const THEME_CSS_FOLDER = 'css';
-
-const OUTPUT_THEME_DIR = 'web/generated';
-const OUTPUT_JS_DIR = 'js/';
-const OUTPUT_CSS_DIR = 'css/';
-const PRECOMPILED_FOLDER = '.precompiled';
-
-const ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME = 'allJsVueFilesWithInheritance.json';
-
-module.exports = {
-    DEPENDENCY_CONFIG_FILENAME,
-    MAGENTO_CONFIG_RELATIVE_PATH,
-    DEPENDENCY_CONFIG_FILE_PATH,
-    MODULE_WEB_PATH,
-    THEME_MODULE_WEB_PATH,
-    MODULE_CSS_FOLDER,
-    THEME_CSS_FOLDER,
-    OUTPUT_THEME_DIR,
-    OUTPUT_JS_DIR,
-    OUTPUT_CSS_DIR,
-    PRECOMPILED_FOLDER,
-    ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME,
-};

package/src/service/configResolver.cjs

@@ -1,39 +0,0 @@
-const { DEPENDENCY_CONFIG_FILE_PATH, OUTPUT_THEME_DIR } = require('../config/default.cjs');
-const fs = require('fs');
-const path = require('path');
-
-let MAGENTO_CONFIG;
-
-try {
-    const magentoConfigJson = fs.readFileSync(DEPENDENCY_CONFIG_FILE_PATH, 'utf-8');
-    MAGENTO_CONFIG = JSON.parse(magentoConfigJson);
-} catch (error) {
-    console.error(`Error reading or parsing configuration file at ${DEPENDENCY_CONFIG_FILE_PATH}:`, error.message);
-    console.error('Try running `devcore:frontend:config --generate` to generate the configuration file.');
-    process.exit(1); // Termina el proceso si no se puede leer el archivo de configuración
-}
-
-const getModulesConfigArray = () => Object.entries(MAGENTO_CONFIG.modules);
-const getThemesConfigArray = () => Object.entries(MAGENTO_CONFIG.themes);
-const getAllMagentoModulesEnabled = () => MAGENTO_CONFIG.allModules;
-const isDev = () => MAGENTO_CONFIG.mode !== 'production';
-const getOutputDirFromTheme = (themePath) => path.resolve(themePath, OUTPUT_THEME_DIR);
-
-const getModuleDefinition = (moduleName) => {
-    return MAGENTO_CONFIG.modules[moduleName];
-}
-
-const getThemeDefinition = (themeName) => {
-    return MAGENTO_CONFIG.themes[themeName];
-}
-
-module.exports = {
-    getMagentoConfig: () => MAGENTO_CONFIG,
-    getModulesConfigArray,
-    getThemesConfigArray,
-    getAllMagentoModulesEnabled,
-    isDev,
-    getOutputDirFromTheme,
-    getThemeDefinition,
-    getModuleDefinition
-};

package/src/service/moduleResolverSync.cjs

@@ -1,84 +0,0 @@
-const path = require("path");
-const fs = require("fs");
-const deepmerge = require("deepmerge");
-const configResolver = require("./configResolver.cjs");
-
-const moduleConfigByThemeCache = new Map();
-
-const MODULE_CONFIG_FILE = configResolver.getMagentoConfig().MODULE_CONFIG_FILE;
-
-/**
- * Gets the theme configuration file path.
- * @returns {string} Full path to the configuration file.
- * @param moduleSrc
- */
-function getModuleConfigPath(moduleSrc) {
-    return path.join(moduleSrc, 'view/frontend/web/', MODULE_CONFIG_FILE);
-}
-
-
-function resolveFileByTheme(themeName, moduleName, filePath, includeTailwindConfigFromParentThemes) {
-    const theme = configResolver.getMagentoConfig().themes[themeName];
-    const fullFilePath = path.join(theme.src, moduleName, 'web', filePath);
-    if (fs.existsSync(fullFilePath)) {
-        return fullFilePath;
-    }
-
-    if (includeTailwindConfigFromParentThemes && theme.parent) {
-        return resolveFileByTheme(theme.parent, moduleName, filePath, includeTailwindConfigFromParentThemes);
-    }
-    return null;
-}
-
-function resolveModuleConfig(moduleName, themeName, includeTailwindConfigFromParentThemes) {
-    const module = configResolver.getMagentoConfig().modules[moduleName];
-    let moduleConfigSourcePath = resolveFileByTheme(themeName, moduleName, MODULE_CONFIG_FILE, includeTailwindConfigFromParentThemes);
-    if (!moduleConfigSourcePath && !module) {
-        return null;
-    }
-    if (!moduleConfigSourcePath) {
-        moduleConfigSourcePath = getModuleConfigPath(module.src);
-    }
-    if (!fs.existsSync(moduleConfigSourcePath)) {
-        return null;
-    }
-    return require(moduleConfigSourcePath);
-}
-
-/**
- * Retrieves the Tailwind configuration for a theme synchronously.
- * Uses a cache system to optimize performance.
- * @param {string} themeName - Name of the theme.
- * @returns {object|null} Tailwind configuration object.
- */
-function getModuleConfigByThemeConfig(themeName, themeConfig) {
-    if (moduleConfigByThemeCache.has(themeName)) {
-        return moduleConfigByThemeCache.get(themeName);
-    }
-    if (!themeConfig) return null;
-    const modules = configResolver.getAllMagentoModulesEnabled();
-
-    let modulesConfig = {};
-
-    for(const moduleName of modules) {
-        let moduleConfig = resolveModuleConfig(moduleName, themeName, themeConfig.includeTailwindConfigFromParentThemes);
-        if (!moduleConfig) {
-            continue;
-        }
-        if (themeConfig.ignoredTailwindConfigFromModules === 'all' || themeConfig.ignoredTailwindConfigFromModules.includes(moduleName)) {
-            moduleConfig.tailwind = {};
-        } else if (moduleConfig.tailwind && moduleConfig.tailwind.content) {
-            const moduleSrc = configResolver.getMagentoConfig().modules[moduleName].src;
-            moduleConfig.tailwind.content = moduleConfig.tailwind.content.map((content) =>
-                path.join(moduleSrc, 'view/frontend/web', content)
-            );
-        }
-        modulesConfig = deepmerge(modulesConfig, moduleConfig);
-    }
-    return modulesConfig;
-}
-
-module.exports = {
-    getModuleConfigByThemeConfig,
-    resolveFileByTheme
-};

package/src/service/tailwindResolver.cjs

@@ -1,15 +0,0 @@
-const themeResolver = require('./themeResolverSync.cjs');
-const moduleResolver = require('./moduleResolverSync.cjs');
-const deepmerge = require('deepmerge');
-
-function getTailwindConfigByTheme(themeName) {
-    const themeConfig = themeResolver.getThemeConfig(themeName);
-    return deepmerge(
-        moduleResolver.getModuleConfigByThemeConfig(themeName, themeConfig)?.tailwind ?? {},
-        themeConfig?.tailwind ?? {}
-    );
-}
-
-module.exports = {
-    getTailwindConfigByTheme
-};

package/src/service/themeResolverSync.cjs

@@ -1,80 +0,0 @@
-const path = require("path");
-const fs = require("fs");
-const deepmerge = require("deepmerge");
-const { THEME_MODULE_WEB_PATH } = require("../config/default.cjs");
-const configResolver = require("./configResolver.cjs");
-
-const themeConfigCache = new Map();
-
-function getThemeConfigPath(themeSrc) {
-    return path.join(themeSrc, THEME_MODULE_WEB_PATH, configResolver.getMagentoConfig().THEME_CONFIG_FILE);
-}
-
-const themeConfigPlainCache = new Map();
-function loadThemeConfig(themeDefinition, themeName) {
-    if (!themeDefinition) return null;
-    if (themeConfigPlainCache.has(themeName)) return themeConfigPlainCache.get(themeName);
-
-    try {
-        const configPath = getThemeConfigPath(themeDefinition.src);
-        fs.accessSync(configPath, fs.constants.F_OK);
-        let themeConfig = require(configPath);
-        themeConfig = themeConfig.default ?? themeConfig;
-        themeConfigPlainCache.set(themeName, themeConfig);
-        return deepmerge({}, themeConfig);
-    } catch {
-        console.error(`Failed to load configuration for theme "${themeName}"`);
-        return null;
-    }
-}
-
-function getThemeConfig(themeName) {
-    if (themeConfigCache.has(themeName)) return themeConfigCache.get(themeName);
-
-    const themeDefinition = configResolver.getMagentoConfig().themes[themeName];
-    if (!themeDefinition) return null;
-
-    let themeConfig = loadThemeConfig(themeDefinition, themeName);
-    if (!themeConfig) return null;
-    if (themeConfig.includeTailwindConfigFromParentThemes === undefined) {
-        themeConfig.includeTailwindConfigFromParentThemes = true;
-    }
-    if (themeConfig.includeCssSourceFromParentThemes === undefined) {
-        themeConfig.includeCssSourceFromParentThemes = true;
-    }
-    if (themeConfig.ignoredCssFromModules === undefined) {
-        themeConfig.ignoredCssFromModules = [];
-    }
-    if (themeConfig.ignoredTailwindConfigFromModules === undefined) {
-        themeConfig.ignoredTailwindConfigFromModules = [];
-    }
-    if (themeConfig.exposeNpmPackages === undefined) {
-        themeConfig.exposeNpmPackages = [];
-    }
-    if (themeConfig.tailwind === undefined) {
-        themeConfig.tailwind = {};
-    }
-
-
-    if (themeConfig.tailwind?.content) {
-        themeConfig.tailwind.content = themeConfig.tailwind.content.map((content) =>
-            path.join(themeDefinition.src, "web", content)
-        );
-    }
-    const includeTailwindConfigFromParentThemes = themeConfig.includeTailwindConfigFromParentThemes !== undefined ? themeConfig.includeTailwindConfigFromParentThemes : true;
-    if (includeTailwindConfigFromParentThemes && themeDefinition.parent) {
-        themeConfig = deepmerge(getThemeConfig(themeDefinition.parent) || {}, themeConfig);
-    }
-
-    themeConfigCache.set(themeName, themeConfig);
-    return themeConfig;
-}
-
-function getTailwindThemeConfig(themeName) {
-    return getThemeConfig(themeName)?.tailwind ?? {};
-}
-
-module.exports = {
-    getThemeConfig,
-    getTailwindThemeConfig
-};