@lark-apaas/fullstack-cli 1.1.28-alpha.15 → 1.1.28-alpha.17

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,15 +2378,12 @@ var syncConfig = {
       type: "directory",
       overwrite: true
     },
-    // 2. 智能合并 nest-cli.json 配置（保留用户自定义的 assets、plugins 等）
+    // 2. 覆写 nest-cli.json 配置，禁止用户修改
     {
       from: "templates/nest-cli.json",
       to: "nest-cli.json",
-      type: "merge-json",
-      arrayMerge: {
-        "compilerOptions.assets": { key: "include" },
-        "compilerOptions.plugins": { key: "name" }
-      }
+      type: "file",
+      overwrite: true
     },
     // // 2. 追加内容到 .gitignore
     // {
@@ -2478,52 +2476,6 @@ 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();
@@ -2586,12 +2538,6 @@ 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;
   }
@@ -2734,33 +2680,6 @@ 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 = {
@@ -3017,7 +2936,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" || rule.type === "merge-json") {
+    if (rule.type === "file" || rule.type === "directory") {
       filesToStage.add(rule.to);
     } else if (rule.type === "remove-line" || rule.type === "add-line") {
       filesToStage.add(rule.to);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.28-alpha.15",
+  "version": "1.1.28-alpha.17",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",