@esri/hub-common 9.49.1 → 10.0.0-next.3

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.49.0 - Tue Jul 26 2022 19:34:30 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v10.0.0-next.2 - Thu Jul 28 2022 19:50:35 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -6188,15 +6188,10 @@
     ];
     var site$1 = ["Hub Site Application", "Site Application"];
     /**
-     * ```js
-     * import { getCollection } from "@esri/hub-common";
-     * //
-     * getCollection('Feature Layer')
-     * > 'dataset'
-     * ```
      * Get the Hub collection for a given item type
      * @param itemType The ArcGIS [item type](https://developers.arcgis.com/rest/users-groups-and-items/items-and-item-types.htm).
      * @returns the Hub collection of a given item type.
+     * @private
      */
     var getCollection = function (type) {
         if (!type) {
@@ -6208,8 +6203,8 @@
             return collectionTypes.some(function (t) { return t.toLocaleLowerCase() === lowerCaseType; });
         });
     };
-    // TODO: remove this at the next breaking change
-    // it's only here to support deprecated categories
+    // TODO: remove this when we remove the deprecated categories
+    // and then move the above arrays and getCollection() logic to get-family
     var collections = {
         app: app$1,
         dataset: dataset$1,
@@ -6272,8 +6267,10 @@
     ];
     var downloadableTypeKeywords = ["Data"];
     var apiTypes = ["Feature Service", "Map Service", "Image Service"];
-    // TODO: remove this at next breaking version
-    // we're just keeping this for backwards compatibility
+    // DEPRECATED: remove this at next breaking version
+    // this is currently used by hub-search and opendata-ui
+    // (in the dataset-display and content-library-engine)
+    // TODO: remove this once it is no longer used in those places
     var categories = {
         app: app.concat(feedback),
         dataset: dataset,
@@ -6567,12 +6564,6 @@
             Array.isArray(extent[0]) &&
             Array.isArray(extent[1]));
     };
-    function isExtentCoordinateArray(extent) {
-        /* tslint:disable no-console */
-        console.warn("DEPRECATED: use isBBox() instead");
-        /* tslint:enable no-console */
-        return isBBox(extent);
-    }
     function isExtentJSON(extent) {
         return ["xmin", "ymin", "xmax", "ymax"].every(function (key) { return typeof extent[key] === "number"; });
     }
@@ -6582,15 +6573,8 @@
      * @return {Boolean}       indicator
      */
     function isValidExtent(extent) {
-        return (!!extent &&
-            [isExtentCoordinateArray, isExtentJSON].some(function (test) { return test(extent); }));
+        return !!extent && [isBBox, isExtentJSON].some(function (test) { return test(extent); });
     }
-    /* istanbul ignore next DEPRECATED, remove at next breaking change */
-    var bBoxToPolygon = function (bBox) {
-        /* tslint:disable no-console */
-        console.warn("DEPRECATED: use extentToPolygon(bBoxToExtent(bBox)) instead");
-        return extentToPolygon(bBoxToExtent(bBox));
-    };
     /**
      * Convert an extent object into a polygon object
      * @param extent
@@ -6641,9 +6625,7 @@
         var family;
         // override default behavior for the rows that are highlighted in yellow here:
         // https://esriis.sharepoint.com/:x:/r/sites/ArcGISHub/_layouts/15/Doc.aspx?sourcedoc=%7BADA1C9DC-4F6C-4DE4-92C6-693EF9571CFA%7D&file=Hub%20Routes.xlsx&nav=MTBfe0VENEREQzI4LUZFMDctNEI0Ri04NjcyLThCQUE2MTA0MEZGRn1fezIwMTIwMEJFLTA4MEQtNEExRC05QzA4LTE5MTAzOUQwMEE1RH0&action=default&mobileredirect=true&cid=df1c874b-c367-4cea-bc13-7bebfad3f2ac
-        // DEPRECATED: we should make type a required parameter
-        // and just do type.toLowerCase() at the next breaking change
-        switch ((type || "").toLowerCase()) {
+        switch (type.toLowerCase()) {
             case "image service":
                 family = "dataset";
                 break;
@@ -8044,9 +8026,7 @@
                 return item.properties && item.properties.metrics;
             }, get spatialReference() {
                 var _a;
-                // NOTE: I had to add || null just so packages/content/test/portal.test.ts would pass
-                // we can remove that when that package is deprecated
-                return (((_a = layer === null || layer === void 0 ? void 0 : layer.extent) === null || _a === void 0 ? void 0 : _a.spatialReference) || getItemSpatialReference(item) || null);
+                return ((_a = layer === null || layer === void 0 ? void 0 : layer.extent) === null || _a === void 0 ? void 0 : _a.spatialReference) || getItemSpatialReference(item);
             },
             get viewDefinition() {
                 // if this is a layer view and we have the item data
@@ -8064,21 +8044,6 @@
                 /* Note: only returns calcite-icons */
                 return getContentTypeIcon(type);
             },
-            // deprecated properties
-            // TODO: should we add these in legacy wrappers
-            // like itemToContent or datasetToContent instead?
-            get license() {
-                /* tslint:disable no-console */
-                console.warn("DEPRECATED: use structuredLicense instead");
-                /* tslint:enable no-console */
-                return { name: "Custom License", description: item.accessInformation };
-            },
-            get hubType() {
-                /* tslint:disable no-console */
-                console.warn("DEPRECATED: use family instead");
-                /* tslint:enable no-console */
-                return getFamily(type);
-            },
             get additionalResources() {
                 return getAdditionalResources(item, metadata);
             } });
@@ -12200,15 +12165,16 @@
      * getCategory('Feature Layer')
      * > 'dataset'
      * ```
-     * **DEPRECATED: Use getCollection() instead**
+     * **DEPRECATED: Use getFamily() instead**
      * returns the Hub category for a given item type
      * @param itemType The ArcGIS [item type](https://developers.arcgis.com/rest/users-groups-and-items/items-and-item-types.htm).
      * @returns the category of a given item type.
      */
+    /* istanbul ignore next deprecated */
     function getCategory(itemType) {
         if (itemType === void 0) { itemType = ""; }
         /* tslint:disable no-console */
-        console.warn("DEPRECATED: Use getCollection() instead. getCategory will be removed at v10.0.0");
+        console.warn("DEPRECATED: Use getFamily() instead. getCategory will be removed at the next breaking version");
         /* tslint:enable no-console */
         var collection = getCollection(itemType);
         // for backwards compatibility
@@ -12237,12 +12203,17 @@
      * getTypeCategories(item)
      * > [ 'Hub Site Application' ]
      * ```
+     * **DEPRECATED: getTypeCategories will be removed at the next breaking version**
      * @param item Item object.
      * @returns typeCategory of the input item.
      *
      */
+    /* istanbul ignore next deprecated */
     function getTypeCategories(item) {
         if (item === void 0) { item = {}; }
+        /* tslint:disable no-console */
+        console.warn("DEPRECATED: getTypeCategories will be removed at the next breaking version");
+        /* tslint:enable no-console */
         var type = normalizeItemType(item);
         var category = getCategory(type);
         if (category) {
@@ -12307,24 +12278,6 @@
         }
         return content.hubId || content.id;
     }
-    /**
-     * DEPRECATED: Use getFamily() instead.
-     *
-     * get the HubType for a given item or item type
-     *
-     * @param itemOrType an item or item.type
-     */
-    function getItemHubType(itemOrType) {
-        /* tslint:disable no-console */
-        console.warn("DEPRECATED: Use getFamily() instead. getItemHubType() will be removed at v10.0.0");
-        /* tslint:enable no-console */
-        if (typeof itemOrType === "string") {
-            itemOrType = { type: itemOrType };
-        }
-        var itemType = normalizeItemType(itemOrType);
-        // TODO: not all categories are Hub types, may need to validate
-        return getCollection(itemType);
-    }
     /**
      * Convert a Portal item to Hub content
      *
@@ -12498,8 +12451,6 @@
         var contentTypeIcon = getContentTypeIcon(normalizedType);
         var contentTypeLabel = getContentTypeLabel(normalizedType, content.isProxied);
         var updated = __assign(__assign({}, content), { type: normalizedType, family: family,
-            // TODO: remove this at next breaking change now that it has been deprecated
-            normalizedType: normalizedType,
             contentTypeIcon: contentTypeIcon,
             contentTypeLabel: contentTypeLabel });
         // update the relative URL to the content
@@ -12517,55 +12468,6 @@
     var getContentTypeLabel = function (contentType, isProxied) {
         return isProxied ? "CSV" : camelize(contentType || "");
     };
-    /**
-     * DEPRECATED returns a new content that has the specified hubId and updated identifier
-     * @param content orignal content
-     * @param hubId new hubId
-     * @returns new content
-     */
-    /* istanbul ignore next DEPRECATED and no longer in use */
-    var setContentHubId = function (content, hubId) {
-        var id = content.id, slug = content.slug;
-        // get the identifier which is based on hubId
-        var identifier = slug || hubId || id;
-        var updated = __assign(__assign({}, content), { hubId: hubId, identifier: identifier });
-        // update the relative URL to the content
-        // which is based on identifier
-        return appendContentUrls(updated, {
-            relative: getContentRelativeUrl(updated),
-        });
-    };
-    /**
-     * DEPRECATED: Calculates the relative and absolute urls for a given content on a specific site
-     *
-     * @param content
-     * @param siteModel
-     * @returns relative and absolute urls
-     */
-    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 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,
-            site: site,
-        });
-    };
     // URL helpers
     var appendContentUrls = function (content, newUrls) {
         // merge new urls into existing ones and return a new content
@@ -13350,24 +13252,6 @@
         });
     }
 
-    /**
-     * Search the Hub API
-     *
-     * @param requestOptions
-     * @returns JSONAPI response
-     */
-    function hubApiSearch(requestOptions) {
-        // derive default headers if authentication
-        var authentication = requestOptions.authentication;
-        var headers = authentication &&
-            authentication.serialize && { authentication: authentication.serialize() };
-        var defaults = {
-            headers: headers,
-            httpMethod: "POST",
-        };
-        return hubApiRequest("/search", __assign(__assign({}, defaults), requestOptions));
-    }
-
     /* Copyright (c) 2018-2021 Environmental Systems Research Institute, Inc.
      * Apache-2.0 */
     /**
@@ -13431,76 +13315,6 @@
             return api;
         }
     }
-    /**
-     * @private
-     * Merge two date ranges by taking the longest span
-     * @param dr1
-     * @param dr2
-     * @returns
-     */
-    function mergeDateRange(dr1, dr2) {
-        // TODO: Remove with _searchContent
-        var result = cloneObject$1(dr1);
-        // feels like there is a more concise way to do this...
-        if (dr2.from < dr1.from) {
-            result.from = dr2.from;
-        }
-        if (dr2.to > dr1.to) {
-            result.to = dr2.to;
-        }
-        return result;
-    }
-    /**
-     * @private
-     * Merge two [`MatchOptions`](../MatchOptions)
-     *
-     * Currently a naieve implementation where the arrays are simply merged
-     *
-     * @param mo1
-     * @param mo2
-     * @returns
-     */
-    function mergeMatchOptions(mo1, mo2) {
-        // TODO: Remove with _searchContent
-        var result = {};
-        // None of these props are required, so we can't just
-        // use Object.keys/.entries
-        var props = ["any", "all", "not", "exact"];
-        props.forEach(function (prop) {
-            var key = prop;
-            var merged = __spreadArrays(getMatchValue(mo1, key), getMatchValue(mo2, key));
-            if (merged.length) {
-                // remove any dupes and set on the return
-                result[key] = merged.filter(unique);
-            }
-        });
-        return result;
-    }
-    /**
-     * Get the value of a property on an IMatchOptions
-     *
-     * This is complex b/c all the props are optional, and
-     * they could be a simple string, or an array of strings.
-     *
-     * This function normalizes all that and returns an array,
-     * which may or may not be empty
-     * @param option
-     * @param key
-     * @returns
-     */
-    function getMatchValue(option, key) {
-        var matchValue = [];
-        if (option[key]) {
-            var val = option[key];
-            if (Array.isArray(val)) {
-                matchValue = val;
-            }
-            else {
-                matchValue = [val];
-            }
-        }
-        return matchValue;
-    }
     /**
      * @private
      * Convert a field value into a MatchOptions if it's not already one
@@ -13569,137 +13383,6 @@
         }
         return result;
     }
-    /**
-     * @private
-     * As a final `ISearchOptions` object gets created, many such objects are created, and
-     * need to be systematically "merged" so as to return consistently structured `q` and `filter`
-     * values.
-     * @param so1
-     * @param so2
-     * @param join
-     * @returns
-     */
-    function mergeSearchOptions$1(so1, so2, join) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: mergeSearchOptions will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
-        var result = cloneObject$1(so1);
-        var q = so2.q, filter = so2.filter;
-        if (q) {
-            result.q = (result.q ? " (" + result.q + " " + join + " " + q + ")" : q).trim();
-        }
-        if (filter) {
-            result.filter = (result.filter ? "(" + result.filter + " " + join + " " + filter + ")" : filter).trim();
-        }
-        return result;
-    }
-    /**
-     * @private
-     * Serialize a `MatchOptions` into `q` or `filter` on an `ISearchOptions`
-     * DEPRECATED: Serialization should be handled in filter-utils.ts
-     * @param key
-     * @param opts
-     * @returns
-     */
-    function serializeMatchOptions$1(key, opts) {
-        var result = {
-            q: "",
-            filter: "",
-        };
-        if (opts.exact) {
-            // defined separately for refactoring later
-            var userFilterableFields = [
-                "username",
-                "firstname",
-                "lastname",
-                "fullname",
-                "email",
-            ];
-            var itemFilterableFields = [
-                "title",
-                "tags",
-                "typekeywords",
-                "type",
-                "name",
-                "owner",
-            ];
-            var groupFilterableFields = ["title", "typekeywords", "owner"];
-            var filterableFields = __spreadArrays(userFilterableFields, itemFilterableFields, groupFilterableFields);
-            if (filterableFields.includes(key)) {
-                result.filter = serializeStringOrArray$1("AND", key, opts.exact);
-            }
-            else {
-                // Treat it the same as .all
-                if (typeof opts.exact === "string") {
-                    if (!opts.all) {
-                        opts.all = [];
-                    }
-                    if (typeof opts.all === "string") {
-                        opts.all = [opts.all];
-                    }
-                    opts.all.push(opts.exact);
-                }
-                if (Array.isArray(opts.exact)) {
-                    if (!opts.all) {
-                        opts.all = [];
-                    }
-                    if (typeof opts.all === "string") {
-                        opts.all = [opts.all];
-                    }
-                    opts.all = opts.all.concat(opts.exact);
-                }
-            }
-        }
-        // Handle the other props
-        if (opts.any) {
-            result.q = serializeStringOrArray$1("OR", key, opts.any);
-        }
-        if (opts.all) {
-            result.q =
-                (result.q ? result.q + " AND " : "") +
-                    serializeStringOrArray$1("AND", key, opts.all);
-        }
-        if (opts.not) {
-            // negate the entries if they are not
-            result.q =
-                (result.q ? result.q + " AND " : "") +
-                    serializeStringOrArray$1("OR", "-" + key, opts.not);
-        }
-        return result;
-    }
-    /**
-     * @private
-     * Serialize a DateRange<number> into a Portal Query string
-     * @param key
-     * @param range
-     * @returns
-     */
-    function serializeDateRange$1(key, range) {
-        return {
-            q: key + ":[" + range.from + " TO " + range.to + "]",
-            filter: "",
-        };
-    }
-    /**
-     * @private
-     * Serialize a `string` or `string[]` into a string
-     * @param join
-     * @param key
-     * @param value
-     * @returns
-     */
-    function serializeStringOrArray$1(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;
-    }
     /**
      * Create a `.next()` function for a type
      * @param request
@@ -13764,1248 +13447,27 @@
         return thumbnailUrl;
     }
 
-    // TODO: Remove with _searchContent
-    // TODO: Implement $dataset
-    var ContentFilterExpansions = {
-        $apps: [
-            {
-                type: {
-                    any: [
-                        "Code Sample",
-                        "Web Mapping Application",
-                        "Mobile Application",
-                        "Application",
-                        "Desktop Application Template",
-                        "Desktop Application",
-                        "Operation View",
-                        "Dashboard",
-                        "Operations Dashboard Extension",
-                        "Workforce Project",
-                        "Insights Workbook",
-                        "Insights Page",
-                        "Insights Model",
-                        "Hub Page",
-                        "Hub Initiative",
-                        "Hub Site Application",
-                        "StoryMap",
-                        "Web Experience",
-                        "Web Experience Template",
-                        "Form",
-                    ],
-                    not: [
-                        "Code Attachment",
-                        "Featured Items",
-                        "Symbol Set",
-                        "Color Set",
-                        "Windows Viewer Add In",
-                        "Windows Viewer Configuration",
-                        "Map Area",
-                        "Indoors Map Configuration",
-                    ],
-                },
-                typekeywords: {
-                    not: ["MapAreaPackage", "SMX"],
-                },
-            },
-        ],
-        $storymap: [
-            {
-                type: "StoryMap",
-            },
-            {
-                type: "Web Mapping Application",
-                typekeywords: ["Story Map"],
-            },
-        ],
-        $dashboard: [
-            {
-                type: "Dashboard",
-                typekeywords: {
-                    any: ["Dashboard"],
-                    not: ["ArcGIS Operation View", "Add In", "Extension"],
-                },
-            },
-        ],
-        $dataset: [],
-        $experience: [
-            {
-                type: {
-                    any: ["Web Experience"],
-                    not: ["Web Experience Template"],
-                },
-            },
-        ],
-        $site: [
-            {
-                type: ["Hub Site Application", "Site Application"],
-            },
-            {
-                type: ["Web Mapping Application"],
-                typekeywords: ["hubSite"],
-            },
-        ],
-        $initiative: [
-            {
-                type: {
-                    any: "Hub Initiative",
-                    not: "Hub Initiative Template",
-                },
-            },
-        ],
-        $document: [
-            {
-                typekeywords: {
-                    any: "Document",
-                    not: ["MapAreaPackage", "SMX"],
-                },
-                type: {
-                    any: [
-                        "Image",
-                        "Layout",
-                        "Desktop Style",
-                        "Project Template",
-                        "Report Template",
-                        "Pro Report",
-                        "Statistical Data Collection",
-                        "360 VR Experience",
-                        "netCDF",
-                        "PDF",
-                        "CSV",
-                        "Administrative Report",
-                        "Raster function template",
-                    ],
-                    not: [
-                        "Image Service",
-                        "Explorer Document",
-                        "Explorer Map",
-                        "Globe Document",
-                        "Scene Document",
-                        "Code Attachment",
-                        "Featured Items",
-                        "Symbol Set",
-                        "ColorSet",
-                        "Windows Viewer Add In",
-                        "Windows Viewer Configuration",
-                        "Map Area",
-                        "Indoors Map Configuration",
-                    ],
-                },
-            },
-        ],
-    };
-    /**
-     * @private
-     * Convert portal search response to facets
-     * Note: Only applicable to an item search
-     * @param response
-     * @returns
-     */
-    // TODO: Remove with _searchContent
-    function convertPortalResponseToFacets(response, operation) {
-        if (operation === void 0) { operation = "OR"; }
-        // delegate to a more future-friendly version
-        return convertPortalItemResponseToFacets(response, operation, "filter");
-    }
+    var CATALOG_SCHEMA_VERSION = 1.0;
     /**
-     * @private
-     * Convert portal search response to facets
-     * Note: Only applicable to an item search
-     * @param response
+     * Apply schema upgrades to Catalog objects
+     * @param catalog
      * @returns
      */
-    function convertPortalItemResponseToFacets(response, operation, optionProp // TODO: Remove with _searchContent and use `filters`
-    ) {
-        var _a;
-        if (operation === void 0) { operation = "OR"; }
-        if (optionProp === void 0) { optionProp = "filters"; }
-        // TODO: move into portalSearchItems
-        var result = [];
-        if ((_a = response.aggregations) === null || _a === void 0 ? void 0 : _a.counts) {
-            response.aggregations.counts.forEach(function (entry) {
-                var facet = {
-                    label: entry.fieldName,
-                    key: entry.fieldName,
-                    aggField: entry.fieldName,
-                    display: "multi-select",
-                };
-                var options = [];
-                entry.fieldValues.forEach(function (fv) {
-                    var filter = {
-                        filterType: "item",
-                    };
-                    // construct the filter based on the operation
-                    var matchKey = operation === "OR" ? "any" : "all";
-                    var filterMatchOption = {};
-                    filterMatchOption[matchKey] = [fv.value];
-                    filter[entry.fieldName] = filterMatchOption;
-                    // construct the FacetOption
-                    var fo = {
-                        label: fv.value + " (" + fv.count + ")",
-                        key: fv.value,
-                        count: fv.count,
-                        selected: false,
-                    };
-                    // Temporary to ensure the old fn can delegate to this
-                    // but we can still return the correct structure
-                    // TODO: Remove with _searchContent
-                    /* istanbul ignore next */
-                    if (optionProp === "filter") {
-                        fo.filter = filter;
-                    }
-                    else {
-                        fo.filters = [filter];
-                    }
-                    options.push(fo);
-                });
-                facet.options = options;
-                result.push(facet);
-            });
+    function upgradeCatalogSchema(catalog) {
+        var clone = cloneObject$1(catalog);
+        if (getProp(clone, "schemaVersion") === CATALOG_SCHEMA_VERSION) {
+            return clone;
+        }
+        else {
+            // apply migrations in order
+            clone = applyCatalogSchema(clone);
+            return clone;
         }
-        return result;
     }
     /**
-     * Merge `Filter<"content">` 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 mergeContentFilter(filters) {
-        Logger.warn("DEPRECATION: mergeContentFilter will be removed and filters should not longer be merged. Work with IFilterGroups instead");
-        // expand all the filters so all prop types are consistent
-        var expanded = filters.map(expandContentFilter);
-        // now we can merge based on fields
-        var dateFields = ["created", "modified"];
-        var specialFields = __spreadArrays(["filterType", "subFilters", "term"], dateFields);
-        var result = expanded.reduce(function (acc, entry) {
-            // process fields
-            Object.entries(entry).forEach(function (_a) {
-                var key = _a[0], value = _a[1];
-                if (acc.hasOwnProperty(key)) {
-                    /* istanbul ignore else */
-                    if (!specialFields.includes(key)) {
-                        acc[key] = mergeMatchOptions(acc[key], value);
-                    }
-                    else if (dateFields.includes(key)) {
-                        acc[key] = mergeDateRange(acc[key], value);
-                    }
-                    else if (key === "term") {
-                        acc[key] = acc[key] + " " + value;
-                    }
-                    else if (key === "subFilters") {
-                        acc[key] = mergeSubFilters(acc[key], value);
-                    }
-                }
-                else {
-                    acc[key] = cloneObject$1(value);
-                }
-            });
-            return acc;
-        }, {});
-        result.filterType = "content";
-        return result;
-    }
-    function mergeSubFilters(sf1, sf2) {
-        // Simplistic implementation: we just merge the arrays
-        // in the future we may try to de-dupe things as a safeguard
-        return __spreadArrays(sf1, sf2);
-    }
-    /**
-     * 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. `title: "Water"` expands into `title: { any: ["Water"]}`
-     *
-     * - "well known" type values are expanded
-     *    - i.e. `type: "$storymap"` expands into two `subFilter` entries
-     * - Fields defined as `string | string[] | MatchOptions` will be converted to a `MatchOptions`
-     * - RelativeDate fields are converted to DateRange<number>
-     *
-     * @param filter
-     * @returns
-     */
-    function expandContentFilter(filter) {
-        Logger.warn("DEPRECATION: expandContentFilter will be removed. Work with IFilterGroups<\"item\"> instead");
-        // Expand filter.type first
-        var expandedTypeFilter = expandTypeField(filter);
-        // Expand subfilters
-        // Guard - JS Clients could send in anything...
-        if (Array.isArray(filter.subFilters)) {
-            // Convert any strings into the coresponding ContentFilterDefinition
-            expandedTypeFilter.subFilters = expandedTypeFilter.subFilters.reduce(function (acc, entry) {
-                if (typeof entry === "string") {
-                    // if the entry is not a key of ContentFilterExpansions
-                    // we just skip over it
-                    if (ContentFilterExpansions[entry]) {
-                        acc = acc.concat(ContentFilterExpansions[entry]);
-                    }
-                }
-                else {
-                    acc.push(entry); // should be a ContentFilterDefinition
-                }
-                return acc;
-            }, []);
-        }
-        // Convert all props into MatchOptions/DateRanges
-        return convertContentDefinitionToFilter(expandedTypeFilter);
-    }
-    /**
-     * @private
-     * Expand from a well-known "type" into it's longer form
-     *
-     * i.e. `type: "$storymap"` expands into two subFilters entries
-     *
-     * @param filter
-     * @returns
-     */
-    function expandTypeField(filter) {
-        var clone = cloneObject$1(filter);
-        // ensure subFilters is defined as an array
-        clone.subFilters = clone.subFilters || [];
-        if (clone.type) {
-            // if .type is an Array...
-            if (Array.isArray(clone.type)) {
-                // remove any well-known-keys and move their expansions into subfilters
-                clone.type = clone.type.reduce(function (acc, entry) {
-                    if (isWellKnownType(entry)) {
-                        // working with dynamic objects in typescript requires some assertions
-                        var key = entry;
-                        clone.subFilters = clone.subFilters.concat(lookupTypeFilters(key));
-                    }
-                    else {
-                        acc.push(entry);
-                    }
-                    return acc;
-                }, []);
-            }
-            else if (isWellKnownType(clone.type)) {
-                var key = clone.type;
-                clone.subFilters = clone.subFilters.concat(lookupTypeFilters(key));
-                delete clone.type;
-            }
-            else ;
-        }
-        return clone;
-    }
-    /**
-     * Is the argument a well-known type "key"
-     *
-     * Accepts `string`, `string[]` or `IMatchOptions`
-     * but only string values can possibly be properties
-     * on `ContentFilterExpansions`
-     * @param key
-     * @returns
-     */
-    function isWellKnownType(key) {
-        var result = false;
-        if (typeof key === "string") {
-            result = key in ContentFilterExpansions;
-        }
-        return result;
-    }
-    function lookupTypeFilters(key) {
-        return ContentFilterExpansions[key];
-    }
-    /**
-     * @private
-     * Convert a `ContentFilterDefinition` to a `ContentFilter`
-     *
-     * ContentFilter is a narrower version of ContentFilterDefinition, without
-     * the union types. Using a ContentFilter makes working with the structure
-     * in typescript much easier.
-     *
-     * @param filter
-     * @returns
-     */
-    function convertContentDefinitionToFilter(filter) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: convertContentDefinitionToFilter will be removed. Work with IFilterGroups<\"item\"> instead");
-        var result = {};
-        if (filter.term) {
-            result.term = filter.term;
-        }
-        var dateProps = ["created", "modified"];
-        // Some properties should not get converted to MatchOptions
-        var specialProps = __spreadArrays(["filterType", "subFilters", "term"], dateProps);
-        // Do the conversion
-        Object.entries(filter).forEach(function (_a) {
-            var key = _a[0], value = _a[1];
-            if (!specialProps.includes(key)) {
-                result[key] = valueToMatchOptions(value);
-            }
-        });
-        // Special Cases
-        // subFilters; Array of ContentFilterDefinitions
-        if (filter.subFilters && Array.isArray(filter.subFilters)) {
-            // downcast - would be nice to skip this or use some other constuct
-            var sf = filter.subFilters;
-            result.subFilters = sf.map(convertContentDefinitionToFilter);
-        }
-        // Dates; Ensure they are all DateRange<number>
-        dateProps.forEach(function (fld) {
-            if (filter[fld]) {
-                if (filter[fld].type === "relative-date") {
-                    result[fld] = relativeDateToDateRange(filter[fld]);
-                }
-                else {
-                    result[fld] = cloneObject$1(filter[fld]);
-                }
-            }
-        });
-        return result;
-    }
-    /**
-     * @private
-     * Serialize a `ContentFilter` into an `ISearchOptions` for use with `searchItems`
-     * @param filter
-     * @returns
-     */
-    function serializeContentFilterForPortal(filter) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: serializeContentFilterForPortal will be removed. Work with IFilterGroups<\"item\"> and hubSearch() instead");
-        var searchOptions = convertContentFilterToSearchOptions(filter);
-        if (filter.subFilters) {
-            var subFilterOptions = filter.subFilters.reduce(function (acc, entry) {
-                // Next guard is present b/c this can be used from javascript
-                // but our tests are written in typescript which prevents us
-                // from hitting the else
-                /* istanbul ignore else */
-                if (typeof entry === "object") {
-                    acc = mergeSearchOptions$1(acc, convertContentFilterToSearchOptions(entry), "OR");
-                }
-                return acc;
-            }, { q: "", filter: "" });
-            // merge with searchOptions using AND
-            searchOptions = mergeSearchOptions$1(searchOptions, subFilterOptions, "AND");
-        }
-        // term is always last, and pre-pended on searchOptions.q
-        if (filter.term) {
-            searchOptions.q = (filter.term + " " + searchOptions.q).trim();
-        }
-        return searchOptions;
-    }
-    /**
-     * @private
-     * Convert a ContentFilter to a SearchOptions
-     *
-     * @param filter
-     * @returns
-     */
-    function convertContentFilterToSearchOptions(filter) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: convertContentFilterToSearchOptions will be removed. Work with IFilterGroups<\"item\"> and hubSearch() instead");
-        var result = {
-            q: "",
-            filter: "",
-        };
-        var dateProps = ["created", "modified"];
-        var specialProps = __spreadArrays(["filterType", "subFilters", "term"], dateProps);
-        Object.entries(filter).forEach(function (_a) {
-            var key = _a[0], value = _a[1];
-            // MatchOptions may go into either q or filter
-            if (!specialProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeMatchOptions$1(key, value), "AND");
-            }
-            // Dates only go into q
-            if (dateProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeDateRange$1(key, value), "AND");
-            }
-        });
-        return result;
-    }
-
-    // TODO: Remove with _searchContent
-    /**
-     *
-     * Merge `Filter<"group">` 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 mergeGroupFilters(filters) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: mergeGroupFilters will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
-        // expand all the filters so all prop types are consistent
-        var expanded = filters.map(expandGroupFilter);
-        // now we can merge based on fields
-        var dateFields = ["created", "modified"];
-        var specialFields = __spreadArrays(["filterType", "term"], 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: "group",
-        });
-        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. `title: "Water"` expands into `title: { any: ["Water"]}`
-     *
-     * - Fields defined as `string | string[] | MatchOptions` will be converted to a `MatchOptions`
-     * - RelativeDate fields are converted to DateRange<number>
-     *
-     * @param filter
-     * @returns
-     */
-    function expandGroupFilter(filter) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: expandGroupFilters will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
-        var result = {};
-        var dateProps = ["created", "modified"];
-        // Some properties should not get converted to MatchOptions
-        var specialProps = __spreadArrays(["term", "searchUserAccess"], dateProps);
-        // Do the conversion
-        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);
-                }
-            }
-        });
-        // searchUserAccess is boolean, so we check if the prop exists
-        // vs checking if the value is truthy
-        if (filter.hasOwnProperty("searchUserAccess")) {
-            result.searchUserAccess = filter.searchUserAccess;
-        }
-        if (filter.term) {
-            result.term = filter.term;
-        }
-        return result;
-    }
-    /**
-     * @private
-     * Serialize an `IGroupFilterDefinition` into an `ISearchOptions` for use
-     * with `searchGroups`
-     * @param filter
-     * @returns
-     */
-    function serializeGroupFilterForPortal(filter) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: serializeGroupFilterForPortal will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
-        var result = {
-            q: "",
-            filter: "",
-        };
-        var dateProps = ["created", "modified"];
-        var specialProps = __spreadArrays(["term", "searchUserAccess", "filterType"], dateProps);
-        Object.entries(filter).forEach(function (_a) {
-            var key = _a[0], value = _a[1];
-            // MatchOptions fields
-            if (!specialProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeMatchOptions$1(key, value), "AND");
-            }
-            // Dates only go into q
-            if (dateProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeDateRange$1(key, value), "AND");
-            }
-        });
-        // searchUserAccess is also a top-level property
-        if (filter.hasOwnProperty("searchUserAccess")) {
-            result.searchUserAccess = filter.searchUserAccess;
-        }
-        // add the term
-        if (filter.term) {
-            result.q = (filter.term + " " + result.q).trim();
-        }
-        return result;
-    }
-
-    // TODO: Remove with _searchContent
-    /**
-     *
-     * 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) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: mergeUserFilters will be removed. Work with IFilterGroups<\"user\"> and hubSearch() instead");
-        // 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) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: expandUserFilter will be removed. Work with IFilterGroups<\"user\"> and hubSearch() instead");
-        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) {
-        // TODO: Remove with _searchContent
-        Logger.warn("DEPRECATION: serializeUserFilterForPortal will be removed. Work with IFilterGroups<\"user\"> and hubSearch() instead");
-        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$1(result, serializeMatchOptions$1(key, value), "AND");
-            }
-            // Dates only go into q
-            if (dateProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeDateRange$1(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;
-    }
-
-    // TODO: Remove with _searchContent
-    /**
-     * @private
-     * Search for content via the Portal or Hub API
-     * @param filter
-     * @param options
-     */
-    function _searchContent(filter, options) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var expanded, api, searchPromise, so_1, props;
-            return __generator(this, function (_c) {
-                Logger.warn("DEPRECATION: _searchContent will be removed; switch to hubSearch(...)");
-                expanded = expandContentFilter(filter);
-                api = expandApi(options.api || "arcgis");
-                // Portal Search
-                if (api.type === "arcgis") {
-                    so_1 = serializeContentFilterForPortal(expanded);
-                    props = [
-                        "authentication",
-                        "num",
-                        "sortField",
-                        "sortOrder",
-                        "site",
-                        "start",
-                    ];
-                    // copy the props over
-                    props.forEach(function (prop) {
-                        if (options.hasOwnProperty(prop)) {
-                            so_1[prop] = options[prop];
-                        }
-                    });
-                    // If we don't have auth, ensure we have .portal
-                    if (!so_1.authentication) {
-                        so_1.portal = api.url + "/sharing/rest";
-                    }
-                    // DEPRECATION
-                    if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
-                        // tslint:disable-next-line:no-console
-                        console.warn("IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.");
-                        so_1.countFields = options.aggregations.join(",");
-                        so_1.countSize = options.aggLimit || 10;
-                    }
-                    // Aggregations
-                    if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
-                        so_1.countFields = options.aggFields.join(",");
-                        so_1.countSize = options.aggLimit || 10;
-                    }
-                    searchPromise = searchPortal$3(so_1);
-                }
-                else {
-                    // Hub API Search
-                    // TODO: Implement hub api content search
-                    searchPromise = Promise.resolve({
-                        total: 0,
-                        results: [],
-                        facets: [],
-                        hasNext: false,
-                        next: function () {
-                            // tslint:disable-next-line
-                            Promise.resolve(null);
-                        },
-                    });
-                }
-                return [2 /*return*/, searchPromise];
-            });
-        });
-    }
-    /**
-     * 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$3(searchOptions) {
-        var _a;
-        var portalUrl = ((_a = searchOptions.authentication) === null || _a === void 0 ? void 0 : _a.portal) || searchOptions.portal;
-        var token;
-        if (searchOptions.authentication) {
-            var us = searchOptions.authentication;
-            token = us.token;
-        }
-        var thumbnailify = function (content) {
-            content.thumbnailUrl = getItemThumbnailUrl(content, portalUrl, token);
-            return content;
-        };
-        return searchItems(searchOptions).then(function (resp) {
-            var hasNext = resp.nextStart > -1;
-            // convert items to IHubContent's
-            var content = resp.results.map(itemToContent);
-            // if we have a site, add those urls
-            if (searchOptions.site) {
-                content = content.map(function (entry) {
-                    return setContentSiteUrls(entry, searchOptions.site);
-                });
-            }
-            // add thumbnailUrl
-            content = content.map(thumbnailify);
-            // convert aggregations into facets
-            var facets = convertPortalResponseToFacets(resp);
-            return {
-                total: resp.total,
-                results: content,
-                facets: facets,
-                hasNext: hasNext,
-                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$3),
-            };
-        });
-    }
-
-    // TODO: Remove with _searchContent
-    /**
-     * @private
-     * Search Groups using Filter<"group">
-     *
-     * Currently just returns ISearchResult<IGroup>
-     * @param filter
-     * @param options
-     * @returns
-     */
-    function _searchGroups(filter, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var expanded, api, so_1, props;
-            return __generator(this, function (_a) {
-                Logger.warn("DEPRECATION: _searchGroups will be removed; switch to hubSearch(...)");
-                expanded = expandGroupFilter(filter);
-                api = expandApi(options.api || "arcgis");
-                if (api.type === "arcgis") {
-                    so_1 = serializeGroupFilterForPortal(expanded);
-                    props = [
-                        "authentication",
-                        "num",
-                        "sortField",
-                        "sortOrder",
-                        "site",
-                        "start",
-                    ];
-                    // copy the props over
-                    props.forEach(function (prop) {
-                        if (options.hasOwnProperty(prop)) {
-                            so_1[prop] = options[prop];
-                        }
-                    });
-                    // If we don't have auth, ensure we have .portal
-                    if (!so_1.authentication) {
-                        so_1.portal = api.url + "/sharing/rest";
-                    }
-                    return [2 /*return*/, searchPortalGroups(so_1)];
-                }
-                else {
-                    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) || searchOptions.portal;
-        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),
-            };
-        });
-    }
-
-    // TODO: Remove with _searchContent
-    /**
-     * @private
-     * Search for Users via the Portal API.
-     *
-     * **Note** Authentication is required
-     *
-     * Another trivial comment to force a release
-     *
-     * 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_1, props;
-            return __generator(this, function (_a) {
-                Logger.warn("DEPRECATION: _searchUsers will be removed; switch to hubSearch(...)");
-                // JS Clients may not pass in authentication
-                if (!options.authentication) {
-                    throw new Error("Authentication required to search for users.");
-                }
-                expanded = expandUserFilter(filter);
-                api = expandApi(options.api || "arcgis");
-                if (api.type === "arcgis") {
-                    searchOptions_1 = serializeUserFilterForPortal(expanded);
-                    props = [
-                        "authentication",
-                        "num",
-                        "sortField",
-                        "sortOrder",
-                        "site",
-                        "start",
-                    ];
-                    // copy the props over
-                    props.forEach(function (prop) {
-                        if (options.hasOwnProperty(prop)) {
-                            searchOptions_1[prop] = options[prop];
-                        }
-                    });
-                    return [2 /*return*/, searchPortalUsers(searchOptions_1)];
-                }
-                else {
-                    throw new Error("_searchUsers is not implemented for non-arcgis apis");
-                }
-            });
-        });
-    }
-    /**
-     * 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 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),
-            };
-        });
-    }
-
-    /**
-     * @private
-     * Apply the sortState to SortOptions
-     *
-     * @param sortOptions
-     * @param sortState
-     * @returns
-     */
-    function applySortState(sortOptions, sortState) {
-        var updated = cloneObject$1(sortOptions);
-        if (sortState) {
-            var _a = sortState.split("|"), label = _a[0], attribute = _a[1], order = _a[2];
-            updated.label = label;
-            updated.attribute = attribute;
-            updated.order = order;
-        }
-        return updated;
-    }
-    /**
-     * @private
-     * Apply FacetState to a Facet
-     * @param facet
-     * @param state
-     * @returns
-     */
-    function applyFacetState(facet, state) {
-        var updated = cloneObject$1(facet);
-        switch (facet.display) {
-            case "single-select":
-                updated = applySingleSelectFacetState(facet, state);
-                break;
-            case "multi-select":
-                updated = applyMultiSelectFacetState(facet, state);
-                break;
-        }
-        return updated;
-    }
-    /**
-     * @private
-     * Apply the Facet State onto a single-select facet
-     *
-     * Intentionally mutates the facet.
-     * @param facet
-     * @param state
-     * @returns
-     */
-    function applySingleSelectFacetState(facet, state) {
-        var updated = cloneObject$1(facet);
-        updated.options = updated.options.map(function (o) {
-            o.selected = o.key === state[facet.key];
-            return o;
-        });
-        return updated;
-    }
-    /**
-     * @private
-     * Serialize single-select facet into IFacetState
-     * @param facet
-     * @returns
-     */
-    function serializeSingleSelectFacetState(facet) {
-        var state = {};
-        var selected = facet.options.find(function (o) { return o.selected; });
-        if (selected) {
-            state[facet.key] = selected.key;
-        }
-        else {
-            state[facet.key] = null;
-        }
-        return state;
-    }
-    /**
-     * @private
-     * Apply the Facet State onto a multi-select Facet
-     *
-     * Intentionally mutates the facet.
-     * @param facet
-     * @param state
-     * @returns
-     */
-    function applyMultiSelectFacetState(facet, state) {
-        var _a;
-        var updated = cloneObject$1(facet);
-        var selectedKeys = ((_a = state[facet.key]) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
-        updated.options = updated.options.map(function (o) {
-            o.selected = selectedKeys.includes(o.key);
-            return o;
-        });
-        return updated;
-    }
-    /**
-     * @private
-     * Serialize multi-select facet into IFacetState
-     * @param facet
-     * @returns
-     */
-    function serializeMultiSelectFacetState(facet) {
-        var state = {};
-        var selected = facet.options.filter(function (o) { return o.selected; });
-        var value = selected.map(function (o) { return o.key; }).join(",");
-        if (value.length) {
-            state[facet.key] = value;
-        }
-        else {
-            state[facet.key] = null;
-        }
-        return state;
-    }
-    /**
-     * @private
-     * Serialize the state of the SortOption into a key/value pair
-     *
-     * Called from the Sort component
-     * @param sort
-     * @returns
-     */
-    function serializeSortState(sort) {
-        return sort.label + "|" + sort.attribute + "|" + sort.order;
-    }
-    /**
-     * @private
-     * Serialize the state of a facet into a key/value pair
-     *
-     * Called from the various facet components
-     * @param facet
-     * @returns
-     */
-    function serializeFacetState(facet) {
-        var state = {};
-        switch (facet.display) {
-            case "single-select":
-                state = serializeSingleSelectFacetState(facet);
-                break;
-            case "multi-select":
-                state = serializeMultiSelectFacetState(facet);
-                break;
-        }
-        return state;
-    }
-
-    /**
-     * Apply ICollectionState to an ICollection
-     *
-     * Typically used in a Gallery or Catalog component to
-     * set the inital state, based on values deserialized
-     * from a query string
-     * @param collection
-     * @param state
-     * @returns
-     */
-    function applyCollectionState(collection, state) {
-        var updated = cloneObject$1(collection);
-        // Apply default query
-        if (state.query) {
-            updated.defaultQuery = state.query;
-        }
-        // Apply Sort State
-        updated.sortOption = applySortState(updated.sortOption, state.sort);
-        // Look for state props for the facets and apply them
-        updated.facets = updated.facets.map(function (facet) {
-            // see if there is a key for this facet on the state
-            if (Object.keys(state).includes(facet.key)) {
-                var facetState = {};
-                facetState[facet.key] = state[facet.key];
-                return applyFacetState(facet, facetState);
-            }
-            else {
-                // Ensure all options are not selected
-                // because they were not included in the state
-                facet.options.forEach(function (opt) {
-                    opt.selected = false;
-                });
-                return facet;
-            }
-        });
-        //
-        return updated;
-    }
-    /**
-     * Serialize the current state of a collection into a hash that
-     * can be converted into a query string
-     * @param collection
-     * @returns
-     */
-    function serializeCollectionState(collection) {
-        var state = {};
-        if (collection.defaultQuery) {
-            state.query = collection.defaultQuery;
-        }
-        if (collection.sortOption) {
-            state.sort = serializeSortState(collection.sortOption);
-        }
-        var facetState = (collection.facets || []).reduce(function (s, facet) {
-            return __assign(__assign({}, s), serializeFacetState(facet));
-        }, {});
-        return __assign(__assign({}, state), facetState);
-    }
-
-    var CATALOG_SCHEMA_VERSION = 1.0;
-    /**
-     * Apply schema upgrades to Catalog objects
-     * @param catalog
-     * @returns
-     */
-    function upgradeCatalogSchema(catalog) {
-        var clone = cloneObject$1(catalog);
-        if (getProp(clone, "schemaVersion") === CATALOG_SCHEMA_VERSION) {
-            return clone;
-        }
-        else {
-            // apply migrations in order
-            clone = applyCatalogSchema(clone);
-            return clone;
-        }
-    }
-    /**
-     * Apply the Catalog schema to the original, unversioned
-     * site catalog objects
-     * @param original
+     * Apply the Catalog schema to the original, unversioned
+     * site catalog objects
+     * @param original
      * @returns
      */
     function applyCatalogSchema(original) {
@@ -15040,45 +13502,6 @@
             return catalog;
         }
     }
-    /**
-     * DEPRECATED: Use upgradeCatalogSchema(...)
-     * @param original
-     */
-    /* istanbul ignore next */
-    function convertCatalog(original) {
-        return upgradeCatalogSchema(original);
-    }
-
-    /**
-     * Determine if a Filter is "empty"
-     * @param filter
-     * @returns
-     */
-    function isEmptyFilter(filter) {
-        // if it has one property, filterType, it's empty
-        return (Object.keys(filter).length === 1 && filter.hasOwnProperty("filterType"));
-    }
-    /**
-     * Determine if a filterGroup is "empty"
-     * @param filterGroup
-     * @returns
-     */
-    function isEmptyFilterGroup(filterGroup) {
-        // if filters array is empty
-        if (filterGroup.filters.length === 0) {
-            return true;
-        }
-        else {
-            // if all filters are empty
-            var result = filterGroup.filters.reduce(function (acc, entry) {
-                if (acc) {
-                    acc = isEmptyFilter(entry);
-                }
-                return acc;
-            }, true);
-            return result;
-        }
-    }
 
     /**
      * @private
@@ -15198,7 +13621,6 @@
         var portalAllowList = [
             "access",
             "categories",
-            "capabilities",
             "created",
             "description",
             "disabled",
@@ -16337,18 +14759,6 @@
                 });
             });
         };
-        // DEPRECATED IN FAVOR OF .fetch()
-        // TODO: REMOVE AT NEXT MAJOR
-        /* istanbul ignore next */
-        HubProjectManager.prototype.get = function (identifier, requestOptions) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    // tslint:disable-next-line
-                    console.warn("HubProjectManager.get is deprecated and will be removed. Use .fetch() instead.");
-                    return [2 /*return*/, this.fetch(identifier, requestOptions)];
-                });
-            });
-        };
         /**
          * Fetch a Project via id or it's slug
          *
@@ -16961,15 +15371,6 @@
         }
         return prms;
     }
-    /**
-     * @private // keep out of docs
-     */
-    /* istanbul ignore next */
-    function fetchSite(identifier, hubRequestOptions) {
-        // tslint:disable-next-line
-        console.warn("@esri/hub-common::fetchSite is deprecated. Please use @esri/hub-common::fetchSiteModel instead");
-        return fetchSiteModel(identifier, hubRequestOptions);
-    }
 
     /**
      * Get a Site Model by it's Item Id, and apply schema upgrades
@@ -18086,7 +16487,7 @@
      */
     function searchPortal$2(searchOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var resp, fn, results, facets, aggregations;
+            var resp, fn, results, aggregations;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, searchItems(searchOptions)];
@@ -18098,13 +16499,11 @@
                         return [4 /*yield*/, Promise.all(resp.results.map(fn))];
                     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$2),
@@ -18144,10 +16543,9 @@
             });
         });
     }
-    var WellKnownItemFilters = {
+    var WellKnownItemPredicates = {
         $application: [
             {
-                filterType: "item",
                 type: {
                     any: [
                         "Web Mapping Application",
@@ -18162,14 +16560,12 @@
                 },
             },
             {
-                filterType: "item",
                 type: "Web Mapping Experience",
                 typekeywords: "EXB Experience",
             },
         ],
         $dashboard: [
             {
-                filterType: "item",
                 type: {
                     any: ["Dashboard"],
                     not: ["Operation View"],
@@ -18181,7 +16577,6 @@
         ],
         $dataset: [
             {
-                filterType: "item",
                 type: {
                     any: [
                         "Scene Service",
@@ -18216,13 +16611,11 @@
                 },
             },
             {
-                filterType: "item",
                 typekeywords: ["OGC", "Geodata Service"],
             },
         ],
         $document: [
             {
-                filterType: "item",
                 type: [
                     "PDF",
                     "Microsoft Excel",
@@ -18238,48 +16631,40 @@
         ],
         $initiative: [
             {
-                filterType: "item",
                 type: "Hub Initiative",
             },
         ],
         $experience: [
             {
-                filterType: "item",
                 type: "Web Experience",
             },
         ],
         $feedback: [
             {
-                filterType: "item",
                 type: "Form",
             },
         ],
         $page: [
             {
-                filterType: "item",
                 typekeywords: "hubPage",
             },
         ],
         $site: [
             {
-                filterType: "item",
                 type: ["Hub Site Application", "Site Application"],
             },
         ],
         $storymap: [
             {
-                filterType: "item",
                 type: "Storymap",
             },
             {
-                filterType: "item",
                 type: "Web Mapping Application",
                 typekeywords: "Story Map",
             },
         ],
         $template: [
             {
-                filterType: "item",
                 type: [
                     "Web Mapping Application",
                     "Hub Initiative",
@@ -18294,7 +16679,6 @@
         ],
         $webmap: [
             {
-                filterType: "item",
                 type: {
                     any: ["Web Map", "Web Scene"],
                     not: "Web Mapping Application",
@@ -18363,7 +16747,7 @@
     function isWellKnownTypeFilter(key) {
         var result = false;
         if (typeof key === "string") {
-            result = key in WellKnownItemFilters;
+            result = key in WellKnownItemPredicates;
         }
         return result;
     }
@@ -18373,14 +16757,7 @@
      * @returns
      */
     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$1(entry);
-            delete c.filterType;
-            return c;
-        });
-        return predicates;
+        return WellKnownItemPredicates[key];
     }
 
     // ##    ##  #######  ######## ########
@@ -18395,194 +16772,18 @@
     /**
      * @private
      * Execute item search against the Hub API
-     * @param filter
+     * @param query
      * @param options
      * @returns
      */
     /* istanbul ignore next */
-    function hubSearchItems(filters, options) {
-        var _a;
+    function hubSearchItems(query, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var api, apiUrl, cleanFilters, searchRequest, aggs, session, opts, raw, json, token_1, us, tokenizeThubmnailUrl, conversion, results, facets, response, ex_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        api = expandApi(options.api || "hub");
-                        apiUrl = api.url + "/api/items/beta/search";
-                        cleanFilters = [];
-                        filters.forEach(function (block) {
-                            var b = {
-                                operation: block.operation,
-                                filters: block.filters.map(function (f) {
-                                    var c = cloneObject$1(f);
-                                    delete c.filterType;
-                                    return c;
-                                }),
-                            };
-                            cleanFilters.push(b);
-                        });
-                        searchRequest = {
-                            q: cleanFilters,
-                            options: {
-                                num: options.num || 10,
-                                start: options.start || 1,
-                                sortField: options.sortField,
-                                sortOrder: options.sortOrder,
-                            },
-                        };
-                        // Add optional props via setProp b/c typescript really does not like
-                        // adding properties after defining an object
-                        if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
-                            aggs = [
-                                {
-                                    mode: "terms",
-                                    fields: options.aggFields,
-                                    num: options.aggLimit || 10,
-                                },
-                            ];
-                            setProp("aggregations", aggs, searchRequest.options);
-                        }
-                        if (options.authentication) {
-                            session = {
-                                token: options.authentication.token,
-                                portal: options.authentication.portal,
-                            };
-                            setProp("session", session, searchRequest.options);
-                        }
-                        opts = {
-                            method: "POST",
-                            mode: "cors",
-                            cache: "no-cache",
-                            headers: {
-                                "Content-Type": "application/json",
-                            },
-                            body: JSON.stringify(searchRequest),
-                        };
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 5, , 6]);
-                        return [4 /*yield*/, fetch(apiUrl, opts)];
-                    case 2:
-                        raw = _b.sent();
-                        return [4 /*yield*/, raw.json()];
-                    case 3:
-                        json = _b.sent();
-                        if (options.authentication) {
-                            us = options.authentication;
-                            token_1 = us.token;
-                        }
-                        tokenizeThubmnailUrl = function (entry) {
-                            if (token_1 && entry.attributes.access !== "public") {
-                                entry.attributes.thumbnailUrl = entry.attributes.thumbnailUrl + "?token=" + token_1;
-                            }
-                            return entry;
-                        };
-                        json.data = json.data.map(tokenizeThubmnailUrl);
-                        conversion = function (entry) {
-                            return hubContentToSearchResult(jsonApiToHubContent(entry));
-                        };
-                        return [4 /*yield*/, Promise.all(json.data.map(conversion))];
-                    case 4:
-                        results = _b.sent();
-                        facets = convertHubResponseToFacets(json);
-                        response = {
-                            total: json.meta.total,
-                            results: results,
-                            facets: facets,
-                            hasNext: json.meta.hasNext,
-                            next: function () {
-                                // tslint:disable-next-line
-                                Promise.resolve(null);
-                            },
-                        };
-                        return [2 /*return*/, Promise.resolve(response)];
-                    case 5:
-                        ex_1 = _b.sent();
-                        // TODO: Turn into a formal error
-                        throw ex_1;
-                    case 6: return [2 /*return*/];
-                }
+            return __generator(this, function (_a) {
+                throw new Error("Not implemented");
             });
         });
     }
-    /**
-     * Re-structure a jsonApi data entry into a flat object cast into
-     * IHubContent
-     * @param data
-     * @returns
-     */
-    /* istanbul ignore next */
-    function jsonApiToHubContent(data) {
-        var content = cloneObject$1(data.attributes);
-        content.id = data.id;
-        return content;
-    }
-    /* istanbul ignore next */
-    function hubContentToSearchResult(content) {
-        var result = {
-            access: content.access,
-            id: content.id,
-            type: content.type,
-            name: content.name,
-            owner: content.owner,
-            summary: content.snippet || content.description,
-            createdDate: new Date(content.createdDate),
-            createdDateSource: content.createdDateSource,
-            updatedDate: new Date(content.updatedDate),
-            updatedDateSource: content.updatedDateSource,
-            thumbnailUrl: content.thumbnailUrl,
-            metadata: [],
-            family: content.family,
-            urls: {
-                portalHome: "not-implemented",
-                relative: "not-implemented",
-            },
-        };
-        // TODO: Per-type plucking of props into the `meta` hash for use in the card components
-        return Promise.resolve(result);
-    }
-    /* istanbul ignore next */
-    function convertHubResponseToFacets(response, operation) {
-        var _a;
-        if (operation === void 0) { operation = "OR"; }
-        var result = [];
-        if ((_a = response.meta) === null || _a === void 0 ? void 0 : _a.aggregations) {
-            var meta = response.meta;
-            meta.aggregations.forEach(function (entry) {
-                // Dyanmic facets typically "AND" so we are refining
-                var facet = {
-                    label: entry.field,
-                    key: entry.field,
-                    aggField: entry.field,
-                    display: "multi-select",
-                    operation: operation,
-                };
-                var options = [];
-                entry.values.forEach(function (fv) {
-                    var filter = {
-                        filterType: "item",
-                    };
-                    // construct the filter based on the operation
-                    var matchKey = operation === "OR" ? "any" : "all";
-                    var filterMatchOption = {};
-                    filterMatchOption[matchKey] = [fv.value];
-                    filter[entry.field] = filterMatchOption;
-                    // construct the FacetOption
-                    var fo = {
-                        label: fv.value + " (" + fv.count + ")",
-                        key: fv.value,
-                        count: fv.count,
-                        selected: false,
-                        filters: [filter],
-                    };
-                    options.push(fo);
-                });
-                facet.options = options;
-                result.push(facet);
-            });
-        }
-        return result;
-    }
 
     /**
      * @private
@@ -18655,7 +16856,6 @@
                         return [2 /*return*/, {
                                 total: resp.total,
                                 results: results,
-                                facets: [],
                                 hasNext: resp.nextStart > -1,
                                 next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$1),
                             }];
@@ -18756,7 +16956,6 @@
                         return [2 /*return*/, {
                                 total: resp.total,
                                 results: results,
-                                facets: [],
                                 hasNext: resp.nextStart > -1,
                                 next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
                             }];
@@ -18785,26 +16984,6 @@
         });
     }
 
-    /**
-     * @private
-     * TEMPORARY - this function only exists to allow incremental
-     * changes and should be removed as soon as arcgis-hub-gallery
-     * is changed to call `hubSearch(...)` directly
-     *
-     * Default's to search ArcGIS Portal but can delegate
-     * to Hub API when it's available.
-     * @param filterGroups
-     * @param options
-     * @returns
-     */
-    function hubSearchQuery(query, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                // delegate
-                return [2 /*return*/, hubSearch(query, options)];
-            });
-        });
-    }
     /**
      * Main entrypoint for searching via Hub
      *
@@ -21085,9 +19264,6 @@
     exports._processInvite = _processInvite;
     exports._processPrimaryEmail = _processPrimaryEmail;
     exports._processSecondaryEmail = _processSecondaryEmail;
-    exports._searchContent = _searchContent;
-    exports._searchGroups = _searchGroups;
-    exports._searchUsers = _searchUsers;
     exports._unprotectAndRemoveGroup = _unprotectAndRemoveGroup;
     exports._unprotectAndRemoveItem = _unprotectAndRemoveItem;
     exports.addContextToSlug = addContextToSlug;
@@ -21097,13 +19273,11 @@
     exports.addSiteDomains = addSiteDomains;
     exports.addSolutionResourceUrlToAssets = addSolutionResourceUrlToAssets;
     exports.addUsersToGroup = addUsersToGroup;
-    exports.applyCollectionState = applyCollectionState;
     exports.applyPropertiesToItems = applyPropertiesToItems;
     exports.arrayToObject = arrayToObject;
     exports.atob = abab.atob;
     exports.autoAddUsers = autoAddUsers;
     exports.bBoxToExtent = bBoxToExtent;
-    exports.bBoxToPolygon = bBoxToPolygon;
     exports.batch = batch;
     exports.btoa = abab.btoa;
     exports.buildDraft = buildDraft;
@@ -21123,13 +19297,8 @@
     exports.compose = compose;
     exports.composeContent = composeContent;
     exports.constructSlug = constructSlug;
-    exports.convertCatalog = convertCatalog;
-    exports.convertContentDefinitionToFilter = convertContentDefinitionToFilter;
-    exports.convertContentFilterToSearchOptions = convertContentFilterToSearchOptions;
     exports.convertItemToProject = convertItemToProject;
     exports.convertItemToSite = convertItemToSite;
-    exports.convertPortalItemResponseToFacets = convertPortalItemResponseToFacets;
-    exports.convertPortalResponseToFacets = convertPortalResponseToFacets;
     exports.convertSolutionTemplateResourcesToAssets = convertSolutionTemplateResourcesToAssets;
     exports.convertToWellKnownLocale = convertToWellKnownLocale;
     exports.convertUrlsToAnchorTags = convertUrlsToAnchorTags;
@@ -21167,10 +19336,6 @@
     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.extentToPolygon = extentToPolygon;
@@ -21187,7 +19352,6 @@
     exports.fetchOrg = fetchOrg;
     exports.fetchOrgLimits = fetchOrgLimits;
     exports.fetchProject = fetchProject;
-    exports.fetchSite = fetchSite;
     exports.fetchSiteModel = fetchSiteModel;
     exports.filterBy = filterBy;
     exports.findBy = findBy;
@@ -21196,7 +19360,6 @@
     exports.generateRandomString = generateRandomString;
     exports.getCategory = getCategory;
     exports.getContentIdentifier = getContentIdentifier;
-    exports.getContentSiteUrls = getContentSiteUrls;
     exports.getContentTypeIcon = getContentTypeIcon;
     exports.getContentTypeLabel = getContentTypeLabel;
     exports.getCulture = getCulture;
@@ -21221,7 +19384,6 @@
     exports.getItemDataUrl = getItemDataUrl;
     exports.getItemHomeUrl = getItemHomeUrl;
     exports.getItemHubId = getItemHubId;
-    exports.getItemHubType = getItemHubType;
     exports.getItemLayer = getItemLayer;
     exports.getItemLayerId = getItemLayerId;
     exports.getItemThumbnailUrl = getItemThumbnailUrl;
@@ -21259,9 +19421,7 @@
     exports.getWithDefault = getWithDefault$1;
     exports.hasBasePriv = hasBasePriv;
     exports.hubApiRequest = hubApiRequest;
-    exports.hubApiSearch = hubApiSearch;
     exports.hubSearch = hubSearch;
-    exports.hubSearchQuery = hubSearchQuery;
     exports.includes = includes;
     exports.incrementString = incrementString;
     exports.interpolate = interpolate;
@@ -21271,9 +19431,6 @@
     exports.isDomainForLegacySite = isDomainForLegacySite;
     exports.isDomainUsedElsewhere = isDomainUsedElsewhere;
     exports.isDownloadable = isDownloadable;
-    exports.isEmptyFilter = isEmptyFilter;
-    exports.isEmptyFilterGroup = isEmptyFilterGroup;
-    exports.isExtentCoordinateArray = isExtentCoordinateArray;
     exports.isFeatureService = isFeatureService$1;
     exports.isFieldworkerView = isFieldworkerView;
     exports.isGuid = isGuid;
@@ -21291,13 +19448,7 @@
     exports.mapBy = mapBy;
     exports.maybeAdd = maybeAdd;
     exports.maybePush = maybePush;
-    exports.mergeContentFilter = mergeContentFilter;
-    exports.mergeDateRange = mergeDateRange;
-    exports.mergeGroupFilters = mergeGroupFilters;
-    exports.mergeMatchOptions = mergeMatchOptions;
     exports.mergeObjects = mergeObjects;
-    exports.mergeSearchOptions = mergeSearchOptions$1;
-    exports.mergeUserFilters = mergeUserFilters;
     exports.normalizeItemType = normalizeItemType;
     exports.normalizeSolutionTemplateItem = normalizeSolutionTemplateItem;
     exports.objectToArray = objectToArray;
@@ -21319,18 +19470,9 @@
     exports.saveSession = saveSession;
     exports.searchProjects = searchProjects;
     exports.searchSites = searchSites;
-    exports.serializeCollectionState = serializeCollectionState;
-    exports.serializeContentFilterForPortal = serializeContentFilterForPortal;
-    exports.serializeDateRange = serializeDateRange$1;
-    exports.serializeGroupFilterForPortal = serializeGroupFilterForPortal;
-    exports.serializeMatchOptions = serializeMatchOptions$1;
     exports.serializeModel = serializeModel;
     exports.serializeQueryForPortal = serializeQueryForPortal;
     exports.serializeSpatialReference = serializeSpatialReference;
-    exports.serializeStringOrArray = serializeStringOrArray$1;
-    exports.serializeUserFilterForPortal = serializeUserFilterForPortal;
-    exports.setContentHubId = setContentHubId;
-    exports.setContentSiteUrls = setContentSiteUrls;
     exports.setContentType = setContentType;
     exports.setItemThumbnail = setItemThumbnail;
     exports.setProp = setProp;