@dimina/compiler 1.0.12-beta.2 → 1.0.12-beta.5

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.4";
 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.4";
 const pack = {
   version
 };

package/dist/core/logic-compiler.cjs

@@ -95,17 +95,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 +172,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 +198,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,7 +230,9 @@ 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);
+          }
         }
       }
     }
@@ -236,12 +245,14 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
     ]
   });
   compileInfo.code = code;
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
+  const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);
   const assignmentExpression = types.assignmentExpression(
     "=",
-    types.memberExpression(types.identifier("globalThis"), types.identifier("__extraInfo")),
-    addedArgs
+    types.memberExpression(types.identifier("globalThis"), propertyAssignment.key),
+    propertyAssignment.value
   );
   return types.expressionStatement(assignmentExpression);
 }

package/dist/core/logic-compiler.js

@@ -93,17 +93,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 +170,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 +196,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,7 +228,9 @@ 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);
+          }
         }
       }
     }
@@ -234,12 +243,14 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
     ]
   });
   compileInfo.code = code;
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
+  const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);
   const assignmentExpression = types.assignmentExpression(
     "=",
-    types.memberExpression(types.identifier("globalThis"), types.identifier("__extraInfo")),
-    addedArgs
+    types.memberExpression(types.identifier("globalThis"), propertyAssignment.key),
+    propertyAssignment.value
   );
   return types.expressionStatement(assignmentExpression);
 }

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 {
@@ -84,10 +83,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 +99,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 {
@@ -65,10 +64,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 +80,7 @@ async function buildCompileCss(module, depthChain = []) {
       if (!componentModule) {
         continue;
       }
-      result += await buildCompileCss(componentModule);
+      result += await buildCompileCss(componentModule, depthChain);
     }
   }
   return result;

package/dist/core/view-compiler.cjs

@@ -140,7 +140,6 @@ const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
 const wxsModuleRegistry = /* @__PURE__ */ new Set();
 const wxsFilePathMap = /* @__PURE__ */ new Map();
-const processedViewPaths = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
   node_worker_threads.parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -239,10 +238,15 @@ function isRegisteredWxsModule(modulePath) {
 }
 function buildCompileView(module2, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module2.path;
-  if (processedViewPaths.has(currentPath)) {
-    return null;
+  if (depthChain.includes(currentPath)) {
+    console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  processedViewPaths.add(currentPath);
+  if (depthChain.length > 20) {
+    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
+  }
+  depthChain = [...depthChain, currentPath];
   const allScriptModules = [];
   const currentInstruction = compileModule(module2, isComponent, scriptRes);
   if (currentInstruction && currentInstruction.scriptModule) {
@@ -255,10 +259,10 @@ function buildCompileView(module2, isComponent = false, scriptRes, depthChain =
         continue;
       }
       if (componentModule.path === module2.path) {
-        console.warn("[view]", `检测到自依赖，跳过处理: ${module2.path}`);
+        console.warn("[view]", `检测到循环依赖，跳过处理: ${module2.path}`);
         continue;
       }
-      const componentInstruction = buildCompileView(componentModule, true, scriptRes);
+      const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain);
       if (componentInstruction && componentInstruction.scriptModule) {
         for (const sm of componentInstruction.scriptModule) {
           if (!allScriptModules.find((existing) => existing.path === sm.path)) {
@@ -357,7 +361,7 @@ function compileModule(module2, isComponent, scriptRes) {
       comments: false,
       sourceType: "script"
     }).code;
-    tplComponents += `'${tm.path}':${code2.replace(/;$/, "")},`;
+    tplComponents += `'${tm.path}':${cleanCompiledCode(code2)},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
@@ -369,7 +373,7 @@ function compileModule(module2, isComponent, scriptRes) {
   const code = `Module({
 		path: '${module2.path}',
 		id: '${module2.id}',
-		render: ${transCode.replace(/;$/, "")},
+		render: ${cleanCompiledCode(transCode)},
 		usingComponents: ${JSON.stringify(module2.usingComponents)},
 		tplComponents: ${tplComponents},
 		});`;
@@ -574,7 +578,7 @@ function compileModuleWithAllWxs(module2, scriptRes, allScriptModules) {
       comments: false,
       sourceType: "script"
     }).code;
-    tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
+    tplComponents += `'${tm.path}':${cleanCompiledCode(code2)},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
@@ -586,7 +590,7 @@ function compileModuleWithAllWxs(module2, scriptRes, allScriptModules) {
   const code = `Module({
 		path: '${module2.path}',
 		id: '${module2.id}',
-		render: ${transCode.replace(/;$/, "").replace(/^"use strict";\s*/, "")},
+		render: ${cleanCompiledCode(transCode)},
 		usingComponents: ${JSON.stringify(module2.usingComponents)},
 		tplComponents: ${tplComponents},
 		});`;
@@ -656,6 +660,9 @@ function processIncludedFileWxsDependencies(content, includePath, scriptModule,
     }
   }
 }
+function cleanCompiledCode(code) {
+  return code.replace(/;$/, "").replace(/^"use strict";\s*/, "");
+}
 function toCompileTemplate(isComponent, path2, components, componentPlaceholder, processedPaths = /* @__PURE__ */ new Set()) {
   const workPath = env.getWorkPath();
   const fullPath = getViewPath(workPath, path2);

package/dist/core/view-compiler.js

@@ -120,7 +120,6 @@ const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
 const wxsModuleRegistry = /* @__PURE__ */ new Set();
 const wxsFilePathMap = /* @__PURE__ */ new Map();
-const processedViewPaths = /* @__PURE__ */ new Set();
 if (!isMainThread) {
   parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -219,10 +218,15 @@ function isRegisteredWxsModule(modulePath) {
 }
 function buildCompileView(module, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module.path;
-  if (processedViewPaths.has(currentPath)) {
-    return null;
+  if (depthChain.includes(currentPath)) {
+    console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  processedViewPaths.add(currentPath);
+  if (depthChain.length > 20) {
+    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
+  }
+  depthChain = [...depthChain, currentPath];
   const allScriptModules = [];
   const currentInstruction = compileModule(module, isComponent, scriptRes);
   if (currentInstruction && currentInstruction.scriptModule) {
@@ -235,10 +239,10 @@ function buildCompileView(module, isComponent = false, scriptRes, depthChain = [
         continue;
       }
       if (componentModule.path === module.path) {
-        console.warn("[view]", `检测到自依赖，跳过处理: ${module.path}`);
+        console.warn("[view]", `检测到循环依赖，跳过处理: ${module.path}`);
         continue;
       }
-      const componentInstruction = buildCompileView(componentModule, true, scriptRes);
+      const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain);
       if (componentInstruction && componentInstruction.scriptModule) {
         for (const sm of componentInstruction.scriptModule) {
           if (!allScriptModules.find((existing) => existing.path === sm.path)) {
@@ -337,7 +341,7 @@ function compileModule(module, isComponent, scriptRes) {
       comments: false,
       sourceType: "script"
     }).code;
-    tplComponents += `'${tm.path}':${code2.replace(/;$/, "")},`;
+    tplComponents += `'${tm.path}':${cleanCompiledCode(code2)},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
@@ -349,7 +353,7 @@ function compileModule(module, isComponent, scriptRes) {
   const code = `Module({
 		path: '${module.path}',
 		id: '${module.id}',
-		render: ${transCode.replace(/;$/, "")},
+		render: ${cleanCompiledCode(transCode)},
 		usingComponents: ${JSON.stringify(module.usingComponents)},
 		tplComponents: ${tplComponents},
 		});`;
@@ -554,7 +558,7 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
       comments: false,
       sourceType: "script"
     }).code;
-    tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
+    tplComponents += `'${tm.path}':${cleanCompiledCode(code2)},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
@@ -566,7 +570,7 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
   const code = `Module({
 		path: '${module.path}',
 		id: '${module.id}',
-		render: ${transCode.replace(/;$/, "").replace(/^"use strict";\s*/, "")},
+		render: ${cleanCompiledCode(transCode)},
 		usingComponents: ${JSON.stringify(module.usingComponents)},
 		tplComponents: ${tplComponents},
 		});`;
@@ -636,6 +640,9 @@ function processIncludedFileWxsDependencies(content, includePath, scriptModule,
     }
   }
 }
+function cleanCompiledCode(code) {
+  return code.replace(/;$/, "").replace(/^"use strict";\s*/, "");
+}
 function toCompileTemplate(isComponent, path2, components, componentPlaceholder, processedPaths = /* @__PURE__ */ new Set()) {
   const workPath = getWorkPath();
   const fullPath = getViewPath(workPath, path2);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.12-beta.2",
+	"version": "1.0.12-beta.5",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",