#56 refactor chat system files

timostamm · Dec 22, 2020 · aa4540e · aa4540e
1 parent 7a458dd
commit aa4540e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/packages/example-chat-system/Makefile b/packages/example-chat-system/Makefile
@@ -4,9 +4,9 @@
 default: generate run-server
 
 generate:
-	npx protoc -I . --ts_out . --ts_opt server_generic,client_call,optimize_code_size service-chat.proto
+	npx protoc -I protos --ts_out protos --ts_opt server_generic,client_call,optimize_code_size protos/service-chat.proto
 	# TODO just here for UnhandledPromiseRejectionWarning
-	npx protoc -I . --ts_out . --ts_opt server_grpc,optimize_code_size service-chat.proto
+	npx protoc -I protos --ts_out protos --ts_opt server_grpc,optimize_code_size protos/service-chat.proto
 
 run-server:
 	npx ts-node server.ts

diff --git a/packages/example-chat-system/client-alt.ts b/packages/example-chat-system/client-alt.ts
@@ -1,6 +1,6 @@
 import {ChannelCredentials} from "@grpc/grpc-js";
 import {GrpcTransport} from "@protobuf-ts/grpc-transport";
-import {ChatServiceClient} from "./service-chat.client";
+import {ChatServiceClient} from "./protos/service-chat.client";
 import AbortController from "abort-controller";
 
 

diff --git a/packages/example-chat-system/client.ts b/packages/example-chat-system/client.ts
@@ -1,6 +1,6 @@
 import {ChannelCredentials} from "@grpc/grpc-js";
 import {GrpcTransport} from "@protobuf-ts/grpc-transport";
-import {ChatServiceClient, IChatServiceClient} from "./service-chat.client";
+import {ChatServiceClient, IChatServiceClient} from "./protos/service-chat.client";
 import {TerminalIO} from "./terminal-io";
 
 

diff --git a/...xample-chat-system/service-chat.client.ts → ...chat-system/protos/service-chat.client.ts b/...xample-chat-system/service-chat.client.ts → ...chat-system/protos/service-chat.client.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.0.0-alpha.9 with parameters server_grpc,optimize_code_size
+// @generated by protobuf-ts 2.0.0-alpha.10 with parameters server_grpc,optimize_code_size
 // @generated from protobuf file "service-chat.proto" (package "spec", syntax proto3)
 // tslint:disable
 import { RpcTransport } from "@protobuf-ts/runtime-rpc";

diff --git a/...e-chat-system/service-chat.grpc-server.ts → ...system/protos/service-chat.grpc-server.ts b/...e-chat-system/service-chat.grpc-server.ts → ...system/protos/service-chat.grpc-server.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.0.0-alpha.9 with parameters server_grpc,optimize_code_size
+// @generated by protobuf-ts 2.0.0-alpha.10 with parameters server_grpc,optimize_code_size
 // @generated from protobuf file "service-chat.proto" (package "spec", syntax proto3)
 // tslint:disable
 import { PostResponse } from "./service-chat";

diff --git a/...es/example-chat-system/service-chat.proto → ...ple-chat-system/protos/service-chat.proto b/...es/example-chat-system/service-chat.proto → ...ple-chat-system/protos/service-chat.proto
diff --git a/...xample-chat-system/service-chat.server.ts → ...chat-system/protos/service-chat.server.ts b/...xample-chat-system/service-chat.server.ts → ...chat-system/protos/service-chat.server.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.0.0-alpha.9 with parameters server_generic,client_call,optimize_code_size
+// @generated by protobuf-ts 2.0.0-alpha.10 with parameters server_generic,client_call,optimize_code_size
 // @generated from protobuf file "service-chat.proto" (package "spec", syntax proto3)
 // tslint:disable
 import { PostResponse } from "./service-chat";

diff --git a/packages/example-chat-system/service-chat.ts → ...xample-chat-system/protos/service-chat.ts b/packages/example-chat-system/service-chat.ts → ...xample-chat-system/protos/service-chat.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.0.0-alpha.9 with parameters server_grpc,optimize_code_size
+// @generated by protobuf-ts 2.0.0-alpha.10 with parameters server_grpc,optimize_code_size
 // @generated from protobuf file "service-chat.proto" (package "spec", syntax proto3)
 // tslint:disable
 import { ServiceType } from "@protobuf-ts/runtime-rpc";

diff --git a/packages/example-chat-system/server-alt.ts b/packages/example-chat-system/server-alt.ts
@@ -1,6 +1,6 @@
 import * as grpc from '@grpc/grpc-js';
-import {ChatEvent, JoinRequest, PostRequest, PostResponse} from "./service-chat";
-import {chatServiceDefinition, IChatService} from "./service-chat.grpc-server";
+import {ChatEvent, JoinRequest, PostRequest, PostResponse} from "./protos/service-chat";
+import {chatServiceDefinition, IChatService} from "./protos/service-chat.grpc-server";
 
 
 // TODO UnhandledPromiseRejectionWarning - see client-alt.ts

diff --git a/packages/example-chat-system/server.ts b/packages/example-chat-system/server.ts
@@ -1,8 +1,8 @@
 import * as grpc from '@grpc/grpc-js';
 import {RpcError, RpcInputStream, ServerCallContext} from "@protobuf-ts/runtime-rpc";
 import {adaptService} from "@protobuf-ts/grpc-backend";
-import {IChatService} from "./service-chat.server";
-import {ChatEvent, ChatService as ChatServiceType, JoinRequest, PostRequest, PostResponse} from "./service-chat";
+import {IChatService} from "./protos/service-chat.server";
+import {ChatEvent, ChatService as ChatServiceType, JoinRequest, PostRequest, PostResponse} from "./protos/service-chat";
 
 
 class ChatService implements IChatService {