@dimina/compiler 1.0.6 → 1.0.8

package/README.md

@@ -98,11 +98,59 @@ dmcc build --no-app-id-dir
 
 ```txt
 app.js, index.js      ->  logic.js     (逻辑文件)
+app.ts, index.ts      ->  logic.js     (TypeScript 逻辑文件)
 index.wxml            ->  view.js      (视图文件)
 app.wxss, index.wxss  ->  style.css    (样式文件)
+app.less, index.less  ->  style.css    (Less 样式文件)
+app.scss, index.scss  ->  style.css    (SCSS 样式文件)
+app.sass, index.sass  ->  style.css    (Sass 样式文件)
 app.json, index.json  ->  config.json  (配置文件)
+miniprogram_npm/      ->  npm包构建   (npm组件支持)
 ```
 
+### TypeScript、Less 和 SCSS 支持
+
+编译器现已支持现代前端开发工具：
+
+- ✅ **TypeScript 支持**: `.ts` 文件自动编译为 JavaScript
+- ✅ **ES6 Import 语句**: 支持相对路径、npm 包和绝对路径导入
+- ✅ **Less 支持**: `.less` 文件编译为 CSS，支持变量、mixin 和嵌套
+- ✅ **SCSS/Sass 支持**: `.scss` 和 `.sass` 文件编译为 CSS
+- ✅ **错误处理**: 编译失败时自动回退，不中断构建流程
+- ✅ **向后兼容**: 完全兼容现有的 `.js` 和 `.wxss` 文件
+
+#### 支持的文件类型
+
+**逻辑文件查找顺序**: `.js` → `.ts`
+**样式文件查找顺序**: `.wxss` → `.ddss` → `.less` → `.scss` → `.sass`
+
+详细使用说明请参考：[TypeScript、Less 和 SCSS 支持文档](./docs/typescript-less-scss-support.md)
+
+### npm 组件支持
+
+编译器现已支持微信小程序的 npm 包功能，遵循微信官方的 npm 支持规范：
+
+- ✅ 支持 `miniprogram_npm` 目录中的组件解析
+- ✅ 按照微信小程序寻址顺序查找组件
+- ✅ 自动构建和复制 npm 包文件
+- ✅ 支持组件依赖关系处理
+- ✅ 缓存机制提升编译性能
+- ✅ 兼容现有的相对路径组件引用
+
+#### npm 组件使用示例
+
+```json
+// pages/index/index.json
+{
+  "usingComponents": {
+    "lib-button": "lib-weapp/button",
+    "custom-component": "./components/custom"
+  }
+}
+```
+
+详细使用说明请参考：[npm 支持文档](./docs/npm-support.md)
+
 ### 编译产物目录结构
 
 编译后，默认会在目标目录生成以小程序 id 命名的文件夹，项目结构如下：

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,15 @@
 "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 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 processedModules = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
@@ -25,18 +28,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 +81,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 +100,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) {
@@ -99,9 +119,35 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
     code: ""
   };
   const src = module2.path.startsWith("/") ? module2.path : `/${module2.path}`;
-  const modulePath = `${env.getWorkPath()}${src}.js`;
-  const js = env.getContentByPath(modulePath);
-  const ast = babel.parseSync(js);
+  const modulePath = getJSAbsolutePath(src);
+  if (!modulePath) {
+    console.warn("[logic]", `找不到模块文件: ${src}`);
+    return;
+  }
+  const sourceCode = env.getContentByPath(modulePath);
+  if (!sourceCode) {
+    console.warn("[logic]", `无法读取模块文件: ${modulePath}`);
+    return;
+  }
+  let jsCode = sourceCode;
+  if (modulePath.endsWith(".ts")) {
+    try {
+      const result = ts.transpileModule(sourceCode, {
+        compilerOptions: {
+          target: ts.ScriptTarget.ES2020,
+          module: ts.ModuleKind.CommonJS,
+          strict: false,
+          esModuleInterop: true,
+          skipLibCheck: true
+        }
+      });
+      jsCode = result.outputText;
+    } catch (error) {
+      console.error(`[logic] TypeScript 编译失败 ${modulePath}:`, error.message);
+      jsCode = sourceCode;
+    }
+  }
+  const ast = babel.parseSync(jsCode);
   const addedArgs = types.objectExpression([
     types.objectProperty(types.identifier("path"), types.stringLiteral(module2.path))
   ]);
@@ -115,7 +161,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 +168,6 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
             break;
           }
         }
-        if (!toMainSubPackage) {
-          if (!normalizedPath.startsWith(`${rootPackageName}/`)) {
-            continue;
-          }
-        }
       } else {
         toMainSubPackage = false;
       }
@@ -155,9 +195,45 @@ 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];
+          let id = requireFullPath.split(`${env.getWorkPath()}${path.sep}`)[1];
+          id = id.replace(/\.(js|ts)$/, "").replace(/\\/g, "/");
+          if (!id.startsWith("/")) {
+            id = "/" + id;
+          }
           ap.node.arguments[0] = types.stringLiteral(id);
-          if (!processedModules.has(id)) {
+          if (!processedModules.has(packageName + id)) {
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
+          }
+        }
+      }
+    },
+    ImportDeclaration(ap) {
+      const importPath = ap.node.source.value;
+      if (importPath) {
+        let id;
+        let shouldProcess = false;
+        if (importPath.startsWith("@") || importPath.startsWith("miniprogram_npm/")) {
+          if (importPath.startsWith("@")) {
+            id = `/miniprogram_npm/${importPath}`;
+          } else {
+            id = importPath.startsWith("/") ? importPath : `/${importPath}`;
+          }
+          shouldProcess = true;
+        } else if (importPath.startsWith("./") || importPath.startsWith("../") || !importPath.startsWith("/")) {
+          const importFullPath = path.resolve(modulePath, `../${importPath}`);
+          id = importFullPath.split(`${env.getWorkPath()}${path.sep}`)[1];
+          id = id.replace(/\.(js|ts)$/, "").replace(/\\/g, "/");
+          if (!id.startsWith("/")) {
+            id = "/" + id;
+          }
+          shouldProcess = true;
+        } else {
+          id = importPath;
+          shouldProcess = true;
+        }
+        if (shouldProcess) {
+          ap.node.source = types.stringLiteral(id);
+          if (!processedModules.has(packageName + id)) {
             buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
           }
         }
@@ -165,20 +241,34 @@ function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtr
     }
   });
   const { code } = babel.transformFromAstSync(ast, "", {
-    comments: false
+    comments: false,
+    plugins: [
+      // 将 ES6 import/export 转换为 CommonJS
+      transformModulesCommonjs
+    ]
   });
   compileInfo.code = code;
-  processedModules.add(currentPath);
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
   const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);
-  const propertyAssignmentStatement = types.expressionStatement(
-    types.assignmentExpression(
-      "=",
-      types.memberExpression(types.identifier(type), propertyAssignment.key),
-      propertyAssignment.value
-    )
+  const assignmentExpression = types.assignmentExpression(
+    "=",
+    types.memberExpression(types.identifier("globalThis"), propertyAssignment.key),
+    propertyAssignment.value
   );
-  return propertyAssignmentStatement;
+  return types.expressionStatement(assignmentExpression);
+}
+function getJSAbsolutePath(modulePath) {
+  const workPath = env.getWorkPath();
+  const fileTypes = [".js", ".ts"];
+  for (const ext of fileTypes) {
+    const fullPath = `${workPath}${modulePath}${ext}`;
+    if (fs.existsSync(fullPath)) {
+      return fullPath;
+    }
+  }
+  return null;
 }
-module.exports = compileJS;
+exports.buildJSByPath = buildJSByPath;
+exports.compileJS = compileJS;

package/dist/core/logic-compiler.js

@@ -1,11 +1,13 @@
 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 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 processedModules = /* @__PURE__ */ new Set();
 if (!isMainThread) {
@@ -24,18 +26,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 +79,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 +98,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) {
@@ -98,9 +117,35 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
     code: ""
   };
   const src = module.path.startsWith("/") ? module.path : `/${module.path}`;
-  const modulePath = `${getWorkPath()}${src}.js`;
-  const js = getContentByPath(modulePath);
-  const ast = babel.parseSync(js);
+  const modulePath = getJSAbsolutePath(src);
+  if (!modulePath) {
+    console.warn("[logic]", `找不到模块文件: ${src}`);
+    return;
+  }
+  const sourceCode = getContentByPath(modulePath);
+  if (!sourceCode) {
+    console.warn("[logic]", `无法读取模块文件: ${modulePath}`);
+    return;
+  }
+  let jsCode = sourceCode;
+  if (modulePath.endsWith(".ts")) {
+    try {
+      const result = ts.transpileModule(sourceCode, {
+        compilerOptions: {
+          target: ts.ScriptTarget.ES2020,
+          module: ts.ModuleKind.CommonJS,
+          strict: false,
+          esModuleInterop: true,
+          skipLibCheck: true
+        }
+      });
+      jsCode = result.outputText;
+    } catch (error) {
+      console.error(`[logic] TypeScript 编译失败 ${modulePath}:`, error.message);
+      jsCode = sourceCode;
+    }
+  }
+  const ast = babel.parseSync(jsCode);
   const addedArgs = types.objectExpression([
     types.objectProperty(types.identifier("path"), types.stringLiteral(module.path))
   ]);
@@ -114,7 +159,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 +166,6 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
             break;
           }
         }
-        if (!toMainSubPackage) {
-          if (!normalizedPath.startsWith(`${rootPackageName}/`)) {
-            continue;
-          }
-        }
       } else {
         toMainSubPackage = false;
       }
@@ -154,9 +193,45 @@ 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];
+          let id = requireFullPath.split(`${getWorkPath()}${sep}`)[1];
+          id = id.replace(/\.(js|ts)$/, "").replace(/\\/g, "/");
+          if (!id.startsWith("/")) {
+            id = "/" + id;
+          }
           ap.node.arguments[0] = types.stringLiteral(id);
-          if (!processedModules.has(id)) {
+          if (!processedModules.has(packageName + id)) {
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
+          }
+        }
+      }
+    },
+    ImportDeclaration(ap) {
+      const importPath = ap.node.source.value;
+      if (importPath) {
+        let id;
+        let shouldProcess = false;
+        if (importPath.startsWith("@") || importPath.startsWith("miniprogram_npm/")) {
+          if (importPath.startsWith("@")) {
+            id = `/miniprogram_npm/${importPath}`;
+          } else {
+            id = importPath.startsWith("/") ? importPath : `/${importPath}`;
+          }
+          shouldProcess = true;
+        } else if (importPath.startsWith("./") || importPath.startsWith("../") || !importPath.startsWith("/")) {
+          const importFullPath = resolve(modulePath, `../${importPath}`);
+          id = importFullPath.split(`${getWorkPath()}${sep}`)[1];
+          id = id.replace(/\.(js|ts)$/, "").replace(/\\/g, "/");
+          if (!id.startsWith("/")) {
+            id = "/" + id;
+          }
+          shouldProcess = true;
+        } else {
+          id = importPath;
+          shouldProcess = true;
+        }
+        if (shouldProcess) {
+          ap.node.source = types.stringLiteral(id);
+          if (!processedModules.has(packageName + id)) {
             buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
           }
         }
@@ -164,22 +239,36 @@ function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra
     }
   });
   const { code } = babel.transformFromAstSync(ast, "", {
-    comments: false
+    comments: false,
+    plugins: [
+      // 将 ES6 import/export 转换为 CommonJS
+      transformModulesCommonjs
+    ]
   });
   compileInfo.code = code;
-  processedModules.add(currentPath);
+  processedModules.add(packageName + currentPath);
 }
 function getExtraInfoStatement(type, addedArgs) {
   const propertyAssignment = types.objectProperty(types.identifier("__extraInfo"), addedArgs);
-  const propertyAssignmentStatement = types.expressionStatement(
-    types.assignmentExpression(
-      "=",
-      types.memberExpression(types.identifier(type), propertyAssignment.key),
-      propertyAssignment.value
-    )
+  const assignmentExpression = types.assignmentExpression(
+    "=",
+    types.memberExpression(types.identifier("globalThis"), propertyAssignment.key),
+    propertyAssignment.value
   );
-  return propertyAssignmentStatement;
+  return types.expressionStatement(assignmentExpression);
+}
+function getJSAbsolutePath(modulePath) {
+  const workPath = getWorkPath();
+  const fileTypes = [".js", ".ts"];
+  for (const ext of fileTypes) {
+    const fullPath = `${workPath}${modulePath}${ext}`;
+    if (fs.existsSync(fullPath)) {
+      return fullPath;
+    }
+  }
+  return null;
 }
 export {
-  compileJS as default
+  buildJSByPath,
+  compileJS
 };