mage-obsidian 1.0.10 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mage-obsidian",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Mage Obsidian Ultis",
   "main": "./src/scripts/buildThemes.js",
   "keywords": [
@@ -25,12 +25,14 @@
     "./config/": "./src/config/"
   },
   "dependencies": {
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
+    "commander": "^13.1.0",
     "deepmerge": "^4.3.1",
+    "readline-sync": "^1.4.10"
+  },
+  "devDependencies": {
     "jest": "^29.7.0",
-    "jest-environment-node": "^29.7.0",
-    "readline-sync": "^1.4.10",
-    "commander": "^13.1.0"
+    "jest-environment-node": "^29.7.0"
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"

package/src/service/cssResolver.js

@@ -1,192 +1,73 @@
-import path from "path";
-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.js";
-import getFilesFromFolders from '../utils/findComponents.js'
-import fs from "fs";
-import deepmerge from "deepmerge";
+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, getAllJsVueFilesWithInheritanceCached } from './moduleResolver.js';
+import configResolver from './configResolver.js';
+import fs from 'node:fs/promises';
 
-const defaultFoldersToMap = [
-    {
-        src: configResolver.getMagentoConfig().VUE_COMPONENTS_PATH,
-        ext: [
-            'vue',
-            'js'
-        ]
-    },
-    {
-        src: configResolver.getMagentoConfig().JS_PATH,
-        ext: [
-            'js'
-        ]
-    }
-];
-
-const cachedModulesByTheme = {};
-
-async function getAllJsVueFilesFromActiveModules() {
-    let result = {};
-    for (const entry of configResolver.getModulesConfigArray()) {
-        const [moduleName, moduleConfig] = entry;
-        const moduleResult = await getFilesFromFolders(
-            moduleName,
-            path.resolve(moduleConfig.src, MODULE_WEB_PATH),
-            defaultFoldersToMap
-        );
-        Object.assign(result, moduleResult);
-    }
-    return result;
-}
-
-async function getAllJsVueFilesFromTheme(themeName) {
-    let result = {};
-    const theme = configResolver.getMagentoConfig().themes[themeName];
-    if (!theme) {
-        return {}
-    }
-
-    if (theme.parent) {
-        result = await getAllJsVueFilesFromTheme(theme.parent)
-    }
-
-    for (const moduleName of configResolver.getAllMagentoModulesEnabled()) {
-        const modulePath = path.resolve(theme.src, moduleName, THEME_MODULE_WEB_PATH);
-        const moduleResult = await getFilesFromFolders(
-            moduleName,
-            modulePath,
-            defaultFoldersToMap
-        );
-        if (moduleResult) {
-            result = deepmerge(result, moduleResult);
-        }
-    }
-    const moduleResult = await getFilesFromFolders(
-        'Theme',
-        path.resolve(theme.src, THEME_MODULE_WEB_PATH),
-        defaultFoldersToMap
-    );
-    result = deepmerge(result, moduleResult);
-    return result;
-}
-
-
-function getAllJsVueFilesWithInheritanceCached(themeName) {
-    themeName = themeName ?? process.env.CURRENT_THEME;
-    if (cachedModulesByTheme[themeName]) {
-        return cachedModulesByTheme[themeName];
-    }
-    //check if exits
+const { getMagentoConfig, getModuleDefinition, getThemeDefinition, getModulesConfigArray } = configResolver;
 
-    const filePath = path.join(PRECOMPILED_FOLDER, themeName, ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME);
-    const fileContent = fs.readFileSync(filePath, "utf-8");
-    const data = JSON.parse(fileContent);
-    cachedModulesByTheme[themeName] = data;
-    return data;
-}
+const MODULE_CSS_EXTEND_FILE = getMagentoConfig().MODULE_CSS_EXTEND_FILE;
+const THEME_CSS_SOURCE_FILE = getMagentoConfig().THEME_CSS_SOURCE_FILE;
 
-async function getAllJsVueFilesWithInheritance(themeName) {
-    themeName = themeName ?? process.env.CURRENT_THEME;
-    if (cachedModulesByTheme[themeName]) {
-        return cachedModulesByTheme[themeName];
+async function getThemeImports(themeName, themeConfig) {
+    if (!themeConfig) {
+        themeConfig = themeResolver.getThemeConfig(themeName);
     }
-    const allJsVueFilesFromModules = await getAllJsVueFilesFromActiveModules();
-    const allJsVueFilesFromThemes = await getAllJsVueFilesFromTheme(themeName);
-    cachedModulesByTheme[themeName] = deepmerge(allJsVueFilesFromModules, allJsVueFilesFromThemes);
-    return cachedModulesByTheme[themeName];
-}
-
-const moduleConfigByThemeCache = new Map();
-
-const MODULE_CONFIG_FILE = configResolver.getMagentoConfig().MODULE_CONFIG_FILE;
+    const themeDefinition = getThemeDefinition(themeName);
+    const themePath = themeDefinition.src;
 
-/**
- * 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;
+    let imports = '';
+    if (themeConfig.includeCssSourceFromParentThemes && themeDefinition.parent) {
+        imports += await getThemeImports(themeDefinition.parent, themeConfig);
     }
 
-    if (includeTailwindConfigFromParentThemes && theme.parent) {
-        return resolveFileByTheme(theme.parent, moduleName, filePath, includeTailwindConfigFromParentThemes);
-    }
-    return null;
+    imports += `@import "${path.join(themePath, THEME_MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_CSS_SOURCE_FILE)}";\n`;
+    return imports;
 }
 
-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;
-    }
+function resolveModuleCssSourcePath(moduleName, themeName) {
+    let moduleConfigSourcePath = resolveFileByTheme(themeName, moduleName, 'css', MODULE_CSS_EXTEND_FILE);
     if (!moduleConfigSourcePath) {
-        moduleConfigSourcePath = getModuleConfigPath(module.src);
-    }
-    if (!fs.existsSync(moduleConfigSourcePath)) {
-        return null;
+        const moduleDefinition = getModuleDefinition(moduleName);
+        moduleConfigSourcePath = path.join(moduleDefinition.src, MODULE_WEB_PATH, 'css', MODULE_CSS_EXTEND_FILE);
     }
-
-    // Importación dinámica común en ESModules
-    const moduleConfig = await import(moduleConfigSourcePath);
-    return moduleConfig.default ?? moduleConfig;
+    return moduleConfigSourcePath;
 }
 
-/**
- * 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 = {};
+async function getVueComponentsSource(themeName) {
+    const vueComponents = await getAllJsVueFilesWithInheritanceCached(themeName);
+    // split with @source al inicio
+    const vueComponentSources = Object.entries(vueComponents).map(([name, url]) => {
+        return `@source "${url}";\n`;
+    })
+    return vueComponentSources.join('');
+}
 
-    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)
-            );
+async function getCssImports(themeName) {
+    const themeConfig = themeResolver.getThemeConfig(themeName);
+    const excludedModules = new Set(themeConfig.ignoredCssFromModules || []);
+    const modulesConfig = getModulesConfigArray();
+
+    let cssSource = await getVueComponentsSource(themeName);
+    let cssImports = '';
+
+    if (themeConfig.ignoredCssFromModules !== 'all') {
+        for (const [moduleName, moduleConfig] of modulesConfig) {
+            if (excludedModules.has(moduleName)) continue;
+
+            const filePath = resolveModuleCssSourcePath(moduleName, themeName);
+            try {
+                await fs.access(filePath);
+                cssImports += `@import "${filePath}";\n`;
+            } catch {
+                // ignore if file doesn't exist
+            }
         }
-
-        modulesConfig = deepmerge(modulesConfig, moduleConfig);
     }
 
-    moduleConfigByThemeCache.set(themeName, modulesConfig);
-    return modulesConfig;
+    cssImports += await getThemeImports(themeName);
+    return `${cssSource}\n${cssImports}`;
 }
 
-export default {
-    getAllJsVueFilesWithInheritance,
-    getAllJsVueFilesWithInheritanceCached,
-    getModuleConfigByThemeConfig,
-    resolveFileByTheme
-};
-
-export { getModuleConfigByThemeConfig, resolveFileByTheme, getAllJsVueFilesWithInheritance, getAllJsVueFilesWithInheritanceCached };
-
+export default getCssImports;

package/src/service/moduleResolver.js

@@ -186,5 +186,5 @@ export default {
     resolveFileByTheme
 };
 
-export { getModuleConfigByThemeConfig, resolveFileByTheme };
+export { getModuleConfigByThemeConfig, resolveFileByTheme, getAllJsVueFilesWithInheritance, getAllJsVueFilesWithInheritanceCached };