mage-obsidian 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mage-obsidian",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Mage Obsidian Ultis",
   "main": "./src/scripts/buildThemes.js",
   "keywords": [

package/src/service/inheritAssetsModuleResolver.js

@@ -0,0 +1,78 @@
+import path from "path";
+import configResolver from "./configResolver.cjs";
+import fs from "fs";
+
+export default function customAssetsResolverPlugin() {
+    const CURRENT_THEME = process.env.CURRENT_THEME;
+    const THEME_ASSETS_PATH = 'web';
+    const MODULE_ASSETS_PATH = 'view/frontend/web';
+
+
+    function tryResolveAssetPathByTheme(themeName, filePath) {
+        const themeDefinition = configResolver.getThemeDefinition(themeName);
+        if (!themeDefinition) {
+            return null;
+        }
+
+        const themeAssetPath = path.join(themeDefinition.src, filePath);
+
+        if (fs.existsSync(themeAssetPath)) {
+            return themeAssetPath;
+        }
+
+        if (themeDefinition.parent) {
+            return tryResolveAssetPathByTheme(themeDefinition.parent, filePath);
+        }
+
+        return null;
+    }
+
+    function tryResolveAssetPathByModule(moduleName, filePath) {
+        const moduleDefinition = configResolver.getModuleDefinition(moduleName);
+        const assetPath = path.join(moduleDefinition.src, MODULE_ASSETS_PATH, filePath);
+        if (fs.existsSync(assetPath)) {
+            return assetPath;
+        }
+        return null;
+    }
+
+
+    const resolveAssetPath = (moduleName, filePath) => {
+        if (!filePath.startsWith("assets/")) {
+            return null;
+        }
+        let assetSrc = null;
+        if (moduleName === "Theme") {
+            assetSrc = tryResolveAssetPathByTheme(CURRENT_THEME, path.join(THEME_ASSETS_PATH, filePath));
+        } else {
+            assetSrc = tryResolveAssetPathByTheme(CURRENT_THEME, path.join(moduleName, THEME_ASSETS_PATH, filePath));
+        }
+        if (!assetSrc) {
+            assetSrc = tryResolveAssetPathByModule(moduleName, filePath);
+        }
+
+        return assetSrc;
+    };
+
+    return {
+        name: "inherit-assets-resolver",
+        resolveId: {
+            order: 'pre',
+            handler(id) {
+                if (!id) {
+                    return;
+                }
+                const idParts = id.split("::");
+                if (idParts.length === 1) {
+                    return;
+                }
+                const [moduleName, filePath] = idParts;
+                const assetSrc = resolveAssetPath(moduleName, filePath);
+                if (!assetSrc) {
+                    return;
+                }
+                return assetSrc;
+            }
+        }
+    };
+}

package/src/service/inheritModuleResolver.js

@@ -5,13 +5,6 @@ import configResolver from "./configResolver.cjs";
 export default function customResolverPlugin() {
     const allComponents = moduleResolver.getAllJsVueFilesWithInheritanceCached();
     const validComponentExtensions = configResolver.getMagentoConfig().ALLOWED_EXTENSIONS;
-    const extensionsPattern = validComponentExtensions.map((ext) =>
-        ext.replace('.', '')
-    ).join("|");
-    const dynamicRegex = new RegExp(
-        `(["'])([\\w\\d]+::[\\w\\d/]+\\.(${extensionsPattern}))\\1`,
-        "g"
-    );
 
     const hasValidExtension = (filePath) =>
         validComponentExtensions.some((ext) => filePath.endsWith(ext));