@dimina/compiler 1.0.12-beta.0 → 1.0.12-beta.10

package/dist/bin/index.cjs

@@ -5,7 +5,7 @@ const process = require("node:process");
 const chokidar = require("chokidar");
 const commander = require("commander");
 const index = require("../index.cjs");
-const version = "1.0.12-beta.0";
+const version = "1.0.12-beta.10";
 const pack = {
   version
 };

package/dist/bin/index.js

@@ -4,7 +4,7 @@ import process from "node:process";
 import chokidar from "chokidar";
 import { program } from "commander";
 import build from "../index.js";
-const version = "1.0.12-beta.0";
+const version = "1.0.12-beta.10";
 const pack = {
   version
 };

package/dist/core/logic-compiler.cjs

@@ -11,6 +11,15 @@ const ts = require("typescript");
 const transformModulesCommonjs = require("@babel/plugin-transform-modules-commonjs");
 const env = require("../env-Cmen1qwy.cjs");
 const traverse = _traverse.default ? _traverse.default : _traverse;
+const BABEL_TRANSFORM_CONFIG = {
+  comments: false,
+  configFile: false,
+  babelrc: false,
+  plugins: [
+    // 将 ES6 import/export 转换为 CommonJS
+    transformModulesCommonjs
+  ]
+};
 const processedModules = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
   node_worker_threads.parentPort.on("message", async ({ pages, storeInfo }) => {
@@ -42,8 +51,10 @@ ${error.stack}`);
         }
       }
       await writeCompileRes(mainCompileRes, null);
+      processedModules.clear();
       node_worker_threads.parentPort.postMessage({ success: true });
     } catch (error) {
+      processedModules.clear();
       node_worker_threads.parentPort.postMessage({
         success: false,
         error: {
@@ -95,17 +106,22 @@ async function compileJS(pages, root, mainCompileRes, progress) {
   return compileRes;
 }
 function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
-  if (!module2.path) {
+  const currentPath = module2.path;
+  if (depthChain.includes(currentPath)) {
+    console.warn("[logic]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
+  }
+  if (depthChain.length > 20) {
+    console.warn("[logic]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
     return;
   }
-  const moduleKey = packageName + module2.path;
-  if (processedModules.has(moduleKey)) {
+  depthChain = [...depthChain, currentPath];
+  if (!module2.path) {
     return;
   }
   if (env.hasCompileInfo(module2.path, compileRes, mainCompileRes)) {
     return;
   }
-  processedModules.add(moduleKey);
   const compileInfo = {
     path: module2.path,
     code: ""
@@ -167,7 +183,7 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
       if (!componentModule) {
         continue;
       }
-      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, toMainSubPackage);
+      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
       const props = types.objectProperty(types.identifier(`'${name}'`), types.stringLiteral(path2));
       components.value.properties.push(props);
     }
@@ -193,7 +209,9 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
             id = "/" + id;
           }
           ap.node.arguments[0] = types.stringLiteral(id);
-          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
+          if (!processedModules.has(packageName + id)) {
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
+          }
         }
       }
     },
@@ -223,19 +241,16 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
         }
         if (shouldProcess) {
           ap.node.source = types.stringLiteral(id);
-          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
+          if (!processedModules.has(packageName + id)) {
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
+          }
         }
       }
     }
   });
-  const { code } = babel.transformFromAstSync(ast, "", {
-    comments: false,
-    plugins: [
-      // 将 ES6 import/export 转换为 CommonJS
-      transformModulesCommonjs
-    ]
-  });
+  const { code } = babel.transformFromAstSync(ast, "", BABEL_TRANSFORM_CONFIG);
   compileInfo.code = code;
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
   const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);

package/dist/core/logic-compiler.js

@@ -9,6 +9,15 @@ import ts from "typescript";
 import transformModulesCommonjs from "@babel/plugin-transform-modules-commonjs";
 import { r as resetStoreInfo, g as getTargetPath, i as hasCompileInfo, b as getContentByPath, j as getAppConfigInfo, a as getComponent, d as getWorkPath } from "../env-Csj3AHY4.js";
 const traverse = _traverse.default ? _traverse.default : _traverse;
+const BABEL_TRANSFORM_CONFIG = {
+  comments: false,
+  configFile: false,
+  babelrc: false,
+  plugins: [
+    // 将 ES6 import/export 转换为 CommonJS
+    transformModulesCommonjs
+  ]
+};
 const processedModules = /* @__PURE__ */ new Set();
 if (!isMainThread) {
   parentPort.on("message", async ({ pages, storeInfo }) => {
@@ -40,8 +49,10 @@ ${error.stack}`);
         }
       }
       await writeCompileRes(mainCompileRes, null);
+      processedModules.clear();
       parentPort.postMessage({ success: true });
     } catch (error) {
+      processedModules.clear();
       parentPort.postMessage({
         success: false,
         error: {
@@ -93,17 +104,22 @@ async function compileJS(pages, root, mainCompileRes, progress) {
   return compileRes;
 }
 function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
-  if (!module.path) {
+  const currentPath = module.path;
+  if (depthChain.includes(currentPath)) {
+    console.warn("[logic]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
+  }
+  if (depthChain.length > 20) {
+    console.warn("[logic]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
     return;
   }
-  const moduleKey = packageName + module.path;
-  if (processedModules.has(moduleKey)) {
+  depthChain = [...depthChain, currentPath];
+  if (!module.path) {
     return;
   }
   if (hasCompileInfo(module.path, compileRes, mainCompileRes)) {
     return;
   }
-  processedModules.add(moduleKey);
   const compileInfo = {
     path: module.path,
     code: ""
@@ -165,7 +181,7 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
       if (!componentModule) {
         continue;
       }
-      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, toMainSubPackage);
+      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
       const props = types.objectProperty(types.identifier(`'${name}'`), types.stringLiteral(path));
       components.value.properties.push(props);
     }
@@ -191,7 +207,9 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
             id = "/" + id;
           }
           ap.node.arguments[0] = types.stringLiteral(id);
-          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
+          if (!processedModules.has(packageName + id)) {
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
+          }
         }
       }
     },
@@ -221,19 +239,16 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
         }
         if (shouldProcess) {
           ap.node.source = types.stringLiteral(id);
-          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
+          if (!processedModules.has(packageName + id)) {
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
+          }
         }
       }
     }
   });
-  const { code } = babel.transformFromAstSync(ast, "", {
-    comments: false,
-    plugins: [
-      // 将 ES6 import/export 转换为 CommonJS
-      transformModulesCommonjs
-    ]
-  });
+  const { code } = babel.transformFromAstSync(ast, "", BABEL_TRANSFORM_CONFIG);
   compileInfo.code = code;
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
   const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);

package/dist/core/style-compiler.cjs

@@ -30,7 +30,6 @@ function _interopNamespaceDefault(e) {
 const sass__namespace = /* @__PURE__ */ _interopNamespaceDefault(sass);
 const fileType = [".wxss", ".ddss", ".less", ".scss", ".sass"];
 const compileRes = /* @__PURE__ */ new Map();
-const processedPaths = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
   node_worker_threads.parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -49,8 +48,10 @@ if (!node_worker_threads.isMainThread) {
       for (const [root, subPages] of Object.entries(pages.subPages)) {
         await compileSS(subPages.info, root, progress);
       }
+      compileRes.clear();
       node_worker_threads.parentPort.postMessage({ success: true });
     } catch (error) {
+      compileRes.clear();
       node_worker_threads.parentPort.postMessage({
         success: false,
         error: {
@@ -84,10 +85,15 @@ async function compileSS(pages, root, progress) {
 }
 async function buildCompileCss(module2, depthChain = []) {
   const currentPath = module2.path;
-  if (processedPaths.has(currentPath)) {
+  if (depthChain.includes(currentPath)) {
+    console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
     return;
   }
-  processedPaths.add(currentPath);
+  if (depthChain.length > 20) {
+    console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
+  }
+  depthChain = [...depthChain, currentPath];
   let result = await enhanceCSS(module2) || "";
   if (module2.usingComponents) {
     for (const componentInfo of Object.values(module2.usingComponents)) {
@@ -95,7 +101,7 @@ async function buildCompileCss(module2, depthChain = []) {
       if (!componentModule) {
         continue;
       }
-      result += await buildCompileCss(componentModule);
+      result += await buildCompileCss(componentModule, depthChain);
     }
   }
   return result;

package/dist/core/style-compiler.js

@@ -11,7 +11,6 @@ import * as sass from "sass";
 import { r as resetStoreInfo, g as getTargetPath, a as getComponent, b as getContentByPath, h as tagWhiteList, e as collectAssets, f as getAppId, d as getWorkPath, t as transformRpx } from "../env-Csj3AHY4.js";
 const fileType = [".wxss", ".ddss", ".less", ".scss", ".sass"];
 const compileRes = /* @__PURE__ */ new Map();
-const processedPaths = /* @__PURE__ */ new Set();
 if (!isMainThread) {
   parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -30,8 +29,10 @@ if (!isMainThread) {
       for (const [root, subPages] of Object.entries(pages.subPages)) {
         await compileSS(subPages.info, root, progress);
       }
+      compileRes.clear();
       parentPort.postMessage({ success: true });
     } catch (error) {
+      compileRes.clear();
       parentPort.postMessage({
         success: false,
         error: {
@@ -65,10 +66,15 @@ async function compileSS(pages, root, progress) {
 }
 async function buildCompileCss(module, depthChain = []) {
   const currentPath = module.path;
-  if (processedPaths.has(currentPath)) {
+  if (depthChain.includes(currentPath)) {
+    console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
     return;
   }
-  processedPaths.add(currentPath);
+  if (depthChain.length > 20) {
+    console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
+  }
+  depthChain = [...depthChain, currentPath];
   let result = await enhanceCSS(module) || "";
   if (module.usingComponents) {
     for (const componentInfo of Object.values(module.usingComponents)) {
@@ -76,7 +82,7 @@ async function buildCompileCss(module, depthChain = []) {
       if (!componentModule) {
         continue;
       }
-      result += await buildCompileCss(componentModule);
+      result += await buildCompileCss(componentModule, depthChain);
     }
   }
   return result;