Skip to content

Fix typescript possible undefined values #27

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
merged 4 commits into from
Feb 25, 2025
Merged

Fix typescript possible undefined values #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0527d61
Fix typescript possible undefined values
ScreamingHawk Feb 25, 2025
9f0d99f
Update ci go version
ScreamingHawk Feb 25, 2025
25f4acb
Update test files
ScreamingHawk Feb 25, 2025
5d5f56e
Update generated test files go version
ScreamingHawk Feb 25, 2025
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.20"
go-version: "1.23"

- name: Install webrpc-gen (development)
run: git clone --single-branch https://github.com/webrpc/webrpc.git --branch master && cd webrpc && make install
Expand Down
20 changes: 10 additions & 10 deletions _examples/node-ts/server/server.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable */
// node-ts v1.0.0 f5566a7aae2c4d2f76cc64d8e55f9ac841447e43
// --
// Code generated by webrpc-gen@v0.22.0 with ../../../gen-typescript generator. DO NOT EDIT.
// Code generated by webrpc-gen@v0.23.0-1-g0d3483b with ../../../gen-typescript generator. DO NOT EDIT.
//
// webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server/server.gen.ts

export const WebrpcHeader = "Webrpc"

export const WebrpcHeaderValue = "webrpc@v0.22.0;gen-typescript@unknown;node-ts@v1.0.0"
export const WebrpcHeaderValue = "webrpc@v0.23.0-1-g0d3483b;gen-typescript@unknown;node-ts@v1.0.0"

// WebRPC description and code-gen version
export const WebRPCVersion = "v1"
Expand Down Expand Up @@ -53,16 +53,16 @@ function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
};
}

const [_, webrpcGenVersion] = versions[0].split("@");
const [codeGenName, codeGenVersion] = versions[1].split("@");
const [schemaName, schemaVersion] = versions[2].split("@");
const [_, webrpcGenVersion] = versions[0]!.split("@");
const [codeGenName, codeGenVersion] = versions[1]!.split("@");
const [schemaName, schemaVersion] = versions[2]!.split("@");

return {
webrpcGenVersion,
codeGenName,
codeGenVersion,
schemaName,
schemaVersion,
webrpcGenVersion: webrpcGenVersion ?? "",
codeGenName: codeGenName ?? "",
codeGenVersion: codeGenVersion ?? "",
schemaName: schemaName ?? "",
schemaVersion: schemaVersion ?? "",
};
}

Expand Down
20 changes: 10 additions & 10 deletions _examples/node-ts/webapp/client.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable */
// node-ts v1.0.0 f5566a7aae2c4d2f76cc64d8e55f9ac841447e43
// --
// Code generated by webrpc-gen@v0.22.0 with ../../../gen-typescript generator. DO NOT EDIT.
// Code generated by webrpc-gen@v0.23.0-1-g0d3483b with ../../../gen-typescript generator. DO NOT EDIT.
//
// webrpc-gen -schema=service.ridl -target=../../../gen-typescript -client -out=./webapp/client.gen.ts

export const WebrpcHeader = "Webrpc"

export const WebrpcHeaderValue = "webrpc@v0.22.0;gen-typescript@unknown;node-ts@v1.0.0"
export const WebrpcHeaderValue = "webrpc@v0.23.0-1-g0d3483b;gen-typescript@unknown;node-ts@v1.0.0"

// WebRPC description and code-gen version
export const WebRPCVersion = "v1"
Expand Down Expand Up @@ -53,16 +53,16 @@ function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
};
}

const [_, webrpcGenVersion] = versions[0].split("@");
const [codeGenName, codeGenVersion] = versions[1].split("@");
const [schemaName, schemaVersion] = versions[2].split("@");
const [_, webrpcGenVersion] = versions[0]!.split("@");
const [codeGenName, codeGenVersion] = versions[1]!.split("@");
const [schemaName, schemaVersion] = versions[2]!.split("@");

return {
webrpcGenVersion,
codeGenName,
codeGenVersion,
schemaName,
schemaVersion,
webrpcGenVersion: webrpcGenVersion ?? "",
codeGenName: codeGenName ?? "",
codeGenVersion: codeGenVersion ?? "",
schemaName: schemaName ?? "",
schemaVersion: schemaVersion ?? "",
};
}

Expand Down
20 changes: 10 additions & 10 deletions _examples/sse/webapp/client.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable */
// webrpc-sse-chat v1.0.0 a799dc63b082644f5d003c8881424546aee23a2c
// --
// Code generated by webrpc-gen@v0.22.0 with ../../ generator. DO NOT EDIT.
// Code generated by webrpc-gen@v0.23.0-1-g0d3483b with ../../ generator. DO NOT EDIT.
//
// webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts

export const WebrpcHeader = "Webrpc"

export const WebrpcHeaderValue = "webrpc@v0.22.0;@unknown;webrpc-sse-chat@v1.0.0"
export const WebrpcHeaderValue = "webrpc@v0.23.0-1-g0d3483b;@unknown;webrpc-sse-chat@v1.0.0"

// WebRPC description and code-gen version
export const WebRPCVersion = "v1"
Expand Down Expand Up @@ -53,16 +53,16 @@ function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
};
}

const [_, webrpcGenVersion] = versions[0].split("@");
const [codeGenName, codeGenVersion] = versions[1].split("@");
const [schemaName, schemaVersion] = versions[2].split("@");
const [_, webrpcGenVersion] = versions[0]!.split("@");
const [codeGenName, codeGenVersion] = versions[1]!.split("@");
const [schemaName, schemaVersion] = versions[2]!.split("@");

return {
webrpcGenVersion,
codeGenName,
codeGenVersion,
schemaName,
schemaVersion,
webrpcGenVersion: webrpcGenVersion ?? "",
codeGenName: codeGenName ?? "",
codeGenVersion: codeGenVersion ?? "",
schemaName: schemaName ?? "",
schemaVersion: schemaVersion ?? "",
};
}

Expand Down
16 changes: 8 additions & 8 deletions main.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@ function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
};
}

const [_, webrpcGenVersion] = versions[0].split("@");
const [codeGenName, codeGenVersion] = versions[1].split("@");
const [schemaName, schemaVersion] = versions[2].split("@");
const [_, webrpcGenVersion] = versions[0]!.split("@");
const [codeGenName, codeGenVersion] = versions[1]!.split("@");
const [schemaName, schemaVersion] = versions[2]!.split("@");

return {
webrpcGenVersion,
codeGenName,
codeGenVersion,
schemaName,
schemaVersion,
webrpcGenVersion: webrpcGenVersion ?? "",
codeGenName: codeGenName ?? "",
codeGenVersion: codeGenVersion ?? "",
schemaName: schemaName ?? "",
schemaVersion: schemaVersion ?? "",
};
}

Expand Down