@lark-apaas/fullstack-cli 1.1.14 → 1.1.16-alpha.0

package/dist/index.js

@@ -186,7 +186,7 @@ function convertSchemaTableInvocations(source) {
 // src/commands/db/gen-dbschema/helper/table-rename.ts
 import { pinyin } from "pinyin-pro";
 function renamePgTableConstants(source) {
-  const pgTableRegex = /export const\s+([^\s=]+)\s*=\s*(pgTable|pgView|pgMaterializedView)\(\s*["'`]([^"'`]+)["'`]/gu;
+  const pgTableRegex = /export const\s+([^\s=]+)\s*=\s*(pgTable|pgView|pgMaterializedView|pgEnum|pgSequence)\(\s*["'`]([^"'`]+)["'`]/gu;
   const renames = [];
   const updated = source.replace(pgTableRegex, (match, currentName, factory, tableName) => {
     const sanitized = sanitizeIdentifier(tableName);
@@ -209,7 +209,7 @@ function updateTableReferenceIdentifiers(source, renames) {
     if (!rename.from || rename.from === rename.to) {
       return acc;
     }
-    const pattern = new RegExp(`\\b${escapeRegExp(rename.from)}(\\s*\\.)`, "g");
+    const pattern = new RegExp(`\\b${escapeRegExp(rename.from)}(\\s*[.(])`, "g");
     return acc.replace(pattern, `${rename.to}$1`);
   }, source);
 }
@@ -256,16 +256,18 @@ function toAsciiName(name) {
 
 // src/commands/db/gen-dbschema/helper/custom-types.ts
 var CUSTOM_TYPE_PATTERN = /\/\/ TODO: failed to parse database type '(?:\w+\.)?(user_profile|file_attachment)(\[\])?'/;
+var UNKNOWN_TYPE_TODO_PATTERN = /\/\/ TODO: failed to parse database type '([^']+)'/;
 function replaceUnknownColumns(source) {
   const lines = source.split("\n");
   const result = [];
   let replaced = 0;
+  let fallbackToText = 0;
   const unmatched = [];
   for (let i = 0; i < lines.length; i += 1) {
     const line = lines[i];
-    const match = line.match(CUSTOM_TYPE_PATTERN);
-    if (match) {
-      const typeName = match[1];
+    const knownMatch = line.match(CUSTOM_TYPE_PATTERN);
+    if (knownMatch) {
+      const typeName = knownMatch[1];
       const factory = typeName === "user_profile" ? "userProfile" : "fileAttachment";
       const replacedLine = replaceFollowingUnknown(lines[i + 1], factory);
       if (replacedLine) {
@@ -278,6 +280,19 @@ function replaceUnknownColumns(source) {
       }
       continue;
     }
+    const unknownMatch = line.match(UNKNOWN_TYPE_TODO_PATTERN);
+    if (unknownMatch) {
+      const replacedLine = replaceFollowingUnknown(lines[i + 1], "text");
+      if (replacedLine) {
+        result.push(replacedLine);
+        fallbackToText += 1;
+        i += 1;
+      } else {
+        unmatched.push(line.trim());
+        result.push(line);
+      }
+      continue;
+    }
     if (line.includes("unknown(")) {
       unmatched.push(line.trim());
     }
@@ -286,6 +301,7 @@ function replaceUnknownColumns(source) {
   return {
     text: result.join("\n"),
     replaced,
+    fallbackToText,
     unmatched
   };
 }
@@ -547,6 +563,53 @@ ${aliasLines}
 `;
 }
 
+// src/commands/db/gen-dbschema/helper/system-objects-filter.ts
+var SYSTEM_OBJECTS = [
+  // pg_stat_statements 扩展
+  "pg_stat_statements",
+  "pg_stat_statements_info",
+  // pg_partman 扩展
+  "part_config",
+  "part_config_sub",
+  // 系统权限视图
+  "table_privs"
+];
+function removeSystemObjects(source, additionalObjects = []) {
+  const objectsToFilter = [...SYSTEM_OBJECTS, ...additionalObjects];
+  const removed = [];
+  const lines = source.split("\n");
+  const result = [];
+  let skipUntilNextExport = false;
+  let currentSystemObject = null;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (!skipUntilNextExport) {
+      const exportMatch = line.match(/^export const (\w+)\s*=/);
+      if (exportMatch) {
+        const objName = exportMatch[1];
+        if (objectsToFilter.includes(objName)) {
+          skipUntilNextExport = true;
+          currentSystemObject = objName;
+          continue;
+        }
+      }
+    }
+    if (skipUntilNextExport) {
+      if (line.match(/^\}\);/) || line.match(/\.as\([^)]*\);$/)) {
+        skipUntilNextExport = false;
+        if (currentSystemObject) {
+          removed.push(currentSystemObject);
+          currentSystemObject = null;
+        }
+        continue;
+      }
+      continue;
+    }
+    result.push(line);
+  }
+  return { text: result.join("\n"), removed };
+}
+
 // src/commands/db/gen-dbschema/postprocess.ts
 function postprocessDrizzleSchema(targetPath) {
   const resolvedPath = path.resolve(targetPath);
@@ -561,6 +624,8 @@ function postprocessDrizzleSchema(targetPath) {
   text = removePgSchemaDeclarations(text);
   const tableConversion = convertSchemaTableInvocations(text);
   text = tableConversion.text;
+  const systemObjectsResult = removeSystemObjects(text);
+  text = systemObjectsResult.text;
   const renameResult = renamePgTableConstants(text);
   text = renameResult.text;
   text = updateTableReferenceIdentifiers(text, renameResult.renames);
@@ -582,10 +647,13 @@ function postprocessDrizzleSchema(targetPath) {
     console.info(`[postprocess-drizzle-schema] Patched ${patchResult.fixed} drizzle-kit defects (.default(') -> .default(''))`);
   }
   if (replacement.replaced > 0) {
-    console.info(`[postprocess-drizzle-schema] Replaced ${replacement.replaced} unknown columns`);
+    console.info(`[postprocess-drizzle-schema] Replaced ${replacement.replaced} unknown columns with custom types`);
+  }
+  if (replacement.fallbackToText > 0) {
+    console.info(`[postprocess-drizzle-schema] Replaced ${replacement.fallbackToText} unknown columns with text (fallback)`);
   }
   if (replacement.unmatched.length > 0) {
-    console.warn("[postprocess-drizzle-schema] Unmatched custom types:", replacement.unmatched.length);
+    console.warn("[postprocess-drizzle-schema] Unmatched unknown columns:", replacement.unmatched.length);
     replacement.unmatched.forEach((line) => console.warn(`  ${line}`));
   }
   if (tableConversion.converted > 0) {
@@ -597,12 +665,17 @@ function postprocessDrizzleSchema(targetPath) {
   if (defaultNowReplacement.replaced > 0) {
     console.info(`[postprocess-drizzle-schema] Replaced ${defaultNowReplacement.replaced} .defaultNow() with .default(sql\`CURRENT_TIMESTAMP\`)`);
   }
+  if (systemObjectsResult.removed.length > 0) {
+    console.info(`[postprocess-drizzle-schema] Removed ${systemObjectsResult.removed.length} system objects: ${systemObjectsResult.removed.join(", ")}`);
+  }
   return {
     replacedUnknown: replacement.replaced,
+    fallbackToText: replacement.fallbackToText,
     unmatchedUnknown: replacement.unmatched,
     patchedDefects: patchResult.fixed,
     replacedTimestamps: timestampReplacement.replaced,
-    replacedDefaultNow: defaultNowReplacement.replaced
+    replacedDefaultNow: defaultNowReplacement.replaced,
+    removedSystemObjects: systemObjectsResult.removed
   };
 }
 
@@ -1832,10 +1905,13 @@ function getHttpClient() {
         enabled: true
       }
     });
-    clientInstance.interceptors.request.use((req) => {
-      req.headers["x-tt-env"] = "boe_miaoda_plugin";
-      return req;
-    });
+    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;
 }
@@ -2280,7 +2356,6 @@ var actionPluginCommandGroup = {
 
 // src/commands/capability/utils.ts
 import fs8 from "fs";
-import { createRequire as createRequire2 } from "module";
 import path7 from "path";
 var CAPABILITIES_DIR = "server/capabilities";
 function getProjectRoot2() {
@@ -2304,7 +2379,7 @@ function listCapabilityIds() {
     return [];
   }
   const files = fs8.readdirSync(dir);
-  return files.filter((f) => f.endsWith(".json")).map((f) => f.replace(/\.json$/, ""));
+  return files.filter((f) => f.endsWith(".json") && f !== "capabilities.json").map((f) => f.replace(/\.json$/, ""));
 }
 function readCapability(id) {
   const filePath = getCapabilityPath(id);
@@ -2323,7 +2398,19 @@ function readCapability(id) {
 }
 function readAllCapabilities() {
   const ids = listCapabilityIds();
-  return ids.map((id) => readCapability(id));
+  const capabilities = [];
+  for (const id of ids) {
+    try {
+      const capability = readCapability(id);
+      if (!capability.pluginKey) {
+        continue;
+      }
+      capabilities.push(capability);
+    } catch {
+      continue;
+    }
+  }
+  return capabilities;
 }
 function readPluginManifest(pluginKey) {
   const manifestPath = getPluginManifestPath(pluginKey);
@@ -2348,10 +2435,7 @@ function hasValidParamsSchema(paramsSchema) {
 }
 async function loadPlugin(pluginKey) {
   try {
-    const userRequire = createRequire2(path7.join(getProjectRoot2(), "package.json"));
-    const resolvedPath = userRequire.resolve(pluginKey);
-    const pluginModule = await import(resolvedPath);
-    const pluginPackage = pluginModule.default ?? pluginModule;
+    const pluginPackage = (await import(pluginKey)).default;
     if (!pluginPackage || typeof pluginPackage.create !== "function") {
       throw new Error(`Plugin ${pluginKey} does not export a valid create function`);
     }
@@ -2561,10 +2645,21 @@ function detectJsonMigration() {
   try {
     const content = fs11.readFileSync(oldFilePath, "utf-8");
     const parsed = JSON.parse(content);
-    const capabilities = Array.isArray(parsed) ? parsed : [];
+    if (!Array.isArray(parsed)) {
+      return {
+        needsMigration: false,
+        reason: "capabilities.json is not a valid array"
+      };
+    }
+    if (parsed.length === 0) {
+      return {
+        needsMigration: false,
+        reason: "capabilities.json is an empty array"
+      };
+    }
     return {
       needsMigration: true,
-      oldCapabilities: capabilities,
+      oldCapabilities: parsed,
       oldFilePath
     };
   } catch (error) {
@@ -3165,13 +3260,15 @@ function analyzeClass(sourceFile) {
     if (!name) continue;
     const isInjectable = hasDecorator(classDecl, "Injectable");
     const isController = hasDecorator(classDecl, "Controller");
-    if (classInfo && classInfo.isInjectable && !isInjectable && !isController) {
+    const isAutomation = hasDecorator(classDecl, "Automation");
+    if (classInfo && classInfo.isInjectable && !isInjectable && !isController && !isAutomation) {
       continue;
     }
     const info = {
       name,
       isInjectable,
       isController,
+      isAutomation,
       constructorParamCount: 0
     };
     const classBody = classDecl.getChildSyntaxListOrThrow();
@@ -3190,7 +3287,7 @@ function analyzeClass(sourceFile) {
         info.constructorParamsEnd = ctor.getStart();
       }
     }
-    if (isInjectable || isController || !classInfo) {
+    if (isInjectable || isController || isAutomation || !classInfo) {
       classInfo = info;
     }
   }
@@ -3203,10 +3300,10 @@ function canAutoMigrate(classInfo) {
       reason: "No class found in file"
     };
   }
-  if (!classInfo.isInjectable && !classInfo.isController) {
+  if (!classInfo.isInjectable && !classInfo.isController && !classInfo.isAutomation) {
     return {
       canMigrate: false,
-      reason: `Class "${classInfo.name}" is not @Injectable or @Controller`
+      reason: `Class "${classInfo.name}" is not @Injectable, @Controller or @Automation`
     };
   }
   return { canMigrate: true };

package/package.json

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