@lark-apaas/fullstack-cli 1.1.16-beta.7 → 1.1.16-beta.9

package/dist/index.js

@@ -1414,14 +1414,15 @@ async function fetchSyncedTables(appId, workspace) {
         DEFAULT_TIMEOUT_MS2
       );
     });
+    const dbBranch = process.env.FORCE_DB_BRANCH || "main";
     const start = Date.now();
     console.log(
-      `[fetchSyncedTables] \u2192 GET listTableView (dbBranch=main) appId=${appId ? "set" : "unset"} workspace=${workspace ? "set" : "unset"}`
+      `[fetchSyncedTables] \u2192 GET listTableView (dbBranch=${dbBranch}) appId=${appId ? "set" : "unset"} workspace=${workspace ? "set" : "unset"}`
     );
     const response = await Promise.race([
       client.get(
         `/api/v1/dataloom/inner/app/${appId}/workspaces/${workspace}/listTableView`,
-        { params: { dbBranch: "main" }, headers: { "x-supaas-bizsource": "miaoda" } }
+        { params: { dbBranch }, headers: { "x-supaas-bizsource": "miaoda" } }
       ),
       timeoutPromise
     ]);
@@ -2377,12 +2378,15 @@ var syncConfig = {
       type: "directory",
       overwrite: true
     },
-    // 2. 覆写 nest-cli.json 配置，禁止用户修改
+    // 2. 智能合并 nest-cli.json 配置（保留用户自定义的 assets、plugins 等）
     {
       from: "templates/nest-cli.json",
       to: "nest-cli.json",
-      type: "file",
-      overwrite: true
+      type: "merge-json",
+      arrayMerge: {
+        "compilerOptions.assets": { key: "include" },
+        "compilerOptions.plugins": { key: "name" }
+      }
     },
     // // 2. 追加内容到 .gitignore
     // {
@@ -2475,6 +2479,52 @@ function removeLineFromFile(filePath, pattern) {
   return true;
 }
 
+// src/utils/merge-json.ts
+function isPlainObject(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function mergeArrayByKey(userArr, templateArr, key) {
+  const result = [...userArr];
+  for (const templateItem of templateArr) {
+    if (!isPlainObject(templateItem)) continue;
+    const templateKey = templateItem[key];
+    const existingIndex = result.findIndex(
+      (item) => isPlainObject(item) && item[key] === templateKey
+    );
+    if (existingIndex >= 0) {
+      result[existingIndex] = templateItem;
+    } else {
+      result.push(templateItem);
+    }
+  }
+  return result;
+}
+function deepMergeJson(user, template, arrayMerge = {}, currentPath = "") {
+  const result = { ...user };
+  for (const key of Object.keys(template)) {
+    const fullPath = currentPath ? `${currentPath}.${key}` : key;
+    const templateValue = template[key];
+    const userValue = user[key];
+    if (Array.isArray(templateValue)) {
+      const mergeConfig = arrayMerge[fullPath];
+      if (mergeConfig && Array.isArray(userValue)) {
+        result[key] = mergeArrayByKey(userValue, templateValue, mergeConfig.key);
+      } else {
+        result[key] = templateValue;
+      }
+    } else if (isPlainObject(templateValue)) {
+      if (isPlainObject(userValue)) {
+        result[key] = deepMergeJson(userValue, templateValue, arrayMerge, fullPath);
+      } else {
+        result[key] = templateValue;
+      }
+    } else {
+      result[key] = templateValue;
+    }
+  }
+  return result;
+}
+
 // src/commands/sync/run.handler.ts
 async function run2(options) {
   const userProjectRoot = process.env.INIT_CWD || process.cwd();
@@ -2537,6 +2587,12 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
     addLineToFile(destPath2, rule.line);
     return;
   }
+  if (rule.type === "merge-json") {
+    const srcPath2 = path4.join(pluginRoot, rule.from);
+    const destPath2 = path4.join(userProjectRoot, rule.to);
+    mergeJsonFile(srcPath2, destPath2, rule.arrayMerge);
+    return;
+  }
   if (!("from" in rule)) {
     return;
   }
@@ -2679,6 +2735,33 @@ function addLineToFile(filePath, line) {
   fs6.appendFileSync(filePath, appendContent);
   console.log(`[fullstack-cli] \u2713 ${fileName} (added: ${line})`);
 }
+function mergeJsonFile(src, dest, arrayMerge) {
+  const fileName = path4.basename(dest);
+  if (!fs6.existsSync(src)) {
+    console.warn(`[fullstack-cli] Source not found: ${src}`);
+    return;
+  }
+  const templateContent = JSON.parse(fs6.readFileSync(src, "utf-8"));
+  if (!fs6.existsSync(dest)) {
+    const destDir = path4.dirname(dest);
+    if (!fs6.existsSync(destDir)) {
+      fs6.mkdirSync(destDir, { recursive: true });
+    }
+    fs6.writeFileSync(dest, JSON.stringify(templateContent, null, 2) + "\n");
+    console.log(`[fullstack-cli] \u2713 ${fileName} (created)`);
+    return;
+  }
+  const userContent = JSON.parse(fs6.readFileSync(dest, "utf-8"));
+  const merged = deepMergeJson(userContent, templateContent, arrayMerge ?? {});
+  const userStr = JSON.stringify(userContent, null, 2);
+  const mergedStr = JSON.stringify(merged, null, 2);
+  if (userStr === mergedStr) {
+    console.log(`[fullstack-cli] \u25CB ${fileName} (already up to date)`);
+    return;
+  }
+  fs6.writeFileSync(dest, mergedStr + "\n");
+  console.log(`[fullstack-cli] \u2713 ${fileName} (merged)`);
+}
 
 // src/commands/sync/index.ts
 var syncCommand = {
@@ -2935,7 +3018,7 @@ function getUpgradeFilesToStage(disableGenOpenapi = true) {
   const syncConfig2 = genSyncConfig({ disableGenOpenapi });
   const filesToStage = /* @__PURE__ */ new Set();
   syncConfig2.sync.forEach((rule) => {
-    if (rule.type === "file" || rule.type === "directory") {
+    if (rule.type === "file" || rule.type === "directory" || rule.type === "merge-json") {
       filesToStage.add(rule.to);
     } else if (rule.type === "remove-line" || rule.type === "add-line") {
       filesToStage.add(rule.to);
@@ -7173,6 +7256,12 @@ var SCENE_CONFIGS = {
     buildRequestBody: () => ({ commitID: "" })
   }
 };
+var UPLOAD_STATIC_DEFAULTS = {
+  staticDir: "shared/static",
+  tosutilPath: "tosutil",
+  endpoint: "tos-cn-beijing.volces.com",
+  region: "cn-beijing"
+};
 
 // src/commands/build/api-client.ts
 async function genArtifactUploadCredential(appId, body) {
@@ -7188,17 +7277,20 @@ async function genArtifactUploadCredential(appId, body) {
 }
 async function getDefaultBucketId(appId) {
   const client = getHttpClient();
-  const url = `/b/${appId}/get_published_v2`;
-  const response = await client.get(url);
+  const url = `/v1/app/${appId}/storage/inner/staticBucket`;
+  const response = await client.post(url, {});
   if (!response.ok || response.status !== 200) {
     throw new Error(
-      `get_published_v2 \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+      `getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
     );
   }
   const data = await response.json();
-  const bucketId = data?.data?.app_runtime_extra?.bucket?.default_bucket_id;
+  if (data.status_code !== "0") {
+    throw new Error(`getOrCreateStaticBucket \u8FD4\u56DE\u5F02\u5E38, status_code: ${data.status_code}`);
+  }
+  const bucketId = data?.data?.bucketID;
   if (!bucketId) {
-    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9ED8\u8BA4\u5B58\u50A8\u6876`);
+    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9759\u6001\u8D44\u6E90\u5B58\u50A8\u6876`);
   }
   return bucketId;
 }
@@ -7278,10 +7370,10 @@ async function uploadStatic(options) {
   try {
     const {
       appId,
-      staticDir = "shared/static",
-      tosutilPath = "/workspace/tosutil",
-      endpoint = "tos-cn-beijing.volces.com",
-      region = "cn-beijing"
+      staticDir = UPLOAD_STATIC_DEFAULTS.staticDir,
+      tosutilPath = UPLOAD_STATIC_DEFAULTS.tosutilPath,
+      endpoint = UPLOAD_STATIC_DEFAULTS.endpoint,
+      region = UPLOAD_STATIC_DEFAULTS.region
     } = options;
     const resolvedStaticDir = path21.resolve(staticDir);
     if (!fs25.existsSync(resolvedStaticDir)) {
@@ -7292,9 +7384,10 @@ async function uploadStatic(options) {
       console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E3A\u7A7A: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
       return;
     }
-    if (!fs25.existsSync(tosutilPath)) {
+    const resolvedTosutil = resolveTosutilPath(tosutilPath);
+    if (!resolvedTosutil) {
       throw new Error(
-        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD\u6D41\u6C34\u7EBF\u5DF2\u5728"\u4EA7\u7269\u6253\u5305\u4E0A\u4F20"\u6B65\u9AA4\u4E2D\u4E0B\u8F7D tosutil\u3002`
+        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD tosutil \u5DF2\u5B89\u88C5\u5728\u7CFB\u7EDF PATH \u4E2D\u6216\u901A\u8FC7 --tosutil-path \u6307\u5B9A\u8DEF\u5F84\u3002`
       );
     }
     let uploadPrefix;
@@ -7317,7 +7410,7 @@ async function uploadStatic(options) {
     }
     console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
     console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
-    configureTosutil(tosutilPath, {
+    configureTosutil(resolvedTosutil, {
       endpoint,
       region,
       accessKeyID,
@@ -7325,7 +7418,7 @@ async function uploadStatic(options) {
       sessionToken
     });
     console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
-    uploadToTos(tosutilPath, resolvedStaticDir, uploadPrefix);
+    uploadToTos(resolvedTosutil, resolvedStaticDir, uploadPrefix);
     console.error(`${LOG_PREFIX} tosutil \u4E0A\u4F20\u5B8C\u6210`);
     console.error(`${LOG_PREFIX} \u8C03\u7528 callbackStatic (uploadID: ${uploadID})...`);
     const callbackResp = await uploadStaticAttachmentCallback(appId, bucketId, { uploadID });
@@ -7341,6 +7434,17 @@ async function uploadStatic(options) {
     process.exit(1);
   }
 }
+function resolveTosutilPath(tosutilPath) {
+  if (path21.isAbsolute(tosutilPath)) {
+    return fs25.existsSync(tosutilPath) ? tosutilPath : null;
+  }
+  try {
+    const resolved = execFileSync("which", [tosutilPath], { encoding: "utf-8" }).trim();
+    return resolved || null;
+  } catch {
+    return null;
+  }
+}
 async function fetchPreUpload(appId, bucketId) {
   const response = await preUploadStaticAttachment(appId, bucketId);
   if (response.status_code !== "0") {
@@ -7435,7 +7539,7 @@ var uploadStaticCommand = {
   name: "upload-static",
   description: "Upload shared/static files to TOS",
   register(program) {
-    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", "shared/static").option("--tosutil-path <path>", "Path to tosutil binary", "/workspace/tosutil").option("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
+    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", UPLOAD_STATIC_DEFAULTS.staticDir).option("--tosutil-path <path>", "Path to tosutil binary", UPLOAD_STATIC_DEFAULTS.tosutilPath).option("--endpoint <endpoint>", "TOS endpoint", UPLOAD_STATIC_DEFAULTS.endpoint).option("--region <region>", "TOS region", UPLOAD_STATIC_DEFAULTS.region).action(async (options) => {
       await uploadStatic(options);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.16-beta.7",
+  "version": "1.1.16-beta.9",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/scripts/build.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 ROOT_DIR="$(pwd)"
-OUT_DIR="$ROOT_DIR/dist/server"
+DIST_DIR="$ROOT_DIR/dist"
 
 # 记录总开始时间
 TOTAL_START=$(node -e "console.log(Date.now())")
@@ -78,25 +78,26 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 4 ====================
-echo "📦 [4/5] 准备 server 依赖产物"
+echo "📦 [4/5] 准备产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
-mkdir -p "$OUT_DIR/dist/client"
-
-# 移动 HTML（从 dist/client 移走，避免残留）
-mv "$ROOT_DIR/dist/client/"*.html "$OUT_DIR/dist/client/" || true
-
-# 拷贝 run.sh 文件
-cp "$ROOT_DIR/scripts/run.sh" "$OUT_DIR/"
+# 拷贝 run.sh 到 dist/（prod 从 dist/ 启动，确保 cwd 一致性）
+cp "$ROOT_DIR/scripts/run.sh" "$DIST_DIR/"
 
 # 拷贝 .env 文件（如果存在）
 if [ -f "$ROOT_DIR/.env" ]; then
-  cp "$ROOT_DIR/.env" "$OUT_DIR/"
+  cp "$ROOT_DIR/.env" "$DIST_DIR/"
+fi
+
+# 移动 client 下的 HTML 文件到 dist/dist/client，保证 views 路径在 dev/prod 下一致
+if [ -d "$DIST_DIR/client" ]; then
+  mkdir -p "$DIST_DIR/dist/client"
+  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec mv {} "$DIST_DIR/dist/client/" \;
 fi
 
 # 清理无用文件
-rm -rf "$ROOT_DIR/dist/scripts"
-rm -rf "$ROOT_DIR/dist/tsconfig.node.tsbuildinfo"
+rm -rf "$DIST_DIR/scripts"
+rm -rf "$DIST_DIR/tsconfig.node.tsbuildinfo"
 
 print_time $STEP_START
 echo ""
@@ -116,8 +117,8 @@ echo "构建完成"
 print_time $TOTAL_START
 
 # 输出产物信息
-DIST_SIZE=$(du -sh "$OUT_DIR" | cut -f1)
-NODE_MODULES_SIZE=$(du -sh "$ROOT_DIR/dist/node_modules" | cut -f1)
+DIST_SIZE=$(du -sh "$DIST_DIR" | cut -f1)
+NODE_MODULES_SIZE=$(du -sh "$DIST_DIR/node_modules" | cut -f1)
 echo ""
 echo "📊 构建产物统计:"
 echo "   产物大小:        $DIST_SIZE"

package/templates/scripts/prune-smart.js

@@ -6,11 +6,12 @@ const fs = require('fs');
 const path = require('path');
 
 const ROOT_DIR = path.resolve(__dirname, '..');
-const DIST_SERVER_DIR = path.join(ROOT_DIR, 'dist/server');
+const DIST_DIR = path.join(ROOT_DIR, 'dist');
+const DIST_SERVER_DIR = path.join(DIST_DIR, 'server');
 const ROOT_PACKAGE_JSON = path.join(ROOT_DIR, 'package.json');
 const ROOT_NODE_MODULES = path.join(ROOT_DIR, 'node_modules');
-const OUT_NODE_MODULES = path.join(ROOT_DIR, 'dist/node_modules');
-const OUT_PACKAGE_JSON = path.join(DIST_SERVER_DIR, 'package.json');
+const OUT_NODE_MODULES = path.join(DIST_DIR, 'node_modules');
+const OUT_PACKAGE_JSON = path.join(DIST_DIR, 'package.json');
 
 // Server 入口文件
 const SERVER_ENTRY = path.join(DIST_SERVER_DIR, 'main.js');
@@ -294,9 +295,6 @@ async function smartPrune() {
     version: originalPackage.version,
     private: true,
     dependencies: prunedDependencies,
-    scripts: {
-      start: originalPackage.scripts?.start || 'node main.js'
-    },
     engines: originalPackage.engines
   };
 

package/templates/scripts/run.sh

@@ -2,4 +2,7 @@
 # This file is auto-generated by @lark-apaas/fullstack-cli
 
 # 生产环境下，启动服务
-npm run start
+# 从 dist/ 根目录执行，确保 process.cwd() 与 dev 模式一致
+# dev: cwd = 项目根, shared/ client/ 可达
+# prod: cwd = dist/,  shared/ client/ 可达
+NODE_ENV=production node server/main.js