@mbler/mcx-core 0.0.7-alpha.r3 → 0.0.7

package/dist/index.js

@@ -670,8 +670,8 @@ class Utils {
         // first verify ir.raw
         if (ir?.raw && Utils.CheckImportNode(ir?.raw, ir))
             return ir.raw;
-        let result = [];
-        for (let ImportIt of ir.imported) {
+        const result = [];
+        for (const ImportIt of ir.imported) {
             if (!ImportIt)
                 continue;
             if (ImportIt.isAll) {
@@ -690,7 +690,7 @@ class Utils {
     }
     static ImportToCache(node) {
         const result = [];
-        for (let item of node.specifiers) {
+        for (const item of node.specifiers) {
             const thisName = item.local.name;
             if (item.type == "ImportNamespaceSpecifier") {
                 result.push({
@@ -855,7 +855,7 @@ class CompileJS {
     }
     writeBuildCache() {
         const currenySource = [];
-        let build = [];
+        const build = [];
         for (const [as, data] of Object.entries(this.indexTemp)) {
             if (!this.writeImportKeys.includes(as))
                 continue;
@@ -1497,7 +1497,7 @@ class McxUtlis {
                     try {
                         text = JSON.parse(buffer.toString()); // Buffer -> string -> object
                     }
-                    catch (parseErr) {
+                    catch {
                         // JSON 解析失败时返回空对象
                         text = {};
                     }
@@ -1508,7 +1508,8 @@ class McxUtlis {
                 }
                 return text;
             }
-            catch (err) {
+            catch {
+                // err 变量不再使用，直接忽略
                 // 如果不是最后一次尝试，则等待后重试
                 if (attempt < opts.maxRetries - 1) {
                     await McxUtlis.sleep(opts.delay);
@@ -1822,24 +1823,6 @@ async function Comp$1(ctx) {
 }
 
 async function Comp(ctx) {
-    const resolveImportCandidates = (importerId, source) => {
-        const baseDir = path.dirname(importerId);
-        const sourcePath = path.resolve(baseDir, source);
-        const parsed = path.parse(sourcePath);
-        const mcxExt = ".mcx";
-        const candidates = new Set();
-        // compileMCXFn only accepts mcx source; normalize all import styles to .mcx candidates.
-        if (parsed.ext === mcxExt) {
-            candidates.add(sourcePath);
-        }
-        else {
-            // e.g. ./foo or ./foo.js -> ./foo.mcx
-            candidates.add(path.join(parsed.dir, `${parsed.name}${mcxExt}`));
-        }
-        // e.g. ./foo -> ./foo/index.mcx
-        candidates.add(path.join(sourcePath, `index${mcxExt}`));
-        return [...candidates];
-    };
     const eventImportIdList = [];
     for (const impNode of ctx.ctx.compiledCode.JSIR.BuildCache.import) {
         const source = impNode.source;
@@ -1847,45 +1830,34 @@ async function Comp(ctx) {
         if (!parsed.root && !parsed.dir.startsWith(".")) {
             continue;
         }
-        const candidates = resolveImportCandidates(ctx.ctx.currentId, source);
-        let resolvedPath = null;
-        let compileResult = null;
-        let lastErr = null;
-        for (const candidate of candidates) {
-            try {
-                const code = await fs.readFile(candidate, "utf-8");
-                compileResult = compileMCXFn(code);
-                resolvedPath = candidate;
-                break;
-            }
-            catch (err) {
-                if (err?.code === "ENOENT") {
-                    continue;
+        // path
+        const fPath = path.join(ctx.ctx.currentId, "../", source);
+        try {
+            // read file
+            const code = await fs.readFile(fPath, "utf-8");
+            const compiledCode = compileMCXFn(code);
+            // write cache
+            ctx.ctx.cache.set(fPath, compiledCode);
+            if (compiledCode.strLoc.Event.isLoad) {
+                for (const impItem of impNode.imported) {
+                    let type;
+                    if (impItem.isAll)
+                        type = "all";
+                    else if (impItem.import == "default")
+                        type = "default";
+                    else {
+                        throw new Error("not vaild importDeclartion: Event mcx only resolve default and all import, can't use other import");
+                    }
+                    eventImportIdList.push({
+                        type,
+                        as: impItem.as
+                    });
                 }
-                lastErr = err;
-                break;
             }
         }
-        if (!resolvedPath || !compileResult) {
-            ctx.ctx.rollupContext.warn(`[extract import]: can't resolve file from ${source} by ${ctx.ctx.currentId}\n- candidates: ${candidates.join(", ")}\n- err: ${(lastErr instanceof Error) ? lastErr.stack : lastErr ?? "not found"}`);
-            continue;
-        }
-        ctx.ctx.cache.set(resolvedPath, compileResult);
-        if (compileResult.strLoc.Event.isLoad) {
-            for (const impItem of impNode.imported) {
-                let type;
-                if (impItem.isAll)
-                    type = "all";
-                else if (impItem.import == "default")
-                    type = "default";
-                else {
-                    throw new Error("not vaild importDeclartion: Event mcx only resolve default and all import, can't use other import");
-                }
-                eventImportIdList.push({
-                    type,
-                    as: impItem.as
-                });
-            }
+        catch (err) {
+            // if error: file not found, file can't write, mcx syntax error
+            ctx.ctx.rollupContext.warn(`[extract import]: can't resolve file ${fPath} and import by ${ctx.ctx.currentId}\n- err: ${(err instanceof Error) ? err.stack : err}`);
         }
     }
     // only have event import
@@ -2055,7 +2027,7 @@ function transformESMToCJS(code, pluginContext, hook) {
  * 将 import IR 转换为 require 声明
  */
 function transformImportIRtoRequire(importIR) {
-    let define = [
+    const define = [
         t__namespace.variableDeclarator(t__namespace.identifier('__import_default'), t__namespace.functionExpression(null, [t__namespace.identifier('obj')], t__namespace.blockStatement([
             t__namespace.returnStatement(t__namespace.conditionalExpression(t__namespace.memberExpression(t__namespace.identifier('obj'), t__namespace.identifier('__esModule')), t__namespace.memberExpression(t__namespace.identifier('obj'), t__namespace.identifier('default')), t__namespace.identifier('obj'))),
         ]))),