Skip to content
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

Jump to bottom

fix: proper handling of paging field name #174

Merged
merged 2 commits into from
Dec 17, 2019
Merged

fix: proper handling of paging field name #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75474a5
fix: proper handling of paging field name
alexander-fenster Dec 14, 2019
a4793b7
Merge branch 'master' into paging-field
alexander-fenster Dec 17, 2019
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 templates/typescript_gapic/src/$version/$service_client.ts.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export class {{ service.name }}Client {
{%- for method in service.paging %}
{{- pagingJoiner() }}
{{ method.name.toCamelCase() }}:
new gaxModule.PageDescriptor('pageToken', 'nextPageToken', '{{ method.pagingFieldName }}')
new gaxModule.PageDescriptor('pageToken', 'nextPageToken', '{{ method.pagingFieldName.toCamelCase() }}')
{%- endfor %}
};
{%- endif %}
Expand Down
2 changes: 1 addition & 1 deletion typescript/src/schema/proto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ function pagingField(messages: MessagesMap, method: MethodDescriptorProto) {

function pagingFieldName(messages: MessagesMap, method: MethodDescriptorProto) {
const field = pagingField(messages, method);
return field?.name?.toCamelCase();
return field?.name;
}

function pagingResponseType(
Expand Down