@tsed/cli-generate-http-client 6.0.0-alpha.9 → 6.0.0-beta.2

package/lib/esm/commands/GenerateHttpClientCmd.js

@@ -1,11 +1,16 @@
-import { __decorate, __metadata } from "tslib";
-import { CliFs, Command, Inject, Type } from "@tsed/cli-core";
+import { __decorate } from "tslib";
+import { CliFs, Command, constant, inject, Type } from "@tsed/cli-core";
 import { isString } from "@tsed/core";
-import { Constant, InjectorService } from "@tsed/di";
+import { InjectorService } from "@tsed/di";
 import { camelCase } from "change-case";
 import path, { join, resolve } from "path";
 import { generateApi } from "swagger-typescript-api";
 let GenerateHttpClientCmd = class GenerateHttpClientCmd {
+    constructor() {
+        this.fs = inject(CliFs);
+        this.serverModule = constant("server");
+        this.options = constant("httpClient", { hooks: {} });
+    }
     $mapContext($ctx) {
         return { ...$ctx, output: resolve(join(process.cwd(), $ctx.output)) };
     }
@@ -72,8 +77,9 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
                 ...this.options.hooks
             }
         });
-        const promises = files.map(({ content, name }) => {
-            content = content
+        const promises = files.map((file) => {
+            const name = file.fileName;
+            file.fileContent = file.fileContent
                 .replace("class Api", `class ${$ctx.name}`)
                 .replace(".then((response) => response.data)", ".then((response) => response.data as T)")
                 .replace('requestParams.headers.common = { Accept: "*/*" };', "")
@@ -81,7 +87,7 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
                 .replace("requestParams.headers.put = {};", "")
                 .replace("(this.instance.defaults.headers || {})", "((this.instance.defaults.headers || {}) as any)");
             console.log(`${$ctx.output}/${name}`, path.resolve(`${$ctx.output}/${name}`));
-            return this.fs.writeFile(`${$ctx.output}/${name}`, content, { encoding: "utf8" });
+            return this.fs.writeFile(`${$ctx.output}/${name}`, file.fileContent, { encoding: "utf8" });
         });
         return Promise.all(promises);
     }
@@ -108,22 +114,6 @@ let GenerateHttpClientCmd = class GenerateHttpClientCmd {
         return routeNameInfo;
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], GenerateHttpClientCmd.prototype, "injector", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliFs)
-], GenerateHttpClientCmd.prototype, "fs", void 0);
-__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",
@@ -156,4 +146,3 @@ GenerateHttpClientCmd = __decorate([
     })
 ], GenerateHttpClientCmd);
 export { GenerateHttpClientCmd };
-//# sourceMappingURL=GenerateHttpClientCmd.js.map

package/lib/esm/index.js

@@ -1,3 +1,2 @@
 export * from "./commands/GenerateHttpClientCmd.js";
 export default {};
-//# sourceMappingURL=index.js.map

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

@@ -1,5 +1,4 @@
 import { CliFs, type CommandProvider, Type } from "@tsed/cli-core";
-import { InjectorService } from "@tsed/di";
 import { type Hooks, type RawRouteInfo, type RouteNameInfo } from "swagger-typescript-api";
 export interface GenerateHttpClientCtx {
     output: string;
@@ -12,9 +11,8 @@ export interface GenerateHttpClientOpts {
     transformOperationId?(operationId: string, routeNameInfo: RouteNameInfo, raw: RawRouteInfo): string;
 }
 export declare class GenerateHttpClientCmd implements CommandProvider {
-    injector: InjectorService;
     protected fs: CliFs;
-    protected serverModule: Type<any>;
+    protected serverModule: Type<any> | undefined;
     protected options: Partial<GenerateHttpClientOpts>;
     $mapContext($ctx: GenerateHttpClientCtx): {
         output: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-generate-http-client",
   "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.",
-  "version": "6.0.0-alpha.9",
+  "version": "6.0.0-beta.2",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -25,11 +25,11 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/cli": "6.0.0-alpha.9",
-    "@tsed/cli-core": "6.0.0-alpha.9",
-    "@tsed/typescript": "6.0.0-alpha.9",
+    "@tsed/cli": "6.0.0-beta.2",
+    "@tsed/cli-core": "6.0.0-beta.2",
+    "@tsed/typescript": "6.0.0-beta.2",
     "cross-env": "7.0.3",
-    "swagger-typescript-api": "^9.3.1",
+    "swagger-typescript-api": "^13.0.22",
     "typescript": "5.6.2",
     "vitest": "2.1.1"
   },
@@ -54,6 +54,6 @@
   "author": "Romain Lenzotti",
   "license": "MIT",
   "publishConfig": {
-    "tag": "alpha"
+    "tag": "beta"
   }
 }

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

@@ -1 +0,0 @@
-{"version":3,"file":"GenerateHttpClientCmd.js","sourceRoot":"","sources":["../../../src/commands/GenerateHttpClientCmd.ts"],"names":[],"mappings":"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"}

package/lib/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC;AAEpD,eAAe,EAAE,CAAC"}