From 6a7503262efff6b24cfa0987453d063ed215837d Mon Sep 17 00:00:00 2001 From: Henning Perl Date: Tue, 27 Feb 2024 17:29:30 +0100 Subject: [PATCH] fix: make ts declarations depend on grpc-js (#1513) --- buf.gen.yaml | 2 +- .../opl/v1alpha1/syntax_service_grpc_pb.d.ts | 41 ------------------- .../v1alpha2/check_service_grpc_pb.d.ts | 6 +-- .../v1alpha2/expand_service_grpc_pb.d.ts | 6 +-- .../v1alpha2/namespaces_service_grpc_pb.d.ts | 6 +-- .../v1alpha2/read_service_grpc_pb.d.ts | 6 +-- .../v1alpha2/version_grpc_pb.d.ts | 6 +-- .../v1alpha2/write_service_grpc_pb.d.ts | 6 +-- 8 files changed, 19 insertions(+), 60 deletions(-) delete mode 100644 proto/ory/keto/opl/v1alpha1/syntax_service_grpc_pb.d.ts diff --git a/buf.gen.yaml b/buf.gen.yaml index b6ef22cdb..2000c2b3c 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -19,7 +19,7 @@ plugins: - name: ts out: proto - opt: ts_out=proto + opt: grpc_js path: node_modules/.bin/protoc-gen-ts - name: doc diff --git a/proto/ory/keto/opl/v1alpha1/syntax_service_grpc_pb.d.ts b/proto/ory/keto/opl/v1alpha1/syntax_service_grpc_pb.d.ts deleted file mode 100644 index f08c2a90a..000000000 --- a/proto/ory/keto/opl/v1alpha1/syntax_service_grpc_pb.d.ts +++ /dev/null @@ -1,41 +0,0 @@ -// package: ory.keto.opl.v1alpha1 -// file: ory/keto/opl/v1alpha1/syntax_service.proto - -/* tslint:disable */ -/* eslint-disable */ - -import * as grpc from "grpc"; -import * as ory_keto_opl_v1alpha1_syntax_service_pb from "../../../../ory/keto/opl/v1alpha1/syntax_service_pb"; - -interface ISyntaxServiceService extends grpc.ServiceDefinition { - check: ISyntaxServiceService_ICheck; -} - -interface ISyntaxServiceService_ICheck extends grpc.MethodDefinition { - path: "/ory.keto.opl.v1alpha1.SyntaxService/Check"; - requestStream: false; - responseStream: false; - requestSerialize: grpc.serialize; - requestDeserialize: grpc.deserialize; - responseSerialize: grpc.serialize; - responseDeserialize: grpc.deserialize; -} - -export const SyntaxServiceService: ISyntaxServiceService; - -export interface ISyntaxServiceServer { - check: grpc.handleUnaryCall; -} - -export interface ISyntaxServiceClient { - check(request: ory_keto_opl_v1alpha1_syntax_service_pb.CheckRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_opl_v1alpha1_syntax_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; - check(request: ory_keto_opl_v1alpha1_syntax_service_pb.CheckRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_opl_v1alpha1_syntax_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; - check(request: ory_keto_opl_v1alpha1_syntax_service_pb.CheckRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_opl_v1alpha1_syntax_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; -} - -export class SyntaxServiceClient extends grpc.Client implements ISyntaxServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); - public check(request: ory_keto_opl_v1alpha1_syntax_service_pb.CheckRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_opl_v1alpha1_syntax_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; - public check(request: ory_keto_opl_v1alpha1_syntax_service_pb.CheckRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_opl_v1alpha1_syntax_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; - public check(request: ory_keto_opl_v1alpha1_syntax_service_pb.CheckRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_opl_v1alpha1_syntax_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; -} diff --git a/proto/ory/keto/relation_tuples/v1alpha2/check_service_grpc_pb.d.ts b/proto/ory/keto/relation_tuples/v1alpha2/check_service_grpc_pb.d.ts index 2cd99f6ba..c083ad858 100644 --- a/proto/ory/keto/relation_tuples/v1alpha2/check_service_grpc_pb.d.ts +++ b/proto/ory/keto/relation_tuples/v1alpha2/check_service_grpc_pb.d.ts @@ -4,7 +4,7 @@ /* tslint:disable */ /* eslint-disable */ -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import * as ory_keto_relation_tuples_v1alpha2_check_service_pb from "../../../../ory/keto/relation_tuples/v1alpha2/check_service_pb"; import * as ory_keto_relation_tuples_v1alpha2_relation_tuples_pb from "../../../../ory/keto/relation_tuples/v1alpha2/relation_tuples_pb"; @@ -24,7 +24,7 @@ interface ICheckServiceService_ICheck extends grpc.MethodDefinition; } @@ -35,7 +35,7 @@ export interface ICheckServiceClient { } export class CheckServiceClient extends grpc.Client implements ICheckServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); public check(request: ory_keto_relation_tuples_v1alpha2_check_service_pb.CheckRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_check_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; public check(request: ory_keto_relation_tuples_v1alpha2_check_service_pb.CheckRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_check_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; public check(request: ory_keto_relation_tuples_v1alpha2_check_service_pb.CheckRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_check_service_pb.CheckResponse) => void): grpc.ClientUnaryCall; diff --git a/proto/ory/keto/relation_tuples/v1alpha2/expand_service_grpc_pb.d.ts b/proto/ory/keto/relation_tuples/v1alpha2/expand_service_grpc_pb.d.ts index 456049012..b54e91025 100644 --- a/proto/ory/keto/relation_tuples/v1alpha2/expand_service_grpc_pb.d.ts +++ b/proto/ory/keto/relation_tuples/v1alpha2/expand_service_grpc_pb.d.ts @@ -4,7 +4,7 @@ /* tslint:disable */ /* eslint-disable */ -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import * as ory_keto_relation_tuples_v1alpha2_expand_service_pb from "../../../../ory/keto/relation_tuples/v1alpha2/expand_service_pb"; import * as ory_keto_relation_tuples_v1alpha2_relation_tuples_pb from "../../../../ory/keto/relation_tuples/v1alpha2/relation_tuples_pb"; @@ -24,7 +24,7 @@ interface IExpandServiceService_IExpand extends grpc.MethodDefinition; } @@ -35,7 +35,7 @@ export interface IExpandServiceClient { } export class ExpandServiceClient extends grpc.Client implements IExpandServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); public expand(request: ory_keto_relation_tuples_v1alpha2_expand_service_pb.ExpandRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_expand_service_pb.ExpandResponse) => void): grpc.ClientUnaryCall; public expand(request: ory_keto_relation_tuples_v1alpha2_expand_service_pb.ExpandRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_expand_service_pb.ExpandResponse) => void): grpc.ClientUnaryCall; public expand(request: ory_keto_relation_tuples_v1alpha2_expand_service_pb.ExpandRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_expand_service_pb.ExpandResponse) => void): grpc.ClientUnaryCall; diff --git a/proto/ory/keto/relation_tuples/v1alpha2/namespaces_service_grpc_pb.d.ts b/proto/ory/keto/relation_tuples/v1alpha2/namespaces_service_grpc_pb.d.ts index 8573542bf..c0fe725c5 100644 --- a/proto/ory/keto/relation_tuples/v1alpha2/namespaces_service_grpc_pb.d.ts +++ b/proto/ory/keto/relation_tuples/v1alpha2/namespaces_service_grpc_pb.d.ts @@ -4,7 +4,7 @@ /* tslint:disable */ /* eslint-disable */ -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import * as ory_keto_relation_tuples_v1alpha2_namespaces_service_pb from "../../../../ory/keto/relation_tuples/v1alpha2/namespaces_service_pb"; interface INamespacesServiceService extends grpc.ServiceDefinition { @@ -23,7 +23,7 @@ interface INamespacesServiceService_IListNamespaces extends grpc.MethodDefinitio export const NamespacesServiceService: INamespacesServiceService; -export interface INamespacesServiceServer { +export interface INamespacesServiceServer extends grpc.UntypedServiceImplementation { listNamespaces: grpc.handleUnaryCall; } @@ -34,7 +34,7 @@ export interface INamespacesServiceClient { } export class NamespacesServiceClient extends grpc.Client implements INamespacesServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); public listNamespaces(request: ory_keto_relation_tuples_v1alpha2_namespaces_service_pb.ListNamespacesRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_namespaces_service_pb.ListNamespacesResponse) => void): grpc.ClientUnaryCall; public listNamespaces(request: ory_keto_relation_tuples_v1alpha2_namespaces_service_pb.ListNamespacesRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_namespaces_service_pb.ListNamespacesResponse) => void): grpc.ClientUnaryCall; public listNamespaces(request: ory_keto_relation_tuples_v1alpha2_namespaces_service_pb.ListNamespacesRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_namespaces_service_pb.ListNamespacesResponse) => void): grpc.ClientUnaryCall; diff --git a/proto/ory/keto/relation_tuples/v1alpha2/read_service_grpc_pb.d.ts b/proto/ory/keto/relation_tuples/v1alpha2/read_service_grpc_pb.d.ts index 4622b75af..a68ec365e 100644 --- a/proto/ory/keto/relation_tuples/v1alpha2/read_service_grpc_pb.d.ts +++ b/proto/ory/keto/relation_tuples/v1alpha2/read_service_grpc_pb.d.ts @@ -4,7 +4,7 @@ /* tslint:disable */ /* eslint-disable */ -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import * as ory_keto_relation_tuples_v1alpha2_read_service_pb from "../../../../ory/keto/relation_tuples/v1alpha2/read_service_pb"; import * as ory_keto_relation_tuples_v1alpha2_relation_tuples_pb from "../../../../ory/keto/relation_tuples/v1alpha2/relation_tuples_pb"; import * as google_protobuf_field_mask_pb from "google-protobuf/google/protobuf/field_mask_pb"; @@ -25,7 +25,7 @@ interface IReadServiceService_IListRelationTuples extends grpc.MethodDefinition< export const ReadServiceService: IReadServiceService; -export interface IReadServiceServer { +export interface IReadServiceServer extends grpc.UntypedServiceImplementation { listRelationTuples: grpc.handleUnaryCall; } @@ -36,7 +36,7 @@ export interface IReadServiceClient { } export class ReadServiceClient extends grpc.Client implements IReadServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); public listRelationTuples(request: ory_keto_relation_tuples_v1alpha2_read_service_pb.ListRelationTuplesRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_read_service_pb.ListRelationTuplesResponse) => void): grpc.ClientUnaryCall; public listRelationTuples(request: ory_keto_relation_tuples_v1alpha2_read_service_pb.ListRelationTuplesRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_read_service_pb.ListRelationTuplesResponse) => void): grpc.ClientUnaryCall; public listRelationTuples(request: ory_keto_relation_tuples_v1alpha2_read_service_pb.ListRelationTuplesRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_read_service_pb.ListRelationTuplesResponse) => void): grpc.ClientUnaryCall; diff --git a/proto/ory/keto/relation_tuples/v1alpha2/version_grpc_pb.d.ts b/proto/ory/keto/relation_tuples/v1alpha2/version_grpc_pb.d.ts index e99b28cc7..59d8f73dd 100644 --- a/proto/ory/keto/relation_tuples/v1alpha2/version_grpc_pb.d.ts +++ b/proto/ory/keto/relation_tuples/v1alpha2/version_grpc_pb.d.ts @@ -4,7 +4,7 @@ /* tslint:disable */ /* eslint-disable */ -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import * as ory_keto_relation_tuples_v1alpha2_version_pb from "../../../../ory/keto/relation_tuples/v1alpha2/version_pb"; interface IVersionServiceService extends grpc.ServiceDefinition { @@ -23,7 +23,7 @@ interface IVersionServiceService_IGetVersion extends grpc.MethodDefinition; } @@ -34,7 +34,7 @@ export interface IVersionServiceClient { } export class VersionServiceClient extends grpc.Client implements IVersionServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); public getVersion(request: ory_keto_relation_tuples_v1alpha2_version_pb.GetVersionRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_version_pb.GetVersionResponse) => void): grpc.ClientUnaryCall; public getVersion(request: ory_keto_relation_tuples_v1alpha2_version_pb.GetVersionRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_version_pb.GetVersionResponse) => void): grpc.ClientUnaryCall; public getVersion(request: ory_keto_relation_tuples_v1alpha2_version_pb.GetVersionRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_version_pb.GetVersionResponse) => void): grpc.ClientUnaryCall; diff --git a/proto/ory/keto/relation_tuples/v1alpha2/write_service_grpc_pb.d.ts b/proto/ory/keto/relation_tuples/v1alpha2/write_service_grpc_pb.d.ts index 4e9f29615..2b06f3f83 100644 --- a/proto/ory/keto/relation_tuples/v1alpha2/write_service_grpc_pb.d.ts +++ b/proto/ory/keto/relation_tuples/v1alpha2/write_service_grpc_pb.d.ts @@ -4,7 +4,7 @@ /* tslint:disable */ /* eslint-disable */ -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import * as ory_keto_relation_tuples_v1alpha2_write_service_pb from "../../../../ory/keto/relation_tuples/v1alpha2/write_service_pb"; import * as ory_keto_relation_tuples_v1alpha2_relation_tuples_pb from "../../../../ory/keto/relation_tuples/v1alpha2/relation_tuples_pb"; @@ -34,7 +34,7 @@ interface IWriteServiceService_IDeleteRelationTuples extends grpc.MethodDefiniti export const WriteServiceService: IWriteServiceService; -export interface IWriteServiceServer { +export interface IWriteServiceServer extends grpc.UntypedServiceImplementation { transactRelationTuples: grpc.handleUnaryCall; deleteRelationTuples: grpc.handleUnaryCall; } @@ -49,7 +49,7 @@ export interface IWriteServiceClient { } export class WriteServiceClient extends grpc.Client implements IWriteServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); public transactRelationTuples(request: ory_keto_relation_tuples_v1alpha2_write_service_pb.TransactRelationTuplesRequest, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_write_service_pb.TransactRelationTuplesResponse) => void): grpc.ClientUnaryCall; public transactRelationTuples(request: ory_keto_relation_tuples_v1alpha2_write_service_pb.TransactRelationTuplesRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_write_service_pb.TransactRelationTuplesResponse) => void): grpc.ClientUnaryCall; public transactRelationTuples(request: ory_keto_relation_tuples_v1alpha2_write_service_pb.TransactRelationTuplesRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: ory_keto_relation_tuples_v1alpha2_write_service_pb.TransactRelationTuplesResponse) => void): grpc.ClientUnaryCall;