@or-sdk/discovery 1.3.4 → 1.4.0-beta.598.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [1.3.5](https://gitlab.com/onereach/platform/or-sdk-next/compare/@or-sdk/discovery@1.3.4...@or-sdk/discovery@1.3.5) (2022-08-30)
+
+
+### Bug Fixes
+
+* **discovery:** Fix getServiceUrls method ([3cf25d0](https://gitlab.com/onereach/platform/or-sdk-next/commit/3cf25d006399bac39fd0a2ee1d79dde607f66391))
+
+
+
 ### [1.3.4](https://gitlab.com/onereach/platform/or-sdk-next/compare/@or-sdk/discovery@1.3.3...@or-sdk/discovery@1.3.4) (2022-08-29)
 
 **Note:** Version bump only for package @or-sdk/discovery

package/dist/cjs/Discovery.js

@@ -50,15 +50,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Discovery = void 0;
 var base_1 = require("@or-sdk/base");
@@ -114,18 +105,24 @@ var Discovery = (function (_super) {
             });
         });
     };
-    Discovery.prototype.getServiceUrls = function (serviceNames) {
+    Discovery.prototype.getServiceUrls = function (serviceKeys, feature) {
         return __awaiter(this, void 0, void 0, function () {
-            var uniqNames, resArr;
-            var _this = this;
+            var services;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        uniqNames = __spreadArray([], new Set(serviceNames), true);
-                        return [4, Promise.all(uniqNames.map(function (serviceName) { return _this.getServiceUrl(serviceName); }))];
+                    case 0: return [4, this.callApi({
+                            method: 'GET',
+                            route: "".concat(this.route, "/services-by-keys"),
+                            params: {
+                                serviceKeys: serviceKeys,
+                                feature: feature,
+                            },
+                        })];
                     case 1:
-                        resArr = _a.sent();
-                        return [2, resArr];
+                        services = (_a.sent()).services;
+                        return [2, serviceKeys.map(function (key) {
+                                return services.find(function (service) { return service.serviceKey === key; }) || null;
+                            })];
                 }
             });
         });

package/dist/cjs/Discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"Discovery.js","sourceRoot":"","sources":["../../src/Discovery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAuF;AAIvF;IAA+B,6BAAI;IAGjC,mBAAY,EAAwC;YAAtC,KAAK,WAAA,EAAE,YAAY,kBAAA;QAAjC,YACE,kBAAM;YACJ,KAAK,EAAE,KAAM;YACb,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,EAAE;SACf,CAAC,SACH;QARgB,WAAK,GAAG,cAAO,cAAO,CAAE,CAAC;;IAQ1C,CAAC;IAQY,gCAAY,GAAzB,UAA0B,EAA2C;YAA3C,qBAAyC,EAAE,KAAA,EAAzC,IAAI,UAAA,EAAE,OAAO,aAAA;;;;;4BAClB,WAAM,IAAI,CAAC,OAAO,CAA2B;4BAChE,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,UAAG,IAAI,CAAC,KAAK,cAAW;4BAC/B,MAAM,EAAE;gCACN,IAAI,MAAA;gCACJ,OAAO,SAAA;6BACR;yBACF,CAAC,EAAA;;wBAPM,QAAQ,GAAK,CAAA,SAOnB,CAAA,SAPc;wBAShB,WAAO,IAAA,eAAQ,EAAC,QAAQ,CAAC,EAAC;;;;KAC3B;IAQY,iCAAa,GAA1B,UAA2B,WAAmB;;;;;4BAC5B,WAAM,IAAI,CAAC,OAAO,CAA2B;4BAC3D,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,MAAM,EAAE;gCACN,WAAW,aAAA;6BACZ;yBACF,CAAC,EAAA;;wBANM,GAAG,GAAK,CAAA,SAMd,CAAA,IANS;wBAQX,WAAO,GAAG,EAAC;;;;KACZ;IAQY,kCAAc,GAA3B,UAA4B,YAAsB;;;;;;;wBAC1C,SAAS,qBAAO,IAAI,GAAG,CAAC,YAAY,CAA6B,OAAC,CAAC;wBAC1D,WAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,UAAA,WAAW,IAAI,OAAA,KAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAA/B,CAA+B,CAAC,CAAC,EAAA;;wBAAzF,MAAM,GAAG,SAAgF;wBAE/F,WAAO,MAAM,EAAC;;;;KACf;IACH,gBAAC;AAAD,CAAC,AA5DD,CAA+B,WAAI,GA4DlC;AA5DY,8BAAS"}
+{"version":3,"file":"Discovery.js","sourceRoot":"","sources":["../../src/Discovery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAuF;AAGvF;IAA+B,6BAAI;IAGjC,mBAAY,EAAwC;YAAtC,KAAK,WAAA,EAAE,YAAY,kBAAA;QAAjC,YACE,kBAAM;YACJ,KAAK,EAAE,KAAM;YACb,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,EAAE;SACf,CAAC,SACH;QARgB,WAAK,GAAG,cAAO,cAAO,CAAE,CAAC;;IAQ1C,CAAC;IAQY,gCAAY,GAAzB,UAA0B,EAA2C;YAA3C,qBAAyC,EAAE,KAAA,EAAzC,IAAI,UAAA,EAAE,OAAO,aAAA;;;;;4BAClB,WAAM,IAAI,CAAC,OAAO,CAA2B;4BAChE,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,UAAG,IAAI,CAAC,KAAK,cAAW;4BAC/B,MAAM,EAAE;gCACN,IAAI,MAAA;gCACJ,OAAO,SAAA;6BACR;yBACF,CAAC,EAAA;;wBAPM,QAAQ,GAAK,CAAA,SAOnB,CAAA,SAPc;wBAShB,WAAO,IAAA,eAAQ,EAAC,QAAQ,CAAC,EAAC;;;;KAC3B;IAQY,iCAAa,GAA1B,UAA2B,WAAmB;;;;;4BAC5B,WAAM,IAAI,CAAC,OAAO,CAA2B;4BAC3D,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,MAAM,EAAE;gCACN,WAAW,aAAA;6BACZ;yBACF,CAAC,EAAA;;wBANM,GAAG,GAAK,CAAA,SAMd,CAAA,IANS;wBAQX,WAAO,GAAG,EAAC;;;;KACZ;IAQY,kCAAc,GAA3B,UAA4B,WAAqB,EAAE,OAAgB;;;;;4BAC5C,WAAM,IAAI,CAAC,OAAO,CAA2B;4BAChE,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,UAAG,IAAI,CAAC,KAAK,sBAAmB;4BACvC,MAAM,EAAE;gCACN,WAAW,aAAA;gCACX,OAAO,SAAA;6BACR;yBACF,CAAC,EAAA;;wBAPM,QAAQ,GAAK,CAAA,SAOnB,CAAA,SAPc;wBAShB,WAAO,WAAW,CAAC,GAAG,CAAC,UAAC,GAAG;gCACzB,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,UAAU,KAAK,GAAG,EAA1B,CAA0B,CAAC,IAAI,IAAI,CAAC;4BACtE,CAAC,CAAC,EAAC;;;;KACJ;IACH,gBAAC;AAAD,CAAC,AApED,CAA+B,WAAI,GAoElC;AApEY,8BAAS"}

package/dist/esm/Discovery.js

@@ -1,52 +1,45 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Base, makeList, VERSION } from '@or-sdk/base';
 export class Discovery extends Base {
+    route = `api/${VERSION}`;
     constructor({ token, discoveryUrl }) {
         super({
             token: token,
             serviceUrl: discoveryUrl,
             serviceKey: '',
         });
-        this.route = `api/${VERSION}`;
     }
-    listServices({ type, feature } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { services } = yield this.callApi({
-                method: 'GET',
-                route: `${this.route}/services`,
-                params: {
-                    type,
-                    feature,
-                },
-            });
-            return makeList(services);
+    async listServices({ type, feature } = {}) {
+        const { services } = await this.callApi({
+            method: 'GET',
+            route: `${this.route}/services`,
+            params: {
+                type,
+                feature,
+            },
         });
+        return makeList(services);
     }
-    getServiceUrl(serviceName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { url } = yield this.callApi({
-                method: 'GET',
-                route: this.route,
-                params: {
-                    serviceName,
-                },
-            });
-            return url;
+    async getServiceUrl(serviceName) {
+        const { url } = await this.callApi({
+            method: 'GET',
+            route: this.route,
+            params: {
+                serviceName,
+            },
         });
+        return url;
     }
-    getServiceUrls(serviceNames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const uniqNames = [...new Set(serviceNames)];
-            const resArr = yield Promise.all(uniqNames.map(serviceName => this.getServiceUrl(serviceName)));
-            return resArr;
+    async getServiceUrls(serviceKeys, feature) {
+        const { services } = await this.callApi({
+            method: 'GET',
+            route: `${this.route}/services-by-keys`,
+            params: {
+                serviceKeys,
+                feature,
+            },
+        });
+        return serviceKeys.map((key) => {
+            return services.find(service => service.serviceKey === key) || null;
         });
     }
 }

package/dist/esm/Discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"Discovery.js","sourceRoot":"","sources":["../../src/Discovery.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAQ,QAAQ,EAA4B,OAAO,EAAE,MAAM,cAAc,CAAC;AAIvF,MAAM,OAAO,SAAU,SAAQ,IAAI;IAGjC,YAAY,EAAE,KAAK,EAAE,YAAY,EAAmB;QAClD,KAAK,CAAC;YACJ,KAAK,EAAE,KAAM;YACb,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;QAPY,UAAK,GAAG,OAAO,OAAO,EAAE,CAAC;IAQ1C,CAAC;IAQY,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,KAA0B,EAAE;;YACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAA2B;gBAChE,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,WAAW;gBAC/B,MAAM,EAAE;oBACN,IAAI;oBACJ,OAAO;iBACR;aACF,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;KAAA;IAQY,aAAa,CAAC,WAAmB;;YAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAA2B;gBAC3D,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE;oBACN,WAAW;iBACZ;aACF,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAQY,cAAc,CAAC,YAAsB;;YAChD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAA6B,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAEhG,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;CACF"}
+{"version":3,"file":"Discovery.js","sourceRoot":"","sources":["../../src/Discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,QAAQ,EAA4B,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvF,MAAM,OAAO,SAAU,SAAQ,IAAI;IAChB,KAAK,GAAG,OAAO,OAAO,EAAE,CAAC;IAE1C,YAAY,EAAE,KAAK,EAAE,YAAY,EAAmB;QAClD,KAAK,CAAC;YACJ,KAAK,EAAE,KAAM;YACb,UAAU,EAAE,YAAY;YACxB,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;IACL,CAAC;IAQM,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,KAA0B,EAAE;QACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAA2B;YAChE,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,WAAW;YAC/B,MAAM,EAAE;gBACN,IAAI;gBACJ,OAAO;aACR;SACF,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAQM,KAAK,CAAC,aAAa,CAAC,WAAmB;QAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAA2B;YAC3D,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE;gBACN,WAAW;aACZ;SACF,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC;IAQM,KAAK,CAAC,cAAc,CAAC,WAAqB,EAAE,OAAgB;QACjE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAA2B;YAChE,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,mBAAmB;YACvC,MAAM,EAAE;gBACN,WAAW;gBACX,OAAO;aACR;SACF,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7B,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/types/Discovery.d.ts

@@ -5,6 +5,6 @@ export declare class Discovery extends Base {
     constructor({ token, discoveryUrl }: DiscoveryConfig);
     listServices({ type, feature }?: ListServicesPayload): Promise<List<Service>>;
     getServiceUrl(serviceName: string): Promise<string>;
-    getServiceUrls(serviceNames: string[]): Promise<string[]>;
+    getServiceUrls(serviceKeys: string[], feature?: string): Promise<(Service | null)[]>;
 }
 //# sourceMappingURL=Discovery.d.ts.map

package/dist/types/Discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Discovery.d.ts","sourceRoot":"","sources":["../../src/Discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAA+C,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,eAAe,EAAwB,mBAAmB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAG9F,qBAAa,SAAU,SAAQ,IAAI;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;gBAE9B,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,eAAe;IAcvC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAmBjF,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBnD,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAMvE"}
+{"version":3,"file":"Discovery.d.ts","sourceRoot":"","sources":["../../src/Discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAA+C,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAExE,qBAAa,SAAU,SAAQ,IAAI;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;gBAE9B,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,eAAe;IAcvC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAmBjF,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBnD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;CAclG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@or-sdk/discovery",
-  "version": "1.3.4",
+  "version": "1.4.0-beta.598.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -17,7 +17,7 @@
     "dev": "pnpm build:watch:esm"
   },
   "dependencies": {
-    "@or-sdk/base": "^0.26.5"
+    "@or-sdk/base": "^0.27.0-beta.598.0"
   },
   "devDependencies": {
     "concurrently": "^6.4.0",
@@ -25,6 +25,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "62be75910db5696b35b6546b4164c8bcc10fe421"
+  }
 }

package/src/Discovery.ts

@@ -1,6 +1,5 @@
 import { Base, List, makeList, ServiceDiscoveryResponse, VERSION } from '@or-sdk/base';
-import { DiscoveryConfig, GetServiceUrlsResult, ListServicesPayload, Service } from './types';
-import { convertUrlsResult } from './utils';
+import { DiscoveryConfig, ListServicesPayload, Service } from './types';
 
 export class Discovery extends Base {
   private readonly route = `api/${VERSION}`;
@@ -56,10 +55,18 @@ export class Discovery extends Base {
    * const result = await discovery.getServiceUrls(['serviceName']);
    * ```
    */
-  public async getServiceUrls(serviceNames: string[]): Promise<string[]> {
-    const uniqNames = [...new Set(serviceNames) as unknown as Array<string>];
-    const resArr = await Promise.all(uniqNames.map(serviceName => this.getServiceUrl(serviceName)));
+  public async getServiceUrls(serviceKeys: string[], feature?: string): Promise<(Service | null)[]> {
+    const { services } = await this.callApi<{ services: Service[]; }>({
+      method: 'GET',
+      route: `${this.route}/services-by-keys`,
+      params: {
+        serviceKeys,
+        feature,
+      },
+    });
 
-    return resArr;
+    return serviceKeys.map((key) => {
+      return services.find(service => service.serviceKey === key) || null;
+    });
   }
 }

package/tsconfig.esm.json

@@ -4,7 +4,7 @@
     "outDir": "./dist/esm",
     "declarationDir": "./dist/types",
     "module": "ES6",
-    "target": "es6",
+    "target": "es2022",
     "rootDir": "./src",
     "declaration": true,
     "declarationMap": true