@esri/hub-common 10.0.0-next.2 → 10.0.0-next.5

package/dist/esm/search/_internal/portalSearchItems.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator, __spreadArrays } from "tslib";
 import { searchItems } from "@esri/arcgis-rest-portal";
 import { cloneObject, enrichContentSearchResult, HubError } from "../..";
 import { serializeQueryForPortal } from "../serializeQueryForPortal";
@@ -15,49 +14,47 @@ import { expandPredicate } from "./expandPredicate";
  * @param options
  * @returns
  */
-export function portalSearchItems(query, options) {
+export async function portalSearchItems(query, options) {
     var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var updatedQuery, so, props;
-        return __generator(this, function (_b) {
-            if (!options.requestOptions) {
-                throw new HubError("portalSearchItems", "options.requestOptions is required.");
-            }
-            updatedQuery = applyWellKnownItemPredicates(query);
-            // Expand the individual predicates in each filter
-            updatedQuery.filters = updatedQuery.filters.map(function (filter) {
-                filter.predicates = filter.predicates.map(expandPredicate);
-                return filter;
-            });
-            so = serializeQueryForPortal(updatedQuery);
-            props = [
-                "num",
-                "sortField",
-                "sortOrder",
-                "include",
-                "start",
-                "requestOptions",
-            ];
-            // copy the props over
-            props.forEach(function (prop) {
-                if (options.hasOwnProperty(prop)) {
-                    so[prop] = options[prop];
-                }
-            });
-            if (options.requestOptions.authentication) {
-                so.authentication = options.requestOptions.authentication;
-            }
-            else {
-                so.portal = options.requestOptions.portal;
-            }
-            // Aggregations
-            if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
-                so.countFields = options.aggFields.join(",");
-                so.countSize = options.aggLimit || 10;
-            }
-            return [2 /*return*/, searchPortal(so)];
-        });
+    if (!options.requestOptions) {
+        throw new HubError("portalSearchItems", "options.requestOptions is required.");
+    }
+    // Expand well-known filterGroups
+    const updatedQuery = applyWellKnownItemPredicates(query);
+    // Expand the individual predicates in each filter
+    updatedQuery.filters = updatedQuery.filters.map((filter) => {
+        filter.predicates = filter.predicates.map(expandPredicate);
+        return filter;
+    });
+    // Serialize the all the groups for portal
+    const so = serializeQueryForPortal(updatedQuery);
+    // Array of properties we want to copy from IHubSearchOptions to the ISearchOptions
+    const props = [
+        "num",
+        "sortField",
+        "sortOrder",
+        "include",
+        "start",
+        "requestOptions",
+    ];
+    // copy the props over
+    props.forEach((prop) => {
+        if (options.hasOwnProperty(prop)) {
+            so[prop] = options[prop];
+        }
     });
+    if (options.requestOptions.authentication) {
+        so.authentication = options.requestOptions.authentication;
+    }
+    else {
+        so.portal = options.requestOptions.portal;
+    }
+    // Aggregations
+    if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
+        so.countFields = options.aggFields.join(",");
+        so.countSize = options.aggLimit || 10;
+    }
+    return searchPortal(so);
 }
 /**
  * Internal portal search, which then converts `IItem`s to `IHubSearchResult`s
@@ -66,32 +63,25 @@ export function portalSearchItems(query, options) {
  * @param searchOptions
  * @returns
  */
-function searchPortal(searchOptions) {
-    return __awaiter(this, void 0, void 0, function () {
-        var resp, fn, results, aggregations;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, searchItems(searchOptions)];
-                case 1:
-                    resp = _a.sent();
-                    fn = function (item) {
-                        return itemToSearchResult(item, searchOptions.includes, searchOptions.requestOptions);
-                    };
-                    return [4 /*yield*/, Promise.all(resp.results.map(fn))];
-                case 2:
-                    results = _a.sent();
-                    aggregations = convertPortalAggregations(resp);
-                    // Construct the return
-                    return [2 /*return*/, {
-                            total: resp.total,
-                            results: results,
-                            aggregations: aggregations,
-                            hasNext: resp.nextStart > -1,
-                            next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
-                        }];
-            }
-        });
-    });
+async function searchPortal(searchOptions) {
+    // Execute portal search
+    const resp = await searchItems(searchOptions);
+    // create mappable fn that will handle the includes
+    const fn = (item) => {
+        return itemToSearchResult(item, searchOptions.includes, searchOptions.requestOptions);
+    };
+    // map over results
+    const results = await Promise.all(resp.results.map(fn));
+    // convert portal  aggregations into hub aggregations
+    const aggregations = convertPortalAggregations(resp);
+    // Construct the return
+    return {
+        total: resp.total,
+        results,
+        aggregations,
+        hasNext: resp.nextStart > -1,
+        next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
+    };
 }
 /**
  * Convert an `IItem` to a `IHubSearchResult`
@@ -101,30 +91,26 @@ function searchPortal(searchOptions) {
  * @param requestOptions
  * @returns
  */
-function itemToSearchResult(item, includes, requestOptions) {
-    if (includes === void 0) { includes = []; }
-    return __awaiter(this, void 0, void 0, function () {
-        var fn;
-        return __generator(this, function (_a) {
-            fn = enrichContentSearchResult;
-            switch (item.type) {
-                case "Hub Site Application":
-                case "Site Application":
-                    fn = enrichSiteSearchResult;
-                    break;
-                case "Hub Page":
-                case "Site Page":
-                    fn = enrichPageSearchResult;
-                    break;
-                case "Hub Project":
-                    fn = enrichProjectSearchResult;
-                    break;
-            }
-            return [2 /*return*/, fn(item, includes, requestOptions)];
-        });
-    });
+async function itemToSearchResult(item, includes = [], requestOptions) {
+    // based on the type, we delegate to type-specific functions
+    // this allows each type to apply "default" enrichments
+    let fn = enrichContentSearchResult;
+    switch (item.type) {
+        case "Hub Site Application":
+        case "Site Application":
+            fn = enrichSiteSearchResult;
+            break;
+        case "Hub Page":
+        case "Site Page":
+            fn = enrichPageSearchResult;
+            break;
+        case "Hub Project":
+            fn = enrichProjectSearchResult;
+            break;
+    }
+    return fn(item, includes, requestOptions);
 }
-export var WellKnownItemPredicates = {
+export const WellKnownItemPredicates = {
     $application: [
         {
             type: {
@@ -285,18 +271,18 @@ export var WellKnownItemPredicates = {
  * @param filterGroups
  */
 export function applyWellKnownItemPredicates(query) {
-    var queryClone = cloneObject(query);
+    const queryClone = cloneObject(query);
     // iterate the filters
-    queryClone.filters = queryClone.filters.map(function (filter) {
+    queryClone.filters = queryClone.filters.map((filter) => {
         // replace predicates with well-known types
-        var replacedPredicates = false;
-        filter.predicates = filter.predicates.reduce(function (acc, predicate) {
+        let replacedPredicates = false;
+        filter.predicates = filter.predicates.reduce((acc, predicate) => {
             // if the predicate has a well-known type
             // we replace it with the set of predicates defined
             // for the well-known type
             if (isWellKnownTypeFilter(predicate.type)) {
-                var replacements = lookupTypePredicates(predicate.type);
-                acc = __spreadArrays(acc, replacements);
+                const replacements = lookupTypePredicates(predicate.type);
+                acc = [...acc, ...replacements];
                 replacedPredicates = true;
             }
             else {
@@ -326,7 +312,7 @@ export function applyWellKnownItemPredicates(query) {
  * @returns
  */
 export function isWellKnownTypeFilter(key) {
-    var result = false;
+    let result = false;
     if (typeof key === "string") {
         result = key in WellKnownItemPredicates;
     }

package/dist/esm/search/_internal/portalSearchItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchItems.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"portalSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchItems.ts"],"names":[],"mappings":"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"}

package/dist/esm/search/_internal/portalSearchUsers.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator } from "tslib";
 import { searchUsers, } from "@esri/arcgis-rest-portal";
 import { enrichUserSearchResult } from "../..";
 import { serializeQueryForPortal } from "../serializeQueryForPortal";
@@ -12,44 +11,41 @@ import { expandPredicate } from "./expandPredicate";
  * @param options
  * @returns
  */
-export function portalSearchUsers(query, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var so, props;
-        return __generator(this, function (_a) {
-            // requestOptions is always required and user must be authd
-            if (!options.requestOptions) {
-                throw new HubError("portalSearchUsers", "requestOptions: IHubRequestOptions is required.");
-            }
-            if (!options.requestOptions.authentication) {
-                throw new HubError("portalSearchUsers", "requestOptions must pass authentication.");
-            }
-            // Expand the individual predicates in each filter
-            query.filters = query.filters.map(function (filter) {
-                filter.predicates = filter.predicates.map(expandPredicate);
-                return filter;
-            });
-            so = serializeQueryForPortal(query);
-            props = [
-                "num",
-                "sortField",
-                "sortOrder",
-                "include",
-                "start",
-                "requestOptions",
-            ];
-            // copy the props over
-            props.forEach(function (prop) {
-                if (options.hasOwnProperty(prop)) {
-                    so[prop] = options[prop];
-                }
-            });
-            // Unlike Groups and Item, the Users api *requires* authentication
-            // so we set it directly
-            so.authentication = options.requestOptions.authentication;
-            // Execute search
-            return [2 /*return*/, searchPortal(so)];
-        });
+export async function portalSearchUsers(query, options) {
+    // requestOptions is always required and user must be authd
+    if (!options.requestOptions) {
+        throw new HubError("portalSearchUsers", "requestOptions: IHubRequestOptions is required.");
+    }
+    if (!options.requestOptions.authentication) {
+        throw new HubError("portalSearchUsers", "requestOptions must pass authentication.");
+    }
+    // Expand the individual predicates in each filter
+    query.filters = query.filters.map((filter) => {
+        filter.predicates = filter.predicates.map(expandPredicate);
+        return filter;
     });
+    // Serialize the all the groups for portal
+    const so = serializeQueryForPortal(query);
+    // Array of properties we want to copy from IHubSearchOptions to the ISearchOptions
+    const props = [
+        "num",
+        "sortField",
+        "sortOrder",
+        "include",
+        "start",
+        "requestOptions",
+    ];
+    // copy the props over
+    props.forEach((prop) => {
+        if (options.hasOwnProperty(prop)) {
+            so[prop] = options[prop];
+        }
+    });
+    // Unlike Groups and Item, the Users api *requires* authentication
+    // so we set it directly
+    so.authentication = options.requestOptions.authentication;
+    // Execute search
+    return searchPortal(so);
 }
 /**
  * Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
@@ -58,31 +54,24 @@ export function portalSearchUsers(query, options) {
  * @param searchOptions
  * @returns
  */
-function searchPortal(searchOptions) {
-    return __awaiter(this, void 0, void 0, function () {
-        var resp, fn, results;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, searchUsers(searchOptions)];
-                case 1:
-                    resp = _a.sent();
-                    fn = function (user) {
-                        return userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
-                    };
-                    return [4 /*yield*/, Promise.all(resp.results.map(fn))];
-                case 2:
-                    results = _a.sent();
-                    // Group Search does not support aggregations
-                    // Construct the return
-                    return [2 /*return*/, {
-                            total: resp.total,
-                            results: results,
-                            hasNext: resp.nextStart > -1,
-                            next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
-                        }];
-            }
-        });
-    });
+async function searchPortal(searchOptions) {
+    // Execute portal search
+    const resp = await searchUsers(searchOptions);
+    // create mappable fn that will close
+    // over the includes and requestOptions
+    const fn = (user) => {
+        return userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
+    };
+    // map over results
+    const results = await Promise.all(resp.results.map(fn));
+    // Group Search does not support aggregations
+    // Construct the return
+    return {
+        total: resp.total,
+        results,
+        hasNext: resp.nextStart > -1,
+        next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
+    };
 }
 /**
  * Convert an Item to a IHubSearchResult
@@ -92,16 +81,11 @@ function searchPortal(searchOptions) {
  * @param requestOptions
  * @returns
  */
-function userToSearchResult(user, includes, requestOptions) {
-    if (includes === void 0) { includes = []; }
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            // Delegate to HubGroups module
-            // This layer of indirection is not necessary but
-            // aligns with how the items search works and
-            // allows for future specialization
-            return [2 /*return*/, enrichUserSearchResult(user, includes, requestOptions)];
-        });
-    });
+async function userToSearchResult(user, includes = [], requestOptions) {
+    // Delegate to HubGroups module
+    // This layer of indirection is not necessary but
+    // aligns with how the items search works and
+    // allows for future specialization
+    return enrichUserSearchResult(user, includes, requestOptions);
 }
 //# sourceMappingURL=portalSearchUsers.js.map

package/dist/esm/search/_internal/portalSearchUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":";AAAA,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,sBAAsB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAQtC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;;;GAMG;AACH,MAAM,UAAgB,iBAAiB,CACrC,KAAa,EACb,OAA0B;;;;YAE1B,2DAA2D;YAC3D,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC3B,MAAM,IAAI,QAAQ,CAChB,mBAAmB,EACnB,iDAAiD,CAClD,CAAC;aACH;YAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE;gBAC1C,MAAM,IAAI,QAAQ,CAChB,mBAAmB,EACnB,0CAA0C,CAC3C,CAAC;aACH;YAED,kDAAkD;YAClD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM;gBACvC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC3D,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;YAGG,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;YAEpC,KAAK,GAAmC;gBAC5C,KAAK;gBACL,WAAW;gBACX,WAAW;gBACX,SAAS;gBACT,OAAO;gBACP,gBAAgB;aACjB,CAAC;YACF,sBAAsB;YACtB,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;gBACjB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;oBAChC,EAAE,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YAEH,kEAAkE;YAClE,wBAAwB;YACxB,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC;YAE1D,iBAAiB;YACjB,sBAAO,YAAY,CAAC,EAAwB,CAAC,EAAC;;;CAC/C;AAED;;;;;;GAMG;AACH,SAAe,YAAY,CACzB,aAAiC;;;;;wBAGpB,qBAAM,WAAW,CAAC,aAAa,CAAC,EAAA;;oBAAvC,IAAI,GAAG,SAAgC;oBAIvC,EAAE,GAAG,UAAC,IAAW;wBACrB,OAAO,kBAAkB,CACvB,IAAI,EACJ,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,cAAc,CAC7B,CAAC;oBACJ,CAAC,CAAC;oBAGc,qBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAA;;oBAAjD,OAAO,GAAG,SAAuC;oBAEvD,6CAA6C;oBAC7C,uBAAuB;oBACvB,sBAAO;4BACL,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,OAAO,SAAA;4BACP,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;4BAC5B,IAAI,EAAE,eAAe,CACnB,aAAa,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,EACV,YAAY,CACb;yBACF,EAAC;;;;CACH;AAED;;;;;;;GAOG;AACH,SAAe,kBAAkB,CAC/B,IAAW,EACX,QAAuB,EACvB,cAAmC;IADnC,yBAAA,EAAA,aAAuB;;;YAGvB,+BAA+B;YAC/B,iDAAiD;YACjD,6CAA6C;YAC7C,mCAAmC;YACnC,sBAAO,sBAAsB,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAC;;;CAC/D"}
+{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":"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"}

package/dist/esm/search/_internal/portalSearchUtils.js

@@ -7,7 +7,7 @@
 export function convertPortalAggregations(searchResults) {
     var _a;
     if ((_a = searchResults.aggregations) === null || _a === void 0 ? void 0 : _a.counts) {
-        return searchResults.aggregations.counts.map(function (entry) {
+        return searchResults.aggregations.counts.map((entry) => {
             return {
                 mode: "terms",
                 field: entry.fieldName,

package/dist/esm/search/_internal/portalSearchUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchUtils.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUtils.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,aAA+B;;IAE/B,UAAI,aAAa,CAAC,YAAY,0CAAE,MAAM,EAAE;QACtC,OAAO,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK;YACjD,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,CAAC,SAAS;gBACtB,MAAM,EAAE,KAAK,CAAC,WAAW;aAC1B,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}
+{"version":3,"file":"portalSearchUtils.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUtils.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,aAA+B;;IAE/B,UAAI,aAAa,CAAC,YAAY,0CAAE,MAAM,EAAE;QACtC,OAAO,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACrD,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,CAAC,SAAS;gBACtB,MAAM,EAAE,KAAK,CAAC,WAAW;aAC1B,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}

package/dist/esm/search/_internal/searchEntities.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator } from "tslib";
 import { searchItems } from "@esri/arcgis-rest-portal";
 import { expandApi, getNextFunction } from "../utils";
 import { serializeQueryForPortal } from "../serializeQueryForPortal";
@@ -14,14 +13,14 @@ import { convertPortalAggregations } from "./portalSearchUtils";
 export function searchEntities(query, convertFn, options) {
     var _a;
     // serialize query to searchOptions
-    var searchOptions = serializeQueryForPortal(query);
+    const searchOptions = serializeQueryForPortal(query);
     // Aggregations
     if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
         searchOptions.countFields = options.aggFields.join(",");
         searchOptions.countSize = options.aggLimit || 10;
     }
     // properties to copy from IHubSearchOptions to the ISearchOptions
-    var props = [
+    const props = [
         "num",
         "sortField",
         "sortOrder",
@@ -30,16 +29,16 @@ export function searchEntities(query, convertFn, options) {
     ];
     // Include "start" here
     // copy the props over
-    props.forEach(function (prop) {
+    props.forEach((prop) => {
         if (options.hasOwnProperty(prop)) {
             searchOptions[prop] = options[prop];
         }
     });
     // create the entitySearchFn
-    var searchFn = createEntitySearchFn(convertFn);
+    const searchFn = createEntitySearchFn(convertFn);
     // Add ArcGIS API
     if (options.api && !options.authentication) {
-        var expandedApi = expandApi(options.api);
+        const expandedApi = expandApi(options.api);
         searchOptions.portal = expandedApi.url;
     }
     return searchFn(searchOptions);
@@ -53,30 +52,22 @@ export function createEntitySearchFn(convertFn) {
     // Return a function that does the search, with a closure over the
     // conversion function. Naming this function is important as it's
     // referenced in the `next` section below
-    return function executeSearch(searchOptions) {
-        return __awaiter(this, void 0, void 0, function () {
-            var response, entities, aggregations;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, searchItems(searchOptions)];
-                    case 1:
-                        response = _a.sent();
-                        return [4 /*yield*/, Promise.all(response.results.map(function (itm) {
-                                return convertFn(itm, searchOptions);
-                            }))];
-                    case 2:
-                        entities = _a.sent();
-                        aggregations = convertPortalAggregations(response);
-                        return [2 /*return*/, {
-                                total: response.total,
-                                results: entities,
-                                aggregations: aggregations,
-                                hasNext: response.nextStart > -1,
-                                next: getNextFunction(searchOptions, response.nextStart, response.total, executeSearch),
-                            }];
-                }
-            });
-        });
+    return async function executeSearch(searchOptions) {
+        // execute the search against portal api
+        const response = await searchItems(searchOptions);
+        // run the conversion function
+        const entities = await Promise.all(response.results.map((itm) => {
+            return convertFn(itm, searchOptions);
+        }));
+        // convert portal  aggregations into hub aggregations
+        const aggregations = convertPortalAggregations(response);
+        return {
+            total: response.total,
+            results: entities,
+            aggregations,
+            hasNext: response.nextStart > -1,
+            next: getNextFunction(searchOptions, response.nextStart, response.total, executeSearch),
+        };
     };
 }
 //# sourceMappingURL=searchEntities.js.map

package/dist/esm/search/_internal/searchEntities.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchEntities.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAUhE;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,KAAa,EACb,SAAgC,EAChC,OAA0B;;IAE1B,mCAAmC;IACnC,IAAM,aAAa,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAErD,eAAe;IACf,UAAI,OAAO,CAAC,SAAS,0CAAE,MAAM,EAAE;QAC7B,aAAa,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;KAClD;IACD,kEAAkE;IAClE,IAAM,KAAK,GAAmC;QAC5C,KAAK;QACL,WAAW;QACX,WAAW;QACX,OAAO;QACP,gBAAgB;KACjB,CAAC;IAEF,uBAAuB;IACvB,sBAAsB;IACtB,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;QACjB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,aAAa,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAC7D;IACH,CAAC,CAAC,CAAC;IACH,4BAA4B;IAC5B,IAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAEjD,iBAAiB;IACjB,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC1C,IAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,aAAa,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC;KACxC;IACD,OAAO,QAAQ,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAgC;IAEhC,kEAAkE;IAClE,iEAAiE;IACjE,yCAAyC;IACzC,OAAO,SAAe,aAAa,CACjC,aAA6B;;;;;4BAGZ,qBAAM,WAAW,CAAC,aAAa,CAAC,EAAA;;wBAA3C,QAAQ,GAAG,SAAgC;wBAEhC,qBAAM,OAAO,CAAC,GAAG,CAChC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,GAAG;gCACvB,OAAO,SAAS,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;4BACvC,CAAC,CAAC,CACH,EAAA;;wBAJK,QAAQ,GAAG,SAIhB;wBAGK,YAAY,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;wBAEzD,sBAAO;gCACL,KAAK,EAAE,QAAQ,CAAC,KAAK;gCACrB,OAAO,EAAE,QAAQ;gCACjB,YAAY,cAAA;gCACZ,OAAO,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC;gCAChC,IAAI,EAAE,eAAe,CACnB,aAAa,EACb,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,KAAK,EACd,aAAa,CACd;6BACF,EAAC;;;;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"searchEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAUhE;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,KAAa,EACb,SAAgC,EAChC,OAA0B;;IAE1B,mCAAmC;IACnC,MAAM,aAAa,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAErD,eAAe;IACf,UAAI,OAAO,CAAC,SAAS,0CAAE,MAAM,EAAE;QAC7B,aAAa,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;KAClD;IACD,kEAAkE;IAClE,MAAM,KAAK,GAAmC;QAC5C,KAAK;QACL,WAAW;QACX,WAAW;QACX,OAAO;QACP,gBAAgB;KACjB,CAAC;IAEF,uBAAuB;IACvB,sBAAsB;IACtB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,aAAa,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAC7D;IACH,CAAC,CAAC,CAAC;IACH,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAEjD,iBAAiB;IACjB,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC1C,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,aAAa,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC;KACxC;IACD,OAAO,QAAQ,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAgC;IAEhC,kEAAkE;IAClE,iEAAiE;IACjE,yCAAyC;IACzC,OAAO,KAAK,UAAU,aAAa,CACjC,aAA6B;QAE7B,wCAAwC;QACxC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC;QAClD,8BAA8B;QAC9B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3B,OAAO,SAAS,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACvC,CAAC,CAAC,CACH,CAAC;QAEF,qDAAqD;QACrD,MAAM,YAAY,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAEzD,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,OAAO,EAAE,QAAQ;YACjB,YAAY;YACZ,OAAO,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC;YAChC,IAAI,EAAE,eAAe,CACnB,aAAa,EACb,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,KAAK,EACd,aAAa,CACd;SACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}