qdmp-cli 0.1.11 → 0.1.13

package/actions.js

@@ -8,6 +8,9 @@ import table from "table";
 import { inquirerAccountPassword } from "./utils/interactive.js";
 import { login, getUserInfo } from "./api.js";
 import fs from "fs";
+import path from "path";
+import { createRequire } from "module";
+import { execFileSync } from "child_process";
 import {
   getUploadPath,
   getAppId,
@@ -178,14 +181,32 @@ export const buildAction = async () => {
         if (buildResult.code !== 0) {
           throw new Error("构建失败");
         }
-        shell.cd("dist");
-        const dmccResult = shell.exec("npx dmcc build --no-app-id-dir");
-        if (dmccResult.code !== 0) {
+        info("开始 EMP 编译...");
+        const require = createRequire(import.meta.url);
+        const dmccBin = path.resolve(
+          path.dirname(require.resolve("@dimina/compiler")),
+          "bin/index.js",
+        );
+        const distDir = path.resolve(process.cwd(), "dist");
+        try {
+          execFileSync(
+            process.execPath,
+            [
+              dmccBin,
+              "build",
+              "--work-path",
+              distDir,
+              "--target-path",
+              distDir,
+              "--no-app-id-dir",
+            ],
+            { stdio: "inherit" },
+          );
+        } catch (e) {
           throw new Error(
             "dmcc 构建失败，请保证 npm run build 产物是一个标准的微信小程序",
           );
         }
-        shell.cd("..");
         success("构建完成");
         break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdmp-cli",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "qdmp-cli",
   "main": "index.js",
   "type": "module",
@@ -18,6 +18,7 @@
   "author": "zhangyanran",
   "license": "ISC",
   "dependencies": {
+    "@dimina/compiler": "^1.0.16",
     "adm-zip": "^0.5.16",
     "chalk": "^5.4.1",
     "commander": "^14.0.0",

package/utils/common.js

@@ -145,35 +145,82 @@ async function copyDistFolder(dirname) {
     return false;
   }
 }
+
+function hasCompiledMainDir(dirname) {
+  try {
+    return fs.statSync(path.join(dirname, "main")).isDirectory();
+  } catch (e) {
+    return false;
+  }
+}
+
+function resolveCompiledEmpDistFolder(compiledOutputDir, compiledAppId) {
+  const resolvedOutputDir = path.resolve(compiledOutputDir);
+
+  if (hasCompiledMainDir(resolvedOutputDir)) {
+    return resolvedOutputDir;
+  }
+
+  if (compiledAppId) {
+    const appDir = path.join(resolvedOutputDir, compiledAppId);
+    if (hasCompiledMainDir(appDir)) {
+      return appDir;
+    }
+  }
+
+  const candidates = fs.existsSync(resolvedOutputDir)
+    ? fs
+        .readdirSync(resolvedOutputDir)
+        .map((name) => path.join(resolvedOutputDir, name))
+        .filter((dirname) => {
+          try {
+            return fs.statSync(dirname).isDirectory() && hasCompiledMainDir(dirname);
+          } catch (e) {
+            return false;
+          }
+        })
+    : [];
+
+  if (candidates.length === 1) {
+    return candidates[0];
+  }
+
+  throw new Error("未找到EMP编译产物，请先执行 qdmp build");
+}
+
+function writeEmpMetadata(workDir, appId, code) {
+  const metadataPath = path.join(workDir, "dist", "main", "qdmp.json");
+  fs.mkdirSync(path.dirname(metadataPath), { recursive: true });
+
+  let qdmpJson = {};
+  if (fs.existsSync(metadataPath)) {
+    try {
+      qdmpJson = JSON.parse(fs.readFileSync(metadataPath, "utf8"));
+    } catch (e) {
+      qdmpJson = {};
+    }
+  }
+
+  qdmpJson.appId = appId;
+  if (code != null) {
+    qdmpJson.version = code;
+  }
+
+  fs.writeFileSync(metadataPath, JSON.stringify(qdmpJson, null, 2));
+}
+
 /** 复制EMP文件夹
  * @param {*} dirname 文件夹名
  */
 async function copyAndSetEmpDistFolder(appId, code) {
-  //直接复制根目录下dist文件夹
   try {
-    fs.cpSync("dist", `${WORKSPACE_DIR}/dist`, { recursive: true });
-    if (!fs.existsSync(`${WORKSPACE_DIR}/dist/main/qdmp.json`)) {
-      fs.writeFileSync(
-        `${WORKSPACE_DIR}/dist/main/qdmp.json`,
-        JSON.stringify({
-          appId,
-          version: code,
-        }),
-      );
-    } else {
-      const qdmpJson = JSON.parse(
-        fs.readFileSync(`${WORKSPACE_DIR}/dist/main/qdmp.json`, "utf8"),
-      );
-      qdmpJson.version = code;
-      fs.writeFileSync(
-        `${WORKSPACE_DIR}/dist/main/qdmp.json`,
-        JSON.stringify(qdmpJson),
-      );
-    }
+    const distSource = resolveCompiledEmpDistFolder("dist", appId);
+    fs.cpSync(distSource, `${WORKSPACE_DIR}/dist`, { recursive: true });
+    writeEmpMetadata(WORKSPACE_DIR, appId, code);
     success("文件复制完成");
     return true;
   } catch (e) {
-    error(e);
+    error(e.message || e);
     return false;
   }
 }