Skip to content

Avoid unnecessary TypeScript path conversions #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meoyawn merged 1 commit into from
Aug 25, 2026
Merged

Avoid unnecessary TypeScript path conversions #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/tsemit/tsemit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ func pathExpression(path string, params []opParam) string {
if param.Kind != "path" {
continue
}
expr = strings.ReplaceAll(expr, "{"+param.WireName+"}", "${encodeURIComponent(String(requestParameters['"+param.Name+"']))}")
expr = strings.ReplaceAll(expr, "{"+param.WireName+"}", "${encodeURIComponent(requestParameters['"+param.Name+"'])}")
}
if strings.Contains(expr, "${") {
return "`" + expr + "`"
Expand Down
6 changes: 6 additions & 0 deletions oasmith_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,12 @@ func TestTypeScriptClientQueries(t *testing.T) {
if !strings.Contains(string(raw), "const queryParameters = new URLSearchParams()") {
t.Fatal("generated TypeScript API does not use URLSearchParams")
}
if !strings.Contains(string(raw), `encodeURIComponent(requestParameters["thingId"])`) {
t.Fatal("generated TypeScript API does not directly escape path parameters")
}
if strings.Contains(string(raw), "encodeURIComponent(String(") {
t.Fatal("generated TypeScript API unnecessarily converts path parameters")
}
testPath := filepath.Join(outDir, "query.test.ts")
if err := os.WriteFile(testPath, []byte(typescriptQueryBehaviorTest), 0o644); err != nil {
t.Fatalf("write TypeScript query test: %v", err)
Expand Down
31 changes: 15 additions & 16 deletions testdata/golden/private-typescript/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ export class DefaultApi {
const headerParameters: Record<string, string> = {}
return new Request(
this.baseURL +
`/session/pages/show/${encodeURIComponent(String(requestParameters["showId"]))}`,
`/session/pages/show/${encodeURIComponent(requestParameters["showId"])}`,
{
method: "GET",
headers: headerParameters,
Expand Down Expand Up @@ -1567,7 +1567,7 @@ export class DefaultApi {
const headerParameters: Record<string, string> = {}
return new Request(
this.baseURL +
`/session/pages/shows/${encodeURIComponent(String(requestParameters["teamId"]))}`,
`/session/pages/shows/${encodeURIComponent(requestParameters["teamId"])}`,
{
method: "GET",
headers: headerParameters,
Expand Down Expand Up @@ -1716,7 +1716,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/image-uploads/presign`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/image-uploads/presign`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -1805,7 +1805,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/media-uploads/multipart`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/media-uploads/multipart`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -1894,7 +1894,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/media-uploads/presign`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/media-uploads/presign`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -1993,7 +1993,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/media-uploads/${encodeURIComponent(String(requestParameters["uploadSessionId"]))}/complete`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/media-uploads/${encodeURIComponent(requestParameters["uploadSessionId"])}/complete`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -2093,7 +2093,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/media-uploads/${encodeURIComponent(String(requestParameters["uploadSessionId"]))}/parts/presign`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/media-uploads/${encodeURIComponent(requestParameters["uploadSessionId"])}/parts/presign`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -2170,7 +2170,7 @@ export class DefaultApi {
const headerParameters: Record<string, string> = {}
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows`,
{
method: "GET",
headers: headerParameters,
Expand Down Expand Up @@ -2248,7 +2248,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -2349,7 +2349,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows/${encodeURIComponent(String(requestParameters["showId"]))}`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows/${encodeURIComponent(requestParameters["showId"])}`,
{
method: "PUT",
headers: headerParameters,
Expand Down Expand Up @@ -2432,7 +2432,7 @@ export class DefaultApi {
const headerParameters: Record<string, string> = {}
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows/${encodeURIComponent(String(requestParameters["showId"]))}/episodes`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows/${encodeURIComponent(requestParameters["showId"])}/episodes`,
{
method: "GET",
headers: headerParameters,
Expand Down Expand Up @@ -2524,7 +2524,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows/${encodeURIComponent(String(requestParameters["showId"]))}/episodes`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows/${encodeURIComponent(requestParameters["showId"])}/episodes`,
{
method: "POST",
headers: headerParameters,
Expand Down Expand Up @@ -2628,7 +2628,7 @@ export class DefaultApi {
headerParameters["Content-Type"] = "application/json"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows/${encodeURIComponent(String(requestParameters["showId"]))}/episodes/${encodeURIComponent(String(requestParameters["episodeId"]))}`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows/${encodeURIComponent(requestParameters["showId"])}/episodes/${encodeURIComponent(requestParameters["episodeId"])}`,
{
method: "PUT",
headers: headerParameters,
Expand Down Expand Up @@ -2725,7 +2725,7 @@ export class DefaultApi {
headerParameters["Accept"] = "text/event-stream"
return new Request(
this.baseURL +
`/session/teams/${encodeURIComponent(String(requestParameters["teamId"]))}/shows/${encodeURIComponent(String(requestParameters["showId"]))}/episodes/${encodeURIComponent(String(requestParameters["episodeId"]))}/episode-events`,
`/session/teams/${encodeURIComponent(requestParameters["teamId"])}/shows/${encodeURIComponent(requestParameters["showId"])}/episodes/${encodeURIComponent(requestParameters["episodeId"])}/episode-events`,
{
method: "GET",
headers: headerParameters,
Expand Down Expand Up @@ -2892,8 +2892,7 @@ export class DefaultApi {

const headerParameters: Record<string, string> = {}
return new Request(
this.baseURL +
`/${encodeURIComponent(String(requestParameters["feedId"]))}.rss`,
this.baseURL + `/${encodeURIComponent(requestParameters["feedId"])}.rss`,
{
method: "GET",
headers: headerParameters,
Expand Down
Loading