@lark-apaas/devtool-kits 0.1.0-alpha.1 → 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);
@@ -28507,8 +28498,8 @@ __name(transformOpenapiPaths, "transformOpenapiPaths");
 // src/middlewares/openapi/services.ts
 async function enhanceOpenApiWithSourceInfo(options = {}) {
   const startTime = Date.now();
-  const openapiPath = options.openapiPath || import_node_path3.default.resolve(__dirname, "../../client/src/api/gen/openapi.json");
-  const serverDir = options.serverDir || import_node_path3.default.resolve(__dirname, "../../server");
+  const openapiPath = options.openapiPath || import_node_path3.default.resolve(__dirname, "../client/src/api/gen/openapi.json");
+  const serverDir = options.serverDir || import_node_path3.default.resolve(__dirname, "../server");
   const writeFile = options.writeFile !== false;
   let openapi;
   if (options.openapiData) {
@@ -28621,7 +28612,7 @@ function extractControllerMetadata(sourceFile, filePath) {
 __name(extractControllerMetadata, "extractControllerMetadata");
 
 // src/middlewares/openapi/controller.ts
-function createOpenapiHandler(openapiFilePath, enableEnhancement) {
+function createOpenapiHandler(openapiFilePath, enableEnhancement, serverDir) {
   let cache = null;
   return async (_req, res, context) => {
     try {
@@ -28634,7 +28625,8 @@ function createOpenapiHandler(openapiFilePath, enableEnhancement) {
       if (enableEnhancement && context.isDev) {
         const { openapi: enhancedPayload, stats } = await enhanceOpenApiWithSourceInfo({
           openapiData: payload,
-          writeFile: false
+          writeFile: false,
+          serverDir: serverDir || context.rootDir
         });
         payload = enhancedPayload;
         console.log(`[OpenAPI] Enhanced in ${stats.duration}ms (${stats.endpointsEnhanced} endpoints)`);
@@ -28657,9 +28649,10 @@ function createOpenapiHandler(openapiFilePath, enableEnhancement) {
 __name(createOpenapiHandler, "createOpenapiHandler");
 
 // src/middlewares/openapi/router.ts
-function createOpenapiRouter(openapiFilePath, enableEnhancement, context) {
+function createOpenapiRouter(options, context) {
+  const { openapiFilePath, enableEnhancement, serverDir } = options;
   const router = import_express.default.Router();
-  const handler = createOpenapiHandler(openapiFilePath, enableEnhancement);
+  const handler = createOpenapiHandler(openapiFilePath, enableEnhancement, serverDir);
   router.get("/openapi.json", (req, res) => handler(req, res, context));
   return router;
 }
@@ -28674,14 +28667,18 @@ var OPENAPI_ROUTES = [
   }
 ];
 function createOpenapiMiddleware(options) {
-  const { openapiFilePath, enableEnhancement = true } = options;
+  const { openapiFilePath, enableEnhancement = true, serverDir } = options;
   return {
     name: "openapi",
     mountPath: "/dev",
     routes: OPENAPI_ROUTES,
     enabled: /* @__PURE__ */ __name((context) => context.isDev, "enabled"),
     createRouter: /* @__PURE__ */ __name((context) => {
-      return createOpenapiRouter(openapiFilePath, enableEnhancement, context);
+      return createOpenapiRouter({
+        openapiFilePath,
+        enableEnhancement,
+        serverDir
+      }, context);
     }, "createRouter")
   };
 }