@rsdk/grpc.clients 2.1.0 → 2.3.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.3.0](https://github.com/R-Vision/rsdk/compare/v2.2.1...v2.3.0) (2023-06-08)
+
+### Features
+
+* added option define for one server and update docs ([970e1f3](https://github.com/R-Vision/rsdk/commit/970e1f3104c45bf6c1102c32afc1750e2f7e299b))
+
 # [2.1.0](https://github.com/R-Vision/rsdk/compare/v2.0.0...v2.1.0) (2023-06-06)
 
 ### Features

package/dist/servers/grpc.servers.d.ts

@@ -1,5 +1,6 @@
-import type { GrpcServerDeclaration, GrpcServerDefinition, GrpcServerMap } from './types';
+import type { GrpcServerDeclaration, GrpcServerDefinition, GrpcServerMap, GrpcServiceDeclaration, GrpcServiceMap } from './types';
 export declare class GrpcServers {
-    static define<TKeyDeclaration extends GrpcServerDeclaration>(declaration: TKeyDeclaration): GrpcServerMap<TKeyDeclaration>;
+    static define<TGrpcServerDeclaration extends GrpcServerDeclaration>(declaration: TGrpcServerDeclaration): GrpcServerMap<TGrpcServerDeclaration>;
+    static defineForServer<TServerName extends string, TGrpcServiceDeclaration extends GrpcServiceDeclaration>(serverName: TServerName, declaration: TGrpcServiceDeclaration): GrpcServiceMap<TServerName, TGrpcServiceDeclaration>;
     static extractDefinition<TKeyDeclaration extends GrpcServerDeclaration, TKeyMap extends GrpcServerMap<TKeyDeclaration> = GrpcServerMap<TKeyDeclaration>>(keyMap: TKeyMap): GrpcServerDefinition[];
 }

package/dist/servers/grpc.servers.js

@@ -3,20 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcServers = void 0;
 class GrpcServers {
     static define(declaration) {
-        const map1 = Object.entries(declaration).map(([serverName, serviceMap]) => {
-            const map = Object.entries(serviceMap).map(([serviceName, definition]) => {
-                return [
+        const serverMapping = Object.entries(declaration).map(([serverName, serviceMap]) => {
+            return [
+                serverName,
+                GrpcServers.defineForServer(serverName, serviceMap),
+            ];
+        });
+        return Object.fromEntries(serverMapping);
+    }
+    static defineForServer(serverName, declaration) {
+        const serviceMapping = Object.entries(declaration).map(([serviceName, definition]) => {
+            return [
+                serviceName,
+                {
+                    serverName,
                     serviceName,
-                    {
-                        serverName,
-                        serviceName,
-                        definition,
-                    },
-                ];
-            });
-            return [serverName, Object.fromEntries(map)];
+                    definition,
+                },
+            ];
         });
-        return Object.fromEntries(map1);
+        return Object.fromEntries(serviceMapping);
     }
     static extractDefinition(keyMap) {
         const definitions = [];

package/dist/servers/grpc.servers.js.map

@@ -1 +1 @@
-{"version":3,"file":"grpc.servers.js","sourceRoot":"","sources":["../../src/servers/grpc.servers.ts"],"names":[],"mappings":";;;AAMA,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,CACX,WAA4B;QAE5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE;YACxE,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CACxC,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,EAAE;gBAC5B,OAAO;oBACL,WAAW;oBACX;wBACE,UAAU;wBACV,WAAW;wBACX,UAAU;qBACX;iBACF,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,iBAAiB,CAGtB,MAAe;QACf,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC7C,WAAW,CAAC,IAAI,CAAC,KAA6B,CAAC,CAAC;aACjD;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AArCD,kCAqCC"}
+{"version":3,"file":"grpc.servers.js","sourceRoot":"","sources":["../../src/servers/grpc.servers.ts"],"names":[],"mappings":";;;AAQA,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,CACX,WAAmC;QAEnC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CACnD,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE;YAC3B,OAAO;gBACL,UAAU;gBACV,WAAW,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC;aACpD,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,eAAe,CAIpB,UAAuB,EACvB,WAAoC;QAEpC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CACpD,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,EAAE;YAC5B,OAAO;gBACL,WAAW;gBACX;oBACE,UAAU;oBACV,WAAW;oBACX,UAAU;iBACX;aACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,iBAAiB,CAGtB,MAAe;QACf,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC7C,WAAW,CAAC,IAAI,CAAC,KAA6B,CAAC,CAAC;aACjD;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AApDD,kCAoDC"}

package/dist/servers/types.d.ts

@@ -1,19 +1,21 @@
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 import type { Opaque } from 'type-fest';
+export type GrpcServiceDeclaration = {
+    [serviceName: string]: CompatServiceDefinition;
+};
 export interface GrpcServerDeclaration {
-    [serverName: string]: {
-        [serviceName: string]: CompatServiceDefinition;
-    };
+    [serverName: string]: GrpcServiceDeclaration;
 }
 export type GrpcServerDeclarationValue<TServerName extends string, TServiceName extends string, TServiceDefinition extends CompatServiceDefinition> = Opaque<{
     serverName: TServerName;
     serviceName: TServiceName;
     definition: TServiceDefinition;
 }>;
+export type GrpcServiceMap<serverName extends string, T extends GrpcServiceDeclaration> = {
+    [serviceName in keyof T]: serverName extends string ? serviceName extends string ? GrpcServerDeclarationValue<serverName, serviceName, T[serviceName]> : never : never;
+};
 export type GrpcServerMap<T extends GrpcServerDeclaration> = {
-    [serverName in keyof T]: {
-        [serviceName in keyof T[serverName]]: serverName extends string ? serviceName extends string ? GrpcServerDeclarationValue<serverName, serviceName, T[serverName][serviceName]> : never : never;
-    };
+    [serverName in keyof T]: serverName extends string ? GrpcServiceMap<serverName, T[serverName]> : never;
 };
 export type GrpcServerDefinition = {
     serviceName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/grpc.clients",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Grpc clients infrastructure",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -24,5 +24,5 @@
     "nice-grpc-opentelemetry": "^0.1.2",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "b98d43696f973cf6e21c6299bdddae9b1d8b8d4d"
+  "gitHead": "0c41ea55a21400e586c0793a6aca57a0360f5857"
 }

package/src/servers/grpc.servers.ts

@@ -2,30 +2,47 @@ import type {
   GrpcServerDeclaration,
   GrpcServerDefinition,
   GrpcServerMap,
+  GrpcServiceDeclaration,
+  GrpcServiceMap,
 } from './types';
 
 export class GrpcServers {
-  static define<TKeyDeclaration extends GrpcServerDeclaration>(
-    declaration: TKeyDeclaration,
-  ): GrpcServerMap<TKeyDeclaration> {
-    const map1 = Object.entries(declaration).map(([serverName, serviceMap]) => {
-      const map = Object.entries(serviceMap).map(
-        ([serviceName, definition]) => {
-          return [
-            serviceName,
-            {
-              serverName,
-              serviceName,
-              definition,
-            },
-          ];
-        },
-      );
+  static define<TGrpcServerDeclaration extends GrpcServerDeclaration>(
+    declaration: TGrpcServerDeclaration,
+  ): GrpcServerMap<TGrpcServerDeclaration> {
+    const serverMapping = Object.entries(declaration).map(
+      ([serverName, serviceMap]) => {
+        return [
+          serverName,
+          GrpcServers.defineForServer(serverName, serviceMap),
+        ];
+      },
+    );
+
+    return Object.fromEntries(serverMapping);
+  }
 
-      return [serverName, Object.fromEntries(map)];
-    });
+  static defineForServer<
+    TServerName extends string,
+    TGrpcServiceDeclaration extends GrpcServiceDeclaration,
+  >(
+    serverName: TServerName,
+    declaration: TGrpcServiceDeclaration,
+  ): GrpcServiceMap<TServerName, TGrpcServiceDeclaration> {
+    const serviceMapping = Object.entries(declaration).map(
+      ([serviceName, definition]) => {
+        return [
+          serviceName,
+          {
+            serverName,
+            serviceName,
+            definition,
+          },
+        ];
+      },
+    );
 
-    return Object.fromEntries(map1);
+    return Object.fromEntries(serviceMapping);
   }
 
   static extractDefinition<

package/src/servers/types.ts

@@ -1,10 +1,12 @@
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
 import type { Opaque } from 'type-fest';
 
+export type GrpcServiceDeclaration = {
+  [serviceName: string]: CompatServiceDefinition;
+};
+
 export interface GrpcServerDeclaration {
-  [serverName: string]: {
-    [serviceName: string]: CompatServiceDefinition;
-  };
+  [serverName: string]: GrpcServiceDeclaration;
 }
 
 export type GrpcServerDeclarationValue<
@@ -17,18 +19,21 @@ export type GrpcServerDeclarationValue<
   definition: TServiceDefinition;
 }>;
 
+export type GrpcServiceMap<
+  serverName extends string,
+  T extends GrpcServiceDeclaration,
+> = {
+  [serviceName in keyof T]: serverName extends string
+    ? serviceName extends string
+      ? GrpcServerDeclarationValue<serverName, serviceName, T[serviceName]>
+      : never
+    : never;
+};
+
 export type GrpcServerMap<T extends GrpcServerDeclaration> = {
-  [serverName in keyof T]: {
-    [serviceName in keyof T[serverName]]: serverName extends string
-      ? serviceName extends string
-        ? GrpcServerDeclarationValue<
-            serverName,
-            serviceName,
-            T[serverName][serviceName]
-          >
-        : never
-      : never;
-  };
+  [serverName in keyof T]: serverName extends string
+    ? GrpcServiceMap<serverName, T[serverName]>
+    : never;
 };
 export type GrpcServerDefinition = {
   serviceName: string;