@dimina/compiler 1.0.11 → 1.0.12-beta.0

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.11";
+const version = "1.0.12-beta.0";
 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.11";
+const version = "1.0.12-beta.0";
 const pack = {
   version
 };

package/dist/core/logic-compiler.cjs

@@ -95,22 +95,17 @@ async function compileJS(pages, root, mainCompileRes, progress) {
   return compileRes;
 }
 function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
-  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(" -> ")}`);
+  if (!module2.path) {
     return;
   }
-  depthChain = [...depthChain, currentPath];
-  if (!module2.path) {
+  const moduleKey = packageName + module2.path;
+  if (processedModules.has(moduleKey)) {
     return;
   }
   if (env.hasCompileInfo(module2.path, compileRes, mainCompileRes)) {
     return;
   }
+  processedModules.add(moduleKey);
   const compileInfo = {
     path: module2.path,
     code: ""
@@ -172,7 +167,7 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
       if (!componentModule) {
         continue;
       }
-      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
+      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, toMainSubPackage);
       const props = types.objectProperty(types.identifier(`'${name}'`), types.stringLiteral(path2));
       components.value.properties.push(props);
     }
@@ -198,9 +193,7 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
             id = "/" + id;
           }
           ap.node.arguments[0] = types.stringLiteral(id);
-          if (!processedModules.has(packageName + id)) {
-            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
-          }
+          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
         }
       }
     },
@@ -230,9 +223,7 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
         }
         if (shouldProcess) {
           ap.node.source = types.stringLiteral(id);
-          if (!processedModules.has(packageName + id)) {
-            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
-          }
+          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
         }
       }
     }
@@ -245,7 +236,6 @@ 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);

package/dist/core/logic-compiler.js

@@ -93,22 +93,17 @@ async function compileJS(pages, root, mainCompileRes, progress) {
   return compileRes;
 }
 function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
-  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(" -> ")}`);
+  if (!module.path) {
     return;
   }
-  depthChain = [...depthChain, currentPath];
-  if (!module.path) {
+  const moduleKey = packageName + module.path;
+  if (processedModules.has(moduleKey)) {
     return;
   }
   if (hasCompileInfo(module.path, compileRes, mainCompileRes)) {
     return;
   }
+  processedModules.add(moduleKey);
   const compileInfo = {
     path: module.path,
     code: ""
@@ -170,7 +165,7 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
       if (!componentModule) {
         continue;
       }
-      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
+      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, toMainSubPackage);
       const props = types.objectProperty(types.identifier(`'${name}'`), types.stringLiteral(path));
       components.value.properties.push(props);
     }
@@ -196,9 +191,7 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
             id = "/" + id;
           }
           ap.node.arguments[0] = types.stringLiteral(id);
-          if (!processedModules.has(packageName + id)) {
-            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
-          }
+          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
         }
       }
     },
@@ -228,9 +221,7 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
         }
         if (shouldProcess) {
           ap.node.source = types.stringLiteral(id);
-          if (!processedModules.has(packageName + id)) {
-            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
-          }
+          buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false);
         }
       }
     }
@@ -243,7 +234,6 @@ 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);

package/dist/core/style-compiler.cjs

@@ -30,6 +30,7 @@ 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 {
@@ -83,15 +84,10 @@ async function compileSS(pages, root, progress) {
 }
 async function buildCompileCss(module2, depthChain = []) {
   const currentPath = module2.path;
-  if (depthChain.includes(currentPath)) {
-    console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (processedPaths.has(currentPath)) {
     return;
   }
-  if (depthChain.length > 20) {
-    console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return;
-  }
-  depthChain = [...depthChain, currentPath];
+  processedPaths.add(currentPath);
   let result = await enhanceCSS(module2) || "";
   if (module2.usingComponents) {
     for (const componentInfo of Object.values(module2.usingComponents)) {
@@ -99,7 +95,7 @@ async function buildCompileCss(module2, depthChain = []) {
       if (!componentModule) {
         continue;
       }
-      result += await buildCompileCss(componentModule, depthChain);
+      result += await buildCompileCss(componentModule);
     }
   }
   return result;

package/dist/core/style-compiler.js

@@ -11,6 +11,7 @@ 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 {
@@ -64,15 +65,10 @@ async function compileSS(pages, root, progress) {
 }
 async function buildCompileCss(module, depthChain = []) {
   const currentPath = module.path;
-  if (depthChain.includes(currentPath)) {
-    console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (processedPaths.has(currentPath)) {
     return;
   }
-  if (depthChain.length > 20) {
-    console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return;
-  }
-  depthChain = [...depthChain, currentPath];
+  processedPaths.add(currentPath);
   let result = await enhanceCSS(module) || "";
   if (module.usingComponents) {
     for (const componentInfo of Object.values(module.usingComponents)) {
@@ -80,7 +76,7 @@ async function buildCompileCss(module, depthChain = []) {
       if (!componentModule) {
         continue;
       }
-      result += await buildCompileCss(componentModule, depthChain);
+      result += await buildCompileCss(componentModule);
     }
   }
   return result;

package/dist/core/view-compiler.cjs

@@ -140,6 +140,7 @@ 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 {
@@ -238,15 +239,10 @@ function isRegisteredWxsModule(modulePath) {
 }
 function buildCompileView(module2, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module2.path;
-  if (depthChain.includes(currentPath)) {
-    console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return;
-  }
-  if (depthChain.length > 20) {
-    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return;
+  if (processedViewPaths.has(currentPath)) {
+    return null;
   }
-  depthChain = [...depthChain, currentPath];
+  processedViewPaths.add(currentPath);
   const allScriptModules = [];
   const currentInstruction = compileModule(module2, isComponent, scriptRes);
   if (currentInstruction && currentInstruction.scriptModule) {
@@ -259,10 +255,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, depthChain);
+      const componentInstruction = buildCompileView(componentModule, true, scriptRes);
       if (componentInstruction && componentInstruction.scriptModule) {
         for (const sm of componentInstruction.scriptModule) {
           if (!allScriptModules.find((existing) => existing.path === sm.path)) {

package/dist/core/view-compiler.js

@@ -120,6 +120,7 @@ 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 {
@@ -218,15 +219,10 @@ function isRegisteredWxsModule(modulePath) {
 }
 function buildCompileView(module, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module.path;
-  if (depthChain.includes(currentPath)) {
-    console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return;
-  }
-  if (depthChain.length > 20) {
-    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return;
+  if (processedViewPaths.has(currentPath)) {
+    return null;
   }
-  depthChain = [...depthChain, currentPath];
+  processedViewPaths.add(currentPath);
   const allScriptModules = [];
   const currentInstruction = compileModule(module, isComponent, scriptRes);
   if (currentInstruction && currentInstruction.scriptModule) {
@@ -239,10 +235,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, depthChain);
+      const componentInstruction = buildCompileView(componentModule, true, scriptRes);
       if (componentInstruction && componentInstruction.scriptModule) {
         for (const sm of componentInstruction.scriptModule) {
           if (!allScriptModules.find((existing) => existing.path === sm.path)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.11",
+	"version": "1.0.12-beta.0",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -33,7 +33,9 @@
 		"build": "vite build",
 		"test": "vitest run",
 		"test:dev": "vitest",
-		"coverage": "vitest run --coverage"
+		"coverage": "vitest run --coverage",
+		"version:beta": "npm version prerelease --preid=beta",
+  		"publish:beta": "npm publish --tag beta"
 	},
 	"author": "doslin",
 	"license": "Apache-2.0",