@esri/hub-common 9.43.2 → 9.44.1

package/dist/esm/search/_internal/ifilter-utils.js

@@ -0,0 +1,222 @@
+import { __spreadArrays } from "tslib";
+import { setProp, getProp } from "../../objects";
+import { cloneObject } from "../../util";
+import { valueToMatchOptions, relativeDateToDateRange } from "../utils";
+export function expandPredicate(predicate) {
+    var result = {};
+    var dateProps = ["created", "modified", "lastlogin"];
+    var copyProps = [
+        "filterType",
+        "term",
+        "searchUserAccess",
+        "isopendata",
+        "searchUserName",
+    ];
+    var nonMatchOptionsFields = __spreadArrays(dateProps, copyProps);
+    // Do the conversion
+    Object.entries(predicate).forEach(function (_a) {
+        var key = _a[0], value = _a[1];
+        // Handle MatchOptions fields
+        if (!nonMatchOptionsFields.includes(key)) {
+            setProp(key, valueToMatchOptions(value), result);
+        }
+        // Handle Date fields
+        if (dateProps.includes(key)) {
+            var dateFieldValue = cloneObject(getProp(predicate, key));
+            if (getProp(predicate, key + ".type") === "relative-date") {
+                setProp(key, relativeDateToDateRange(dateFieldValue), result);
+            }
+            else {
+                setProp(key, dateFieldValue, result);
+            }
+        }
+        // Handle fields that are just copied forward
+        if (copyProps.includes(key) && predicate.hasOwnProperty(key)) {
+            setProp(key, value, result);
+        }
+    });
+    return result;
+}
+export function serializeQueryForPortal(query) {
+    var filterSearchOptions = query.filters.map(serializeFilter);
+    var result = mergeSearchOptions(filterSearchOptions, "AND");
+    return result;
+}
+function mergeSearchOptions(options, operation) {
+    var result = options.reduce(function (acc, entry) {
+        // walk the props
+        Object.entries(entry).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            // if prop exists
+            if (acc[key]) {
+                // combine via operation
+                acc[key] = acc[key] + " " + operation + " " + value;
+            }
+            else {
+                // just copy the value
+                acc[key] = value;
+            }
+        });
+        return acc;
+    }, { q: "" });
+    return result;
+}
+/**
+ * Serialize the filters in a FitlerGroup into a Portal Query
+ * @param filter
+ * @returns
+ */
+function serializeFilter(filter) {
+    var operation = filter.operation || "AND";
+    var predicates = filter.predicates.map(expandPredicate);
+    var predicateSearchOptions = predicates.map(serializePredicate);
+    // combine these searchOptions
+    var searchOptions = mergeSearchOptions(predicateSearchOptions, operation);
+    // wrap in parens if we have more than one predicate
+    if (predicates.length > 1) {
+        searchOptions.q = "(" + searchOptions.q + ")";
+    }
+    return searchOptions;
+}
+/**
+ * Serialize a Filter into a Portal Query
+ * @param predicate
+ * @returns
+ */
+function serializePredicate(predicate) {
+    var dateProps = ["created", "modified"];
+    var boolProps = ["isopendata"];
+    var passThroughProps = ["searchUserAccess", "searchUserName"];
+    var specialProps = __spreadArrays([
+        "filterType",
+        "term"
+    ], dateProps, boolProps, passThroughProps);
+    var portalAllowList = [
+        "access",
+        "categories",
+        "created",
+        "description",
+        "disabled",
+        "email",
+        "emailstatus",
+        "firstname",
+        "fullname",
+        "group",
+        "id",
+        "isInvitationOnly",
+        "isopendata",
+        "joined",
+        "lastlogin",
+        "lastname",
+        "memberType",
+        "modified",
+        "name",
+        "orgid",
+        "orgIds",
+        "owner",
+        "provider",
+        "role",
+        "searchUserAccess",
+        "searchUserName",
+        "snippet",
+        "tags",
+        "term",
+        "type",
+        "typekeywords",
+        "userlicensetype",
+        "username",
+    ];
+    var qCount = 0;
+    // TODO: Look at using reduce vs .map and remove the `.filter`
+    var opts = Object.entries(predicate)
+        .map(function (_a) {
+        var key = _a[0], value = _a[1];
+        // When serializing for portal we limit predicate properties to
+        // a list of known properties that the portal api accepts. This will
+        // not attempt to ensure the properties are used in the correct combinations
+        if (portalAllowList.includes(key)) {
+            var so = { q: "" };
+            if (!specialProps.includes(key)) {
+                qCount++;
+                so.q = serializeMatchOptions(key, value);
+            }
+            if (dateProps.includes(key)) {
+                qCount++;
+                so.q = serializeDateRange(key, value);
+            }
+            if (boolProps.includes(key)) {
+                qCount++;
+                so.q = key + ":" + value;
+            }
+            if (passThroughProps.includes(key)) {
+                so[key] = value;
+            }
+            if (key === "term") {
+                qCount++;
+                so.q = value;
+            }
+            return so;
+        }
+    })
+        .filter(function (e) { return e !== undefined; });
+    // merge up all the searchOptions
+    var searchOptions = mergeSearchOptions(opts, "AND");
+    if (qCount > 1) {
+        searchOptions.q = "(" + searchOptions.q + ")";
+    }
+    return searchOptions;
+}
+/**
+ * Serialize MatchOptions into portal syntax
+ * @param key
+ * @param value
+ * @returns
+ */
+function serializeMatchOptions(key, value) {
+    var result = "";
+    if (value.any) {
+        result = "" + serializeStringOrArray("OR", key, value.any);
+    }
+    if (value.all) {
+        result =
+            (result ? result + " AND " : "") +
+                ("" + serializeStringOrArray("AND", key, value.all));
+    }
+    if (value.not) {
+        // negate the entries if they are not
+        result =
+            (result ? result + " AND " : "") +
+                ("" + serializeStringOrArray("OR", "-" + key, value.not));
+    }
+    return result;
+}
+/**
+ * Serialize a date-range into Portal syntax
+ * @param key
+ * @param range
+ * @returns
+ */
+function serializeDateRange(key, range) {
+    return key + ":[" + range.from + " TO " + range.to + "]";
+}
+/**
+ * Serialize a `string` or `string[]` into a string
+ * @param join
+ * @param key
+ * @param value
+ * @returns
+ */
+function serializeStringOrArray(join, key, value) {
+    var q = "";
+    if (Array.isArray(value)) {
+        q = key + ":\"" + value.join("\" " + join + " " + key + ":\"") + "\"";
+        if (value.length > 1) {
+            q = "(" + q + ")";
+        }
+    }
+    else {
+        q = key + ":\"" + value + "\"";
+    }
+    return q;
+}
+//# sourceMappingURL=ifilter-utils.js.map

package/dist/esm/search/_internal/ifilter-utils.js.map

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

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

@@ -1,16 +1,19 @@
 import { __awaiter, __generator } from "tslib";
 import { searchGroups } from "@esri/arcgis-rest-portal";
+import { HubError } from "../../index";
 import { enrichGroupSearchResult } from "../../groups/HubGroups";
 import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
+import { expandPredicate, serializeQueryForPortal } from "./ifilter-utils";
 import { expandApi, getNextFunction } from "../utils";
 /**
  * @private
- * Portal Search Implementation for Items
+ * DEPRECATED: Use `portalSerchGroups`
+ * Portal Search Implementation for Groups
  * @param filterGroups
  * @param options
  * @returns
  */
-export function portalSearchGroups(filterGroups, options) {
+export function portalSearchGroupsFilterGroups(filterGroups, options) {
     return __awaiter(this, void 0, void 0, function () {
         var api, expandedGroups, so, props;
         return __generator(this, function (_a) {
@@ -57,6 +60,51 @@ export function portalSearchGroups(filterGroups, options) {
         });
     });
 }
+/**
+ * @private
+ * Portal Search Implementation for Groups
+ * @param query
+ * @param options
+ * @returns
+ */
+export function portalSearchGroups(query, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var so, props;
+        return __generator(this, function (_a) {
+            if (!options.requestOptions) {
+                throw new HubError("portalSearchGroups", "options.requestOptions is required.");
+            }
+            // 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];
+                }
+            });
+            // If we don't have auth, ensure we have .portal
+            if (options.requestOptions.authentication) {
+                so.authentication = options.requestOptions.authentication;
+            }
+            else {
+                so.portal = options.requestOptions.portal;
+            }
+            return [2 /*return*/, searchPortal(so)];
+        });
+    });
+}
 /**
  * Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
  * handling enrichments & includes along the way

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

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

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

@@ -1,19 +1,21 @@
 import { __awaiter, __generator, __spreadArrays } from "tslib";
 import { searchItems } from "@esri/arcgis-rest-portal";
 import { cloneObject, convertPortalItemResponseToFacets, enrichContentSearchResult, HubError, } from "../..";
+import { expandPredicate, serializeQueryForPortal } from "./ifilter-utils";
 import { enrichPageSearchResult } from "../../pages/HubPages";
 import { enrichProjectSearchResult } from "../../projects";
 import { enrichSiteSearchResult } from "../../sites";
-import { expandFilter, serializeFilterGroupsForPortal, } from "../filter-utils";
+import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
 import { getNextFunction } from "../utils";
+import { convertPortalAggregations } from "./portalSearchUtils";
 /**
  * @private
- * Portal Search Implementation for Items
+ * DEPRECATED
  * @param filterGroups
  * @param options
  * @returns
  */
-export function portalSearchItems(filterGroups, options) {
+export function portalSearchItemsFilterGroups(filterGroups, options) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
         var replaced, expandedGroups, so, props;
@@ -21,7 +23,7 @@ export function portalSearchItems(filterGroups, options) {
             if (!options.requestOptions) {
                 throw new HubError("hubSearch", "requestOptions: IHubRequestOptions is required.");
             }
-            replaced = applyWellKnownItemFilters(filterGroups);
+            replaced = applyWellKnownItemFilterGroups(filterGroups);
             expandedGroups = replaced.map(function (fg) {
                 fg.filters = fg.filters.map(expandFilter);
                 return fg;
@@ -56,6 +58,57 @@ export function portalSearchItems(filterGroups, options) {
         });
     });
 }
+/**
+ * @private
+ * Portal Search Implementation for Items
+ * @param query
+ * @param options
+ * @returns
+ */
+export 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)];
+        });
+    });
+}
 /**
  * Internal portal search, which then converts `IItem`s to `IHubSearchResult`s
  * handling enrichments & includes along the way
@@ -65,7 +118,7 @@ export function portalSearchItems(filterGroups, options) {
  */
 function searchPortal(searchOptions) {
     return __awaiter(this, void 0, void 0, function () {
-        var resp, fn, results, facets;
+        var resp, fn, results, facets, aggregations;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, searchItems(searchOptions)];
@@ -78,11 +131,13 @@ function searchPortal(searchOptions) {
                 case 2:
                     results = _a.sent();
                     facets = convertPortalItemResponseToFacets(resp);
+                    aggregations = convertPortalAggregations(resp);
                     // Construct the return
                     return [2 /*return*/, {
                             total: resp.total,
                             results: results,
                             facets: facets,
+                            aggregations: aggregations,
                             hasNext: resp.nextStart > -1,
                             next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
                         }];
@@ -296,7 +351,36 @@ export var WellKnownItemFilters = {
  * Only exported to enable extensive testing
  * @param filterGroups
  */
-export function applyWellKnownItemFilters(filterGroups) {
+export function applyWellKnownItemPredicates(query) {
+    var queryClone = cloneObject(query);
+    // iterate the filters
+    queryClone.filters = queryClone.filters.map(function (filter) {
+        // replace predicates with well-known types
+        filter.predicates = filter.predicates.reduce(function (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);
+            }
+            else {
+                // this predicate does not have a well-known type
+                // so we just keep it
+                acc.push(predicate);
+            }
+            return acc;
+        }, []);
+        return filter;
+    });
+    return queryClone;
+}
+/**
+ * DEPRECATED
+ * @param filterGroups
+ * @returns
+ */
+export function applyWellKnownItemFilterGroups(filterGroups) {
     var clone = cloneObject(filterGroups);
     // iterate the filterGroups
     var result = clone.map(function (filterGroup) {
@@ -333,7 +417,7 @@ export function applyWellKnownItemFilters(filterGroups) {
  * @param key
  * @returns
  */
-function isWellKnownTypeFilter(key) {
+export function isWellKnownTypeFilter(key) {
     var result = false;
     if (typeof key === "string") {
         result = key in WellKnownItemFilters;
@@ -348,4 +432,14 @@ function isWellKnownTypeFilter(key) {
 function lookupTypeFilters(key) {
     return WellKnownItemFilters[key];
 }
+function lookupTypePredicates(key) {
+    var rawPredicates = WellKnownItemFilters[key];
+    // Remove the filterType property as it's not needed in an IPredicate
+    var predicates = rawPredicates.map(function (entry) {
+        var c = cloneObject(entry);
+        delete c.filterType;
+        return c;
+    });
+    return predicates;
+}
 //# sourceMappingURL=portalSearchItems.js.map

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,16 +1,18 @@
 import { __awaiter, __generator } from "tslib";
 import { searchUsers, } from "@esri/arcgis-rest-portal";
 import { enrichUserSearchResult } from "../..";
+import { expandPredicate, serializeQueryForPortal } from "./ifilter-utils";
 import HubError from "../../HubError";
 import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
 import { getNextFunction } from "../utils";
 /**
  * @private
+ * DEPRECATED: Use `portalSearchUsers`
  * Portal Search implementation for Users
  * @param filterGroups
  * @param options
  */
-export function portalSearchUsers(filterGroups, options) {
+export function portalSearchUsersFilterGroups(filterGroups, options) {
     return __awaiter(this, void 0, void 0, function () {
         var expandedGroups, so, props;
         return __generator(this, function (_a) {
@@ -47,6 +49,52 @@ export function portalSearchUsers(filterGroups, options) {
         });
     });
 }
+/**
+ * @private
+ * Portal Search Implementation for Users
+ * @param filterGroups
+ * @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)];
+        });
+    });
+}
 /**
  * Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
  * handling enrichments & includes along the way

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,EAAU,MAAM,OAAO,CAAC;AAEvD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AAQ/E,OAAO,EAAa,eAAe,EAAE,MAAM,UAAU,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,UAAgB,iBAAiB,CACrC,YAAyC,EACzC,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;YAGK,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,UAAC,EAAE;gBACzC,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC1C,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAGG,EAAE,GAAG,8BAA8B,CAAC,cAAc,CAAC,CAAC;YAEpD,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,kCAAkC;YAClC,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,MAAM,EAAE,EAAE;4BACV,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

@@ -0,0 +1,22 @@
+/**
+ * @private
+ * Convert a portal aggregation structure into the HubAggregations structure
+ * @param searchResults
+ * @returns
+ */
+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 {
+                mode: "terms",
+                field: entry.fieldName,
+                values: entry.fieldValues,
+            };
+        });
+    }
+    else {
+        return [];
+    }
+}
+//# sourceMappingURL=portalSearchUtils.js.map

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

@@ -0,0 +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"}

package/dist/esm/search/filter-utils.js

@@ -2,6 +2,7 @@ import { __spreadArrays } from "tslib";
 import { getProp, setProp } from "../objects";
 import { cloneObject } from "../util";
 import { relativeDateToDateRange, valueToMatchOptions } from "./utils";
+// DEPRECATED - REMOVE THIS FILE
 /**
  * Expand a Filter into it's more expressive structure so it can be
  * serialized deterministically.