@lark-apaas/fullstack-cli 1.1.22-alpha.17 → 1.1.22-alpha.18

package/dist/index.js

@@ -1433,12 +1433,17 @@ async function fetchSyncedTables(appId, workspace) {
         `listTableView API failed: ${response.status} ${response.statusText}`
       );
     }
-    const json = await response.json();
+    let json;
+    try {
+      json = await response.json();
+    } catch (error) {
+      console.warn(
+        "[fetchSyncedTables] \u26A0 Failed to parse listTableView response JSON, returning empty map:",
+        error instanceof Error ? error.message : String(error)
+      );
+      return /* @__PURE__ */ new Map();
+    }
     const tableView = json?.data?.data;
-    console.log(
-      "[fetchSyncedTables] listTableView raw response:",
-      JSON.stringify(json, null, 2)
-    );
     if (!tableView) {
       console.warn(
         "[fetchSyncedTables] \u26A0 listTableView response missing data.data, returning empty map"
@@ -1456,7 +1461,7 @@ async function fetchSyncedTables(appId, workspace) {
       "[fetchSyncedTables] \u274C Error fetching synced tables:",
       error
     );
-    return void 0;
+    return /* @__PURE__ */ new Map();
   }
 }
 function extractSyncedTableMap(tableView) {
@@ -2155,7 +2160,9 @@ async function run(options = {}) {
   }
   const databaseUrl = process.env.SUDA_DATABASE_URL;
   if (!databaseUrl) {
-    console.error("[gen-db-schema] Error: SUDA_DATABASE_URL environment variable is required");
+    console.error(
+      "[gen-db-schema] Error: SUDA_DATABASE_URL environment variable is required"
+    );
     process.exit(1);
   }
   const outputPath = options.output || process.env.DB_SCHEMA_OUTPUT || "server/database/schema.ts";
@@ -2170,9 +2177,14 @@ async function run(options = {}) {
     path2.resolve(__dirname2, "../../../dist/config/drizzle.config.js")
   ];
   const configPath = configPathCandidates.find((p) => fs4.existsSync(p));
-  console.log("[gen-db-schema] Using drizzle config from:", configPath ?? "(not found)");
+  console.log(
+    "[gen-db-schema] Using drizzle config from:",
+    configPath ?? "(not found)"
+  );
   if (!configPath) {
-    console.error("[gen-db-schema] Error: drizzle config not found in CLI package");
+    console.error(
+      "[gen-db-schema] Error: drizzle config not found in CLI package"
+    );
     process.exit(1);
   }
   const resolveDrizzleKitBin = () => {
@@ -2188,7 +2200,9 @@ async function run(options = {}) {
           const binField = pkgJson.bin;
           const binRelPath = typeof binField === "string" ? binField : binField?.["drizzle-kit"];
           if (!binRelPath) {
-            throw new Error("Unable to resolve drizzle-kit binary from package.json");
+            throw new Error(
+              "Unable to resolve drizzle-kit binary from package.json"
+            );
           }
           return path2.resolve(currentDir, binRelPath);
         }
@@ -2209,14 +2223,20 @@ async function run(options = {}) {
     const start = Date.now();
     console.log("[gen-db-schema] \u2192 Fetching column comments...");
     const res = await fetchColumnComments(databaseUrl, { timeoutMs: 1e4 });
-    console.log(`[gen-db-schema] \u2190 Fetched column comments: ${res.size} items (${Date.now() - start}ms)`);
+    console.log(
+      `[gen-db-schema] \u2190 Fetched column comments: ${res.size} items (${Date.now() - start}ms)`
+    );
     return res;
   })();
   const syncedTablesTask = appId && workspace ? (async () => {
     const start = Date.now();
-    console.log("[gen-db-schema] \u2192 Fetching synced tables from listTableView...");
+    console.log(
+      "[gen-db-schema] \u2192 Fetching synced tables from listTableView..."
+    );
     const res = await fetchSyncedTables(appId, workspace);
-    console.log(`[gen-db-schema] \u2190 Fetched synced tables: ${res?.size} tables (${Date.now() - start}ms)`);
+    console.log(
+      `[gen-db-schema] \u2190 Fetched synced tables: ${res.size} tables (${Date.now() - start}ms)`
+    );
     return res;
   })() : void 0;
   const fetchTasks = await Promise.allSettled([
@@ -2225,7 +2245,9 @@ async function run(options = {}) {
   ]);
   if (fetchTasks[0].status === "fulfilled") {
     columnComments = fetchTasks[0].value;
-    console.log(`[gen-db-schema] \u2713 Column comments ready: ${columnComments.size}`);
+    console.log(
+      `[gen-db-schema] \u2713 Column comments ready: ${columnComments.size}`
+    );
   } else {
     console.warn(
       "[gen-db-schema] \u26A0 Failed to fetch column comments (skipping):",
@@ -2235,15 +2257,21 @@ async function run(options = {}) {
   if (appId && workspace) {
     if (fetchTasks[1]?.status === "fulfilled") {
       syncedTableMap = fetchTasks[1].value;
-      console.log(`[gen-db-schema] \u2713 Synced tables ready: ${syncedTableMap?.size ?? 0}`);
+      console.log(
+        `[gen-db-schema] \u2713 Synced tables ready: ${syncedTableMap.size}`
+      );
     } else if (fetchTasks[1]?.status === "rejected") {
       console.warn(
         "[gen-db-schema] \u26A0 Failed to fetch synced tables (skipping):",
         fetchTasks[1].reason instanceof Error ? fetchTasks[1].reason.message : String(fetchTasks[1].reason)
       );
+      syncedTableMap = /* @__PURE__ */ new Map();
     }
   } else {
-    console.info("[gen-db-schema] \u2139 Skipping synced table detection (app_id or suda_workspace_id not set)");
+    console.info(
+      "[gen-db-schema] \u2139 Skipping synced table detection (app_id or suda_workspace_id not set)"
+    );
+    syncedTableMap = /* @__PURE__ */ new Map();
   }
   try {
     const env = {
@@ -2255,13 +2283,19 @@ async function run(options = {}) {
     };
     const drizzleKitBin = resolveDrizzleKitBin();
     const spawnArgs = [drizzleKitBin, "introspect", "--config", configPath];
-    const result = spawnSync(process.execPath, spawnArgs, { stdio: "inherit", env, cwd: process.cwd() });
+    const result = spawnSync(process.execPath, spawnArgs, {
+      stdio: "inherit",
+      env,
+      cwd: process.cwd()
+    });
     if (result.error) {
       console.error("[gen-db-schema] Execution failed:", result.error);
       throw result.error;
     }
     if ((result.status ?? 0) !== 0) {
-      throw new Error(`drizzle-kit introspect failed with status ${result.status}`);
+      throw new Error(
+        `drizzle-kit introspect failed with status ${result.status}`
+      );
     }
     const generatedSchema = path2.join(OUT_DIR, "schema.ts");
     if (!fs4.existsSync(generatedSchema)) {
@@ -2273,7 +2307,10 @@ async function run(options = {}) {
       syncedTableMap
     });
     if (stats?.unmatchedUnknown?.length) {
-      console.warn("[gen-db-schema] Unmatched custom types detected:", stats.unmatchedUnknown);
+      console.warn(
+        "[gen-db-schema] Unmatched custom types detected:",
+        stats.unmatchedUnknown
+      );
     }
     console.log("[gen-db-schema] \u2713 Postprocessed schema");
     fs4.mkdirSync(path2.dirname(SCHEMA_FILE), { recursive: true });
@@ -2288,14 +2325,22 @@ async function run(options = {}) {
           schemaFilePath,
           moduleOutputDir: path2.resolve(process.cwd(), "server/modules")
         });
-        console.log("[gen-db-schema] \u2713 Generate NestJS Module Boilerplate Successfully");
+        console.log(
+          "[gen-db-schema] \u2713 Generate NestJS Module Boilerplate Successfully"
+        );
       }
     } catch (error) {
-      console.warn("[gen-db-schema] Generate NestJS Module Boilerplate failed:", error instanceof Error ? error.message : String(error));
+      console.warn(
+        "[gen-db-schema] Generate NestJS Module Boilerplate failed:",
+        error instanceof Error ? error.message : String(error)
+      );
     }
     console.log("[gen-db-schema] \u2713 Complete");
   } catch (err) {
-    console.error("[gen-db-schema] Failed:", err instanceof Error ? err.message : String(err));
+    console.error(
+      "[gen-db-schema] Failed:",
+      err instanceof Error ? err.message : String(err)
+    );
     exitCode = 1;
   } finally {
     if (fs4.existsSync(OUT_DIR)) {
@@ -2745,6 +2790,21 @@ function gitAddUpgradeFiles(cwd = process.cwd(), filesToStage) {
     throw new Error(`git add failed: ${errorMsg}`);
   }
 }
+function hasStagedChanges(cwd = process.cwd()) {
+  const result = spawnSync2("git", ["diff", "--cached", "--quiet"], {
+    cwd,
+    stdio: "pipe",
+    encoding: "utf-8"
+  });
+  if (result.status === 0) {
+    return false;
+  }
+  if (result.status === 1) {
+    return true;
+  }
+  const errorMsg = result.stderr || result.error?.message || "Unknown error";
+  throw new Error(`Failed to check staged changes: ${errorMsg}`);
+}
 function gitCommit(message, cwd = process.cwd()) {
   const result = spawnSync2("git", ["commit", "-m", message], {
     cwd,
@@ -2768,6 +2828,10 @@ function autoCommitUpgradeChanges(version, cwd, filesToStage, commitMessage) {
   }
   try {
     gitAddUpgradeFiles(cwd, filesToStage);
+    if (!hasStagedChanges(cwd)) {
+      console.log("[fullstack-cli] No upgrade changes to commit");
+      return false;
+    }
     const message = commitMessage || `chore(upgrade): auto-upgrade by fullstack-cli
 
 - Sync template files

package/package.json

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