@dimina/compiler 1.0.6 → 1.0.7

package/dist/bin/index.cjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 "use strict";
-const process = require("node:process");
 const path = require("node:path");
-const commander = require("commander");
+const process = require("node:process");
 const chokidar = require("chokidar");
+const commander = require("commander");
 const index = require("../index.cjs");
-const version = "1.0.5";
+const version = "1.0.7";
 const pack = {
   version
 };

package/dist/bin/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import process from "node:process";
 import path from "node:path";
-import { program } from "commander";
+import process from "node:process";
 import chokidar from "chokidar";
+import { program } from "commander";
 import build from "../index.js";
-const version = "1.0.5";
+const version = "1.0.7";
 const pack = {
   version
 };

package/dist/core/logic-compiler.cjs

@@ -1,12 +1,13 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const fs = require("node:fs");
 const path = require("node:path");
 const node_worker_threads = require("node:worker_threads");
 const babel = require("@babel/core");
-const types = require("@babel/types");
 const _traverse = require("@babel/traverse");
+const types = require("@babel/types");
 const esbuild = require("esbuild");
-const env = require("../env-Chow6VXH.cjs");
+const env = require("../env-CGYKCSjT.cjs");
 const traverse = _traverse.default ? _traverse.default : _traverse;
 const processedModules = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
@@ -25,18 +26,33 @@ if (!node_worker_threads.isMainThread) {
       };
       const mainCompileRes = await compileJS(pages.mainPages, null, null, progress);
       for (const [root, subPages] of Object.entries(pages.subPages)) {
-        const subCompileRes = await compileJS(
-          subPages.info,
-          root,
-          subPages.independent ? [] : mainCompileRes,
-          progress
-        );
-        await writeCompileRes(subCompileRes, root);
+        try {
+          const subCompileRes = await compileJS(
+            subPages.info,
+            root,
+            subPages.independent ? [] : mainCompileRes,
+            progress
+          );
+          await writeCompileRes(subCompileRes, root);
+        } catch (error) {
+          throw new Error(`Error processing subpackage ${root}: ${error.message}
+${error.stack}`);
+        }
       }
       await writeCompileRes(mainCompileRes, null);
       node_worker_threads.parentPort.postMessage({ success: true });
     } catch (error) {
-      node_worker_threads.parentPort.postMessage({ success: false, error: error.message });
+      node_worker_threads.parentPort.postMessage({
+        success: false,
+        error: {
+          message: error.message,
+          stack: error.stack,
+          name: error.name,
+          file: error.file || null,
+          line: error.line || null,
+          code: error.code || null
+        }
+      });
     }
   });
 }
@@ -63,7 +79,7 @@ ${module2.code}
   } else {
     const mainDir = `${env.getTargetPath()}/main`;
     if (!fs.existsSync(mainDir)) {
-      fs.mkdirSync(mainDir);
+      fs.mkdirSync(mainDir, { recursive: true });
     }
     fs.writeFileSync(`${mainDir}/logic.js`, mergeCode);
   }
@@ -82,10 +98,12 @@ async function compileJS(pages, root, mainCompileRes, progress) {
 function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
   const currentPath = module2.path;
   if (depthChain.includes(currentPath)) {
-    console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    console.warn("[logic]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  if (depthChain.length > 100) {
-    console.warn(`检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (depthChain.length > 20) {
+    console.warn("[logic]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
   depthChain = [...depthChain, currentPath];
   if (!module2.path) {
@@ -115,7 +133,6 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
     for (const [name, path2] of Object.entries(module2.usingComponents)) {
       let toMainSubPackage = true;
       if (packageName) {
-        const rootPackageName = packageName.startsWith("sub_") ? packageName.slice(4) : packageName;
         const normalizedPath = path2.startsWith("/") ? path2.substring(1) : path2;
         for (const subPackage of allSubPackages) {
           if (normalizedPath.startsWith(`${subPackage.root}/`)) {
@@ -123,11 +140,6 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
             break;
           }
         }
-        if (!toMainSubPackage) {
-          if (!normalizedPath.startsWith(`${rootPackageName}/`)) {
-            continue;
-          }
-        }
       } else {
         toMainSubPackage = false;
       }
@@ -155,9 +167,9 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
         const requirePath = ap.node.arguments[0].value;
         if (requirePath) {
           const requireFullPath = path.resolve(modulePath, `../${requirePath}`);
-          const id = requireFullPath.split(`${env.getWorkPath()}/`)[1].split(".js")[0];
+          const id = requireFullPath.split(`${env.getWorkPath()}${path.sep}`)[1].split(".js")[0].replace(/\\/g, "/");
           ap.node.arguments[0] = types.stringLiteral(id);
-          if (!processedModules.has(id)) {
+          if (!processedModules.has(packageName + id)) {
             buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
           }
         }
@@ -168,7 +180,7 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
     comments: false
   });
   compileInfo.code = code;
-  processedModules.add(currentPath);
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
   const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);
@@ -181,4 +193,5 @@ function getExtraInfoStatement(type, addedArgs) {
   );
   return propertyAssignmentStatement;
 }
-module.exports = compileJS;
+exports.buildJSByPath = buildJSByPath;
+exports.compileJS = compileJS;

package/dist/core/logic-compiler.js

@@ -1,11 +1,11 @@
 import fs from "node:fs";
-import { resolve } from "node:path";
+import { resolve, sep } from "node:path";
 import { isMainThread, parentPort } from "node:worker_threads";
 import babel from "@babel/core";
-import types from "@babel/types";
 import _traverse from "@babel/traverse";
+import types from "@babel/types";
 import { transform } from "esbuild";
-import { r as resetStoreInfo, g as getTargetPath, i as hasCompileInfo, f as getWorkPath, b as getContentByPath, j as getAppConfigInfo, a as getComponent } from "../env-CezfCSQz.js";
+import { r as resetStoreInfo, g as getTargetPath, i as hasCompileInfo, d as getWorkPath, b as getContentByPath, j as getAppConfigInfo, a as getComponent } from "../env-fkuCnng-.js";
 const traverse = _traverse.default ? _traverse.default : _traverse;
 const processedModules = /* @__PURE__ */ new Set();
 if (!isMainThread) {
@@ -24,18 +24,33 @@ if (!isMainThread) {
       };
       const mainCompileRes = await compileJS(pages.mainPages, null, null, progress);
       for (const [root, subPages] of Object.entries(pages.subPages)) {
-        const subCompileRes = await compileJS(
-          subPages.info,
-          root,
-          subPages.independent ? [] : mainCompileRes,
-          progress
-        );
-        await writeCompileRes(subCompileRes, root);
+        try {
+          const subCompileRes = await compileJS(
+            subPages.info,
+            root,
+            subPages.independent ? [] : mainCompileRes,
+            progress
+          );
+          await writeCompileRes(subCompileRes, root);
+        } catch (error) {
+          throw new Error(`Error processing subpackage ${root}: ${error.message}
+${error.stack}`);
+        }
       }
       await writeCompileRes(mainCompileRes, null);
       parentPort.postMessage({ success: true });
     } catch (error) {
-      parentPort.postMessage({ success: false, error: error.message });
+      parentPort.postMessage({
+        success: false,
+        error: {
+          message: error.message,
+          stack: error.stack,
+          name: error.name,
+          file: error.file || null,
+          line: error.line || null,
+          code: error.code || null
+        }
+      });
     }
   });
 }
@@ -62,7 +77,7 @@ ${module.code}
   } else {
     const mainDir = `${getTargetPath()}/main`;
     if (!fs.existsSync(mainDir)) {
-      fs.mkdirSync(mainDir);
+      fs.mkdirSync(mainDir, { recursive: true });
     }
     fs.writeFileSync(`${mainDir}/logic.js`, mergeCode);
   }
@@ -81,10 +96,12 @@ async function compileJS(pages, root, mainCompileRes, progress) {
 function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
   const currentPath = module.path;
   if (depthChain.includes(currentPath)) {
-    console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    console.warn("[logic]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  if (depthChain.length > 100) {
-    console.warn(`检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (depthChain.length > 20) {
+    console.warn("[logic]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
   depthChain = [...depthChain, currentPath];
   if (!module.path) {
@@ -114,7 +131,6 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
     for (const [name, path] of Object.entries(module.usingComponents)) {
       let toMainSubPackage = true;
       if (packageName) {
-        const rootPackageName = packageName.startsWith("sub_") ? packageName.slice(4) : packageName;
         const normalizedPath = path.startsWith("/") ? path.substring(1) : path;
         for (const subPackage of allSubPackages) {
           if (normalizedPath.startsWith(`${subPackage.root}/`)) {
@@ -122,11 +138,6 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
             break;
           }
         }
-        if (!toMainSubPackage) {
-          if (!normalizedPath.startsWith(`${rootPackageName}/`)) {
-            continue;
-          }
-        }
       } else {
         toMainSubPackage = false;
       }
@@ -154,9 +165,9 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
         const requirePath = ap.node.arguments[0].value;
         if (requirePath) {
           const requireFullPath = resolve(modulePath, `../${requirePath}`);
-          const id = requireFullPath.split(`${getWorkPath()}/`)[1].split(".js")[0];
+          const id = requireFullPath.split(`${getWorkPath()}${sep}`)[1].split(".js")[0].replace(/\\/g, "/");
           ap.node.arguments[0] = types.stringLiteral(id);
-          if (!processedModules.has(id)) {
+          if (!processedModules.has(packageName + id)) {
             buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
           }
         }
@@ -167,7 +178,7 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
     comments: false
   });
   compileInfo.code = code;
-  processedModules.add(currentPath);
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
   const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);
@@ -181,5 +192,6 @@ function getExtraInfoStatement(type, addedArgs) {
   return propertyAssignmentStatement;
 }
 export {
-  compileJS as default
+  buildJSByPath,
+  compileJS
 };

package/dist/core/style-compiler.cjs

@@ -1,16 +1,16 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const fs = require("node:fs");
 const path = require("node:path");
 const node_worker_threads = require("node:worker_threads");
-const postcss = require("postcss");
+const compilerSfc = require("@vue/compiler-sfc");
 const autoprefixer = require("autoprefixer");
-const selectorParser = require("postcss-selector-parser");
 const cssnano = require("cssnano");
-const compilerSfc = require("@vue/compiler-sfc");
-const env = require("../env-Chow6VXH.cjs");
+const postcss = require("postcss");
+const selectorParser = require("postcss-selector-parser");
+const env = require("../env-CGYKCSjT.cjs");
 const fileType = [".wxss", ".ddss"];
 const compileRes = /* @__PURE__ */ new Map();
-const processedModules = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
   node_worker_threads.parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -42,13 +42,13 @@ async function compileSS(pages, root, progress) {
     if (root) {
       const subDir = `${env.getTargetPath()}/${root}`;
       if (!fs.existsSync(subDir)) {
-        fs.mkdirSync(subDir);
+        fs.mkdirSync(subDir, { recursive: true });
       }
       fs.writeFileSync(`${subDir}/${filename}.css`, code);
     } else {
       const mainDir = `${env.getTargetPath()}/main`;
       if (!fs.existsSync(mainDir)) {
-        fs.mkdirSync(mainDir);
+        fs.mkdirSync(mainDir, { recursive: true });
       }
       fs.writeFileSync(`${mainDir}/${filename}.css`, code);
     }
@@ -58,10 +58,12 @@ async function compileSS(pages, root, progress) {
 async function buildCompileCss(module2, depthChain = []) {
   const currentPath = module2.path;
   if (depthChain.includes(currentPath)) {
-    console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  if (depthChain.length > 100) {
-    console.warn(`检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (depthChain.length > 20) {
+    console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
   depthChain = [...depthChain, currentPath];
   let result = await enhanceCSS(module2) || "";
@@ -74,7 +76,6 @@ async function buildCompileCss(module2, depthChain = []) {
       result += await buildCompileCss(componentModule, depthChain);
     }
   }
-  processedModules.add(currentPath);
   return result;
 }
 async function enhanceCSS(module2) {
@@ -89,9 +90,7 @@ async function enhanceCSS(module2) {
   if (compileRes.has(absolutePath)) {
     return compileRes.get(absolutePath);
   }
-  const fixedCSS = inputCSS.replace(/@import[^;\n]*$/gm, (match) => {
-    return match.endsWith(";") ? match : `${match};`;
-  });
+  const fixedCSS = ensureImportSemicolons(inputCSS);
   const ast = postcss.parse(fixedCSS);
   const promises = [];
   ast.walk(async (node) => {
@@ -153,4 +152,10 @@ function getAbsolutePath(modulePath) {
     }
   }
 }
-module.exports = compileSS;
+function ensureImportSemicolons(css) {
+  return css.replace(/@import[^;\n]*$/gm, (match) => {
+    return match.endsWith(";") ? match : `${match};`;
+  });
+}
+exports.compileSS = compileSS;
+exports.ensureImportSemicolons = ensureImportSemicolons;

package/dist/core/style-compiler.js

@@ -1,15 +1,14 @@
 import fs from "node:fs";
 import path from "node:path";
 import { isMainThread, parentPort } from "node:worker_threads";
-import postcss from "postcss";
+import { compileStyle } from "@vue/compiler-sfc";
 import autoprefixer from "autoprefixer";
-import selectorParser from "postcss-selector-parser";
 import cssnano from "cssnano";
-import { compileStyle } from "@vue/compiler-sfc";
-import { r as resetStoreInfo, g as getTargetPath, a as getComponent, b as getContentByPath, h as tagWhiteList, d as collectAssets, e as getAppId, f as getWorkPath, t as transformRpx } from "../env-CezfCSQz.js";
+import postcss from "postcss";
+import selectorParser from "postcss-selector-parser";
+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-fkuCnng-.js";
 const fileType = [".wxss", ".ddss"];
 const compileRes = /* @__PURE__ */ new Map();
-const processedModules = /* @__PURE__ */ new Set();
 if (!isMainThread) {
   parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -41,13 +40,13 @@ async function compileSS(pages, root, progress) {
     if (root) {
       const subDir = `${getTargetPath()}/${root}`;
       if (!fs.existsSync(subDir)) {
-        fs.mkdirSync(subDir);
+        fs.mkdirSync(subDir, { recursive: true });
       }
       fs.writeFileSync(`${subDir}/${filename}.css`, code);
     } else {
       const mainDir = `${getTargetPath()}/main`;
       if (!fs.existsSync(mainDir)) {
-        fs.mkdirSync(mainDir);
+        fs.mkdirSync(mainDir, { recursive: true });
       }
       fs.writeFileSync(`${mainDir}/${filename}.css`, code);
     }
@@ -57,10 +56,12 @@ async function compileSS(pages, root, progress) {
 async function buildCompileCss(module, depthChain = []) {
   const currentPath = module.path;
   if (depthChain.includes(currentPath)) {
-    console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  if (depthChain.length > 100) {
-    console.warn(`检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (depthChain.length > 20) {
+    console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
   depthChain = [...depthChain, currentPath];
   let result = await enhanceCSS(module) || "";
@@ -73,7 +74,6 @@ async function buildCompileCss(module, depthChain = []) {
       result += await buildCompileCss(componentModule, depthChain);
     }
   }
-  processedModules.add(currentPath);
   return result;
 }
 async function enhanceCSS(module) {
@@ -88,9 +88,7 @@ async function enhanceCSS(module) {
   if (compileRes.has(absolutePath)) {
     return compileRes.get(absolutePath);
   }
-  const fixedCSS = inputCSS.replace(/@import[^;\n]*$/gm, (match) => {
-    return match.endsWith(";") ? match : `${match};`;
-  });
+  const fixedCSS = ensureImportSemicolons(inputCSS);
   const ast = postcss.parse(fixedCSS);
   const promises = [];
   ast.walk(async (node) => {
@@ -152,6 +150,12 @@ function getAbsolutePath(modulePath) {
     }
   }
 }
+function ensureImportSemicolons(css) {
+  return css.replace(/@import[^;\n]*$/gm, (match) => {
+    return match.endsWith(";") ? match : `${match};`;
+  });
+}
 export {
-  compileSS as default
+  compileSS,
+  ensureImportSemicolons
 };