fix: base url (#102)

Himenon · Mar 20, 2023 · 3857267 · 3857267
1 parent 895f7a7
commit 3857267
Show file tree

Hide file tree

Showing 16 changed files with 1,101 additions and 1,060 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,6 +35,7 @@ jobs:
       - name: Test & Build
         run: |
           pnpm build
+          pnpm test:code:gen
           pnpm test
         env:
           CI: true
diff --git a/jest.config.js b/jest.config.js
@@ -1,3 +1,6 @@
+/**
+ * @type {import("@jest/types").Config.InitialOptions}
+ */
 module.exports = {
   automock: false,
   moduleFileExtensions: ["js", "json", "jsx", "ts", "tsx", "node"],

diff --git a/jest.snapshot.config.js b/jest.snapshot.config.js
@@ -1,17 +1,23 @@
+/**
+ * @type {import("@jest/types").Config.InitialOptions}
+ */
 module.exports = {
   automock: false,
-  globals: {
-    "ts-jest": {
-      tsconfig: "tsconfig.test.json",
-      diagnostics: false,
-    },
-  },
   moduleFileExtensions: ["js", "json", "jsx", "ts", "tsx", "node"],
   roots: ["<rootDir>/test"],
   testEnvironment: "node",
   testMatch: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[tj]s?(x)"],
   transform: {
-    "^.+\\.tsx?$": "ts-jest",
+    "^.+\\.(t|j)sx?$": [
+      "@swc/jest",
+      {
+        jsc: {
+          parser :{
+            syntax: "typescript"
+          }
+        }
+      },
+    ],
   },
   unmockedModulePathPatterns: ["<rootDir>/node_modules/*"],
 };
diff --git a/src/code-templates/_shared/MethodBody/PathParameter.ts b/src/code-templates/_shared/MethodBody/PathParameter.ts
@@ -24,7 +24,7 @@ const generateUrlVariableStatement = (
       expression: "this",
     }),
     function: factory.Identifier.create({
-      name: "baseUrl",
+      name: "_baseUrl",
     }),
   };
   return factory.VariableStatement.create({

diff --git a/src/code-templates/functional-api-client/FunctionalApiClient/index.ts b/src/code-templates/functional-api-client/FunctionalApiClient/index.ts
@@ -50,7 +50,26 @@ export const create = (factory: TsGenerator.Factory.Type, list: CodeGenerator.Pa
       }),
     ],
     body: factory.Block.create({
-      statements: [returnValue],
+      statements: [
+        factory.VariableStatement.create({
+          declarationList: factory.VariableDeclarationList.create({
+            flag: "const",
+            declarations: [
+              factory.VariableDeclaration.create({
+                name: "_baseUrl",
+                initializer: factory.CallExpression.create({
+                  expression: factory.PropertyAccessExpression.create({
+                    expression: "baseUrl",
+                    name: "replace",
+                  }),
+                  argumentsArray: [factory.RegularExpressionLiteral.create({ text: "/\\/$/" }), factory.StringLiteral.create({ text: "" })],
+                }),
+              }),
+            ],
+          }),
+        }),
+        returnValue,
+      ],
       multiLine: true,
     }),
   });

diff --git a/src/internal/TsGenerator/factory/IndexSignatureDeclaration.ts b/src/internal/TsGenerator/factory/IndexSignatureDeclaration.ts
@@ -13,12 +13,10 @@ export const create =
   ({ factory }: Pick<ts.TransformationContext, "factory">): Factory["create"] =>
   (params: Params$Create): ts.IndexSignatureDeclaration => {
     const node = factory.createIndexSignature(
-      undefined,
       undefined,
       // TODO Feature Development: Refactoring
       [
         factory.createParameterDeclaration(
-          undefined,
           undefined,
           undefined,
           factory.createIdentifier(params.name),

diff --git a/src/internal/TsGenerator/factory/ParameterDeclaration.ts b/src/internal/TsGenerator/factory/ParameterDeclaration.ts
@@ -24,7 +24,6 @@ export const create =
       return;
     })();
     const node = factory.createParameterDeclaration(
-      undefined,
       modifiers,
       undefined,
       factory.createIdentifier(params.name),

diff --git a/src/meta.ts b/src/meta.ts
@@ -1,2 +1,2 @@
 export const Name = "@himenon/openapi-typescript-code-generator";
-export const Version = "0.22.1";
+export const Version = "0.22.2";
diff --git a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
@@ -3830,92 +3830,93 @@ export interface ApiClient<RequestOption> {
     request: <T = SuccessResponses>(httpMethod: HttpMethod, url: string, headers: ObjectLike | any, requestBody: ObjectLike | any, queryParameters: QueryParameters | undefined, options?: RequestOption) => Promise<T>;
 }
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
+    const _baseUrl = baseUrl.replace(/\\/$/, "");
     return {
         RolloutService_GetNamespace: (option?: RequestOption): Promise<Response$RolloutService_GetNamespace$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/namespace\`;
+            const url = _baseUrl + \`/api/v1/namespace\`;
             const headers = {
                 Accept: "application/json"
             };
             return apiClient.request("GET", url, headers, undefined, undefined, option);
         },
         RolloutService_ListRolloutInfos: (params: Params$RolloutService_ListRolloutInfos, option?: RequestOption): Promise<Response$RolloutService_ListRolloutInfos$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/info\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/info\`;
             const headers = {
                 Accept: "application/json"
             };
             return apiClient.request("GET", url, headers, undefined, undefined, option);
         },
         RolloutService_WatchRolloutInfos: (params: Params$RolloutService_WatchRolloutInfos, option?: RequestOption): Promise<Response$RolloutService_WatchRolloutInfos$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/info/watch\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/info/watch\`;
             const headers = {
                 Accept: "application/json"
             };
             return apiClient.request("GET", url, headers, undefined, undefined, option);
         },
         RolloutService_AbortRollout: (params: Params$RolloutService_AbortRollout, option?: RequestOption): Promise<Response$RolloutService_AbortRollout$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/abort\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/abort\`;
             const headers = {
                 "Content-Type": "application/json",
                 Accept: "application/json"
             };
             return apiClient.request("PUT", url, headers, params.requestBody, undefined, option);
         },
         RolloutService_GetRolloutInfo: (params: Params$RolloutService_GetRolloutInfo, option?: RequestOption): Promise<Response$RolloutService_GetRolloutInfo$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/info\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/info\`;
             const headers = {
                 Accept: "application/json"
             };
             return apiClient.request("GET", url, headers, undefined, undefined, option);
         },
         RolloutService_WatchRolloutInfo: (params: Params$RolloutService_WatchRolloutInfo, option?: RequestOption): Promise<Response$RolloutService_WatchRolloutInfo$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/info/watch\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/info/watch\`;
             const headers = {
                 Accept: "application/json"
             };
             return apiClient.request("GET", url, headers, undefined, undefined, option);
         },
         RolloutService_PromoteRollout: (params: Params$RolloutService_PromoteRollout, option?: RequestOption): Promise<Response$RolloutService_PromoteRollout$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/promote\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/promote\`;
             const headers = {
                 "Content-Type": "application/json",
                 Accept: "application/json"
             };
             return apiClient.request("PUT", url, headers, params.requestBody, undefined, option);
         },
         RolloutService_RestartRollout: (params: Params$RolloutService_RestartRollout, option?: RequestOption): Promise<Response$RolloutService_RestartRollout$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/restart\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/restart\`;
             const headers = {
                 "Content-Type": "application/json",
                 Accept: "application/json"
             };
             return apiClient.request("PUT", url, headers, params.requestBody, undefined, option);
         },
         RolloutService_RetryRollout: (params: Params$RolloutService_RetryRollout, option?: RequestOption): Promise<Response$RolloutService_RetryRollout$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/retry\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.name}/retry\`;
             const headers = {
                 "Content-Type": "application/json",
                 Accept: "application/json"
             };
             return apiClient.request("PUT", url, headers, params.requestBody, undefined, option);
         },
         RolloutService_SetRolloutImage: (params: Params$RolloutService_SetRolloutImage, option?: RequestOption): Promise<Response$RolloutService_SetRolloutImage$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.rollout}/set/\${params.parameter.container}/\${params.parameter.image}/\${params.parameter.tag}\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.rollout}/set/\${params.parameter.container}/\${params.parameter.image}/\${params.parameter.tag}\`;
             const headers = {
                 "Content-Type": "application/json",
                 Accept: "application/json"
             };
             return apiClient.request("PUT", url, headers, params.requestBody, undefined, option);
         },
         RolloutService_UndoRollout: (params: Params$RolloutService_UndoRollout, option?: RequestOption): Promise<Response$RolloutService_UndoRollout$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.rollout}/undo/\${params.parameter.revision}\`;
+            const url = _baseUrl + \`/api/v1/rollouts/\${params.parameter.namespace}/\${params.parameter.rollout}/undo/\${params.parameter.revision}\`;
             const headers = {
                 "Content-Type": "application/json",
                 Accept: "application/json"
             };
             return apiClient.request("PUT", url, headers, params.requestBody, undefined, option);
         },
         RolloutService_Version: (option?: RequestOption): Promise<Response$RolloutService_Version$Status$200["application/json"]> => {
-            const url = baseUrl + \`/api/v1/version\`;
+            const url = _baseUrl + \`/api/v1/version\`;
             const headers = {
                 Accept: "application/json"
             };

diff --git a/test/__tests__/functional/__snapshots__/format.domain.ts.snap b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
@@ -47,6 +47,7 @@ export interface ApiClient<RequestOption> {
     request: <T = SuccessResponses>(httpMethod: HttpMethod, url: string, headers: ObjectLike | any, requestBody: ObjectLike | any, queryParameters: QueryParameters | undefined, options?: RequestOption) => Promise<T>;
 }
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
+    const _baseUrl = baseUrl.replace(/\\/$/, "");
     return {};
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;