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(grpc): don't emit gRPC clients for libraries #474

Merged
merged 2 commits into from
Apr 4, 2024
Merged

fix(grpc): don't emit gRPC clients for libraries #474

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
bf06ec9
fix(grpc): don't emit gRPC clients for libraries
malept Apr 2, 2024
ab4c5e5
chore: remove special scripts/.tool-versions
malept Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions scripts/.tool-versions
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions templates/api/clients/node/src/client-helpers.spec.ts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{{- $_ := stencil.ApplyTemplate "skipGrpcClient" "node" -}}
{{- if not (stencil.Arg "service") }}
{{- $_ := file.Skip "No client generated for libraries" }}
{{- end }}
describe('{{ .Config.Name }} client', () => {
it('asserts true # please fill this test in with your own', () => {
expect(true).toBeTruthy();
Expand Down
3 changes: 3 additions & 0 deletions templates/api/clients/node/src/client-helpers.ts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{{- $_ := stencil.ApplyTemplate "skipGrpcClient" "node" -}}
{{- if not (stencil.Arg "service") }}
{{- $_ := file.Skip "No client generated for libraries" }}
{{- end }}
import * as grpc from '@grpc/grpc-js';
import { {{ stencil.ApplyTemplate "serviceNameLanguageSafe" }}Client } from './grpc/{{ .Config.Name }}_grpc_pb';
import { createErrorLoggerInterceptor } from '@getoutreach/grpc-client';
Expand Down
2 changes: 2 additions & 0 deletions templates/api/clients/node/src/index.ts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{{- $_ := stencil.ApplyTemplate "skipGrpcClient" "node" -}}
{{- if stencil.Arg "service" }}
export * as {{ stencil.ApplyTemplate "serviceNameLanguageSafe" }}Types from './grpc/{{ .Config.Name }}_pb';
export * from './client-helpers';

import { {{ stencil.ApplyTemplate "serviceNameLanguageSafe" }}Client } from './grpc/{{ .Config.Name }}_grpc_pb';
export default {{ stencil.ApplyTemplate "serviceNameLanguageSafe" }}Client;
{{- end }}
7 changes: 3 additions & 4 deletions templates/api/clients/ruby/lib/client.rb.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# {{ stencil.ApplyTemplate "copyright" }}
{{- if not (has "grpc" (stencil.Arg "serviceActivities")) }}
{{ file.Skip "Not a gRPC service" }}
{{- end }}
# {{ stencil.ApplyTemplate "copyright" }}
{{- $_ := file.SetPath (printf "api/clients/ruby/lib/%s_client.rb" .Config.Name) }}
{{- $_ := stencil.ApplyTemplate "skipGrpcClient" "ruby" }}

require "{{ .Config.Name }}_client/client"
require "{{ .Config.Name }}_client/version"
{{- if stencil.Arg "service" }}
require "{{ .Config.Name }}_client/{{ .Config.Name }}_pb"
require "{{ .Config.Name }}_client/{{ .Config.Name }}_services_pb"
{{- end }}
6 changes: 5 additions & 1 deletion templates/api/clients/ruby/lib/client/client.rb.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# {{ stencil.ApplyTemplate "copyright" }}
# {{ stencil.ApplyTemplate "copyright" }}
{{- $_ := stencil.ApplyTemplate "skipGrpcClient" "ruby" -}}
{{- $_ := file.SetPath (printf "api/clients/ruby/lib/%s_client/%s" .Config.Name (base file.Path)) }}

{{- if stencil.Arg "service" }}
require "{{ .Config.Name }}_client/{{ .Config.Name }}_pb"
require "{{ .Config.Name }}_client/{{ .Config.Name }}_services_pb"
{{- end }}

## <<Stencil::Block(rubyModuleGlobalSpaceInclusions)>>
{{ file.Block "rubyModuleGlobalSpaceInclusions" }}
## <</Stencil::Block>>

{{- if stencil.Arg "service" }}
module {{ title .Config.Name }}Client
class Client < {{ title .Config.Name }}::Stub
class Interceptor < GRPC::ClientInterceptor
Expand Down Expand Up @@ -69,3 +72,4 @@ module {{ title .Config.Name }}Client
{{ file.Block "rubyModuleExtensions" }}
## <</Stencil::Block>>
end
{{- end }}