@mbler/mcx-core 0.0.8-rc.1 → 0.0.8-rc.3

package/dist/index.js

@@ -1684,7 +1684,9 @@ async function generateEventConfig(eventTag, ctx, impBody) {
                 extend.push(t__namespace.identifier(id));
             }
         }
-        data.push(t__namespace.objectProperty(t__namespace.identifier(name), t__namespace.stringLiteral(handlerName)));
+        else {
+            data.push(t__namespace.objectProperty(t__namespace.identifier(name), t__namespace.stringLiteral(handlerName)));
+        }
     }
     argm.properties.push(t__namespace.objectProperty(t__namespace.identifier("data"), t__namespace.objectExpression(data)), t__namespace.objectProperty(t__namespace.identifier("extends"), t__namespace.arrayExpression(extend)));
     return argm;
@@ -11020,32 +11022,105 @@ function mcxPlugn(opt, output) {
             errors: []
         };
     }
+    const resolveExtensions = ["", ".ts", ".mts", ".cts", ".js", ".mjs", ".cjs"];
+    const indexExtensions = resolveExtensions.map(ext => "/index" + ext);
+    async function tryResolvePath(filePath) {
+        for (const idxExt of indexExtensions) {
+            try {
+                const fullPath = filePath + idxExt;
+                await fs.readFile(fullPath, "utf-8");
+                return fullPath;
+            }
+            catch { }
+        }
+        for (const ext of resolveExtensions) {
+            try {
+                const fullPath = filePath + ext;
+                await fs.readFile(fullPath, "utf-8");
+                return fullPath;
+            }
+            catch { }
+        }
+        return null;
+    }
+    async function resolvePackageExports(pkgDir, subPath, pkgJson) {
+        const exports$1 = pkgJson.exports;
+        if (exports$1) {
+            const subImport = subPath.startsWith("./") ? subPath : `./${subPath}`;
+            if (typeof exports$1 === "object" && exports$1 !== null) {
+                if (exports$1[subImport]) {
+                    const target = exports$1[subImport];
+                    if (typeof target === "string") {
+                        return path.join(pkgDir, target);
+                    }
+                    else if (typeof target === "object" && target !== null) {
+                        if (target.import) {
+                            return path.join(pkgDir, target.import);
+                        }
+                        return path.join(pkgDir, target.default || Object.values(target)[0]);
+                    }
+                }
+                if (subImport.endsWith("/") || subImport.endsWith("/*")) {
+                    const dirMapping = subImport.slice(0, -1);
+                    for (const [key, value] of Object.entries(exports$1)) {
+                        if (key.startsWith(dirMapping) && key !== dirMapping) {
+                            const target = value;
+                            return path.join(pkgDir, target);
+                        }
+                    }
+                }
+            }
+            else if (typeof exports$1 === "string") {
+                return path.join(pkgDir, exports$1);
+            }
+        }
+        return null;
+    }
     return {
         name: "mbler-mcx-core",
         async resolveId(id, imp) {
             const i = path.parse(id);
-            // if is not a file path
-            if (!i.root && !i.dir.startsWith(".")) {
-                // read module package.json
-                const d = path.join(opt.moduleDir, id);
+            if (i.dir.startsWith(".") || i.root) {
+                if (imp) {
+                    const baseDir = path.dirname(imp);
+                    const resolved = await tryResolvePath(path.join(baseDir, id));
+                    if (resolved)
+                        return resolved;
+                }
+                return null;
+            }
+            else {
+                const isScopedPackage = id.startsWith("@");
+                const parts = id.split("/");
+                const pkgName = isScopedPackage ? `${parts[0]}/${parts[1]}` : parts[0];
+                const subPath = isScopedPackage ? parts.slice(2).join("/") : parts.slice(1).join("/");
+                const d = path.join(opt.moduleDir, pkgName);
                 let pkgJson;
                 try {
                     pkgJson = JSON.parse(await fs.readFile(path.join(d, "package.json"), "utf-8"));
                 }
                 catch (err) {
-                    if (err.code === "ENOENT") {
-                        throw new Error(`[mcx resolveId]\: package.json not found for '${id}'`);
+                    if (!err.code || err.code === "ENOENT") {
+                        throw new Error(`[mcx resolveId]: package.json not found for '${id}' at '${d}'`);
                     }
                     else {
-                        throw new Error(`[mcx resolveId]\: invalid package.json for '${id}'`);
-                    }
+                        throw new Error(`[mcx resolveId]: invalid package.json for '${id}': ${err.message}`);
+                    }
+                }
+                if (subPath) {
+                    const fromExports = await resolvePackageExports(d, subPath, pkgJson);
+                    if (fromExports)
+                        return fromExports;
+                    const fromDist = await tryResolvePath(path.join(d, "./dist", subPath));
+                    if (fromDist)
+                        return fromDist;
+                    const fromRoot = await tryResolvePath(path.join(d, subPath));
+                    if (fromRoot)
+                        return fromRoot;
+                    return null;
                 }
                 return path.join(d, pkgJson.main);
             }
-            else if (imp) {
-                return path.join(path.dirname(imp), id);
-            }
-            return null;
         },
         transform: async function (code, id) {
             const magic = new MagicString(code);