@lark-apaas/fullstack-nestjs-core 1.0.3-alpha.7 → 1.0.3-alpha.9

package/dist/index.cjs

@@ -367,12 +367,12 @@ var import_path = require("path");
 var import_hbs = require("hbs");
 var import_cookie_parser = __toESM(require("cookie-parser"), 1);
 
-// src/modules/devtool/index.ts
+// src/modules/devtool-v2/index.ts
 var import_swagger = require("@nestjs/swagger");
-var import_node_fs2 = require("fs");
-var import_node_path2 = require("path");
+var import_node_fs3 = require("fs");
+var import_node_path3 = require("path");
 
-// src/modules/devtool/helper.ts
+// src/modules/devtool-v2/helper.ts
 var import_node_path = require("path");
 var import_node_fs = require("fs");
 function normalizeBasePath(rawBasePath) {
@@ -409,10 +409,27 @@ function ensureDirAndWrite(filePath, content) {
 }
 __name(ensureDirAndWrite, "ensureDirAndWrite");
 
-// src/modules/devtool/index.ts
-var DevToolsModule = class {
+// src/modules/devtool-v2/plugins/client-config-generator.ts
+var import_node_fs2 = require("fs");
+var import_node_path2 = require("path");
+function generateClientConfig(options) {
+  const configFilePath = (0, import_node_path2.resolve)(options.outputPath, "client.config.ts");
+  const configContent = `// This file is auto-generated by @hey-api/openapi-ts
+import axios from 'axios';
+import type { CreateClientConfig } from './client';
+export const createClientConfig: CreateClientConfig = (config) => ({
+  axios
+});
+`;
+  (0, import_node_fs2.writeFileSync)(configFilePath, configContent, "utf-8");
+  return configFilePath;
+}
+__name(generateClientConfig, "generateClientConfig");
+
+// src/modules/devtool-v2/index.ts
+var DevToolsV2Module = class {
   static {
-    __name(this, "DevToolsModule");
+    __name(this, "DevToolsV2Module");
   }
   static async mount(app, opts = {}) {
     const options = resolveOptsWithDefaultValue(opts);
@@ -429,13 +446,16 @@ var DevToolsModule = class {
       });
       console.log(`[OpenAPI] Swagger UI \u5DF2\u6302\u8F7D\u81F3 ${options.docsPath}`);
     }
-    const openapiPath = (0, import_node_path2.resolve)(baseDirname, options.openapiOut);
+    const openapiPath = (0, import_node_path3.resolve)(baseDirname, options.openapiOut);
     ensureDirAndWrite(openapiPath, JSON.stringify(document, null, 2));
     if (options.needGenerateClientSdk) {
-      const clientSdkOutPath = (0, import_node_path2.resolve)(baseDirname, options.clientSdkOut);
-      (0, import_node_fs2.mkdirSync)(clientSdkOutPath, {
+      const clientSdkOutPath = (0, import_node_path3.resolve)(baseDirname, options.clientSdkOut);
+      (0, import_node_fs3.mkdirSync)(clientSdkOutPath, {
         recursive: true
       });
+      generateClientConfig({
+        outputPath: clientSdkOutPath
+      });
       const { createClient } = await import("@hey-api/openapi-ts");
       await createClient({
         input: openapiPath,
@@ -445,7 +465,10 @@ var DevToolsModule = class {
         plugins: [
           "@hey-api/typescript",
           "@hey-api/sdk",
-          "@hey-api/client-axios"
+          {
+            name: "@hey-api/client-axios",
+            runtimeConfigPath: (0, import_node_path3.join)(clientSdkOutPath, "./client.config.ts")
+          }
         ]
       });
       ensureDirAndWrite(openapiPath, JSON.stringify(document, null, 2));
@@ -465,7 +488,7 @@ async function configureApp(app, options) {
   app.setViewEngine("html");
   app.engine("html", import_hbs.__express);
   if (process.env.NODE_ENV !== "production") {
-    await DevToolsModule.mount(app, {
+    await DevToolsV2Module.mount(app, {
       basePath: process.env.CLIENT_BASE_PATH,
       docsPath: "/api_docs"
     });
@@ -473,6 +496,90 @@ async function configureApp(app, options) {
 }
 __name(configureApp, "configureApp");
 
+// src/modules/devtool/index.ts
+var import_swagger2 = require("@nestjs/swagger");
+var import_node_fs5 = require("fs");
+var import_node_path5 = require("path");
+
+// src/modules/devtool/helper.ts
+var import_node_path4 = require("path");
+var import_node_fs4 = require("fs");
+function normalizeBasePath2(rawBasePath) {
+  const normalizedBasePath = rawBasePath.startsWith("/") ? rawBasePath : `/${rawBasePath}`;
+  return normalizedBasePath.endsWith("/") ? normalizedBasePath.slice(0, -1) : normalizedBasePath;
+}
+__name(normalizeBasePath2, "normalizeBasePath");
+function resolveOptsWithDefaultValue2(options) {
+  const basePath = normalizeBasePath2(options.basePath || "/");
+  const docsPath = normalizeBasePath2(options.docsPath || `api/docs`);
+  return {
+    ...options,
+    needSetupServer: options.needSetupServer ?? false,
+    basePath,
+    docsPath: `${basePath}${docsPath}`,
+    openapiOut: options.openapiOut || "./client/src/api/gen/openapi.json",
+    clientSdkOut: options.clientSdkOut || "./client/src/api/gen",
+    needGenerateClientSdk: options.needGenerateClientSdk ?? true,
+    swaggerOptions: {
+      title: options.swaggerOptions?.title ?? "NestJS Fullstack API",
+      version: options.swaggerOptions?.version ?? "1.0.0",
+      customSiteTitle: options.swaggerOptions?.customSiteTitle ?? "API Documentation",
+      customCss: options.swaggerOptions?.customCss ?? ".swagger-ui .topbar { display: none }"
+    }
+  };
+}
+__name(resolveOptsWithDefaultValue2, "resolveOptsWithDefaultValue");
+function ensureDirAndWrite2(filePath, content) {
+  const dir = (0, import_node_path4.dirname)(filePath);
+  (0, import_node_fs4.mkdirSync)(dir, {
+    recursive: true
+  });
+  (0, import_node_fs4.writeFileSync)(filePath, content);
+}
+__name(ensureDirAndWrite2, "ensureDirAndWrite");
+
+// src/modules/devtool/index.ts
+var DevToolsModule = class {
+  static {
+    __name(this, "DevToolsModule");
+  }
+  static async mount(app, opts = {}) {
+    const options = resolveOptsWithDefaultValue2(opts);
+    const baseDirname = process.cwd();
+    const builder = new import_swagger2.DocumentBuilder().setTitle(options.swaggerOptions.title).setVersion(options.swaggerOptions.version);
+    const document = import_swagger2.SwaggerModule.createDocument(app, builder.build(), {
+      operationIdFactory: /* @__PURE__ */ __name((_c, m) => m, "operationIdFactory")
+    });
+    if (options.needSetupServer) {
+      import_swagger2.SwaggerModule.setup(options.docsPath, app, document, {
+        customSiteTitle: options.swaggerOptions.customSiteTitle,
+        customCss: options.swaggerOptions.customCss,
+        swaggerOptions: {
+          persistAuthorization: true
+        }
+      });
+      console.log(`[OpenAPI] Swagger UI \u5DF2\u6302\u8F7D\u81F3 ${options.docsPath}`);
+    }
+    const openapiPath = (0, import_node_path5.resolve)(baseDirname, options.openapiOut);
+    ensureDirAndWrite2(openapiPath, JSON.stringify(document, null, 2));
+    if (options.needGenerateClientSdk) {
+      const clientSdkOutPath = (0, import_node_path5.resolve)(baseDirname, options.clientSdkOut);
+      (0, import_node_fs5.mkdirSync)(clientSdkOutPath, {
+        recursive: true
+      });
+      const { generate } = await import("openapi-typescript-codegen");
+      await generate({
+        input: openapiPath,
+        output: clientSdkOutPath,
+        httpClient: "axios",
+        useOptions: false,
+        exportServices: true
+      });
+      console.log("[OpenAPI] \u5BFC\u51FA openapi.json \u5E76\u751F\u6210 axios SDK \u2705");
+    }
+  }
+};
+
 // src/index.ts
 __reExport(index_exports, require("@lark-apaas/nestjs-authnpaas"), module.exports);
 __reExport(index_exports, require("@lark-apaas/nestjs-datapaas"), module.exports);

package/dist/index.js

@@ -322,16 +322,16 @@ PlatformModule = _ts_decorate5([
 
 // src/setup.ts
 import { AppLogger as AppLogger2 } from "@lark-apaas/nestjs-logger";
-import { join } from "path";
+import { join as join2 } from "path";
 import { __express as hbsExpressEngine } from "hbs";
 import cookieParser from "cookie-parser";
 
-// src/modules/devtool/index.ts
+// src/modules/devtool-v2/index.ts
 import { SwaggerModule, DocumentBuilder } from "@nestjs/swagger";
 import { mkdirSync as mkdirSync2 } from "fs";
-import { resolve } from "path";
+import { resolve as resolve2, join } from "path";
 
-// src/modules/devtool/helper.ts
+// src/modules/devtool-v2/helper.ts
 import { dirname } from "path";
 import { writeFileSync, mkdirSync } from "fs";
 function normalizeBasePath(rawBasePath) {
@@ -368,10 +368,27 @@ function ensureDirAndWrite(filePath, content) {
 }
 __name(ensureDirAndWrite, "ensureDirAndWrite");
 
-// src/modules/devtool/index.ts
-var DevToolsModule = class {
+// src/modules/devtool-v2/plugins/client-config-generator.ts
+import { writeFileSync as writeFileSync2 } from "fs";
+import { resolve } from "path";
+function generateClientConfig(options) {
+  const configFilePath = resolve(options.outputPath, "client.config.ts");
+  const configContent = `// This file is auto-generated by @hey-api/openapi-ts
+import axios from 'axios';
+import type { CreateClientConfig } from './client';
+export const createClientConfig: CreateClientConfig = (config) => ({
+  axios
+});
+`;
+  writeFileSync2(configFilePath, configContent, "utf-8");
+  return configFilePath;
+}
+__name(generateClientConfig, "generateClientConfig");
+
+// src/modules/devtool-v2/index.ts
+var DevToolsV2Module = class {
   static {
-    __name(this, "DevToolsModule");
+    __name(this, "DevToolsV2Module");
   }
   static async mount(app, opts = {}) {
     const options = resolveOptsWithDefaultValue(opts);
@@ -388,13 +405,16 @@ var DevToolsModule = class {
       });
       console.log(`[OpenAPI] Swagger UI \u5DF2\u6302\u8F7D\u81F3 ${options.docsPath}`);
     }
-    const openapiPath = resolve(baseDirname, options.openapiOut);
+    const openapiPath = resolve2(baseDirname, options.openapiOut);
     ensureDirAndWrite(openapiPath, JSON.stringify(document, null, 2));
     if (options.needGenerateClientSdk) {
-      const clientSdkOutPath = resolve(baseDirname, options.clientSdkOut);
+      const clientSdkOutPath = resolve2(baseDirname, options.clientSdkOut);
       mkdirSync2(clientSdkOutPath, {
         recursive: true
       });
+      generateClientConfig({
+        outputPath: clientSdkOutPath
+      });
       const { createClient } = await import("@hey-api/openapi-ts");
       await createClient({
         input: openapiPath,
@@ -404,7 +424,10 @@ var DevToolsModule = class {
         plugins: [
           "@hey-api/typescript",
           "@hey-api/sdk",
-          "@hey-api/client-axios"
+          {
+            name: "@hey-api/client-axios",
+            runtimeConfigPath: join(clientSdkOutPath, "./client.config.ts")
+          }
         ]
       });
       ensureDirAndWrite(openapiPath, JSON.stringify(document, null, 2));
@@ -420,11 +443,11 @@ async function configureApp(app, options) {
   app.use(cookieParser());
   const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
   app.setGlobalPrefix(globalPrefix);
-  app.setBaseViewsDir(join(process.cwd(), options?.viewsDir ?? "dist/client"));
+  app.setBaseViewsDir(join2(process.cwd(), options?.viewsDir ?? "dist/client"));
   app.setViewEngine("html");
   app.engine("html", hbsExpressEngine);
   if (process.env.NODE_ENV !== "production") {
-    await DevToolsModule.mount(app, {
+    await DevToolsV2Module.mount(app, {
       basePath: process.env.CLIENT_BASE_PATH,
       docsPath: "/api_docs"
     });
@@ -432,6 +455,90 @@ async function configureApp(app, options) {
 }
 __name(configureApp, "configureApp");
 
+// src/modules/devtool/index.ts
+import { SwaggerModule as SwaggerModule2, DocumentBuilder as DocumentBuilder2 } from "@nestjs/swagger";
+import { mkdirSync as mkdirSync4 } from "fs";
+import { resolve as resolve3 } from "path";
+
+// src/modules/devtool/helper.ts
+import { dirname as dirname2 } from "path";
+import { writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "fs";
+function normalizeBasePath2(rawBasePath) {
+  const normalizedBasePath = rawBasePath.startsWith("/") ? rawBasePath : `/${rawBasePath}`;
+  return normalizedBasePath.endsWith("/") ? normalizedBasePath.slice(0, -1) : normalizedBasePath;
+}
+__name(normalizeBasePath2, "normalizeBasePath");
+function resolveOptsWithDefaultValue2(options) {
+  const basePath = normalizeBasePath2(options.basePath || "/");
+  const docsPath = normalizeBasePath2(options.docsPath || `api/docs`);
+  return {
+    ...options,
+    needSetupServer: options.needSetupServer ?? false,
+    basePath,
+    docsPath: `${basePath}${docsPath}`,
+    openapiOut: options.openapiOut || "./client/src/api/gen/openapi.json",
+    clientSdkOut: options.clientSdkOut || "./client/src/api/gen",
+    needGenerateClientSdk: options.needGenerateClientSdk ?? true,
+    swaggerOptions: {
+      title: options.swaggerOptions?.title ?? "NestJS Fullstack API",
+      version: options.swaggerOptions?.version ?? "1.0.0",
+      customSiteTitle: options.swaggerOptions?.customSiteTitle ?? "API Documentation",
+      customCss: options.swaggerOptions?.customCss ?? ".swagger-ui .topbar { display: none }"
+    }
+  };
+}
+__name(resolveOptsWithDefaultValue2, "resolveOptsWithDefaultValue");
+function ensureDirAndWrite2(filePath, content) {
+  const dir = dirname2(filePath);
+  mkdirSync3(dir, {
+    recursive: true
+  });
+  writeFileSync3(filePath, content);
+}
+__name(ensureDirAndWrite2, "ensureDirAndWrite");
+
+// src/modules/devtool/index.ts
+var DevToolsModule = class {
+  static {
+    __name(this, "DevToolsModule");
+  }
+  static async mount(app, opts = {}) {
+    const options = resolveOptsWithDefaultValue2(opts);
+    const baseDirname = process.cwd();
+    const builder = new DocumentBuilder2().setTitle(options.swaggerOptions.title).setVersion(options.swaggerOptions.version);
+    const document = SwaggerModule2.createDocument(app, builder.build(), {
+      operationIdFactory: /* @__PURE__ */ __name((_c, m) => m, "operationIdFactory")
+    });
+    if (options.needSetupServer) {
+      SwaggerModule2.setup(options.docsPath, app, document, {
+        customSiteTitle: options.swaggerOptions.customSiteTitle,
+        customCss: options.swaggerOptions.customCss,
+        swaggerOptions: {
+          persistAuthorization: true
+        }
+      });
+      console.log(`[OpenAPI] Swagger UI \u5DF2\u6302\u8F7D\u81F3 ${options.docsPath}`);
+    }
+    const openapiPath = resolve3(baseDirname, options.openapiOut);
+    ensureDirAndWrite2(openapiPath, JSON.stringify(document, null, 2));
+    if (options.needGenerateClientSdk) {
+      const clientSdkOutPath = resolve3(baseDirname, options.clientSdkOut);
+      mkdirSync4(clientSdkOutPath, {
+        recursive: true
+      });
+      const { generate } = await import("openapi-typescript-codegen");
+      await generate({
+        input: openapiPath,
+        output: clientSdkOutPath,
+        httpClient: "axios",
+        useOptions: false,
+        exportServices: true
+      });
+      console.log("[OpenAPI] \u5BFC\u51FA openapi.json \u5E76\u751F\u6210 axios SDK \u2705");
+    }
+  }
+};
+
 // src/index.ts
 export * from "@lark-apaas/nestjs-authnpaas";
 export * from "@lark-apaas/nestjs-datapaas";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.0.3-alpha.7",
+  "version": "1.0.3-alpha.9",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -41,6 +41,7 @@
   },
   "dependencies": {
     "@hey-api/openapi-ts": "^0.86.11",
+    "openapi-typescript-codegen": "^0.29.0",
     "@lark-apaas/nestjs-authnpaas": "^1.0.0",
     "@lark-apaas/nestjs-datapaas": "^1.0.1",
     "@lark-apaas/nestjs-logger": "^1.0.0",