@lark-apaas/fullstack-nestjs-core 1.0.3-alpha.6 → 1.0.3-alpha.8

package/dist/index.cjs

@@ -369,8 +369,8 @@ var import_cookie_parser = __toESM(require("cookie-parser"), 1);
 
 // src/modules/devtool/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
 var import_node_path = require("path");
@@ -409,6 +409,23 @@ function ensureDirAndWrite(filePath, content) {
 }
 __name(ensureDirAndWrite, "ensureDirAndWrite");
 
+// src/modules/devtool/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/client.gen';
+export const createClientConfig: CreateClientConfig = (config) => ({
+  axios
+});
+`;
+  (0, import_node_fs2.writeFileSync)(configFilePath, configContent, "utf-8");
+  return configFilePath;
+}
+__name(generateClientConfig, "generateClientConfig");
+
 // src/modules/devtool/index.ts
 var DevToolsModule = class {
   static {
@@ -418,9 +435,7 @@ var DevToolsModule = class {
     const options = resolveOptsWithDefaultValue(opts);
     const baseDirname = process.cwd();
     const builder = new import_swagger.DocumentBuilder().setTitle(options.swaggerOptions.title).setVersion(options.swaggerOptions.version);
-    const document = import_swagger.SwaggerModule.createDocument(app, builder.build(), {
-      operationIdFactory: /* @__PURE__ */ __name((_c, m) => m, "operationIdFactory")
-    });
+    const document = import_swagger.SwaggerModule.createDocument(app, builder.build());
     if (options.needSetupServer) {
       import_swagger.SwaggerModule.setup(options.docsPath, app, document, {
         customSiteTitle: options.swaggerOptions.customSiteTitle,
@@ -431,21 +446,29 @@ 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,
-        output: clientSdkOutPath,
+        output: {
+          path: clientSdkOutPath
+        },
         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));

package/dist/index.js

@@ -322,14 +322,14 @@ 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
 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
 import { dirname } from "path";
@@ -368,6 +368,23 @@ function ensureDirAndWrite(filePath, content) {
 }
 __name(ensureDirAndWrite, "ensureDirAndWrite");
 
+// src/modules/devtool/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/client.gen';
+export const createClientConfig: CreateClientConfig = (config) => ({
+  axios
+});
+`;
+  writeFileSync2(configFilePath, configContent, "utf-8");
+  return configFilePath;
+}
+__name(generateClientConfig, "generateClientConfig");
+
 // src/modules/devtool/index.ts
 var DevToolsModule = class {
   static {
@@ -377,9 +394,7 @@ var DevToolsModule = class {
     const options = resolveOptsWithDefaultValue(opts);
     const baseDirname = process.cwd();
     const builder = new DocumentBuilder().setTitle(options.swaggerOptions.title).setVersion(options.swaggerOptions.version);
-    const document = SwaggerModule.createDocument(app, builder.build(), {
-      operationIdFactory: /* @__PURE__ */ __name((_c, m) => m, "operationIdFactory")
-    });
+    const document = SwaggerModule.createDocument(app, builder.build());
     if (options.needSetupServer) {
       SwaggerModule.setup(options.docsPath, app, document, {
         customSiteTitle: options.swaggerOptions.customSiteTitle,
@@ -390,21 +405,29 @@ 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,
-        output: clientSdkOutPath,
+        output: {
+          path: clientSdkOutPath
+        },
         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,7 +443,7 @@ 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") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.0.3-alpha.6",
+  "version": "1.0.3-alpha.8",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -45,8 +45,7 @@
     "@lark-apaas/nestjs-datapaas": "^1.0.1",
     "@lark-apaas/nestjs-logger": "^1.0.0",
     "cookie-parser": "^1.4.7",
-    "hbs": "^4.2.0",
-    "openapi-typescript-codegen": "^0.29.0"
+    "hbs": "^4.2.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.4.20",