From 2e7c39b538cc892592165aeff66e4f002a476852 Mon Sep 17 00:00:00 2001 From: Mihail Yonchev <45242072+insertmike@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:24:35 +0100 Subject: [PATCH 1/5] [transform/paths] Remove parameters replacing --- packages/openapi-typescript/src/transform/paths-enum.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openapi-typescript/src/transform/paths-enum.ts b/packages/openapi-typescript/src/transform/paths-enum.ts index 78d33b313..94fc1c90c 100644 --- a/packages/openapi-typescript/src/transform/paths-enum.ts +++ b/packages/openapi-typescript/src/transform/paths-enum.ts @@ -32,7 +32,7 @@ export default function makeApiPathsEnum(pathsObject: PathsObject): ts.EnumDecla } // Replace {parameters} with :parameters - const adaptedUrl = url.replace(/{(\w+)}/g, ":$1"); + const adaptedUrl = url.replace(/{(\w+)}/g, "{$1}"); enumKeys.push(adaptedUrl); enumMetaData.push({ From 21ab4c0464255aa844eef5d7e809bd95cf1a401e Mon Sep 17 00:00:00 2001 From: Mihail Yonchev <45242072+insertmike@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:26:04 +0100 Subject: [PATCH 2/5] fix tests --- .../openapi-typescript/test/transform/paths-enum.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/openapi-typescript/test/transform/paths-enum.test.ts b/packages/openapi-typescript/test/transform/paths-enum.test.ts index 37ee91e23..191540a97 100644 --- a/packages/openapi-typescript/test/transform/paths-enum.test.ts +++ b/packages/openapi-typescript/test/transform/paths-enum.test.ts @@ -38,7 +38,7 @@ describe("transformPathsObjectToEnum", () => { }, }, want: `export enum ApiPaths { - GetApiV1User = "/api/v1/user/:user_id" + GetApiV1User = "/api/v1/user/{user_id}" }`, }, ], @@ -62,7 +62,7 @@ describe("transformPathsObjectToEnum", () => { }, }, want: `export enum ApiPaths { - GetUserById = "/api/v1/user/:user_id" + GetUserById = "/api/v1/user/{user_id}" }`, }, ], @@ -89,8 +89,8 @@ describe("transformPathsObjectToEnum", () => { }, }, want: `export enum ApiPaths { - GetUserById = "/api/v1/user/:user_id", - PostApiV1User = "/api/v1/user/:user_id" + GetUserById = "/api/v1/user/{user_id}", + PostApiV1User = "/api/v1/user/{user_id}" }`, }, ], From 6f721d10f5128094aa028fe2c82727dc2eec5400 Mon Sep 17 00:00:00 2001 From: Mihail Yonchev <45242072+insertmike@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:31:57 +0100 Subject: [PATCH 3/5] Create little-meals-hide.md --- .changeset/little-meals-hide.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/little-meals-hide.md diff --git a/.changeset/little-meals-hide.md b/.changeset/little-meals-hide.md new file mode 100644 index 000000000..722161212 --- /dev/null +++ b/.changeset/little-meals-hide.md @@ -0,0 +1,5 @@ +--- +"openapi-typescript": patch +--- + +fix: --make-paths-enum renames the paths URL (:id instead of {id}) From e8ca21681c22fb14bcfc1815b962e5c43e2d5c3b Mon Sep 17 00:00:00 2001 From: Mihail Yonchev <45242072+insertmike@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:41:59 +0100 Subject: [PATCH 4/5] Update paths-enum.ts --- packages/openapi-typescript/src/transform/paths-enum.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/openapi-typescript/src/transform/paths-enum.ts b/packages/openapi-typescript/src/transform/paths-enum.ts index 94fc1c90c..ea2fbdb43 100644 --- a/packages/openapi-typescript/src/transform/paths-enum.ts +++ b/packages/openapi-typescript/src/transform/paths-enum.ts @@ -30,11 +30,7 @@ export default function makeApiPathsEnum(pathsObject: PathsObject): ts.EnumDecla }) .join(""); } - - // Replace {parameters} with :parameters - const adaptedUrl = url.replace(/{(\w+)}/g, "{$1}"); - - enumKeys.push(adaptedUrl); + enumKeys.push(url); enumMetaData.push({ name: pathName, }); From e60c1693172c33e5850196b7e3872f4a1d757a1c Mon Sep 17 00:00:00 2001 From: Mihail Yonchev <45242072+insertmike@users.noreply.github.com> Date: Fri, 14 Feb 2025 09:14:15 +0100 Subject: [PATCH 5/5] Update little-meals-hide.md --- .changeset/little-meals-hide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/little-meals-hide.md b/.changeset/little-meals-hide.md index 722161212..db4647f59 100644 --- a/.changeset/little-meals-hide.md +++ b/.changeset/little-meals-hide.md @@ -2,4 +2,4 @@ "openapi-typescript": patch --- -fix: --make-paths-enum renames the paths URL (:id instead of {id}) +- Fixed --make-paths-enum option transforming the paths URL (`:id` instead of `{id}`)