@esri/hub-common 9.7.1 → 9.8.1

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.7.0 - Mon Nov 15 2021 14:36:45 GMT-0700 (Mountain Standard Time)
+ * @esri/hub-common - v9.8.0 - Mon Dec 06 2021 08:31:21 GMT-0800 (Pacific Standard Time)
  * Copyright (c) 2021 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -3220,6 +3220,22 @@
         return request(url, options);
     }
 
+    /**
+     * ```js
+     * import { searchItems } from "@esri/arcgis-rest-portal";
+     * //
+     * searchUsers({ q: 'tommy', authentication })
+     *   .then(response) // response.total => 355
+     * ```
+     * Search a portal for users.
+     *
+     * @param search - A RequestOptions object to pass through to the endpoint.
+     * @returns A Promise that will resolve with the data from the response.
+     */
+    function searchUsers(search) {
+        return genericSearch(search, "user");
+    }
+
     /**
      * ```js
      * import { isItemSharedWithGroup } from "@esri/arcgis-rest-portal";
@@ -6163,7 +6179,7 @@
         };
     }
     /**
-     * retunrs a new content that has the specified type and
+     * returns a new content that has the specified type and
      * and updated related properties like normalizedType, family, etc
      * @param content orignal content
      * @param type new type
@@ -6171,8 +6187,8 @@
      */
     var setContentType = function (content, type) {
         // get family and normalized type based on new type
-        var family = getFamily(type);
         var normalizedType = normalizeItemType(__assign(__assign({}, content.item), { type: type }));
+        var family = getFamily(normalizedType);
         var updated = __assign(__assign({}, content), { type: type, family: family, normalizedType: normalizedType });
         // update the relative URL to the content
         // which is based on type and family
@@ -6181,7 +6197,7 @@
         });
     };
     /**
-     * retunrs a new content that has the specified hubId and updated identifier
+     * returns a new content that has the specified hubId and updated identifier
      * @param content orignal content
      * @param hubId new hubId
      * @returns new content
@@ -6198,19 +6214,30 @@
         });
     };
     /**
-     * append the absolute URL to the content on the site
-     * also updates the relative URL in case the
+     * Calculates the relative and absolute urls for a given content on a specific site
+     *
      * @param content
      * @param siteModel
-     * @returns
+     * @returns relative and absolute urls
      */
-    var setContentSiteUrls = function (content, siteModel) {
-        // recompute relative URL using a site specific identifier
+    var getContentSiteUrls = function (content, siteModel) {
+        // compute relative URL using a site specific identifier
         var siteIdentifier = getContentIdentifier(content, siteModel);
         var relative = getContentRelativeUrl(content, siteIdentifier);
         // get the absolute URL to this content on the site
         var siteUrl = getProp(siteModel, "item.url").replace(/\/$/, "");
-        var site = "" + siteUrl + relative;
+        var absolute = "" + siteUrl + relative;
+        return { relative: relative, absolute: absolute };
+    };
+    /**
+     * append the absolute URL to the content on the site
+     * also updates the relative URL in case the
+     * @param content
+     * @param siteModel
+     * @returns
+     */
+    var setContentSiteUrls = function (content, siteModel) {
+        var _a = getContentSiteUrls(content, siteModel), relative = _a.relative, site = _a.absolute;
         // append the updated URLs to a new content
         return appendContentUrls(content, {
             relative: relative,
@@ -8158,52 +8185,27 @@
     };
     /**
      * @private
-     * Convert api "names" into full ApiDefinitions
+     * Convert array of api "names" into full ApiDefinitions
      * @param apis
      * @returns
      */
     function expandApis(apis) {
-        return apis.map(function (api) {
-            if (typeof api === "string" && api in SEARCH_APIS) {
-                return SEARCH_APIS[api];
-            }
-            else {
-                // it's an object, so we trust that it's well formed
-                return api;
-            }
-        });
+        return apis.map(expandApi);
     }
     /**
      * @private
-     * Merge multiple search responses
-     *
-     * Naieve implementation that just merges arrays
-     * @param responses
+     * Convert an api "name" into a full ApiDefinition
+     * @param api
      * @returns
      */
-    function mergeSearchResults(responses) {
-        // Merge content
-        var results = responses.reduce(function (acc, response) {
-            if (response.results) {
-                acc = acc.concat(response.results);
-            }
-            return acc;
-        }, []);
-        // Merge Facets
-        var facets = responses.reduce(function (acc, response) {
-            if (response.facets) {
-                acc = acc.concat(response.facets);
-            }
-            return acc;
-        }, []);
-        // Total
-        var total = responses.reduce(function (acc, entry) {
-            if (entry.total) {
-                acc = acc + entry.total;
-            }
-            return acc;
-        }, 0);
-        return { total: total, results: results, facets: facets };
+    function expandApi(api) {
+        if (typeof api === "string" && api in SEARCH_APIS) {
+            return SEARCH_APIS[api];
+        }
+        else {
+            // it's an object, so we trust that it's well formed
+            return api;
+        }
     }
     /**
      * @private
@@ -8463,6 +8465,69 @@
         }
         return q;
     }
+    /**
+     * Create a `.next()` function for a type
+     * @param request
+     * @param nextStart
+     * @param total
+     * @param fn
+     * @returns
+     */
+    function getNextFunction(request, nextStart, total, fn) {
+        var clonedRequest = cloneObject$1(request);
+        // clone will not handle authentication so we do it manually
+        if (request.authentication) {
+            clonedRequest.authentication = UserSession.deserialize(request.authentication.serialize());
+        }
+        // figure out the start
+        clonedRequest.start = nextStart > -1 ? nextStart : total + 1;
+        return function (authentication) {
+            if (authentication) {
+                clonedRequest.authentication = authentication;
+            }
+            return fn(clonedRequest);
+        };
+    }
+    /**
+     * Construct a the full url to a group thumbnail
+     *
+     * - If the group has a thumbnail, construct the full url
+     * - If the group is not public, append on the token
+     * @param portalUrl
+     * @param group
+     * @param token
+     * @returns
+     */
+    function getGroupThumbnailUrl(portalUrl, group, token) {
+        var thumbnailUrl = null;
+        if (group.thumbnail) {
+            thumbnailUrl = portalUrl + "/community/groups/" + group.id + "/info/" + group.thumbnail;
+            if (token && group.access !== "public") {
+                thumbnailUrl = thumbnailUrl + "?token=" + token;
+            }
+        }
+        return thumbnailUrl;
+    }
+    /**
+     * Construct a the full url to a user thumbnail
+     *
+     * - If the user has a thumbnail, construct the full url
+     * - If the user is not public, append on the token
+     * @param portalUrl
+     * @param user
+     * @param token
+     * @returns
+     */
+    function getUserThumbnailUrl(portalUrl, user, token) {
+        var thumbnailUrl = null;
+        if (user.thumbnail) {
+            thumbnailUrl = portalUrl + "/community/users/" + user.username + "/info/" + user.thumbnail;
+            if (token && user.access !== "public") {
+                thumbnailUrl = thumbnailUrl + "?token=" + token;
+            }
+        }
+        return thumbnailUrl;
+    }
 
     // TODO: Implement $dataset
     var ContentFilterExpansions = {
@@ -9012,79 +9077,219 @@
         return result;
     }
 
+    /**
+     *
+     * Merge `Filter<"user">` objects
+     *
+     * Useful in components which may get partial filters from a variety of
+     * sub-components, which are then combined into a single filter prior
+     * to executing the search.
+     * @param filters
+     * @returns
+     */
+    function mergeUserFilters(filters) {
+        // expand all the filters so all prop types are consistent
+        var expanded = filters.map(expandUserFilter);
+        // now we can merge based on fields
+        var dateFields = ["created", "modified", "lastlogin"];
+        var specialFields = __spreadArrays(["disabled", "term", "filterType"], dateFields);
+        // acc is initialized as Filter<group> but also needs it
+        // in the function signature... for reasons?!
+        var result = expanded.reduce(function (acc, entry) {
+            // process fields
+            Object.entries(entry).forEach(function (_a) {
+                // Note: getProp/setProp are used to get around
+                // typescript issues with string indexing
+                var key = _a[0], value = _a[1];
+                if (acc.hasOwnProperty(key)) {
+                    var existingValue = getProp(acc, key);
+                    // if the key is not to a special field
+                    if (!specialFields.includes(key)) {
+                        // treat as an IMatchOptions
+                        setProp(key, mergeMatchOptions(existingValue, value), acc);
+                    }
+                    else if (dateFields.includes(key)) {
+                        // treat as IDateRange
+                        setProp(key, mergeDateRange(existingValue, value), acc);
+                    }
+                    else if (key === "term") {
+                        // append terms
+                        acc[key] = acc[key] + " " + value;
+                    }
+                }
+                else {
+                    // Acc does not have an entry for this yet
+                    // so just clone it
+                    setProp(key, cloneObject$1(value), acc);
+                }
+            });
+            return acc;
+        }, {
+            filterType: "user",
+        });
+        return result;
+    }
+    /**
+     * Prior to serialization into the query syntax for the backing APIs, we first expand [Filters](../Filter)
+     *
+     * Filter's can express their intent in a very terse form, but to ensure consistent structures
+     * we expand them into their more verbose form.
+     *
+     * i.e. `firstname: "John"` expands into `firstname: { any: ["John"]}`
+     *
+     * - Fields defined as `string | string[] | MatchOptions` will be converted to a `MatchOptions`
+     * - RelativeDate fields are converted to DateRange<number>
+     * @param filter
+     * @returns
+     */
+    function expandUserFilter(filter) {
+        var result = {};
+        var dateProps = ["created", "modified", "lastlogin"];
+        var specialProps = __spreadArrays(["disabled", "term"], dateProps);
+        Object.entries(filter).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            // handle Matchish fields
+            if (!specialProps.includes(key)) {
+                // setProp side-steps typescript complaining
+                setProp(key, valueToMatchOptions(value), result);
+            }
+            // Handle date fields
+            if (dateProps.includes(key)) {
+                var dateFieldValue = cloneObject$1(getProp(filter, key));
+                if (getProp(filter, key + ".type") === "relative-date") {
+                    setProp(key, relativeDateToDateRange(dateFieldValue), result);
+                }
+                else {
+                    setProp(key, dateFieldValue, result);
+                }
+            }
+        });
+        // disabled is boolean, so we check if the prop exists
+        // vs checking if the value is truthy
+        if (filter.hasOwnProperty("disabled")) {
+            result.disabled = filter.disabled;
+        }
+        if (filter.term) {
+            result.term = filter.term;
+        }
+        return result;
+    }
+    /**
+     * @private
+     * Serialize an `IUserFilterDefinition` into an `ISearchOptions` for use
+     * with `searchUsers`
+     * @param filter
+     * @returns
+     */
+    function serializeUserFilterForPortal(filter) {
+        var result = {
+            q: "",
+            filter: "",
+        };
+        var dateProps = ["created", "modified", "lastlogin"];
+        var specialProps = __spreadArrays(["term", "filterType"], dateProps);
+        Object.entries(filter).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            // MatchOptions fields
+            if (!specialProps.includes(key)) {
+                result = mergeSearchOptions(result, serializeMatchOptions(key, value), "AND");
+            }
+            // Dates only go into q
+            if (dateProps.includes(key)) {
+                result = mergeSearchOptions(result, serializeDateRange(key, value), "AND");
+            }
+        });
+        // disabled is also a top-level property
+        if (filter.hasOwnProperty("disabled")) {
+            result.disabled = filter.disabled;
+        }
+        // add the term
+        if (filter.term) {
+            // Note: this is slightly different from other types
+            result.q = ("(" + filter.term + ") " + result.q).trim();
+        }
+        return result;
+    }
+
     /**
      * Search for content via the Portal or Hub API
      * @param filter
      * @param options
      */
     function _searchContent(filter, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var expanded, apis, searchPromises, results;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        expanded = expandContentFilter(filter);
-                        // APIs
-                        if (!options.apis) {
-                            // default to AGO PROD
-                            options.apis = ["arcgis"];
-                        }
-                        apis = expandApis(options.apis);
-                        searchPromises = apis.map(function (api) {
-                            var _a;
-                            // Portal Search
-                            if (api.type === "arcgis") {
-                                // serialize for portal
-                                var so = serializeContentFilterForPortal(expanded);
-                                // pass auth forward
-                                if (options.authentication) {
-                                    so.authentication = options.authentication;
-                                }
-                                // Aggregations
-                                if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
-                                    so.countFields = options.aggregations.join(",");
-                                    so.countSize = 200;
-                                }
-                                // copy over various options
-                                // TODO: Dry this up
-                                if (options.num) {
-                                    so.num = options.num;
-                                }
-                                if (options.sortField) {
-                                    so.sortField = options.sortField;
-                                }
-                                if (options.sortOrder) {
-                                    so.sortOrder = options.sortOrder;
-                                }
-                                // NOTE: I think we will end up setting
-                                // the site URL in mergeSearchResults() instead
-                                // since it applies to both items and datasets
-                                return searchPortal(so, options.site);
-                            }
-                            else {
-                                // Hub API Search
-                                // TODO: Implement hub api content search
-                                return Promise.resolve({
-                                    total: 0,
-                                    results: [],
-                                    facets: [],
-                                });
-                            }
-                        });
-                        return [4 /*yield*/, Promise.all(searchPromises)];
-                    case 1:
-                        results = _a.sent();
-                        // merge and return
-                        return [2 /*return*/, mergeSearchResults(results)];
+            var expanded, api, searchPromise, so;
+            return __generator(this, function (_b) {
+                expanded = expandContentFilter(filter);
+                api = expandApi(options.api || "arcgis");
+                // map over the apis, depending on the type we issue the queries
+                // const searchPromises = apis.map((api) => {
+                // Portal Search
+                if (api.type === "arcgis") {
+                    so = serializeContentFilterForPortal(expanded);
+                    // pass auth forward
+                    if (options.authentication) {
+                        so.authentication = options.authentication;
+                    }
+                    else {
+                        so.portal = api.url + "/sharing/rest";
+                    }
+                    // Aggregations
+                    if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
+                        so.countFields = options.aggregations.join(",");
+                        so.countSize = 200;
+                    }
+                    // copy over various options
+                    // TODO: Dry this up - typscript makes this... inconvenient
+                    if (options.num) {
+                        so.num = options.num;
+                    }
+                    if (options.sortField) {
+                        so.sortField = options.sortField;
+                    }
+                    if (options.sortOrder) {
+                        so.sortOrder = options.sortOrder;
+                    }
+                    if (options.site) {
+                        so.site = cloneObject$1(options.site);
+                    }
+                    searchPromise = searchPortal(so);
                 }
+                else {
+                    // Hub API Search
+                    // TODO: Implement hub api content search
+                    searchPromise = Promise.resolve({
+                        total: 0,
+                        results: [],
+                        facets: [],
+                        hasNext: false,
+                        next: function () {
+                        },
+                    });
+                }
+                // });
+                // return for results
+                return [2 /*return*/, searchPromise];
             });
         });
     }
-    function searchPortal(searchOptions, site) {
+    /**
+     * Internal portal search, which then converts items to Content, and
+     * if a Site was passed, also sets urls
+     *
+     * @param searchOptions
+     * @param site
+     * @returns
+     */
+    function searchPortal(searchOptions) {
         return searchItems(searchOptions).then(function (resp) {
+            var hasNext = resp.nextStart > -1;
             var content = resp.results.map(itemToContent);
-            if (site) {
-                content = content.map(function (entry) { return setContentSiteUrls(entry, site); });
+            if (searchOptions.site) {
+                content = content.map(function (entry) {
+                    return setContentSiteUrls(entry, searchOptions.site);
+                });
             }
             // convert aggregations into facets
             var facets = convertPortalResponseToFacets(resp);
@@ -9092,6 +9297,8 @@
                 total: resp.total,
                 results: content,
                 facets: facets,
+                hasNext: hasNext,
+                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
             };
         });
     }
@@ -9107,63 +9314,168 @@
     function _searchGroups(filter, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var expanded, apis, so, token, us, portalUrl, thumbnailify, teamLinkify;
+            var expanded, api, so;
             return __generator(this, function (_b) {
                 expanded = expandGroupFilter(filter);
-                // APIs
-                if (!options.apis) {
-                    // default to AGO PROD
-                    options.apis = ["arcgis"];
-                }
-                apis = expandApis(options.apis);
-                so = serializeGroupFilterForPortal(expanded);
-                token = "";
-                // if we have auth, pass it forward
-                // otherwise set the portal property
-                if (options.authentication) {
-                    so.authentication = options.authentication;
-                    us = options.authentication;
-                    token = us.token;
+                api = expandApi(options.api || "arcgis");
+                if (api.type === "arcgis") {
+                    so = serializeGroupFilterForPortal(expanded);
+                    // if we have auth, pass it forward
+                    // otherwise set the portal property
+                    if (options.authentication) {
+                        so.authentication = options.authentication;
+                    }
+                    else {
+                        so.portal = api.url + "/sharing/rest";
+                    }
+                    // TODO: Dry this up - typscript makes this... inconvenient
+                    if (options.num) {
+                        so.num = options.num;
+                    }
+                    if (options.sortField) {
+                        so.sortField = options.sortField;
+                    }
+                    if (options.sortOrder) {
+                        so.sortOrder = options.sortOrder;
+                    }
+                    api.url + "/sharing/rest";
+                    if ((_a = so.authentication) === null || _a === void 0 ? void 0 : _a.portal) {
+                        so.authentication.portal;
+                    }
+                    if (options.site) {
+                        so.site = cloneObject$1(options.site);
+                    }
+                    return [2 /*return*/, searchPortalGroups(so)];
                 }
                 else {
-                    so.portal = apis[0].url + "/sharing/rest";
+                    throw new Error("_searchGroups is not implemented for non-arcgis apis");
+                }
+            });
+        });
+    }
+    /**
+     * Internal function that searches for groups using the ArcGIS Portal API
+     * @param searchOptions
+     * @returns
+     */
+    function searchPortalGroups(searchOptions) {
+        var _a;
+        var teamLinkify = function (group) {
+            group.siteTeamUrl = searchOptions.site.item.url + "/teams/" + group.id + "/about";
+            return group;
+        };
+        var portalUrl = ((_a = searchOptions.authentication) === null || _a === void 0 ? void 0 : _a.portal) ||
+            "https://www.arcgis.com/sharing/rest";
+        var token;
+        if (searchOptions.authentication) {
+            var us = searchOptions.authentication;
+            token = us.token;
+        }
+        var thumbnailify = function (group) {
+            group.thumbnailUrl = getGroupThumbnailUrl(portalUrl, group, token);
+            return group;
+        };
+        // execute the search
+        return searchGroups(searchOptions).then(function (response) {
+            var _a, _b;
+            var hasNext = response.nextStart > -1;
+            // upgrade thumbnail url
+            var results = response.results.map(thumbnailify);
+            // generate the site team url if site url is provided
+            if ((_b = (_a = searchOptions.site) === null || _a === void 0 ? void 0 : _a.item) === null || _b === void 0 ? void 0 : _b.url) {
+                results = response.results.map(teamLinkify);
+            }
+            return {
+                hasNext: hasNext,
+                total: response.total,
+                results: results,
+                next: getNextFunction(searchOptions, response.nextStart, response.total, searchPortalGroups),
+            };
+        });
+    }
+
+    /**
+     * Search for Users via the Portal API.
+     *
+     * **Note** Authentication is required
+     *
+     * Note: in the future, there may be options to search via
+     * a Hub specific API
+     * @param filter
+     * @param options
+     * @returns
+     */
+    function _searchUsers(filter, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var expanded, api, searchOptions;
+            return __generator(this, function (_a) {
+                // JS Clients may not pass in authentication
+                if (!options.authentication) {
+                    throw new Error("Authentication required to search for users.");
                 }
-                if (options.num) {
-                    so.num = options.num;
+                expanded = expandUserFilter(filter);
+                api = expandApi(options.api || "arcgis");
+                if (api.type === "arcgis") {
+                    searchOptions = serializeUserFilterForPortal(expanded);
+                    // carry the auth forward
+                    searchOptions.authentication = options.authentication;
+                    // TODO: Dry this up - typscript makes this... inconvenient
+                    if (options.num) {
+                        searchOptions.num = options.num;
+                    }
+                    if (options.sortField) {
+                        searchOptions.sortField = options.sortField;
+                    }
+                    if (options.sortOrder) {
+                        searchOptions.sortOrder = options.sortOrder;
+                    }
+                    if (options.site) {
+                        searchOptions.site = cloneObject$1(options.site);
+                    }
+                    return [2 /*return*/, searchPortalUsers(searchOptions)];
                 }
-                portalUrl = "https://www.arcgis.com/sharing/rest";
-                if ((_a = so.authentication) === null || _a === void 0 ? void 0 : _a.portal) {
-                    portalUrl = so.authentication.portal;
+                else {
+                    throw new Error("_searchUsers is not implemented for non-arcgis apis");
                 }
-                thumbnailify = function (group) {
-                    return addThumbnailUrl(portalUrl, group, token);
-                };
-                teamLinkify = function (group) {
-                    group.siteTeamUrl = options.site.item.url + "/teams/" + group.id + "/about";
-                    return group;
-                };
-                return [2 /*return*/, searchGroups(so).then(function (response) {
-                        var _a, _b;
-                        // upgrade thumbnail url
-                        response.results = response.results.map(thumbnailify);
-                        // generate the site team url if site url is provided
-                        if ((_b = (_a = options.site) === null || _a === void 0 ? void 0 : _a.item) === null || _b === void 0 ? void 0 : _b.url) {
-                            response.results = response.results.map(teamLinkify);
-                        }
-                        return response;
-                    })];
             });
         });
     }
-    // Need to decide how to handle adding the token is group is not public
-    function addThumbnailUrl(portalUrl, group, token) {
-        if (group.thumbnail) {
-            group.thumbnailUrl = portalUrl + "/community/groups/" + group.id + "/info/" + group.thumbnail;
-            if (token) {
-                group.thumbnailUrl = group.thumbnailUrl + "?token=" + token;
+    /**
+     * Internal function that executes the user search along with
+     * some simple enrichments
+     * @param searchOptions
+     * @returns
+     */
+    function searchPortalUsers(searchOptions) {
+        var portalUrl = searchOptions.authentication.portal;
+        var token = searchOptions.authentication.token;
+        // Partially applied functions for mapping over the results
+        var userLinkify = function (user) {
+            user.profileUrl = searchOptions.site.item.url + "/people/" + user.username + "/profile";
+            return user;
+        };
+        var thumbnailify = function (user) {
+            if (user.thumbnail) {
+                user.thumbnailUrl = getUserThumbnailUrl(portalUrl, user, token);
             }
-        }
-        return group;
+            return user;
+        };
+        return searchUsers(searchOptions).then(function (response) {
+            var _a, _b;
+            var hasNext = response.nextStart > -1;
+            // upgrade thumbnail url
+            var results = response.results.map(thumbnailify);
+            // generate the site team url if site url is provided
+            if ((_b = (_a = searchOptions.site) === null || _a === void 0 ? void 0 : _a.item) === null || _b === void 0 ? void 0 : _b.url) {
+                results = response.results.map(userLinkify);
+            }
+            return {
+                hasNext: hasNext,
+                total: response.total,
+                results: results,
+                next: getNextFunction(searchOptions, response.nextStart, response.total, searchPortalUsers),
+            };
+        });
     }
 
     /**
@@ -9772,6 +10084,9 @@
             model = _purgeNonGuidsFromCatalog(model);
             model = _ensureTelemetry(model);
             model = _migrateFeedConfig(model);
+            // WARNING - If you are writing a site schema migration,
+            // you probably need to apply it to site drafts as well!
+            // See https://github.com/Esri/hub.js/issues/498 for more details.
             return model;
         }
     }
@@ -10408,6 +10723,7 @@
     exports._processSecondaryEmail = _processSecondaryEmail;
     exports._searchContent = _searchContent;
     exports._searchGroups = _searchGroups;
+    exports._searchUsers = _searchUsers;
     exports._unprotectAndRemoveGroup = _unprotectAndRemoveGroup;
     exports._unprotectAndRemoveItem = _unprotectAndRemoveItem;
     exports.addContextToSlug = addContextToSlug;
@@ -10457,10 +10773,12 @@
     exports.ensureProp = ensureProp;
     exports.ensureUniqueDomainName = ensureUniqueDomainName;
     exports.ensureUniqueString = ensureUniqueString;
+    exports.expandApi = expandApi;
     exports.expandApis = expandApis;
     exports.expandContentFilter = expandContentFilter;
     exports.expandGroupFilter = expandGroupFilter;
     exports.expandTypeField = expandTypeField;
+    exports.expandUserFilter = expandUserFilter;
     exports.extend = extend;
     exports.extentToBBox = extentToBBox;
     exports.failSafe = failSafe;
@@ -10478,12 +10796,14 @@
     exports.getCategory = getCategory;
     exports.getCollection = getCollection;
     exports.getContentIdentifier = getContentIdentifier;
+    exports.getContentSiteUrls = getContentSiteUrls;
     exports.getCulture = getCulture;
     exports.getDomainsForSite = getDomainsForSite;
     exports.getExportItemTypeKeyword = getExportItemTypeKeyword;
     exports.getExportLayerTypeKeyword = getExportLayerTypeKeyword;
     exports.getFamily = getFamily;
     exports.getGeographicOrgExtent = getGeographicOrgExtent;
+    exports.getGroupThumbnailUrl = getGroupThumbnailUrl;
     exports.getHubApiUrl = getHubApiUrl;
     exports.getHubApiUrlFromPortal = getHubApiUrlFromPortal;
     exports.getHubLocaleAssetUrl = getHubLocaleAssetUrl;
@@ -10501,6 +10821,7 @@
     exports.getLayerIdFromUrl = getLayerIdFromUrl;
     exports.getModel = getModel;
     exports.getModelFromOptions = getModelFromOptions;
+    exports.getNextFunction = getNextFunction;
     exports.getOrgExtentAsBBox = getOrgExtentAsBBox;
     exports.getPortalApiUrl = getPortalApiUrl;
     exports.getPortalUrl = getPortalUrl;
@@ -10519,6 +10840,7 @@
     exports.getUniqueDomainName = getUniqueDomainName;
     exports.getUniqueDomainNamePortal = getUniqueDomainNamePortal;
     exports.getUniqueItemTitle = getUniqueItemTitle;
+    exports.getUserThumbnailUrl = getUserThumbnailUrl;
     exports.getWithDefault = getWithDefault$1;
     exports.hasBasePriv = hasBasePriv;
     exports.hubApiRequest = hubApiRequest;
@@ -10554,7 +10876,7 @@
     exports.mergeMatchOptions = mergeMatchOptions;
     exports.mergeObjects = mergeObjects;
     exports.mergeSearchOptions = mergeSearchOptions;
-    exports.mergeSearchResults = mergeSearchResults;
+    exports.mergeUserFilters = mergeUserFilters;
     exports.normalizeItemType = normalizeItemType;
     exports.normalizeSolutionTemplateItem = normalizeSolutionTemplateItem;
     exports.objectToArray = objectToArray;
@@ -10576,6 +10898,7 @@
     exports.serializeModel = serializeModel;
     exports.serializeSpatialReference = serializeSpatialReference;
     exports.serializeStringOrArray = serializeStringOrArray;
+    exports.serializeUserFilterForPortal = serializeUserFilterForPortal;
     exports.setContentHubId = setContentHubId;
     exports.setContentSiteUrls = setContentSiteUrls;
     exports.setContentType = setContentType;