npm - @tsed/cli-generate-http-client - Versions diffs - 3.22.5 → 3.24.1 - Mend

@tsed/cli-generate-http-client 3.22.5 → 3.24.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/cjs/commands/GenerateHttpClientCmd.js +37 -21
package/lib/cjs/commands/GenerateHttpClientCmd.js.map +1 -1
package/lib/esm/commands/GenerateHttpClientCmd.js +37 -21
package/lib/esm/commands/GenerateHttpClientCmd.js.map +1 -1
package/lib/types/commands/GenerateHttpClientCmd.d.ts +9 -2
package/package.json +3 -3
package/readme.md +12 -4

package/lib/cjs/commands/GenerateHttpClientCmd.js CHANGED Viewed

@@ -12,6 +12,7 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
     injector;
     fs;
     serverModule;
+    options;
     $mapContext($ctx) {
         return { ...$ctx, output: (0, path_1.resolve)((0, path_1.join)(process.cwd(), $ctx.output)) };
     }
@@ -37,18 +38,22 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
     async generate($ctx) {
         const Platform = await this.loadPlatformModule();
         const { SwaggerService } = await (0, core_1.importPackage)("@tsed/swagger");
-        const platform = await Platform.bootstrap(this.serverModule, { logger: { level: "off" } });
+        const platform = await Platform.bootstrap(this.serverModule, {
+            logger: { level: "off" }
+        });
         const swaggerService = platform.injector.get(SwaggerService);
         const confs = platform.injector.settings.get("swagger", []);
         await this.fs.raw.remove($ctx.output);
         await this.fs.ensureDir($ctx.output);
         const promises = confs.map(async (conf) => {
             const spec = await swaggerService.getOpenAPISpec(conf);
-            await this.generateFromSpec(spec, $ctx);
+            await this.generateFromSpec(spec, conf, $ctx);
         });
         await Promise.all(promises);
+        await platform.stop();
     }
-    async generateFromSpec(spec, $ctx) {
+    async generateFromSpec(spec, conf, $ctx) {
+        const operationIdMode = conf.operationId === "%c_%m" ? "underscore" : "default";
         const { files } = await (0, swagger_typescript_api_1.generateApi)({
             name: `${$ctx.name}.ts`,
             httpClientType: $ctx.type,
@@ -57,24 +62,9 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
             typeSuffix: $ctx.suffix,
             unwrapResponseData: true,
             hooks: {
-                onCreateRouteName(routeNameInfo, raw) {
-                    const [, operationId] = raw.operationId.split("_");
-                    const name = raw.moduleName === "oidc" ? (0, change_case_1.camelCase)(routeNameInfo.original.replace("oidc", "")) : (0, change_case_1.camelCase)(operationId);
-                    routeNameInfo.usage = name;
-                    routeNameInfo.original = name;
-                    raw.operationId = name;
-                    return routeNameInfo;
-                },
-                onParseSchema(originalSchema, parsedSchema) {
-                    const { content } = parsedSchema;
-                    if ((0, core_1.isString)(content)) {
-                        if (content.includes("null") && content.includes("any") && content.includes("Record")) {
-                            parsedSchema.content = "any";
-                        }
-                        parsedSchema.content = parsedSchema.content.replace("object", "Record<string, any>");
-                    }
-                    return parsedSchema;
-                }
+                onCreateRouteName: (routeNameInfo, rawRouteInfo) => this.createRouteName(routeNameInfo, rawRouteInfo, operationIdMode),
+                onParseSchema: this.onParseSchema.bind(this),
+                ...this.options.hooks
             }
         });
         const promises = files.map(({ content, name }) => {
@@ -90,6 +80,28 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
         });
         return Promise.all(promises);
     }
+    onParseSchema(originalSchema, parsedSchema) {
+        const { content } = parsedSchema;
+        if ((0, core_1.isString)(content)) {
+            if (content.includes("null") && content.includes("any") && content.includes("Record")) {
+                parsedSchema.content = "any";
+            }
+            parsedSchema.content = parsedSchema.content.replace("object", "Record<string, any>");
+        }
+        return parsedSchema;
+    }
+    createRouteName(routeNameInfo, raw, mode = "default") {
+        let operationId = "";
+        if (mode === "underscore") {
+            operationId = raw.operationId.split("_")[1];
+        }
+        operationId = operationId || raw.operationId.replace(raw.moduleName, "");
+        const name = (0, change_case_1.camelCase)(this.options.transformOperationId ? this.options.transformOperationId(operationId, routeNameInfo, raw) : operationId);
+        routeNameInfo.usage = name;
+        routeNameInfo.original = name;
+        raw.operationId = name;
+        return routeNameInfo;
+    }
 };
 tslib_1.__decorate([
     (0, cli_core_1.Inject)(),
@@ -103,6 +115,10 @@ tslib_1.__decorate([
     (0, di_1.Constant)("server"),
     tslib_1.__metadata("design:type", cli_core_1.Type)
 ], GenerateHttpClientCmd.prototype, "serverModule", void 0);
+tslib_1.__decorate([
+    (0, di_1.Constant)("httpClient", { hooks: {} }),
+    tslib_1.__metadata("design:type", Object)
+], GenerateHttpClientCmd.prototype, "options", void 0);
 GenerateHttpClientCmd = tslib_1.__decorate([
     (0, cli_core_1.Command)({
         name: "generate-http-client",

package/lib/cjs/commands/GenerateHttpClientCmd.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"GenerateHttpClientCmd.js","sourceRoot":"","sources":["../../../src/commands/GenerateHttpClientCmd.ts"],"names":[],"mappings":"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","sourcesContent":["import {CliFs, Command, CommandProvider, Inject, Type} from \"@tsed/cli-core\";\nimport {Constant, InjectorService} from \"@tsed/di\";\nimport {importPackage, isString} from \"@tsed/core\";\nimport {camelCase} from \"change-case\";\nimport path, {join, resolve} from \"path\";\nimport {generateApi} from \"swagger-typescript-api\";\n\ninterface GenerateHttpClientCtx {\n output: string;\n type: \"axios\" \| \"fetch\";\n name: string;\n suffix: string;\n}\n\n@Command({\n name: \"generate-http-client\",\n description: \"Generate the client API from swagger spec\",\n options: {\n \"-s, --suffix <suffix>\": {\n required: false,\n type: String,\n defaultValue: \"Model\",\n description: \"The suffix applied on model\"\n },\n \"-t, --type <type>\": {\n required: false,\n type: String,\n defaultValue: \"axios\",\n description: \"The client type by the Http client (axios or fetch)\"\n },\n \"-n, --name <name>\": {\n required: false,\n type: String,\n defaultValue: \"ApiClient\",\n description: \"The class name of the generated client\"\n },\n \"-o, --output <output>\": {\n required: true,\n type: String,\n description: \"Path to generate files\"\n }\n }\n})\nexport class GenerateHttpClientCmd implements CommandProvider {\n @Inject()\n injector: InjectorService;\n\n @Inject()\n protected fs: CliFs;\n\n @Constant(\"server\")\n protected serverModule: Type<any>;\n\n $mapContext($ctx: GenerateHttpClientCtx) {\n return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))};\n }\n\n async $exec($ctx: GenerateHttpClientCtx) {\n return [\n {\n title: \"generate client\",\n task: () => this.generate($ctx)\n }\n ];\n }\n\n private async loadPlatformModule(): Promise<any> {\n let platform = await importPackage(\"@tsed/platform-express\", undefined, true);\n\n if (platform) {\n return platform.PlatformExpress;\n }\n\n platform = await importPackage(\"@tsed/platform-koa\", undefined, true);\n\n if (platform) {\n return platform.PlatformKoa;\n }\n\n throw new Error(\"Unsupported platform. Please use Express.js or Koa.js platform.\");\n }\n\n private async generate($ctx: GenerateHttpClientCtx) {\n const Platform = await this.loadPlatformModule();\n const {SwaggerService} = await importPackage(\"@tsed/swagger\");\n\n const platform: {injector: InjectorService} = await Platform.bootstrap(this.serverModule, {logger: {level: \"off\"}});\n const swaggerService = platform.injector.get<any>(SwaggerService)!;\n const confs = platform.injector.settings.get(\"swagger\", []);\n\n await this.fs.raw.remove($ctx.output);\n await this.fs.ensureDir($ctx.output);\n\n const promises = confs.map(async (conf) => {\n const spec = await swaggerService.getOpenAPISpec(conf);\n\n await this.generateFromSpec(spec, $ctx);\n });\n\n await Promise.all(promises);\n }\n\n private async generateFromSpec(spec: any, $ctx: GenerateHttpClientCtx) {\n const {files} = await generateApi({\n name: `${$ctx.name}.ts`,\n httpClientType: $ctx.type,\n spec: spec as any,\n moduleNameIndex: 1,\n typeSuffix: $ctx.suffix,\n unwrapResponseData: true,\n hooks: {\n onCreateRouteName(routeNameInfo: any, raw: any) {\n const [, operationId] = raw.operationId.split(\"_\");\n\n const name = raw.moduleName === \"oidc\" ? camelCase(routeNameInfo.original.replace(\"oidc\", \"\")) : camelCase(operationId);\n\n routeNameInfo.usage = name;\n routeNameInfo.original = name;\n raw.operationId = name;\n\n return routeNameInfo;\n },\n onParseSchema(originalSchema: any, parsedSchema: any) {\n const {content} = parsedSchema;\n\n if (isString(content)) {\n if (content.includes(\"null\") && content.includes(\"any\") && content.includes(\"Record\")) {\n parsedSchema.content = \"any\";\n }\n\n parsedSchema.content = parsedSchema.content.replace(\"object\", \"Record<string, any>\");\n }\n\n return parsedSchema;\n }\n }\n } as any);\n\n const promises = files.map(({content, name}) => {\n content = content\n .replace(\"class Api\", `class ${$ctx.name}`)\n .replace(\".then((response) => response.data)\", \".then((response) => response.data as T)\")\n .replace('requestParams.headers.common = { Accept: \"/\" };', \"\")\n .replace(\"requestParams.headers.post = {};\", \"\")\n .replace(\"requestParams.headers.put = {};\", \"\")\n .replace(\"(this.instance.defaults.headers \|\| {})\", \"((this.instance.defaults.headers \|\| {}) as any)\");\n\n console.log(`${$ctx.output}/${name}`, path.resolve(`${$ctx.output}/${name}`));\n return this.fs.writeFile(`${$ctx.output}/${name}`, content, {encoding: \"utf8\"});\n });\n\n return Promise.all(promises);\n }\n}\n"]}
1	+ {"version":3,"file":"GenerateHttpClientCmd.js","sourceRoot":"","sources":["../../../src/commands/GenerateHttpClientCmd.ts"],"names":[],"mappings":"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","sourcesContent":["import {CliFs, Command, CommandProvider, Inject, Type} from \"@tsed/cli-core\";\nimport {Constant, InjectorService} from \"@tsed/di\";\nimport {importPackage, isString} from \"@tsed/core\";\nimport {camelCase} from \"change-case\";\nimport path, {join, resolve} from \"path\";\nimport {generateApi, Hooks, RawRouteInfo, RouteNameInfo} from \"swagger-typescript-api\";\n\nexport interface GenerateHttpClientCtx {\n output: string;\n type: \"axios\" \| \"fetch\";\n name: string;\n suffix: string;\n}\n\nexport interface GenerateHttpClientOpts {\n hooks?: Partial<Hooks>;\n\n transformOperationId?(operationId: string, routeNameInfo: RouteNameInfo, raw: RawRouteInfo): string;\n}\n\n@Command({\n name: \"generate-http-client\",\n description: \"Generate the client API from swagger spec\",\n options: {\n \"-s, --suffix <suffix>\": {\n required: false,\n type: String,\n defaultValue: \"Model\",\n description: \"The suffix applied on model\"\n },\n \"-t, --type <type>\": {\n required: false,\n type: String,\n defaultValue: \"axios\",\n description: \"The client type by the Http client (axios or fetch)\"\n },\n \"-n, --name <name>\": {\n required: false,\n type: String,\n defaultValue: \"ApiClient\",\n description: \"The class name of the generated client\"\n },\n \"-o, --output <output>\": {\n required: true,\n type: String,\n description: \"Path to generate files\"\n }\n }\n})\nexport class GenerateHttpClientCmd implements CommandProvider {\n @Inject()\n injector: InjectorService;\n\n @Inject()\n protected fs: CliFs;\n\n @Constant(\"server\")\n protected serverModule: Type<any>;\n\n @Constant(\"httpClient\", {hooks: {}})\n protected options: Partial<GenerateHttpClientOpts>;\n\n $mapContext($ctx: GenerateHttpClientCtx) {\n return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))};\n }\n\n async $exec($ctx: GenerateHttpClientCtx) {\n return [\n {\n title: \"generate client\",\n task: () => this.generate($ctx)\n }\n ];\n }\n\n private async loadPlatformModule(): Promise<any> {\n let platform = await importPackage(\"@tsed/platform-express\", undefined, true);\n\n if (platform) {\n return platform.PlatformExpress;\n }\n\n platform = await importPackage(\"@tsed/platform-koa\", undefined, true);\n\n if (platform) {\n return platform.PlatformKoa;\n }\n\n throw new Error(\"Unsupported platform. Please use Express.js or Koa.js platform.\");\n }\n\n private async generate($ctx: GenerateHttpClientCtx) {\n const Platform = await this.loadPlatformModule();\n const {SwaggerService} = await importPackage(\"@tsed/swagger\");\n\n const platform: {injector: InjectorService; stop: () => Promise<any>} = await Platform.bootstrap(this.serverModule, {\n logger: {level: \"off\"}\n });\n const swaggerService = platform.injector.get<any>(SwaggerService)!;\n const confs = platform.injector.settings.get(\"swagger\", []);\n\n await this.fs.raw.remove($ctx.output);\n await this.fs.ensureDir($ctx.output);\n\n const promises = confs.map(async (conf) => {\n const spec = await swaggerService.getOpenAPISpec(conf);\n\n await this.generateFromSpec(spec, conf, $ctx);\n });\n\n await Promise.all(promises);\n\n await platform.stop();\n }\n\n private async generateFromSpec(spec: any, conf: any, $ctx: GenerateHttpClientCtx) {\n const operationIdMode = conf.operationId === \"%c_%m\" ? \"underscore\" : \"default\";\n\n const {files} = await generateApi({\n name: `${$ctx.name}.ts`,\n httpClientType: $ctx.type,\n spec: spec as any,\n moduleNameIndex: 1,\n typeSuffix: $ctx.suffix,\n unwrapResponseData: true,\n hooks: {\n onCreateRouteName: (routeNameInfo: RouteNameInfo, rawRouteInfo: RawRouteInfo) =>\n this.createRouteName(routeNameInfo, rawRouteInfo, operationIdMode),\n onParseSchema: this.onParseSchema.bind(this),\n ...this.options.hooks\n }\n } as any);\n\n const promises = files.map(({content, name}) => {\n content = content\n .replace(\"class Api\", `class ${$ctx.name}`)\n .replace(\".then((response) => response.data)\", \".then((response) => response.data as T)\")\n .replace('requestParams.headers.common = { Accept: \"/\" };', \"\")\n .replace(\"requestParams.headers.post = {};\", \"\")\n .replace(\"requestParams.headers.put = {};\", \"\")\n .replace(\"(this.instance.defaults.headers \|\| {})\", \"((this.instance.defaults.headers \|\| {}) as any)\");\n\n console.log(`${$ctx.output}/${name}`, path.resolve(`${$ctx.output}/${name}`));\n return this.fs.writeFile(`${$ctx.output}/${name}`, content, {encoding: \"utf8\"});\n });\n\n return Promise.all(promises);\n }\n\n private onParseSchema(originalSchema: any, parsedSchema: any) {\n const {content} = parsedSchema;\n\n if (isString(content)) {\n if (content.includes(\"null\") && content.includes(\"any\") && content.includes(\"Record\")) {\n parsedSchema.content = \"any\";\n }\n\n parsedSchema.content = parsedSchema.content.replace(\"object\", \"Record<string, any>\");\n }\n\n return parsedSchema;\n }\n\n private createRouteName(routeNameInfo: RouteNameInfo, raw: RawRouteInfo, mode: \"default\" \| \"underscore\" = \"default\") {\n let operationId = \"\";\n\n if (mode === \"underscore\") {\n operationId = raw.operationId.split(\"_\")[1];\n }\n\n operationId = operationId \|\| raw.operationId.replace(raw.moduleName, \"\");\n\n const name = camelCase(\n this.options.transformOperationId ? this.options.transformOperationId(operationId, routeNameInfo, raw) : operationId\n );\n\n routeNameInfo.usage = name;\n routeNameInfo.original = name;\n raw.operationId = name;\n\n return routeNameInfo;\n }\n}\n"]}

package/lib/esm/commands/GenerateHttpClientCmd.js CHANGED Viewed

@@ -9,6 +9,7 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
     injector;
     fs;
     serverModule;
+    options;
     $mapContext($ctx) {
         return { ...$ctx, output: resolve(join(process.cwd(), $ctx.output)) };
     }
@@ -34,18 +35,22 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
     async generate($ctx) {
         const Platform = await this.loadPlatformModule();
         const { SwaggerService } = await importPackage("@tsed/swagger");
-        const platform = await Platform.bootstrap(this.serverModule, { logger: { level: "off" } });
+        const platform = await Platform.bootstrap(this.serverModule, {
+            logger: { level: "off" }
+        });
         const swaggerService = platform.injector.get(SwaggerService);
         const confs = platform.injector.settings.get("swagger", []);
         await this.fs.raw.remove($ctx.output);
         await this.fs.ensureDir($ctx.output);
         const promises = confs.map(async (conf) => {
             const spec = await swaggerService.getOpenAPISpec(conf);
-            await this.generateFromSpec(spec, $ctx);
+            await this.generateFromSpec(spec, conf, $ctx);
         });
         await Promise.all(promises);
+        await platform.stop();
     }
-    async generateFromSpec(spec, $ctx) {
+    async generateFromSpec(spec, conf, $ctx) {
+        const operationIdMode = conf.operationId === "%c_%m" ? "underscore" : "default";
         const { files } = await generateApi({
             name: `${$ctx.name}.ts`,
             httpClientType: $ctx.type,
@@ -54,24 +59,9 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
             typeSuffix: $ctx.suffix,
             unwrapResponseData: true,
             hooks: {
-                onCreateRouteName(routeNameInfo, raw) {
-                    const [, operationId] = raw.operationId.split("_");
-                    const name = raw.moduleName === "oidc" ? camelCase(routeNameInfo.original.replace("oidc", "")) : camelCase(operationId);
-                    routeNameInfo.usage = name;
-                    routeNameInfo.original = name;
-                    raw.operationId = name;
-                    return routeNameInfo;
-                },
-                onParseSchema(originalSchema, parsedSchema) {
-                    const { content } = parsedSchema;
-                    if (isString(content)) {
-                        if (content.includes("null") && content.includes("any") && content.includes("Record")) {
-                            parsedSchema.content = "any";
-                        }
-                        parsedSchema.content = parsedSchema.content.replace("object", "Record<string, any>");
-                    }
-                    return parsedSchema;
-                }
+                onCreateRouteName: (routeNameInfo, rawRouteInfo) => this.createRouteName(routeNameInfo, rawRouteInfo, operationIdMode),
+                onParseSchema: this.onParseSchema.bind(this),
+                ...this.options.hooks
             }
         });
         const promises = files.map(({ content, name }) => {
@@ -87,6 +77,28 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
         });
         return Promise.all(promises);
     }
+    onParseSchema(originalSchema, parsedSchema) {
+        const { content } = parsedSchema;
+        if (isString(content)) {
+            if (content.includes("null") && content.includes("any") && content.includes("Record")) {
+                parsedSchema.content = "any";
+            }
+            parsedSchema.content = parsedSchema.content.replace("object", "Record<string, any>");
+        }
+        return parsedSchema;
+    }
+    createRouteName(routeNameInfo, raw, mode = "default") {
+        let operationId = "";
+        if (mode === "underscore") {
+            operationId = raw.operationId.split("_")[1];
+        }
+        operationId = operationId || raw.operationId.replace(raw.moduleName, "");
+        const name = camelCase(this.options.transformOperationId ? this.options.transformOperationId(operationId, routeNameInfo, raw) : operationId);
+        routeNameInfo.usage = name;
+        routeNameInfo.original = name;
+        raw.operationId = name;
+        return routeNameInfo;
+    }
 };
 __decorate([
     Inject(),
@@ -100,6 +112,10 @@ __decorate([
     Constant("server"),
     __metadata("design:type", Type)
 ], GenerateHttpClientCmd.prototype, "serverModule", void 0);
+__decorate([
+    Constant("httpClient", { hooks: {} }),
+    __metadata("design:type", Object)
+], GenerateHttpClientCmd.prototype, "options", void 0);
 GenerateHttpClientCmd = __decorate([
     Command({
         name: "generate-http-client",

package/lib/esm/commands/GenerateHttpClientCmd.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"GenerateHttpClientCmd.js","sourceRoot":"","sources":["../../../src/commands/GenerateHttpClientCmd.ts"],"names":[],"mappings":"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","sourcesContent":["import {CliFs, Command, CommandProvider, Inject, Type} from \"@tsed/cli-core\";\nimport {Constant, InjectorService} from \"@tsed/di\";\nimport {importPackage, isString} from \"@tsed/core\";\nimport {camelCase} from \"change-case\";\nimport path, {join, resolve} from \"path\";\nimport {generateApi} from \"swagger-typescript-api\";\n\ninterface GenerateHttpClientCtx {\n output: string;\n type: \"axios\" \| \"fetch\";\n name: string;\n suffix: string;\n}\n\n@Command({\n name: \"generate-http-client\",\n description: \"Generate the client API from swagger spec\",\n options: {\n \"-s, --suffix <suffix>\": {\n required: false,\n type: String,\n defaultValue: \"Model\",\n description: \"The suffix applied on model\"\n },\n \"-t, --type <type>\": {\n required: false,\n type: String,\n defaultValue: \"axios\",\n description: \"The client type by the Http client (axios or fetch)\"\n },\n \"-n, --name <name>\": {\n required: false,\n type: String,\n defaultValue: \"ApiClient\",\n description: \"The class name of the generated client\"\n },\n \"-o, --output <output>\": {\n required: true,\n type: String,\n description: \"Path to generate files\"\n }\n }\n})\nexport class GenerateHttpClientCmd implements CommandProvider {\n @Inject()\n injector: InjectorService;\n\n @Inject()\n protected fs: CliFs;\n\n @Constant(\"server\")\n protected serverModule: Type<any>;\n\n $mapContext($ctx: GenerateHttpClientCtx) {\n return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))};\n }\n\n async $exec($ctx: GenerateHttpClientCtx) {\n return [\n {\n title: \"generate client\",\n task: () => this.generate($ctx)\n }\n ];\n }\n\n private async loadPlatformModule(): Promise<any> {\n let platform = await importPackage(\"@tsed/platform-express\", undefined, true);\n\n if (platform) {\n return platform.PlatformExpress;\n }\n\n platform = await importPackage(\"@tsed/platform-koa\", undefined, true);\n\n if (platform) {\n return platform.PlatformKoa;\n }\n\n throw new Error(\"Unsupported platform. Please use Express.js or Koa.js platform.\");\n }\n\n private async generate($ctx: GenerateHttpClientCtx) {\n const Platform = await this.loadPlatformModule();\n const {SwaggerService} = await importPackage(\"@tsed/swagger\");\n\n const platform: {injector: InjectorService} = await Platform.bootstrap(this.serverModule, {logger: {level: \"off\"}});\n const swaggerService = platform.injector.get<any>(SwaggerService)!;\n const confs = platform.injector.settings.get(\"swagger\", []);\n\n await this.fs.raw.remove($ctx.output);\n await this.fs.ensureDir($ctx.output);\n\n const promises = confs.map(async (conf) => {\n const spec = await swaggerService.getOpenAPISpec(conf);\n\n await this.generateFromSpec(spec, $ctx);\n });\n\n await Promise.all(promises);\n }\n\n private async generateFromSpec(spec: any, $ctx: GenerateHttpClientCtx) {\n const {files} = await generateApi({\n name: `${$ctx.name}.ts`,\n httpClientType: $ctx.type,\n spec: spec as any,\n moduleNameIndex: 1,\n typeSuffix: $ctx.suffix,\n unwrapResponseData: true,\n hooks: {\n onCreateRouteName(routeNameInfo: any, raw: any) {\n const [, operationId] = raw.operationId.split(\"_\");\n\n const name = raw.moduleName === \"oidc\" ? camelCase(routeNameInfo.original.replace(\"oidc\", \"\")) : camelCase(operationId);\n\n routeNameInfo.usage = name;\n routeNameInfo.original = name;\n raw.operationId = name;\n\n return routeNameInfo;\n },\n onParseSchema(originalSchema: any, parsedSchema: any) {\n const {content} = parsedSchema;\n\n if (isString(content)) {\n if (content.includes(\"null\") && content.includes(\"any\") && content.includes(\"Record\")) {\n parsedSchema.content = \"any\";\n }\n\n parsedSchema.content = parsedSchema.content.replace(\"object\", \"Record<string, any>\");\n }\n\n return parsedSchema;\n }\n }\n } as any);\n\n const promises = files.map(({content, name}) => {\n content = content\n .replace(\"class Api\", `class ${$ctx.name}`)\n .replace(\".then((response) => response.data)\", \".then((response) => response.data as T)\")\n .replace('requestParams.headers.common = { Accept: \"/\" };', \"\")\n .replace(\"requestParams.headers.post = {};\", \"\")\n .replace(\"requestParams.headers.put = {};\", \"\")\n .replace(\"(this.instance.defaults.headers \|\| {})\", \"((this.instance.defaults.headers \|\| {}) as any)\");\n\n console.log(`${$ctx.output}/${name}`, path.resolve(`${$ctx.output}/${name}`));\n return this.fs.writeFile(`${$ctx.output}/${name}`, content, {encoding: \"utf8\"});\n });\n\n return Promise.all(promises);\n }\n}\n"]}
1	+ {"version":3,"file":"GenerateHttpClientCmd.js","sourceRoot":"","sources":["../../../src/commands/GenerateHttpClientCmd.ts"],"names":[],"mappings":"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","sourcesContent":["import {CliFs, Command, CommandProvider, Inject, Type} from \"@tsed/cli-core\";\nimport {Constant, InjectorService} from \"@tsed/di\";\nimport {importPackage, isString} from \"@tsed/core\";\nimport {camelCase} from \"change-case\";\nimport path, {join, resolve} from \"path\";\nimport {generateApi, Hooks, RawRouteInfo, RouteNameInfo} from \"swagger-typescript-api\";\n\nexport interface GenerateHttpClientCtx {\n output: string;\n type: \"axios\" \| \"fetch\";\n name: string;\n suffix: string;\n}\n\nexport interface GenerateHttpClientOpts {\n hooks?: Partial<Hooks>;\n\n transformOperationId?(operationId: string, routeNameInfo: RouteNameInfo, raw: RawRouteInfo): string;\n}\n\n@Command({\n name: \"generate-http-client\",\n description: \"Generate the client API from swagger spec\",\n options: {\n \"-s, --suffix <suffix>\": {\n required: false,\n type: String,\n defaultValue: \"Model\",\n description: \"The suffix applied on model\"\n },\n \"-t, --type <type>\": {\n required: false,\n type: String,\n defaultValue: \"axios\",\n description: \"The client type by the Http client (axios or fetch)\"\n },\n \"-n, --name <name>\": {\n required: false,\n type: String,\n defaultValue: \"ApiClient\",\n description: \"The class name of the generated client\"\n },\n \"-o, --output <output>\": {\n required: true,\n type: String,\n description: \"Path to generate files\"\n }\n }\n})\nexport class GenerateHttpClientCmd implements CommandProvider {\n @Inject()\n injector: InjectorService;\n\n @Inject()\n protected fs: CliFs;\n\n @Constant(\"server\")\n protected serverModule: Type<any>;\n\n @Constant(\"httpClient\", {hooks: {}})\n protected options: Partial<GenerateHttpClientOpts>;\n\n $mapContext($ctx: GenerateHttpClientCtx) {\n return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))};\n }\n\n async $exec($ctx: GenerateHttpClientCtx) {\n return [\n {\n title: \"generate client\",\n task: () => this.generate($ctx)\n }\n ];\n }\n\n private async loadPlatformModule(): Promise<any> {\n let platform = await importPackage(\"@tsed/platform-express\", undefined, true);\n\n if (platform) {\n return platform.PlatformExpress;\n }\n\n platform = await importPackage(\"@tsed/platform-koa\", undefined, true);\n\n if (platform) {\n return platform.PlatformKoa;\n }\n\n throw new Error(\"Unsupported platform. Please use Express.js or Koa.js platform.\");\n }\n\n private async generate($ctx: GenerateHttpClientCtx) {\n const Platform = await this.loadPlatformModule();\n const {SwaggerService} = await importPackage(\"@tsed/swagger\");\n\n const platform: {injector: InjectorService; stop: () => Promise<any>} = await Platform.bootstrap(this.serverModule, {\n logger: {level: \"off\"}\n });\n const swaggerService = platform.injector.get<any>(SwaggerService)!;\n const confs = platform.injector.settings.get(\"swagger\", []);\n\n await this.fs.raw.remove($ctx.output);\n await this.fs.ensureDir($ctx.output);\n\n const promises = confs.map(async (conf) => {\n const spec = await swaggerService.getOpenAPISpec(conf);\n\n await this.generateFromSpec(spec, conf, $ctx);\n });\n\n await Promise.all(promises);\n\n await platform.stop();\n }\n\n private async generateFromSpec(spec: any, conf: any, $ctx: GenerateHttpClientCtx) {\n const operationIdMode = conf.operationId === \"%c_%m\" ? \"underscore\" : \"default\";\n\n const {files} = await generateApi({\n name: `${$ctx.name}.ts`,\n httpClientType: $ctx.type,\n spec: spec as any,\n moduleNameIndex: 1,\n typeSuffix: $ctx.suffix,\n unwrapResponseData: true,\n hooks: {\n onCreateRouteName: (routeNameInfo: RouteNameInfo, rawRouteInfo: RawRouteInfo) =>\n this.createRouteName(routeNameInfo, rawRouteInfo, operationIdMode),\n onParseSchema: this.onParseSchema.bind(this),\n ...this.options.hooks\n }\n } as any);\n\n const promises = files.map(({content, name}) => {\n content = content\n .replace(\"class Api\", `class ${$ctx.name}`)\n .replace(\".then((response) => response.data)\", \".then((response) => response.data as T)\")\n .replace('requestParams.headers.common = { Accept: \"/\" };', \"\")\n .replace(\"requestParams.headers.post = {};\", \"\")\n .replace(\"requestParams.headers.put = {};\", \"\")\n .replace(\"(this.instance.defaults.headers \|\| {})\", \"((this.instance.defaults.headers \|\| {}) as any)\");\n\n console.log(`${$ctx.output}/${name}`, path.resolve(`${$ctx.output}/${name}`));\n return this.fs.writeFile(`${$ctx.output}/${name}`, content, {encoding: \"utf8\"});\n });\n\n return Promise.all(promises);\n }\n\n private onParseSchema(originalSchema: any, parsedSchema: any) {\n const {content} = parsedSchema;\n\n if (isString(content)) {\n if (content.includes(\"null\") && content.includes(\"any\") && content.includes(\"Record\")) {\n parsedSchema.content = \"any\";\n }\n\n parsedSchema.content = parsedSchema.content.replace(\"object\", \"Record<string, any>\");\n }\n\n return parsedSchema;\n }\n\n private createRouteName(routeNameInfo: RouteNameInfo, raw: RawRouteInfo, mode: \"default\" \| \"underscore\" = \"default\") {\n let operationId = \"\";\n\n if (mode === \"underscore\") {\n operationId = raw.operationId.split(\"_\")[1];\n }\n\n operationId = operationId \|\| raw.operationId.replace(raw.moduleName, \"\");\n\n const name = camelCase(\n this.options.transformOperationId ? this.options.transformOperationId(operationId, routeNameInfo, raw) : operationId\n );\n\n routeNameInfo.usage = name;\n routeNameInfo.original = name;\n raw.operationId = name;\n\n return routeNameInfo;\n }\n}\n"]}

package/lib/types/commands/GenerateHttpClientCmd.d.ts CHANGED Viewed

@@ -1,15 +1,21 @@
 import { CliFs, CommandProvider, Type } from "@tsed/cli-core";
 import { InjectorService } from "@tsed/di";
-interface GenerateHttpClientCtx {
+import { Hooks, RawRouteInfo, RouteNameInfo } from "swagger-typescript-api";
+export interface GenerateHttpClientCtx {
     output: string;
     type: "axios" | "fetch";
     name: string;
     suffix: string;
 }
+export interface GenerateHttpClientOpts {
+    hooks?: Partial<Hooks>;
+    transformOperationId?(operationId: string, routeNameInfo: RouteNameInfo, raw: RawRouteInfo): string;
+}
 export declare class GenerateHttpClientCmd implements CommandProvider {
     injector: InjectorService;
     protected fs: CliFs;
     protected serverModule: Type<any>;
+    protected options: Partial<GenerateHttpClientOpts>;
     $mapContext($ctx: GenerateHttpClientCtx): {
         output: string;
         type: "axios" | "fetch";
@@ -23,5 +29,6 @@ export declare class GenerateHttpClientCmd implements CommandProvider {
     private loadPlatformModule;
     private generate;
     private generateFromSpec;
+    private onParseSchema;
+    private createRouteName;
 }
-export {};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/cli-generate-http-client",
-  "version": "3.22.5",
+  "version": "3.24.1",
   "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
@@ -22,8 +22,8 @@
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@tsed/cli": "3.22.5",
-    "@tsed/cli-core": "3.22.5",
+    "@tsed/cli": "3.24.1",
+    "@tsed/cli-core": "3.24.1",
     "swagger-typescript-api": "^9.3.1"
   },
   "peerDependencies": {

package/readme.md CHANGED Viewed

@@ -45,15 +45,23 @@ Then create or edit the `src/bin/index.ts` in your project:
 ```typescript
 #!/usr/bin/env node
 import { CliCore } from "@tsed/cli-core";
-import {GenerateHttpClientCmd} from "@tsed/cli-generate-http-client";
-import { config } from "../config";
+import { GenerateHttpClientCmd } from "@tsed/cli-generate-http-client";
+import configuration from "../config";
+import { CronCmd } from "./commands/CronCmd";
+import "./db/connections";
 import { Server } from "../Server";
 CliCore.bootstrap({
-  ...config,
+  ...configuration,
   server: Server,
+  httpClient: {
+    hooks: {}, // see swagger-typescript-api hooks options
+    transformOperationId(operationId: string, routeNameInfo: any, raw: any) {
+      return raw.moduleName === "oidc" ? routeNameInfo.original.replace("oidc", "") : operationId;
+    }
+  },
   // add your custom commands here
-  commands: [GenerateHttpClientCmd]
+  commands: [GenerateHttpClientCmd, CronCmd]
 }).catch(console.error);
 ```