@lark-apaas/devtool-kits 0.1.0-alpha.2 → 0.1.0-alpha.3

package/dist/index.cjs

@@ -28111,9 +28111,8 @@ __name(normalizeBasePath, "normalizeBasePath");
 var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path = __toESM(require("path"), 1);
 var import_pinyin_pro = require("pinyin-pro");
-var USER_PROFILE_MARKER = "// TODO: failed to parse database type 'user_profile'";
-var FILE_ATTACHMENT_MARKER = "// TODO: failed to parse database type 'file_attachment'";
 var HEADER_COMMENT = "/** auto generated, do not edit */";
+var CUSTOM_TYPE_PATTERN = /\/\/ TODO: failed to parse database type '(?:\w+\.)?(user_profile|file_attachment)(\[\])?'/;
 function postprocessDrizzleSchema(targetPath) {
   const resolvedPath = import_node_path.default.resolve(targetPath);
   if (!import_node_fs.default.existsSync(resolvedPath)) {
@@ -28144,6 +28143,9 @@ function postprocessDrizzleSchema(targetPath) {
     console.warn("[postprocess-drizzle-schema] Unmatched custom types:", replacement.unmatched.length);
     replacement.unmatched.forEach((line) => console.warn(`  ${line}`));
   }
+  if (tableConversion.converted > 0) {
+    console.info(`[postprocess-drizzle-schema] Converted ${tableConversion.converted} schema.table invocations to pgTable`);
+  }
   return {
     replacedUnknown: replacement.replaced,
     unmatchedUnknown: replacement.unmatched
@@ -28258,25 +28260,18 @@ function replaceUnknownColumns(source) {
   const unmatched = [];
   for (let i = 0; i < lines.length; i += 1) {
     const line = lines[i];
-    if (line.includes(USER_PROFILE_MARKER)) {
-      const replacedLine = replaceFollowingUnknown(lines[i + 1], "userProfile");
-      if (replacedLine) {
-        result.push(replacedLine);
-        replaced += 1;
-        i += 1;
-      } else {
-        unmatched.push(line.trim());
-      }
-      continue;
-    }
-    if (line.includes(FILE_ATTACHMENT_MARKER)) {
-      const replacedLine = replaceFollowingUnknown(lines[i + 1], "fileAttachment");
+    const match = line.match(CUSTOM_TYPE_PATTERN);
+    if (match) {
+      const typeName = match[1];
+      const factory = typeName === "user_profile" ? "userProfile" : "fileAttachment";
+      const replacedLine = replaceFollowingUnknown(lines[i + 1], factory);
       if (replacedLine) {
         result.push(replacedLine);
         replaced += 1;
         i += 1;
       } else {
         unmatched.push(line.trim());
+        result.push(line);
       }
       continue;
     }
@@ -28404,10 +28399,6 @@ function collapseExtraBlankLines(text) {
   return text.replace(/\n{3,}/g, "\n\n");
 }
 __name(collapseExtraBlankLines, "collapseExtraBlankLines");
-if (require.main === module) {
-  const target = process.argv[2] ?? "server/database/schema.ts";
-  postprocessDrizzleSchema(target);
-}
 
 // src/middlewares/index.ts
 var import_node_path6 = __toESM(require("path"), 1);