@lark-apaas/fullstack-cli 1.1.22-alpha.10 → 1.1.22-alpha.12

package/dist/index.js

@@ -1041,6 +1041,8 @@ async function fetchColumnComments(connectionString, options = {}) {
   const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const url = new URL(connectionString);
   const schemaName = url.searchParams.get("schema") ?? "public";
+  const start = Date.now();
+  console.log(`[fetchColumnComments] \u2192 Querying pg_description for schema=${schemaName} (timeout=${timeoutMs}ms)`);
   const sql = postgres(connectionString, {
     connect_timeout: Math.ceil(timeoutMs / 1e3),
     idle_timeout: Math.ceil(timeoutMs / 1e3)
@@ -1069,6 +1071,7 @@ async function fetchColumnComments(connectionString, options = {}) {
       const key = `${row.tableName}.${row.columnName}`;
       commentMap.set(key, row.comment);
     }
+    console.log(`[fetchColumnComments] \u2190 Fetched ${commentMap.size} column comments (${Date.now() - start}ms)`);
     return commentMap;
   } finally {
     await sql.end().catch(() => {
@@ -1167,6 +1170,79 @@ function addJsonbTypeComments(source, columnComments) {
   return { text: result.join("\n"), added };
 }
 
+// src/commands/db/gen-dbschema/transforms/text/synced-table-comments.ts
+var TABLE_COMMENT = "Synced table: data is auto-synced from external source. Do not rename or delete this table.";
+var FIELD_COMMENT = "Synced field: auto-synced, do not modify or delete";
+var TABLE_DEF_REGEX = /^(export const\s+\w+\s*=\s*(?:pgTable|pgView|pgMaterializedView)\(\s*["'`])([^"'`]+)(["'`])/;
+var FIELD_WITH_NAME_REGEX = /^\s*[\w"']+\s*:\s*\w+\(\s*["'`]([^"'`]+)["'`]/;
+var FIELD_PROP_NAME_REGEX = /^\s*([\w]+)\s*:/;
+function addSyncedTableComments(source, syncedTableMap) {
+  if (!syncedTableMap || syncedTableMap.size === 0) {
+    return { text: source, added: 0 };
+  }
+  const lines = source.split("\n");
+  const result = [];
+  let added = 0;
+  let currentSyncedFields = null;
+  let insideTableBody = false;
+  let braceDepth = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const tableMatch = line.match(TABLE_DEF_REGEX);
+    if (tableMatch) {
+      const tableName = tableMatch[2];
+      const syncedFields = syncedTableMap.get(tableName);
+      if (syncedFields) {
+        currentSyncedFields = syncedFields;
+        insideTableBody = true;
+        braceDepth = 0;
+        const prevLine = result[result.length - 1]?.trim() ?? "";
+        if (!prevLine.includes("Synced table")) {
+          const indentMatch = line.match(/^\s*/);
+          const indent = indentMatch ? indentMatch[0] : "";
+          result.push(`${indent}// ${TABLE_COMMENT}`);
+          added++;
+        }
+      }
+    }
+    if (insideTableBody) {
+      for (const ch of line) {
+        if (ch === "{") braceDepth++;
+        if (ch === "}") braceDepth--;
+      }
+      if (braceDepth <= 0) {
+        insideTableBody = false;
+        currentSyncedFields = null;
+      }
+      if (currentSyncedFields && braceDepth >= 1 && !tableMatch) {
+        const columnName = extractColumnName2(line);
+        if (columnName && currentSyncedFields.has(columnName)) {
+          const prevLine = result[result.length - 1]?.trim() ?? "";
+          if (!prevLine.includes("Synced field")) {
+            const indentMatch = line.match(/^\s*/);
+            const indent = indentMatch ? indentMatch[0] : "";
+            result.push(`${indent}// ${FIELD_COMMENT}`);
+            added++;
+          }
+        }
+      }
+    }
+    result.push(line);
+  }
+  return { text: result.join("\n"), added };
+}
+function extractColumnName2(line) {
+  const withNameMatch = line.match(FIELD_WITH_NAME_REGEX);
+  if (withNameMatch) {
+    return withNameMatch[1];
+  }
+  const propMatch = line.match(FIELD_PROP_NAME_REGEX);
+  if (propMatch) {
+    return propMatch[1];
+  }
+  return null;
+}
+
 // src/commands/db/gen-dbschema/transforms/text/table-aliases.ts
 var TABLE_ALIAS_MARKER = "// table aliases";
 function generateTableAliases(source) {
@@ -1215,13 +1291,16 @@ function postprocessSchema(rawSource, options = {}) {
   source = inlineCustomTypes(source);
   const jsonbCommentsResult = addJsonbTypeComments(source, options.columnComments);
   source = jsonbCommentsResult.text;
+  const syncedCommentsResult = addSyncedTableComments(source, options.syncedTableMap);
+  source = syncedCommentsResult.text;
   source = generateTableAliases(source);
   source = formatSource(source);
   return {
     source,
     astStats,
     patchedDefects: patchResult.fixed,
-    addedJsonbComments: jsonbCommentsResult.added
+    addedJsonbComments: jsonbCommentsResult.added,
+    addedSyncedComments: syncedCommentsResult.added
   };
 }
 function logStats(result, prefix = "[postprocess]") {
@@ -1271,6 +1350,9 @@ function logStats(result, prefix = "[postprocess]") {
   if (result.addedJsonbComments > 0) {
     console.info(`${prefix} Added ${result.addedJsonbComments} JSDoc comments for jsonb fields`);
   }
+  if (result.addedSyncedComments > 0) {
+    console.info(`${prefix} Added ${result.addedSyncedComments} comments for synced tables/fields`);
+  }
 }
 
 // src/commands/db/gen-dbschema/index.ts
@@ -1281,7 +1363,10 @@ async function postprocessDrizzleSchema(targetPath, options = {}) {
     return void 0;
   }
   const rawSource = fs3.readFileSync(resolvedPath, "utf8");
-  const result = postprocessSchema(rawSource, { columnComments: options.columnComments });
+  const result = postprocessSchema(rawSource, {
+    columnComments: options.columnComments,
+    syncedTableMap: options.syncedTableMap
+  });
   fs3.writeFileSync(resolvedPath, result.source, "utf8");
   logStats(result, "[postprocess-drizzle-schema]");
   return {
@@ -1291,10 +1376,107 @@ async function postprocessDrizzleSchema(targetPath, options = {}) {
     patchedDefects: result.patchedDefects,
     replacedTimestamps: result.astStats.replacedTimestamp,
     replacedDefaultNow: result.astStats.replacedDefaultNow,
-    addedJsonbComments: result.addedJsonbComments
+    addedJsonbComments: result.addedJsonbComments,
+    addedSyncedComments: result.addedSyncedComments
   };
 }
 
+// src/utils/http-client.ts
+import { HttpClient } from "@lark-apaas/http-client";
+var clientInstance = null;
+function getHttpClient() {
+  if (!clientInstance) {
+    clientInstance = new HttpClient({
+      timeout: 3e4,
+      platform: {
+        enabled: true
+      }
+    });
+    const canaryEnv = process.env.FORCE_FRAMEWORK_CLI_CANARY_ENV;
+    if (canaryEnv) {
+      clientInstance.interceptors.request.use((req) => {
+        req.headers["x-tt-env"] = canaryEnv;
+        return req;
+      });
+    }
+  }
+  return clientInstance;
+}
+
+// src/commands/db/gen-dbschema/utils/fetch-synced-tables.ts
+var DEFAULT_TIMEOUT_MS2 = 1e4;
+async function fetchSyncedTables(appId, workspace) {
+  try {
+    const client = getHttpClient();
+    const timeoutPromise = new Promise((_, reject) => {
+      setTimeout(
+        () => reject(new Error(`Timeout after ${DEFAULT_TIMEOUT_MS2}ms`)),
+        DEFAULT_TIMEOUT_MS2
+      );
+    });
+    const start = Date.now();
+    console.log(
+      `[fetchSyncedTables] \u2192 GET listTableView (dbBranch=main) 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: "dev" } }
+      ),
+      timeoutPromise
+    ]);
+    console.log(
+      `[fetchSyncedTables] \u2190 listTableView response: ${response.status} ${response.statusText} (${Date.now() - start}ms) with logId=${response.headers.get("x-tt-log-id")}`
+    );
+    if (!response.ok) {
+      throw new Error(
+        `listTableView API failed: ${response.status} ${response.statusText}`
+      );
+    }
+    const json = await response.json();
+    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"
+      );
+      return /* @__PURE__ */ new Map();
+    }
+    const syncedMap = extractSyncedTableMap(tableView);
+    const totalCount = (tableView.table?.data?.length ?? 0) + (tableView.view?.data?.length ?? 0) + (tableView.materializedView?.data?.length ?? 0);
+    console.log(
+      `[fetchSyncedTables] \u2713 Extracted synced tables: ${syncedMap.size}/${totalCount} (elapsed ${Date.now() - start}ms)`
+    );
+    return syncedMap;
+  } catch (error) {
+    console.error(
+      "[fetchSyncedTables] \u274C Error fetching synced tables:",
+      error
+    );
+    return void 0;
+  }
+}
+function extractSyncedTableMap(tableView) {
+  const syncedMap = /* @__PURE__ */ new Map();
+  const allTables = [
+    ...tableView.table?.data ?? [],
+    ...tableView.view?.data ?? [],
+    ...tableView.materializedView?.data ?? []
+  ];
+  for (const table of allTables) {
+    if (table.bitableSyncTask && table.bitableSyncTask.fieldApiNameList?.length > 0) {
+      syncedMap.set(
+        table.tableName,
+        new Set(table.bitableSyncTask.fieldApiNameList)
+      );
+    }
+  }
+  return syncedMap;
+}
+
 // src/commands/db/gen-nest-resource/generator.ts
 import { pluralize } from "inflection";
 
@@ -2017,15 +2199,52 @@ async function run(options = {}) {
     throw new Error("Unable to locate drizzle-kit package root");
   };
   let columnComments;
-  try {
-    columnComments = await fetchColumnComments(databaseUrl, { timeoutMs: 1e4 });
-    console.log(`[gen-db-schema] \u2713 Fetched ${columnComments.size} column comments`);
-  } catch (err) {
+  let syncedTableMap;
+  const appId = process.env.app_id;
+  const workspace = process.env.suda_workspace_id;
+  console.log(
+    `[gen-db-schema] Pre-fetch info: columnComments=enabled, syncedTables=${appId && workspace ? "enabled" : "skipped"} (app_id=${appId ? "set" : "unset"}, suda_workspace_id=${workspace ? "set" : "unset"})`
+  );
+  const columnCommentsTask = (async () => {
+    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)`);
+    return res;
+  })();
+  const syncedTablesTask = appId && workspace ? (async () => {
+    const start = Date.now();
+    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)`);
+    return res;
+  })() : void 0;
+  const fetchTasks = await Promise.allSettled([
+    columnCommentsTask,
+    ...syncedTablesTask ? [syncedTablesTask] : []
+  ]);
+  if (fetchTasks[0].status === "fulfilled") {
+    columnComments = fetchTasks[0].value;
+    console.log(`[gen-db-schema] \u2713 Column comments ready: ${columnComments.size}`);
+  } else {
     console.warn(
       "[gen-db-schema] \u26A0 Failed to fetch column comments (skipping):",
-      err instanceof Error ? err.message : String(err)
+      fetchTasks[0].reason instanceof Error ? fetchTasks[0].reason.message : String(fetchTasks[0].reason)
     );
   }
+  if (appId && workspace) {
+    if (fetchTasks[1]?.status === "fulfilled") {
+      syncedTableMap = fetchTasks[1].value;
+      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)
+      );
+    }
+  } else {
+    console.info("[gen-db-schema] \u2139 Skipping synced table detection (app_id or suda_workspace_id not set)");
+  }
   try {
     const env = {
       ...process.env,
@@ -2050,7 +2269,8 @@ async function run(options = {}) {
       throw new Error("drizzle-kit introspect failed to generate schema.ts");
     }
     const stats = await postprocessDrizzleSchema(generatedSchema, {
-      columnComments
+      columnComments,
+      syncedTableMap
     });
     if (stats?.unmatchedUnknown?.length) {
       console.warn("[gen-db-schema] Unmatched custom types detected:", stats.unmatchedUnknown);
@@ -2419,28 +2639,6 @@ var syncCommand = {
   }
 };
 
-// src/utils/http-client.ts
-import { HttpClient } from "@lark-apaas/http-client";
-var clientInstance = null;
-function getHttpClient() {
-  if (!clientInstance) {
-    clientInstance = new HttpClient({
-      timeout: 3e4,
-      platform: {
-        enabled: true
-      }
-    });
-    const canaryEnv = process.env.FORCE_FRAMEWORK_CLI_CANARY_ENV;
-    if (canaryEnv) {
-      clientInstance.interceptors.request.use((req) => {
-        req.headers["x-tt-env"] = canaryEnv;
-        return req;
-      });
-    }
-  }
-  return clientInstance;
-}
-
 // src/utils/telemetry.ts
 async function reportEvents(events) {
   if (events.length === 0) {
@@ -2547,21 +2745,6 @@ 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,
@@ -2585,10 +2768,6 @@ 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.10",
+  "version": "1.1.22-alpha.12",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",