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

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.47.0 - Wed Jul 20 2022 22:15:24 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v10.0.0-next.1 - Fri Jul 22 2022 18:15:55 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -13431,76 +13431,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 +13499,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,2131 +13563,911 @@
         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",
-                    ],
-                },
-            },
-        ],
-    };
+    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
      */
-    // 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");
+    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;
+        }
     }
     /**
-     * @private
-     * Convert portal search response to facets
-     * Note: Only applicable to an item search
-     * @param response
+     * Apply the Catalog schema to the original, unversioned
+     * site catalog objects
+     * @param original
      * @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);
+    function applyCatalogSchema(original) {
+        if (getProp(original, "schemaVersion") > 1.0) {
+            return original;
+        }
+        else {
+            var catalog = {
+                schemaVersion: 1,
+                title: "Default Catalog",
+                scopes: {
+                    item: {
+                        targetEntity: "item",
+                        filters: [],
+                    },
+                },
+                collections: [],
+            };
+            var rawGroups = getProp(original, "groups");
+            var groups = [];
+            if (Array.isArray(rawGroups) && rawGroups.length) {
+                groups = rawGroups;
+            }
+            else if (typeof rawGroups === "string") {
+                groups = [rawGroups];
+            }
+            if (groups.length) {
+                catalog.scopes.item.filters.push({
+                    predicates: [{ group: groups }],
                 });
-                facet.options = options;
-                result.push(facet);
-            });
+            }
+            return catalog;
         }
-        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
+     * DEPRECATED: Use upgradeCatalogSchema(...)
+     * @param original
      */
-    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);
+    /* istanbul ignore next */
+    function convertCatalog(original) {
+        return upgradeCatalogSchema(original);
     }
+
     /**
-     * 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
+     * @private
+     * Expand a predicate
+     * @param predicate
      * @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]);
-                    }
+    function expandPredicate(predicate) {
+        var result = {};
+        var dateProps = ["created", "modified", "lastlogin"];
+        var copyProps = [
+            "filterType",
+            "term",
+            "searchUserAccess",
+            "isopendata",
+            "searchUserName",
+        ];
+        var nonMatchOptionsFields = __spreadArrays(dateProps, copyProps);
+        // Do the conversion
+        Object.entries(predicate).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            // Handle MatchOptions fields
+            if (!nonMatchOptionsFields.includes(key)) {
+                setProp(key, valueToMatchOptions(value), result);
+            }
+            // Handle Date fields
+            if (dateProps.includes(key)) {
+                var dateFieldValue = cloneObject$1(getProp(predicate, key));
+                if (getProp(predicate, key + ".type") === "relative-date") {
+                    setProp(key, relativeDateToDateRange(dateFieldValue), result);
                 }
                 else {
-                    acc.push(entry); // should be a ContentFilterDefinition
+                    setProp(key, dateFieldValue, result);
                 }
-                return acc;
-            }, []);
-        }
-        // Convert all props into MatchOptions/DateRanges
-        return convertContentDefinitionToFilter(expandedTypeFilter);
+            }
+            // Handle fields that are just copied forward
+            if (copyProps.includes(key) && predicate.hasOwnProperty(key)) {
+                setProp(key, value, result);
+            }
+        });
+        return result;
     }
+
     /**
-     * @private
-     * Expand from a well-known "type" into it's longer form
-     *
-     * i.e. `type: "$storymap"` expands into two subFilters entries
-     *
-     * @param filter
+     * Serialize IQuery into ISearchOptions for ArcGIS Portal
+     * @param query
      * @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;
-        }
+    function serializeQueryForPortal(query) {
+        var filterSearchOptions = query.filters.map(serializeFilter);
+        // remove any empty entries
+        var nonEmptyOptions = filterSearchOptions.filter(removeEmptyEntries);
+        var result = mergeSearchOptions(nonEmptyOptions, "AND");
         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
+     * Predicate to remove things from array
+     * @param e
      * @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]);
+    function removeEmptyEntries(e) {
+        return !(typeof e === "undefined" || e === null || e === "");
+    }
+    function mergeSearchOptions(options, operation) {
+        var result = options.reduce(function (acc, entry) {
+            // walk the props
+            Object.entries(entry).forEach(function (_a) {
+                var key = _a[0], value = _a[1];
+                // if prop exists and is not empty string
+                if (acc[key] && value !== "") {
+                    // combine via operation
+                    acc[key] = acc[key] + " " + operation + " " + value;
                 }
                 else {
-                    result[fld] = cloneObject$1(filter[fld]);
+                    // just copy the value if it's not empty string
+                    if (value !== "") {
+                        acc[key] = value;
+                    }
                 }
-            }
-        });
+            });
+            return acc;
+        }, { q: "" });
         return result;
     }
     /**
-     * @private
-     * Serialize a `ContentFilter` into an `ISearchOptions` for use with `searchItems`
+     * Serialize the filters in a FitlerGroup into a Portal Query
      * @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();
+    function serializeFilter(filter) {
+        var operation = filter.operation || "AND";
+        var predicates = filter.predicates.map(expandPredicate);
+        var predicateSearchOptions = predicates
+            .map(serializePredicate)
+            .filter(function (e) { return e !== undefined && e !== null; });
+        // combine these searchOptions
+        var searchOptions = mergeSearchOptions(predicateSearchOptions, operation);
+        // wrap in parens if we have more than one predicate
+        if (predicates.length > 1) {
+            searchOptions.q = "(" + searchOptions.q + ")";
         }
         return searchOptions;
     }
     /**
-     * @private
-     * Convert a ContentFilter to a SearchOptions
-     *
-     * @param filter
+     * Serialize a Filter into a Portal Query
+     * @param predicate
      * @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: "",
-        };
+    function serializePredicate(predicate) {
         var dateProps = ["created", "modified"];
-        var specialProps = __spreadArrays(["filterType", "subFilters", "term"], dateProps);
-        Object.entries(filter).forEach(function (_a) {
+        var boolProps = ["isopendata"];
+        var passThroughProps = ["searchUserAccess", "searchUserName"];
+        var specialProps = __spreadArrays([
+            "filterType",
+            "term"
+        ], dateProps, boolProps, passThroughProps);
+        var portalAllowList = [
+            "access",
+            "categories",
+            "created",
+            "description",
+            "disabled",
+            "email",
+            "emailstatus",
+            "firstname",
+            "fullname",
+            "group",
+            "id",
+            "isInvitationOnly",
+            "isopendata",
+            "joined",
+            "lastlogin",
+            "lastname",
+            "memberType",
+            "modified",
+            "name",
+            "orgid",
+            "orgIds",
+            "owner",
+            "provider",
+            "role",
+            "searchUserAccess",
+            "searchUserName",
+            "snippet",
+            "tags",
+            "term",
+            "title",
+            "type",
+            "typekeywords",
+            "userlicensetype",
+            "username",
+        ];
+        var qCount = 0;
+        // TODO: Look at using reduce vs .map and remove the `.filter`
+        var opts = Object.entries(predicate)
+            .map(function (_a) {
             var key = _a[0], value = _a[1];
-            // MatchOptions may go into either q or filter
-            if (!specialProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeMatchOptions$1(key, value), "AND");
+            // When serializing for portal we limit predicate properties to
+            // a list of known properties that the portal api accepts. This will
+            // not attempt to ensure the properties are used in the correct combinations
+            if (portalAllowList.includes(key)) {
+                var so = { q: "" };
+                if (!specialProps.includes(key) && key !== "term") {
+                    qCount++;
+                    so.q = serializeMatchOptions(key, value);
+                }
+                if (dateProps.includes(key)) {
+                    qCount++;
+                    so.q = serializeDateRange(key, value);
+                }
+                if (boolProps.includes(key)) {
+                    qCount++;
+                    so.q = key + ":" + value;
+                }
+                if (passThroughProps.includes(key)) {
+                    so[key] = value;
+                }
+                if (key === "term") {
+                    qCount++;
+                    so.q = value;
+                }
+                return so;
             }
-            // Dates only go into q
-            if (dateProps.includes(key)) {
-                result = mergeSearchOptions$1(result, serializeDateRange$1(key, value), "AND");
+        })
+            .filter(removeEmptyEntries);
+        // merge up all the searchOptions
+        if (opts.length) {
+            var searchOptions = mergeSearchOptions(opts, "AND");
+            if (qCount > 1) {
+                searchOptions.q = "(" + searchOptions.q + ")";
             }
-        });
-        return result;
+            return searchOptions;
+        }
+        else {
+            return null;
+        }
     }
-
-    // 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
+     * Serialize MatchOptions into portal syntax
+     * @param key
+     * @param value
      * @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",
-        });
+    function serializeMatchOptions(key, value) {
+        var result = "";
+        if (value.any) {
+            result = "" + serializeStringOrArray("OR", key, value.any);
+        }
+        if (value.all) {
+            result =
+                (result ? result + " AND " : "") +
+                    ("" + serializeStringOrArray("AND", key, value.all));
+        }
+        if (value.not) {
+            // negate the entries if they are not
+            result =
+                (result ? result + " AND " : "") +
+                    ("" + serializeStringOrArray("OR", "-" + key, value.not));
+        }
         return result;
     }
     /**
-     * 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
+     * Serialize a date-range into Portal syntax
+     * @param key
+     * @param range
      * @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;
+    function serializeDateRange(key, range) {
+        return key + ":[" + range.from + " TO " + range.to + "]";
     }
     /**
-     * @private
-     * Serialize an `IGroupFilterDefinition` into an `ISearchOptions` for use
-     * with `searchGroups`
-     * @param filter
+     * Serialize a `string` or `string[]` into a string
+     * @param join
+     * @param key
+     * @param value
      * @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");
+    function serializeStringOrArray(join, key, value) {
+        var q = "";
+        if (Array.isArray(value)) {
+            q = key + ":\"" + value.join("\" " + join + " " + key + ":\"") + "\"";
+            if (value.length > 1) {
+                q = "(" + q + ")";
             }
-        });
-        // 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();
+        else {
+            q = key + ":\"" + value + "\"";
         }
-        return result;
+        return q;
     }
 
-    // TODO: Remove with _searchContent
     /**
+     * Generic Hub Error with an Error stack as well
+     * as an optional serialized OperationStack.
      *
-     * 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
+     * Also accepts a `rootCause` Error object
      */
-    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;
+    var HubError = /** @class */ (function (_super) {
+        __extends(HubError, _super);
+        /**
+         * Creates an instance of HubError.
+         * @param {string} operation
+         * @param {string} [message]
+         * @param {Error} [rootCause]
+         * @memberof HubError
+         */
+        function HubError(operation, message, rootCause) {
+            var _this = this;
+            message = message || "UNKNOWN_ERROR";
+            // if the rootCause has a .rootCause, use that so we don't deeply nest
+            rootCause = getWithDefault$1(rootCause, "rootCause", rootCause);
+            /* Skip coverage on super(...) as per:
+               https://github.com/Microsoft/TypeScript/issues/13029
+               https://github.com/SitePen/remap-istanbul/issues/106
+            */
+            /* istanbul ignore next */
+            _this = _super.call(this, operation, message, rootCause) || this;
+            _this.name = "HubError";
+            // if the original error has a stack use it, otherwise create a new
+            // stack. Note: a new Stack will make it look like the error origninated
+            // in the HubError constructor. This is only an issue in tests but
+            // it can be confusing to debug
+            _this.stack = getWithDefault$1(rootCause, "stack", new Error().stack);
+            return _this;
         }
-        return result;
-    }
+        return HubError;
+    }(OperationError$1));
+    var HubError$1 = HubError;
+
     /**
      * @private
-     * Serialize an `IUserFilterDefinition` into an `ISearchOptions` for use
-     * with `searchUsers`
-     * @param filter
+     * Convert a portal aggregation structure into the HubAggregations structure
+     * @param searchResults
      * @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;
+    function convertPortalAggregations(searchResults) {
+        var _a;
+        if ((_a = searchResults.aggregations) === null || _a === void 0 ? void 0 : _a.counts) {
+            return searchResults.aggregations.counts.map(function (entry) {
+                return {
+                    mode: "terms",
+                    field: entry.fieldName,
+                    values: entry.fieldValues,
+                };
+            });
         }
-        // add the term
-        if (filter.term) {
-            // Note: this is slightly different from other types
-            result.q = ("(" + filter.term + ") " + result.q).trim();
+        else {
+            return [];
         }
-        return result;
     }
 
-    // TODO: Remove with _searchContent
     /**
      * @private
-     * Search for content via the Portal or Hub API
-     * @param filter
+     * Execute a search and convert to a specific entity
+     * @param query
+     * @param convertFn
      * @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) {
+    function searchEntities(query, convertFn, options) {
         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);
-                });
+        // serialize query to searchOptions
+        var searchOptions = serializeQueryForPortal(query);
+        // Aggregations
+        if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
+            searchOptions.countFields = options.aggFields.join(",");
+            searchOptions.countSize = options.aggLimit || 10;
+        }
+        // properties to copy from IHubSearchOptions to the ISearchOptions
+        var props = [
+            "num",
+            "sortField",
+            "sortOrder",
+            "start",
+            "requestOptions",
+        ];
+        // Include "start" here
+        // copy the props over
+        props.forEach(function (prop) {
+            if (options.hasOwnProperty(prop)) {
+                searchOptions[prop] = options[prop];
             }
-            // 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),
-            };
         });
+        // create the entitySearchFn
+        var searchFn = createEntitySearchFn(convertFn);
+        // Add ArcGIS API
+        if (options.api && !options.authentication) {
+            var expandedApi = expandApi(options.api);
+            searchOptions.portal = expandedApi.url;
+        }
+        return searchFn(searchOptions);
     }
-
-    // TODO: Remove with _searchContent
     /**
      * @private
-     * Search Groups using Filter<"group">
-     *
-     * Currently just returns ISearchResult<IGroup>
-     * @param filter
-     * @param options
+     * @param convertFn
      * @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";
+    function createEntitySearchFn(convertFn) {
+        // Return a function that does the search, with a closure over the
+        // conversion function. Naming this function is important as it's
+        // referenced in the `next` section below
+        return function executeSearch(searchOptions) {
+            return __awaiter(this, void 0, void 0, function () {
+                var response, entities, aggregations;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, searchItems(searchOptions)];
+                        case 1:
+                            response = _a.sent();
+                            return [4 /*yield*/, Promise.all(response.results.map(function (itm) {
+                                    return convertFn(itm, searchOptions);
+                                }))];
+                        case 2:
+                            entities = _a.sent();
+                            aggregations = convertPortalAggregations(response);
+                            return [2 /*return*/, {
+                                    total: response.total,
+                                    results: entities,
+                                    aggregations: aggregations,
+                                    hasNext: response.nextStart > -1,
+                                    next: getNextFunction(searchOptions, response.nextStart, response.total, executeSearch),
+                                }];
                     }
-                    return [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
+     * Fetch Page specific Enrichments
+     * @param item
+     * @param include
+     * @param requestOptions
      * @returns
      */
-    function _searchUsers(filter, options) {
+    function enrichPageSearchResult(item, include, requestOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var expanded, api, searchOptions_1, props;
+            var result, DEFAULTS, specs, enrichments, enriched;
             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");
+                switch (_a.label) {
+                    case 0:
+                        result = {
+                            access: item.access,
+                            id: item.id,
+                            type: item.type,
+                            name: item.title,
+                            owner: item.owner,
+                            summary: item.snippet || item.description,
+                            createdDate: new Date(item.created),
+                            createdDateSource: "item.created",
+                            updatedDate: new Date(item.modified),
+                            updatedDateSource: "item.modified",
+                            family: getFamily(item.type),
+                            links: {
+                                self: "not-implemented",
+                                siteRelative: "not-implemented",
+                                thumbnail: "not-implemented",
+                            },
+                        };
+                        DEFAULTS = [];
+                        // merge includes
+                        include = __spreadArrays(DEFAULTS, include).filter(unique);
+                        specs = include.map(parseInclude);
+                        enrichments = mapBy("enrichment", specs).filter(unique);
+                        enriched = {};
+                        if (!enrichments.length) return [3 /*break*/, 2];
+                        return [4 /*yield*/, fetchItemEnrichments(item, enrichments, requestOptions)];
+                    case 1:
+                        // TODO: Look into caching for the requests in fetchItemEnrichments
+                        enriched = _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        // map the enriched props onto the result
+                        specs.forEach(function (spec) {
+                            result[spec.prop] = getProp(enriched, spec.path);
+                        });
+                        // Handle Links
+                        result.links.thumbnail = getItemThumbnailUrl(item, requestOptions);
+                        result.links.self = getItemHomeUrl(result.id, requestOptions);
+                        result.links.siteRelative = getHubRelativeUrl(result.type, result.id, item.typeKeywords);
+                        return [2 /*return*/, result];
                 }
             });
         });
     }
-    /**
-     * 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
+     * Given a model, return a serialized clone that can be sent to
+     * the items api
+     * @param {Object} model Item model {item:{}, data:{}}
      */
-    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;
+    function serializeModel(model) {
+        var serialized = cloneObject$1(model.item);
+        serialized.text = JSON.stringify(model.data);
+        return serialized;
     }
+
     /**
-     * @private
-     * Apply FacetState to a Facet
-     * @param facet
-     * @param state
-     * @returns
+     * Gets the full item/data model for an item id
+     * @param {string} id
+     * @param {Object} requestOptions
      */
-    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;
+    function getModel(id, requestOptions) {
+        return Promise.all([
+            getItem(id, requestOptions),
+            getItemData(id, requestOptions),
+        ]).then(function (result) {
+            // shape this into a model
+            return {
+                item: result[0],
+                data: result[1],
+            };
+        });
     }
     /**
-     * @private
-     * Apply the Facet State onto a single-select facet
+     * Get a model by it's slug
+     *
+     * This uses the [Filter](https://developers.arcgis.com/rest/users-groups-and-items/search-reference.htm) option of the
+     * to search for an item that has a typekeyword of `slug|{slug-value}`
+     *
+     * This is useful for applications that want to use human-readable urls instead
+     * of using item ids.
      *
-     * Intentionally mutates the facet.
-     * @param facet
-     * @param state
+     * @param slug
+     * @param requestOptions
      * @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;
+    function getModelBySlug(slug, requestOptions) {
+        return getItemBySlug(slug, requestOptions)
+            .then(function (item) {
+            var prms = [Promise.resolve(item)];
+            if (item) {
+                prms.push(getItemData(item.id, requestOptions));
+            }
+            else {
+                prms.push(Promise.resolve(null));
+            }
+            return Promise.all(prms);
+        })
+            .then(function (result) {
+            if (result[0]) {
+                return {
+                    item: result[0],
+                    data: result[1],
+                };
+            }
+            else {
+                return null;
+            }
         });
-        return updated;
     }
     /**
-     * @private
-     * Serialize single-select facet into IFacetState
-     * @param facet
-     * @returns
+     * Create an item to back and IModel.
+     *
+     * @param {IModel}
+     * @param {IRequestOptions} requestOptions
+     * @returns {Promise<IModel>}
      */
-    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;
+    function createModel(model, requestOptions) {
+        var clone = cloneObject$1(model);
+        var item = cloneObject$1(model.item);
+        item.data = cloneObject$1(model.data);
+        var opts = __assign({ item: item }, requestOptions);
+        return createItem(opts).then(function (response) {
+            clone.item.id = response.id;
+            clone.item.created = new Date().getTime();
+            clone.item.modified = clone.item.created;
+            return clone;
+        });
     }
     /**
-     * @private
-     * Apply the Facet State onto a multi-select Facet
+     * Update an IModel. Generic function that will be used across all
+     * type-specific update functions
      *
-     * Intentionally mutates the facet.
-     * @param facet
-     * @param state
-     * @returns
+     * @export
+     * @param {IModel} "model" object (i.e. `{item:{...}, data:{...}}`)
+     * @param {IRequestOptions} requestOptions
+     * @returns {Promise<IModel>}
      */
-    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;
+    function updateModel(model, requestOptions) {
+        var clone = cloneObject$1(model);
+        var item = cloneObject$1(model.item);
+        item.data = cloneObject$1(model.data);
+        var opts = __assign({ item: item }, requestOptions);
+        return updateItem(opts).then(function () {
+            // update the modified prop
+            // this won't be exact, but it will be very close
+            clone.item.modified = new Date().getTime();
+            return clone;
         });
-        return updated;
     }
     /**
-     * @private
-     * Serialize multi-select facet into IFacetState
-     * @param facet
+     * Given an Item, fetch the data json and return an IModel
+     * @param item
+     * @param requestOptions
      * @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;
+    function fetchModelFromItem(item, requestOptions) {
+        return __awaiter(this, void 0, void 0, function () {
+            var data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, getItemData(item.id, requestOptions)];
+                    case 1:
+                        data = _a.sent();
+                        return [2 /*return*/, {
+                                item: item,
+                                data: data,
+                            }];
+                }
+            });
+        });
     }
+
+    // TODO: work out how to unify content slug fns
+    // https: github.com/Esri/hub.js/blob/master/packages/common/src/content/index.ts#L301-L348
     /**
-     * @private
-     * Serialize the state of the SortOption into a key/value pair
+     * Create a slug, namespaced to an org
+     * Typically used to lookup items by a human readable name in urls
      *
-     * Called from the Sort component
-     * @param sort
+     * @param title
+     * @param orgKey
      * @returns
      */
-    function serializeSortState(sort) {
-        return sort.label + "|" + sort.attribute + "|" + sort.order;
+    function constructSlug(title, orgKey) {
+        return orgKey.toLowerCase() + "-" + slugify(title);
     }
     /**
-     * @private
-     * Serialize the state of a facet into a key/value pair
-     *
-     * Called from the various facet components
-     * @param facet
+     * Adds/Updates the slug typekeyword
+     * Returns a new array of keywords
+     * @param typeKeywords
+     * @param slug
      * @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;
+    function setSlugKeyword(typeKeywords, slug) {
+        // remove slug entry from array
+        var removed = typeKeywords.filter(function (entry) {
+            return !entry.startsWith("slug|");
+        });
+        // now add it
+        removed.push("slug|" + slug);
+        return removed;
     }
-
     /**
-     * Apply ICollectionState to an ICollection
+     * Get an item by searching for items with a typeKeyword like `slug|{slug-value}`
      *
-     * 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
+     * For example, if you pass a slug `"snow-map"` into this function, it will
+     * search for items with `slug|snow-map` in it's typeKeywords array,
+     *
+     * @param slug
+     * @param requestOptions
      * @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);
+    function getItemBySlug(slug, requestOptions) {
+        return findItemsBySlug({ slug: slug }, requestOptions).then(function (results) {
+            if (results.length) {
+                return results[0];
             }
             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 null;
             }
         });
-        //
-        return updated;
     }
     /**
-     * Serialize the current state of a collection into a hash that
-     * can be converted into a query string
-     * @param collection
+     * Find items by slug typeKeywords.
+     *
+     * Optional exclude parameter accepts the id of an item we expect to
+     * have this particular slug. This is used during update calls
+     * where we don't know if the slug specifically has been updated, but we
+     * don't want a false-postive from the item we are updating
+     *
+     * @param slug
+     * @param requestOptions
      * @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);
-    }
-
-    /**
-     * Convert the original site catalog structure into a formal ICatalog
-     * @param original
-     */
-    function convertCatalog(original) {
-        var catalog = {
-            schemaVersion: 1,
-            title: "Default Catalog",
-            scopes: {
-                item: {
-                    targetEntity: "item",
-                    filters: [],
-                },
-            },
-            collections: [],
+    function findItemsBySlug(slugInfo, requestOptions) {
+        var opts = {
+            filter: "typekeywords:\"slug|" + slugInfo.slug + "\"",
         };
-        var rawGroups = getProp(original, "groups");
-        var groups = [];
-        if (Array.isArray(rawGroups) && rawGroups.length) {
-            groups = rawGroups;
+        if (requestOptions.authentication) {
+            opts.authentication = requestOptions.authentication;
         }
-        else if (typeof rawGroups === "string") {
-            groups = [rawGroups];
+        else if (requestOptions.portal) {
+            opts.portal = requestOptions.portal;
         }
-        if (groups.length) {
-            catalog.scopes.item.filters.push({
-                predicates: [{ group: groups }],
-            });
+        // We need to check for other items w/ a slug during
+        // the update calls. For those scenarios we are interested
+        // in any _other_ items which may have a specific slug
+        // but not one specific item
+        if (slugInfo.exclude) {
+            opts.q = "NOT id:" + slugInfo.exclude;
         }
-        return catalog;
+        return searchItems(opts)
+            .then(function (response) {
+            return response.results;
+        })
+            .catch(function (e) {
+            throw e;
+        });
     }
-
     /**
-     * Determine if a Filter is "empty"
-     * @param filter
+     * Given a slug, search for items using that slug, incrementing the slug name until
+     * a unique value is found
+     *
+     * For example, if a slug of `"snow-map"` into this function and some item exists
+     * with that slug, it would return `"snow-map-1"`.
+     *
+     * @param slug
+     * @param requestOptions
+     * @param step
      * @returns
      */
-    function isEmptyFilter(filter) {
-        // if it has one property, filterType, it's empty
-        return (Object.keys(filter).length === 1 && filter.hasOwnProperty("filterType"));
+    function getUniqueSlug(slugInfo, requestOptions, step) {
+        if (step === void 0) { step = 0; }
+        var combinedSlug = slugInfo.slug;
+        if (step) {
+            combinedSlug = slugInfo.slug + "-" + step;
+        }
+        return findItemsBySlug({ slug: combinedSlug, exclude: slugInfo.existingId }, requestOptions)
+            .then(function (results) {
+            if (results.length) {
+                step++;
+                return getUniqueSlug(slugInfo, requestOptions, step);
+            }
+            else {
+                return combinedSlug;
+            }
+        })
+            .catch(function (e) {
+            throw Error("Error in getUniqueSlug " + e);
+        });
     }
+
     /**
-     * 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;
+     * Manage forward and backward property mappings to
+     * streamline conversion between the Hub entities, and
+     * the backing IModel
+     */
+    var PropertyMapper = /** @class */ (function () {
+        /**
+         * Pass in the mappings between the Entity and
+         * it's backing structure (model or otherwise)
+         * @param mappings
+         */
+        function PropertyMapper(mappings) {
+            this.mappings = mappings;
         }
-    }
-
+        /**
+         * Map properties from a model on to the entity object.
+         *
+         * Used when constructing an entity can from a fetched model,
+         * in which case the entity should be an empty object (`{}`).
+         *
+         * Can also be used to apply changes to an entity from a model,
+         * in which case an existing entity can be passed in.
+         * @param model
+         * @param object
+         * @returns
+         */
+        PropertyMapper.prototype.modelToObject = function (model, object) {
+            return mapModelToObject(model, object, this.mappings);
+        };
+        /**
+         * Map properties from an entity object onto a model.
+         *
+         * Typically the model will already exist, and this
+         * method is used to transfer changes to the model
+         * prior to storage.
+         * @param object
+         * @param model
+         * @returns
+         */
+        PropertyMapper.prototype.objectToModel = function (object, model) {
+            return mapObjectToModel(object, model, this.mappings);
+        };
+        return PropertyMapper;
+    }());
     /**
-     * @private
-     * Expand a predicate
-     * @param predicate
+     * Generic function to apply properties from an Object
+     * (i.e. IHubProject) onto a Model that can be persisted to an Item
+     * @param object
+     * @param model
+     * @param mappings
      * @returns
      */
-    function expandPredicate(predicate) {
-        var result = {};
-        var dateProps = ["created", "modified", "lastlogin"];
-        var copyProps = [
-            "filterType",
-            "term",
-            "searchUserAccess",
-            "isopendata",
-            "searchUserName",
-        ];
-        var nonMatchOptionsFields = __spreadArrays(dateProps, copyProps);
-        // Do the conversion
-        Object.entries(predicate).forEach(function (_a) {
-            var key = _a[0], value = _a[1];
-            // Handle MatchOptions fields
-            if (!nonMatchOptionsFields.includes(key)) {
-                setProp(key, valueToMatchOptions(value), result);
-            }
-            // Handle Date fields
-            if (dateProps.includes(key)) {
-                var dateFieldValue = cloneObject$1(getProp(predicate, key));
-                if (getProp(predicate, key + ".type") === "relative-date") {
-                    setProp(key, relativeDateToDateRange(dateFieldValue), result);
-                }
-                else {
-                    setProp(key, dateFieldValue, result);
-                }
-            }
-            // Handle fields that are just copied forward
-            if (copyProps.includes(key) && predicate.hasOwnProperty(key)) {
-                setProp(key, value, result);
-            }
-        });
-        return result;
+    function mapObjectToModel(object, model, mappings) {
+        return mapProps(object, "objectKey", model, "modelKey", mappings);
     }
-
     /**
-     * Serialize IQuery into ISearchOptions for ArcGIS Portal
-     * @param query
+     * Generic function to apply properties from a Model
+     * onto an Object (i.e. IHubProject etc)
+     * @param model
+     * @param object
+     * @param mappings
      * @returns
      */
-    function serializeQueryForPortal(query) {
-        var filterSearchOptions = query.filters.map(serializeFilter);
-        // remove any empty entries
-        var nonEmptyOptions = filterSearchOptions.filter(removeEmptyEntries);
-        var result = mergeSearchOptions(nonEmptyOptions, "AND");
-        return result;
+    function mapModelToObject(model, object, mappings) {
+        return mapProps(model, "modelKey", object, "objectKey", mappings);
     }
     /**
-     * Predicate to remove things from array
-     * @param e
+     * Internal function to map between objects
+     * @param source
+     * @param sourceKey
+     * @param target
+     * @param targetKey
+     * @param mappings
      * @returns
      */
-    function removeEmptyEntries(e) {
-        return !(typeof e === "undefined" || e === null || e === "");
-    }
-    function mergeSearchOptions(options, operation) {
-        var result = options.reduce(function (acc, entry) {
-            // walk the props
-            Object.entries(entry).forEach(function (_a) {
-                var key = _a[0], value = _a[1];
-                // if prop exists and is not empty string
-                if (acc[key] && value !== "") {
-                    // combine via operation
-                    acc[key] = acc[key] + " " + operation + " " + value;
-                }
-                else {
-                    // just copy the value if it's not empty string
-                    if (value !== "") {
-                        acc[key] = value;
-                    }
-                }
-            });
-            return acc;
-        }, { q: "" });
-        return result;
+    function mapProps(source, sourceKey, target, targetKey, mappings) {
+        // clone the target
+        var clone = cloneObject$1(target);
+        // walk the property map array
+        mappings.forEach(function (entry) {
+            // Verbose b/c typescript hates the use of property indexing with generics
+            // i.e. entry<T>[sourceKey] make typescript angry
+            var sourcePath = getProp(entry, sourceKey);
+            var targetPath = getProp(entry, targetKey);
+            // get the value from the source
+            var sourceVal = getProp(source, sourcePath);
+            // if it's not null or undefined
+            if (sourceVal !== null && sourceVal !== undefined) {
+                // set it
+                deepSet(clone, targetPath, sourceVal);
+            }
+        });
+        return clone;
     }
+
+    var HUB_PROJECT_ITEM_TYPE = "Hub Project";
     /**
-     * Serialize the filters in a FitlerGroup into a Portal Query
-     * @param filter
-     * @returns
+     * Default values of a IHubProject
      */
-    function serializeFilter(filter) {
-        var operation = filter.operation || "AND";
-        var predicates = filter.predicates.map(expandPredicate);
-        var predicateSearchOptions = predicates
-            .map(serializePredicate)
-            .filter(function (e) { return e !== undefined && e !== null; });
-        // combine these searchOptions
-        var searchOptions = mergeSearchOptions(predicateSearchOptions, operation);
-        // wrap in parens if we have more than one predicate
-        if (predicates.length > 1) {
-            searchOptions.q = "(" + searchOptions.q + ")";
-        }
-        return searchOptions;
-    }
+    var DEFAULT_PROJECT = {
+        name: "No title provided",
+        tags: [],
+        typeKeywords: ["Hub Project"],
+        status: "inactive",
+    };
     /**
-     * Serialize a Filter into a Portal Query
-     * @param predicate
+     * Default values for a new HubProject Model
+     */
+    var DEFAULT_PROJECT_MODEL = {
+        item: {
+            type: HUB_PROJECT_ITEM_TYPE,
+            title: "No Title Provided",
+            description: "No Description Provided",
+            snippet: "",
+            tags: [],
+            typeKeywords: ["Hub Project"],
+            properties: {
+                slug: "",
+            },
+        },
+        data: {
+            display: "about",
+            timeline: {},
+            status: "inactive",
+            contacts: [],
+            schemaVersion: 1,
+        },
+    };
+    /**
+     * Returns an Array of IPropertyMap objects
+     * We could define these directly, but since the
+     * properties of IHubProject map directly to properties
+     * on item or data, it's slightly less verbose to
+     * generate the structure.
      * @returns
      */
-    function serializePredicate(predicate) {
-        var dateProps = ["created", "modified"];
-        var boolProps = ["isopendata"];
-        var passThroughProps = ["searchUserAccess", "searchUserName"];
-        var specialProps = __spreadArrays([
-            "filterType",
-            "term"
-        ], dateProps, boolProps, passThroughProps);
-        var portalAllowList = [
-            "access",
-            "categories",
+    function getProjectPropertyMap() {
+        var itemProps = [
             "created",
+            "culture",
             "description",
-            "disabled",
-            "email",
-            "emailstatus",
-            "firstname",
-            "fullname",
-            "group",
+            "extent",
             "id",
-            "isInvitationOnly",
-            "isopendata",
-            "joined",
-            "lastlogin",
-            "lastname",
-            "memberType",
             "modified",
-            "name",
-            "orgid",
-            "orgIds",
             "owner",
-            "provider",
-            "role",
-            "searchUserAccess",
-            "searchUserName",
             "snippet",
             "tags",
-            "term",
-            "title",
-            "type",
-            "typekeywords",
-            "userlicensetype",
-            "username",
-        ];
-        var qCount = 0;
-        // TODO: Look at using reduce vs .map and remove the `.filter`
-        var opts = Object.entries(predicate)
-            .map(function (_a) {
-            var key = _a[0], value = _a[1];
-            // When serializing for portal we limit predicate properties to
-            // a list of known properties that the portal api accepts. This will
-            // not attempt to ensure the properties are used in the correct combinations
-            if (portalAllowList.includes(key)) {
-                var so = { q: "" };
-                if (!specialProps.includes(key) && key !== "term") {
-                    qCount++;
-                    so.q = serializeMatchOptions(key, value);
-                }
-                if (dateProps.includes(key)) {
-                    qCount++;
-                    so.q = serializeDateRange(key, value);
-                }
-                if (boolProps.includes(key)) {
-                    qCount++;
-                    so.q = key + ":" + value;
-                }
-                if (passThroughProps.includes(key)) {
-                    so[key] = value;
-                }
-                if (key === "term") {
-                    qCount++;
-                    so.q = value;
-                }
-                return so;
-            }
-        })
-            .filter(removeEmptyEntries);
-        // merge up all the searchOptions
-        if (opts.length) {
-            var searchOptions = mergeSearchOptions(opts, "AND");
-            if (qCount > 1) {
-                searchOptions.q = "(" + searchOptions.q + ")";
-            }
-            return searchOptions;
-        }
-        else {
-            return null;
-        }
-    }
-    /**
-     * Serialize MatchOptions into portal syntax
-     * @param key
-     * @param value
-     * @returns
-     */
-    function serializeMatchOptions(key, value) {
-        var result = "";
-        if (value.any) {
-            result = "" + serializeStringOrArray("OR", key, value.any);
-        }
-        if (value.all) {
-            result =
-                (result ? result + " AND " : "") +
-                    ("" + serializeStringOrArray("AND", key, value.all));
-        }
-        if (value.not) {
-            // negate the entries if they are not
-            result =
-                (result ? result + " AND " : "") +
-                    ("" + serializeStringOrArray("OR", "-" + key, value.not));
-        }
-        return result;
-    }
-    /**
-     * Serialize a date-range into Portal syntax
-     * @param key
-     * @param range
-     * @returns
-     */
-    function serializeDateRange(key, range) {
-        return key + ":[" + range.from + " TO " + range.to + "]";
-    }
-    /**
-     * Serialize a `string` or `string[]` into a string
-     * @param join
-     * @param key
-     * @param value
-     * @returns
-     */
-    function serializeStringOrArray(join, key, value) {
-        var q = "";
-        if (Array.isArray(value)) {
-            q = key + ":\"" + value.join("\" " + join + " " + key + ":\"") + "\"";
-            if (value.length > 1) {
-                q = "(" + q + ")";
-            }
-        }
-        else {
-            q = key + ":\"" + value + "\"";
-        }
-        return q;
-    }
-
-    /**
-     * Generic Hub Error with an Error stack as well
-     * as an optional serialized OperationStack.
-     *
-     * Also accepts a `rootCause` Error object
-     */
-    var HubError = /** @class */ (function (_super) {
-        __extends(HubError, _super);
-        /**
-         * Creates an instance of HubError.
-         * @param {string} operation
-         * @param {string} [message]
-         * @param {Error} [rootCause]
-         * @memberof HubError
-         */
-        function HubError(operation, message, rootCause) {
-            var _this = this;
-            message = message || "UNKNOWN_ERROR";
-            // if the rootCause has a .rootCause, use that so we don't deeply nest
-            rootCause = getWithDefault$1(rootCause, "rootCause", rootCause);
-            /* Skip coverage on super(...) as per:
-               https://github.com/Microsoft/TypeScript/issues/13029
-               https://github.com/SitePen/remap-istanbul/issues/106
-            */
-            /* istanbul ignore next */
-            _this = _super.call(this, operation, message, rootCause) || this;
-            _this.name = "HubError";
-            // if the original error has a stack use it, otherwise create a new
-            // stack. Note: a new Stack will make it look like the error origninated
-            // in the HubError constructor. This is only an issue in tests but
-            // it can be confusing to debug
-            _this.stack = getWithDefault$1(rootCause, "stack", new Error().stack);
-            return _this;
-        }
-        return HubError;
-    }(OperationError$1));
-    var HubError$1 = HubError;
-
-    /**
-     * @private
-     * Convert a portal aggregation structure into the HubAggregations structure
-     * @param searchResults
-     * @returns
-     */
-    function convertPortalAggregations(searchResults) {
-        var _a;
-        if ((_a = searchResults.aggregations) === null || _a === void 0 ? void 0 : _a.counts) {
-            return searchResults.aggregations.counts.map(function (entry) {
-                return {
-                    mode: "terms",
-                    field: entry.fieldName,
-                    values: entry.fieldValues,
-                };
-            });
-        }
-        else {
-            return [];
-        }
-    }
-
-    /**
-     * @private
-     * Execute a search and convert to a specific entity
-     * @param query
-     * @param convertFn
-     * @param options
-     * @returns
-     */
-    function searchEntities(query, convertFn, options) {
-        var _a;
-        // serialize query to searchOptions
-        var searchOptions = serializeQueryForPortal(query);
-        // Aggregations
-        if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
-            searchOptions.countFields = options.aggFields.join(",");
-            searchOptions.countSize = options.aggLimit || 10;
-        }
-        // properties to copy from IHubSearchOptions to the ISearchOptions
-        var props = [
-            "num",
-            "sortField",
-            "sortOrder",
-            "start",
-            "requestOptions",
-        ];
-        // Include "start" here
-        // copy the props over
-        props.forEach(function (prop) {
-            if (options.hasOwnProperty(prop)) {
-                searchOptions[prop] = options[prop];
-            }
-        });
-        // create the entitySearchFn
-        var searchFn = createEntitySearchFn(convertFn);
-        // Add ArcGIS API
-        if (options.api && !options.authentication) {
-            var expandedApi = expandApi(options.api);
-            searchOptions.portal = expandedApi.url;
-        }
-        return searchFn(searchOptions);
-    }
-    /**
-     * @private
-     * @param convertFn
-     * @returns
-     */
-    function createEntitySearchFn(convertFn) {
-        // Return a function that does the search, with a closure over the
-        // conversion function. Naming this function is important as it's
-        // referenced in the `next` section below
-        return function executeSearch(searchOptions) {
-            return __awaiter(this, void 0, void 0, function () {
-                var response, entities, aggregations;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, searchItems(searchOptions)];
-                        case 1:
-                            response = _a.sent();
-                            return [4 /*yield*/, Promise.all(response.results.map(function (itm) {
-                                    return convertFn(itm, searchOptions);
-                                }))];
-                        case 2:
-                            entities = _a.sent();
-                            aggregations = convertPortalAggregations(response);
-                            return [2 /*return*/, {
-                                    total: response.total,
-                                    results: entities,
-                                    aggregations: aggregations,
-                                    hasNext: response.nextStart > -1,
-                                    next: getNextFunction(searchOptions, response.nextStart, response.total, executeSearch),
-                                }];
-                    }
-                });
-            });
-        };
-    }
-
-    /**
-     * Fetch Page specific Enrichments
-     * @param item
-     * @param include
-     * @param requestOptions
-     * @returns
-     */
-    function enrichPageSearchResult(item, include, requestOptions) {
-        return __awaiter(this, void 0, void 0, function () {
-            var result, DEFAULTS, specs, enrichments, enriched;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        result = {
-                            access: item.access,
-                            id: item.id,
-                            type: item.type,
-                            name: item.title,
-                            owner: item.owner,
-                            summary: item.snippet || item.description,
-                            createdDate: new Date(item.created),
-                            createdDateSource: "item.created",
-                            updatedDate: new Date(item.modified),
-                            updatedDateSource: "item.modified",
-                            family: getFamily(item.type),
-                            links: {
-                                self: "not-implemented",
-                                siteRelative: "not-implemented",
-                                thumbnail: "not-implemented",
-                            },
-                        };
-                        DEFAULTS = [];
-                        // merge includes
-                        include = __spreadArrays(DEFAULTS, include).filter(unique);
-                        specs = include.map(parseInclude);
-                        enrichments = mapBy("enrichment", specs).filter(unique);
-                        enriched = {};
-                        if (!enrichments.length) return [3 /*break*/, 2];
-                        return [4 /*yield*/, fetchItemEnrichments(item, enrichments, requestOptions)];
-                    case 1:
-                        // TODO: Look into caching for the requests in fetchItemEnrichments
-                        enriched = _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        // map the enriched props onto the result
-                        specs.forEach(function (spec) {
-                            result[spec.prop] = getProp(enriched, spec.path);
-                        });
-                        // Handle Links
-                        result.links.thumbnail = getItemThumbnailUrl(item, requestOptions);
-                        result.links.self = getItemHomeUrl(result.id, requestOptions);
-                        result.links.siteRelative = getHubRelativeUrl(result.type, result.id, item.typeKeywords);
-                        return [2 /*return*/, result];
-                }
-            });
-        });
-    }
-
-    /**
-     * Given a model, return a serialized clone that can be sent to
-     * the items api
-     * @param {Object} model Item model {item:{}, data:{}}
-     */
-    function serializeModel(model) {
-        var serialized = cloneObject$1(model.item);
-        serialized.text = JSON.stringify(model.data);
-        return serialized;
-    }
-
-    /**
-     * Gets the full item/data model for an item id
-     * @param {string} id
-     * @param {Object} requestOptions
-     */
-    function getModel(id, requestOptions) {
-        return Promise.all([
-            getItem(id, requestOptions),
-            getItemData(id, requestOptions),
-        ]).then(function (result) {
-            // shape this into a model
-            return {
-                item: result[0],
-                data: result[1],
-            };
-        });
-    }
-    /**
-     * Get a model by it's slug
-     *
-     * This uses the [Filter](https://developers.arcgis.com/rest/users-groups-and-items/search-reference.htm) option of the
-     * to search for an item that has a typekeyword of `slug|{slug-value}`
-     *
-     * This is useful for applications that want to use human-readable urls instead
-     * of using item ids.
-     *
-     * @param slug
-     * @param requestOptions
-     * @returns
-     */
-    function getModelBySlug(slug, requestOptions) {
-        return getItemBySlug(slug, requestOptions)
-            .then(function (item) {
-            var prms = [Promise.resolve(item)];
-            if (item) {
-                prms.push(getItemData(item.id, requestOptions));
-            }
-            else {
-                prms.push(Promise.resolve(null));
-            }
-            return Promise.all(prms);
-        })
-            .then(function (result) {
-            if (result[0]) {
-                return {
-                    item: result[0],
-                    data: result[1],
-                };
-            }
-            else {
-                return null;
-            }
-        });
-    }
-    /**
-     * Create an item to back and IModel.
-     *
-     * @param {IModel}
-     * @param {IRequestOptions} requestOptions
-     * @returns {Promise<IModel>}
-     */
-    function createModel(model, requestOptions) {
-        var clone = cloneObject$1(model);
-        var item = cloneObject$1(model.item);
-        item.data = cloneObject$1(model.data);
-        var opts = __assign({ item: item }, requestOptions);
-        return createItem(opts).then(function (response) {
-            clone.item.id = response.id;
-            clone.item.created = new Date().getTime();
-            clone.item.modified = clone.item.created;
-            return clone;
-        });
-    }
-    /**
-     * Update an IModel. Generic function that will be used across all
-     * type-specific update functions
-     *
-     * @export
-     * @param {IModel} "model" object (i.e. `{item:{...}, data:{...}}`)
-     * @param {IRequestOptions} requestOptions
-     * @returns {Promise<IModel>}
-     */
-    function updateModel(model, requestOptions) {
-        var clone = cloneObject$1(model);
-        var item = cloneObject$1(model.item);
-        item.data = cloneObject$1(model.data);
-        var opts = __assign({ item: item }, requestOptions);
-        return updateItem(opts).then(function () {
-            // update the modified prop
-            // this won't be exact, but it will be very close
-            clone.item.modified = new Date().getTime();
-            return clone;
-        });
-    }
-    /**
-     * Given an Item, fetch the data json and return an IModel
-     * @param item
-     * @param requestOptions
-     * @returns
-     */
-    function fetchModelFromItem(item, requestOptions) {
-        return __awaiter(this, void 0, void 0, function () {
-            var data;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, getItemData(item.id, requestOptions)];
-                    case 1:
-                        data = _a.sent();
-                        return [2 /*return*/, {
-                                item: item,
-                                data: data,
-                            }];
-                }
-            });
-        });
-    }
-
-    // TODO: work out how to unify content slug fns
-    // https: github.com/Esri/hub.js/blob/master/packages/common/src/content/index.ts#L301-L348
-    /**
-     * Create a slug, namespaced to an org
-     * Typically used to lookup items by a human readable name in urls
-     *
-     * @param title
-     * @param orgKey
-     * @returns
-     */
-    function constructSlug(title, orgKey) {
-        return orgKey.toLowerCase() + "-" + slugify(title);
-    }
-    /**
-     * Adds/Updates the slug typekeyword
-     * Returns a new array of keywords
-     * @param typeKeywords
-     * @param slug
-     * @returns
-     */
-    function setSlugKeyword(typeKeywords, slug) {
-        // remove slug entry from array
-        var removed = typeKeywords.filter(function (entry) {
-            return !entry.startsWith("slug|");
-        });
-        // now add it
-        removed.push("slug|" + slug);
-        return removed;
-    }
-    /**
-     * Get an item by searching for items with a typeKeyword like `slug|{slug-value}`
-     *
-     * For example, if you pass a slug `"snow-map"` into this function, it will
-     * search for items with `slug|snow-map` in it's typeKeywords array,
-     *
-     * @param slug
-     * @param requestOptions
-     * @returns
-     */
-    function getItemBySlug(slug, requestOptions) {
-        return findItemsBySlug({ slug: slug }, requestOptions).then(function (results) {
-            if (results.length) {
-                return results[0];
-            }
-            else {
-                return null;
-            }
-        });
-    }
-    /**
-     * Find items by slug typeKeywords.
-     *
-     * Optional exclude parameter accepts the id of an item we expect to
-     * have this particular slug. This is used during update calls
-     * where we don't know if the slug specifically has been updated, but we
-     * don't want a false-postive from the item we are updating
-     *
-     * @param slug
-     * @param requestOptions
-     * @returns
-     */
-    function findItemsBySlug(slugInfo, requestOptions) {
-        var opts = {
-            filter: "typekeywords:\"slug|" + slugInfo.slug + "\"",
-        };
-        if (requestOptions.authentication) {
-            opts.authentication = requestOptions.authentication;
-        }
-        else if (requestOptions.portal) {
-            opts.portal = requestOptions.portal;
-        }
-        // We need to check for other items w/ a slug during
-        // the update calls. For those scenarios we are interested
-        // in any _other_ items which may have a specific slug
-        // but not one specific item
-        if (slugInfo.exclude) {
-            opts.q = "NOT id:" + slugInfo.exclude;
-        }
-        return searchItems(opts)
-            .then(function (response) {
-            return response.results;
-        })
-            .catch(function (e) {
-            throw e;
-        });
-    }
-    /**
-     * Given a slug, search for items using that slug, incrementing the slug name until
-     * a unique value is found
-     *
-     * For example, if a slug of `"snow-map"` into this function and some item exists
-     * with that slug, it would return `"snow-map-1"`.
-     *
-     * @param slug
-     * @param requestOptions
-     * @param step
-     * @returns
-     */
-    function getUniqueSlug(slugInfo, requestOptions, step) {
-        if (step === void 0) { step = 0; }
-        var combinedSlug = slugInfo.slug;
-        if (step) {
-            combinedSlug = slugInfo.slug + "-" + step;
-        }
-        return findItemsBySlug({ slug: combinedSlug, exclude: slugInfo.existingId }, requestOptions)
-            .then(function (results) {
-            if (results.length) {
-                step++;
-                return getUniqueSlug(slugInfo, requestOptions, step);
-            }
-            else {
-                return combinedSlug;
-            }
-        })
-            .catch(function (e) {
-            throw Error("Error in getUniqueSlug " + e);
-        });
-    }
-
-    /**
-     * Manage forward and backward property mappings to
-     * streamline conversion between the Hub entities, and
-     * the backing IModel
-     */
-    var PropertyMapper = /** @class */ (function () {
-        /**
-         * Pass in the mappings between the Entity and
-         * it's backing structure (model or otherwise)
-         * @param mappings
-         */
-        function PropertyMapper(mappings) {
-            this.mappings = mappings;
-        }
-        /**
-         * Map properties from a model on to the entity object.
-         *
-         * Used when constructing an entity can from a fetched model,
-         * in which case the entity should be an empty object (`{}`).
-         *
-         * Can also be used to apply changes to an entity from a model,
-         * in which case an existing entity can be passed in.
-         * @param model
-         * @param object
-         * @returns
-         */
-        PropertyMapper.prototype.modelToObject = function (model, object) {
-            return mapModelToObject(model, object, this.mappings);
-        };
-        /**
-         * Map properties from an entity object onto a model.
-         *
-         * Typically the model will already exist, and this
-         * method is used to transfer changes to the model
-         * prior to storage.
-         * @param object
-         * @param model
-         * @returns
-         */
-        PropertyMapper.prototype.objectToModel = function (object, model) {
-            return mapObjectToModel(object, model, this.mappings);
-        };
-        return PropertyMapper;
-    }());
-    /**
-     * Generic function to apply properties from an Object
-     * (i.e. IHubProject) onto a Model that can be persisted to an Item
-     * @param object
-     * @param model
-     * @param mappings
-     * @returns
-     */
-    function mapObjectToModel(object, model, mappings) {
-        return mapProps(object, "objectKey", model, "modelKey", mappings);
-    }
-    /**
-     * Generic function to apply properties from a Model
-     * onto an Object (i.e. IHubProject etc)
-     * @param model
-     * @param object
-     * @param mappings
-     * @returns
-     */
-    function mapModelToObject(model, object, mappings) {
-        return mapProps(model, "modelKey", object, "objectKey", mappings);
-    }
-    /**
-     * Internal function to map between objects
-     * @param source
-     * @param sourceKey
-     * @param target
-     * @param targetKey
-     * @param mappings
-     * @returns
-     */
-    function mapProps(source, sourceKey, target, targetKey, mappings) {
-        // clone the target
-        var clone = cloneObject$1(target);
-        // walk the property map array
-        mappings.forEach(function (entry) {
-            // Verbose b/c typescript hates the use of property indexing with generics
-            // i.e. entry<T>[sourceKey] make typescript angry
-            var sourcePath = getProp(entry, sourceKey);
-            var targetPath = getProp(entry, targetKey);
-            // get the value from the source
-            var sourceVal = getProp(source, sourcePath);
-            // if it's not null or undefined
-            if (sourceVal !== null && sourceVal !== undefined) {
-                // set it
-                deepSet(clone, targetPath, sourceVal);
-            }
-        });
-        return clone;
-    }
-
-    var HUB_PROJECT_ITEM_TYPE = "Hub Project";
-    /**
-     * Default values of a IHubProject
-     */
-    var DEFAULT_PROJECT = {
-        name: "No title provided",
-        tags: [],
-        typeKeywords: ["Hub Project"],
-        status: "inactive",
-    };
-    /**
-     * Default values for a new HubProject Model
-     */
-    var DEFAULT_PROJECT_MODEL = {
-        item: {
-            type: HUB_PROJECT_ITEM_TYPE,
-            title: "No Title Provided",
-            description: "No Description Provided",
-            snippet: "",
-            tags: [],
-            typeKeywords: ["Hub Project"],
-            properties: {
-                slug: "",
-            },
-        },
-        data: {
-            display: "about",
-            timeline: {},
-            status: "inactive",
-            contacts: [],
-            schemaVersion: 1,
-        },
-    };
-    /**
-     * Returns an Array of IPropertyMap objects
-     * We could define these directly, but since the
-     * properties of IHubProject map directly to properties
-     * on item or data, it's slightly less verbose to
-     * generate the structure.
-     * @returns
-     */
-    function getProjectPropertyMap() {
-        var itemProps = [
-            "created",
-            "culture",
-            "description",
-            "extent",
-            "id",
-            "modified",
-            "owner",
-            "snippet",
-            "tags",
-            "typeKeywords",
-            "url",
+            "typeKeywords",
+            "url",
             "type",
         ];
         var dataProps = [
@@ -18053,7 +16632,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)];
@@ -18065,13 +16644,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),
@@ -18111,10 +16688,9 @@
             });
         });
     }
-    var WellKnownItemFilters = {
+    var WellKnownItemPredicates = {
         $application: [
             {
-                filterType: "item",
                 type: {
                     any: [
                         "Web Mapping Application",
@@ -18129,14 +16705,12 @@
                 },
             },
             {
-                filterType: "item",
                 type: "Web Mapping Experience",
                 typekeywords: "EXB Experience",
             },
         ],
         $dashboard: [
             {
-                filterType: "item",
                 type: {
                     any: ["Dashboard"],
                     not: ["Operation View"],
@@ -18148,7 +16722,6 @@
         ],
         $dataset: [
             {
-                filterType: "item",
                 type: {
                     any: [
                         "Scene Service",
@@ -18183,13 +16756,11 @@
                 },
             },
             {
-                filterType: "item",
                 typekeywords: ["OGC", "Geodata Service"],
             },
         ],
         $document: [
             {
-                filterType: "item",
                 type: [
                     "PDF",
                     "Microsoft Excel",
@@ -18205,48 +16776,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",
@@ -18261,7 +16824,6 @@
         ],
         $webmap: [
             {
-                filterType: "item",
                 type: {
                     any: ["Web Map", "Web Scene"],
                     not: "Web Mapping Application",
@@ -18330,7 +16892,7 @@
     function isWellKnownTypeFilter(key) {
         var result = false;
         if (typeof key === "string") {
-            result = key in WellKnownItemFilters;
+            result = key in WellKnownItemPredicates;
         }
         return result;
     }
@@ -18340,14 +16902,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];
     }
 
     // ##    ##  #######  ######## ########
@@ -18362,194 +16917,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
@@ -18622,7 +17001,6 @@
                         return [2 /*return*/, {
                                 total: resp.total,
                                 results: results,
-                                facets: [],
                                 hasNext: resp.nextStart > -1,
                                 next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$1),
                             }];
@@ -18723,102 +17101,672 @@
                         return [2 /*return*/, {
                                 total: resp.total,
                                 results: results,
-                                facets: [],
                                 hasNext: resp.nextStart > -1,
                                 next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
                             }];
                 }
             });
-        });
-    }
+        });
+    }
+    /**
+     * Convert an Item to a IHubSearchResult
+     * Fetches the includes and attaches them to the item
+     * @param item
+     * @param includes
+     * @param requestOptions
+     * @returns
+     */
+    function userToSearchResult(user, includes, requestOptions) {
+        if (includes === void 0) { includes = []; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                // Delegate to HubGroups module
+                // This layer of indirection is not necessary but
+                // aligns with how the items search works and
+                // allows for future specialization
+                return [2 /*return*/, enrichUserSearchResult(user, includes, requestOptions)];
+            });
+        });
+    }
+
+    /**
+     * @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
+     *
+     * Default's to search ArcGIS Portal but can delegate
+     * to Hub API when it's available.
+     * @param query
+     * @param options
+     * @returns
+     */
+    function hubSearch(query, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var filterType, apiType, fnHash, fn;
+            return __generator(this, function (_a) {
+                // Validate inputs
+                if (!query) {
+                    throw new HubError$1("hubSearch", "Query is required.");
+                }
+                if (!query.filters || !query.filters.length) {
+                    throw new HubError$1("hubSearch", "Query must contain at least one Filter.");
+                }
+                if (!options.requestOptions) {
+                    throw new HubError$1("hubSearch", "requestOptions: IHubRequestOptions is required.");
+                }
+                // Ensure includes is an array
+                if (!options.include) {
+                    options.include = [];
+                }
+                filterType = query.targetEntity;
+                apiType = expandApi(options.api || "arcgis").type;
+                fnHash = {
+                    arcgis: {
+                        item: portalSearchItems,
+                        group: portalSearchGroups,
+                        user: portalSearchUsers,
+                    },
+                    "arcgis-hub": {
+                        item: hubSearchItems,
+                    },
+                };
+                fn = getProp(fnHash, apiType + "." + filterType);
+                if (!fn) {
+                    throw new HubError$1("hubSearch", "Search via \"" + filterType + "\" filter against \"" + apiType + "\" api is not implemented. Please ensure \"targetEntity\" is defined on the query.");
+                }
+                return [2 /*return*/, fn(cloneObject$1(query), options)];
+            });
+        });
+    }
+
+    /**
+     * Collection Class
+     *
+     * Abstracts searching a Collection
+     *
+     * For more information, check out the [Catalog & Collection Guide](/hub.js/guides/concepts/catalog-collection/)
+     */
+    var Collection = /** @class */ (function () {
+        function Collection(collection, context) {
+            this._collection = collection;
+            this._context = context;
+        }
+        /**
+         * Create an instance of a Collection from a JSON object
+         * @param collection
+         * @param context
+         * @returns
+         */
+        Collection.fromJson = function (collection, context) {
+            return new Collection(collection, context);
+        };
+        /**
+         * Return the JSON object backing the instance
+         * @returns
+         */
+        Collection.prototype.toJson = function () {
+            return cloneObject$1(this._collection);
+        };
+        Object.defineProperty(Collection.prototype, "label", {
+            // Getters
+            get: function () {
+                return this._collection.label;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Collection.prototype, "key", {
+            get: function () {
+                return this._collection.key;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Collection.prototype, "include", {
+            get: function () {
+                return this._collection.include || [];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Collection.prototype, "scope", {
+            get: function () {
+                return this._collection.scope;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Collection.prototype, "sortField", {
+            get: function () {
+                return this._collection.sortField || "title";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Collection.prototype, "sortDirection", {
+            get: function () {
+                return this._collection.sortDirection || "asc";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Collection.prototype, "targetEntity", {
+            get: function () {
+                return this._collection.targetEntity;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Search the collection using a string or IQuery
+         * @param query
+         * @param options
+         * @returns
+         */
+        Collection.prototype.search = function (query, options) {
+            if (options === void 0) { options = {}; }
+            return __awaiter(this, void 0, void 0, function () {
+                var qry, opts;
+                return __generator(this, function (_a) {
+                    if (typeof query === "string") {
+                        // construct a query from that...
+                        qry = {
+                            targetEntity: this._collection.targetEntity,
+                            filters: [
+                                {
+                                    predicates: [
+                                        {
+                                            term: query,
+                                        },
+                                    ],
+                                },
+                            ],
+                        };
+                    }
+                    else {
+                        qry = query;
+                    }
+                    // TODO: What should happen when a Query is passed in that has a targetEntity that doesn't match the collection's targetEntity?
+                    // merge the passed in query w/ the scope
+                    qry.filters = __spreadArrays(qry.filters, this.scope.filters);
+                    opts = cloneObject$1(options);
+                    opts.requestOptions = this._context.hubRequestOptions;
+                    // inject default sort info if not specified
+                    opts.sortField = options.sortField || this.sortField;
+                    opts.sortOrder = options.sortOrder || this.sortDirection;
+                    // inject default includes if not specified
+                    opts.include = options.include || this.include;
+                    // execute the search and return results
+                    return [2 /*return*/, hubSearch(qry, opts)];
+                });
+            });
+        };
+        return Collection;
+    }());
+
     /**
-     * Convert an Item to a IHubSearchResult
-     * Fetches the includes and attaches them to the item
-     * @param item
-     * @param includes
+     * Fetch a IHubCatalog from a backing item.
+     * This will apply schema upgrades to the structure
+     * @param identifier
      * @param requestOptions
      * @returns
      */
-    function userToSearchResult(user, includes, requestOptions) {
-        if (includes === void 0) { includes = []; }
+    function fetchCatalog(identifier, requestOptions) {
         return __awaiter(this, void 0, void 0, function () {
+            var getPrms, url, fetched;
             return __generator(this, function (_a) {
-                // Delegate to HubGroups module
-                // This layer of indirection is not necessary but
-                // aligns with how the items search works and
-                // allows for future specialization
-                return [2 /*return*/, enrichUserSearchResult(user, includes, requestOptions)];
+                switch (_a.label) {
+                    case 0:
+                        // identifier can be a guid or a url
+                        if (identifier.indexOf("http") === 0) {
+                            url = identifier;
+                            // get down the the hostname
+                            url = stripProtocol(url);
+                            // if url does not include a hash (i.e. it's not portal)
+                            // then we want to split on the first slash to get the hostname
+                            // lookupDomain will handle the enterprise base urls
+                            if (!url.includes("#")) {
+                                url = url.split("/")[0];
+                            }
+                            getPrms = lookupDomain(url, requestOptions)
+                                // get the item's data, and read the catalog out of it
+                                .then(function (_a) {
+                                var siteId = _a.siteId;
+                                return getItemData(siteId, requestOptions);
+                            })
+                                .then(function (data) {
+                                return upgradeCatalogSchema(data.catalog || {});
+                            });
+                        }
+                        else if (isGuid(identifier)) {
+                            // get the item's data, and read the catalog out of it
+                            getPrms = getItemData(identifier, requestOptions).then(function (data) {
+                                return upgradeCatalogSchema(data.catalog || {});
+                            });
+                        }
+                        else {
+                            throw new HubError$1("Catalog.create", "Identifier must be a url, guid");
+                        }
+                        return [4 /*yield*/, getPrms];
+                    case 1:
+                        fetched = _a.sent();
+                        return [2 /*return*/, fetched];
+                }
             });
         });
     }
 
     /**
-     * @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
+     * Catalog Class
      *
-     * Default's to search ArcGIS Portal but can delegate
-     * to Hub API when it's available.
-     * @param filterGroups
-     * @param options
-     * @returns
+     * Abstracts working with Catalogs and fetching collections with
+     * the correct scope applied.
+     *
+     * For more information, check out the [Catalog & Collection Guide](/hub.js/guides/concepts/catalog-collection/)
      */
-    function hubSearchQuery(query, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                // delegate
-                return [2 /*return*/, hubSearch(query, options)];
+    var Catalog = /** @class */ (function () {
+        // internal - use static factory methods
+        function Catalog(catalog, context) {
+            this._catalog = catalog;
+            this._context = context;
+        }
+        /**
+         * Create a Collection instance from a Catalog json object, a site url or itemId
+         * '''js
+         * const catalog = await Catalog.create('https://site-org.hub.arcgis.com', context);
+         * '''
+         *
+         * @param identifier
+         * @param context
+         * @returns
+         */
+        Catalog.init = function (identifier, context) {
+            return __awaiter(this, void 0, void 0, function () {
+                var mgr, fetched;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!!context) return [3 /*break*/, 2];
+                            return [4 /*yield*/, ArcGISContextManager.create()];
+                        case 1:
+                            mgr = _a.sent();
+                            context = mgr.context;
+                            _a.label = 2;
+                        case 2: return [4 /*yield*/, fetchCatalog(identifier, context.hubRequestOptions)];
+                        case 3:
+                            fetched = _a.sent();
+                            // return an instance
+                            return [2 /*return*/, new Catalog(fetched, context)];
+                    }
+                });
             });
+        };
+        /**
+         * Create a Catalog instance from a Catalog Json object
+         * @param json
+         * @param context
+         * @returns
+         */
+        Catalog.fromJson = function (json, context) {
+            // ensure it's in the latest structure
+            var catalog = upgradeCatalogSchema(json);
+            return new Catalog(catalog, context);
+        };
+        /**
+         * Return the JSON object backing the instance
+         * @returns
+         */
+        Catalog.prototype.toJson = function () {
+            return cloneObject$1(this._catalog);
+        };
+        Object.defineProperty(Catalog.prototype, "schemaVersion", {
+            /**
+             * Return the schema version
+             */
+            get: function () {
+                return this._catalog.schemaVersion;
+            },
+            enumerable: false,
+            configurable: true
         });
-    }
-    /**
-     * Main entrypoint for searching via Hub
-     *
-     * Default's to search ArcGIS Portal but can delegate
-     * to Hub API when it's available.
-     * @param query
-     * @param options
-     * @returns
-     */
-    function hubSearch(query, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var filterType, apiType, fnHash, fn;
-            return __generator(this, function (_a) {
-                // Validate inputs
-                if (!query) {
-                    throw new HubError$1("hubSearch", "Query is required.");
-                }
-                if (!query.filters || !query.filters.length) {
-                    throw new HubError$1("hubSearch", "Query must contain at least one Filter.");
-                }
-                if (!options.requestOptions) {
-                    throw new HubError$1("hubSearch", "requestOptions: IHubRequestOptions is required.");
-                }
-                // Ensure includes is an array
-                if (!options.include) {
-                    options.include = [];
+        Object.defineProperty(Catalog.prototype, "title", {
+            /**
+             * Title getter
+             */
+            get: function () {
+                return this._catalog.title;
+            },
+            /**
+             * Title setter
+             */
+            set: function (v) {
+                this._catalog.title = v;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Catalog.prototype, "scopes", {
+            /**
+             * Return the existing scopes hash
+             */
+            get: function () {
+                return this._catalog.scopes;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Catalog.prototype, "availableScopes", {
+            /**
+             * Return an array of the entity types available in this Catalog
+             */
+            get: function () {
+                return Object.keys(this.scopes);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Get the scope's query for a particular entity type
+         * @param type
+         * @returns
+         */
+        Catalog.prototype.getScope = function (type) {
+            return this._catalog.scopes[type];
+        };
+        /**
+         * Set the scope for a specific entity type
+         * @param type
+         * @param query
+         */
+        Catalog.prototype.setScope = function (type, query) {
+            this._catalog.scopes[type] = query;
+        };
+        Object.defineProperty(Catalog.prototype, "collections", {
+            /**
+             * Get the collections array. Returns simple objects not Collection instances
+             */
+            get: function () {
+                return this._catalog.collections || [];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Catalog.prototype, "collectionNames", {
+            /**
+             * Get the names of the collections
+             */
+            get: function () {
+                return mapBy("key", this.collections);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Get a Collection instance by name
+         * @param name
+         * @returns
+         */
+        Catalog.prototype.getCollection = function (name) {
+            var json = this.collections.find(function (entry) { return entry.key === name; });
+            if (json) {
+                // clone it then merge in the associated scope filter
+                var clone = cloneObject$1(json);
+                var catalogScope = this.getScope(clone.scope.targetEntity);
+                if (catalogScope === null || catalogScope === void 0 ? void 0 : catalogScope.filters) {
+                    clone.scope.filters = __spreadArrays(clone.scope.filters, catalogScope.filters);
                 }
-                filterType = query.targetEntity;
-                apiType = expandApi(options.api || "arcgis").type;
-                fnHash = {
-                    arcgis: {
-                        item: portalSearchItems,
-                        group: portalSearchGroups,
-                        user: portalSearchUsers,
+                return Collection.fromJson(clone, this._context);
+            }
+            else {
+                throw new HubError$1("getCollection", "Collection \"" + name + "\" is not present in the Catalog");
+            }
+        };
+        /**
+         * Search for Items
+         * Will throw if the Catalog does not have a scope defined for items
+         * @param query
+         * @param options
+         * @returns
+         */
+        Catalog.prototype.searchItems = function (query, options) {
+            if (options === void 0) { options = {}; }
+            if (!this.getScope("item")) {
+                var result = this.getEmptyResult();
+                result.messages = [
+                    {
+                        code: "missingScope",
+                        message: "Catalog does not have a scope for items",
+                        data: {
+                            scope: "item",
+                        },
                     },
-                    "arcgis-hub": {
-                        item: hubSearchItems,
+                ];
+                return Promise.resolve(result);
+            }
+            else {
+                // ensure it's an item search
+                options.targetEntity = "item";
+                return this.search(query, options);
+            }
+        };
+        /**
+         * Search for Groups
+         * Will throw if the Catalog does not have a scope defined for groups
+         * @param query
+         * @param options
+         * @returns
+         */
+        Catalog.prototype.searchGroups = function (query, options) {
+            if (options === void 0) { options = {}; }
+            if (!this.getScope("group")) {
+                var result = this.getEmptyResult();
+                result.messages = [
+                    {
+                        code: "missingScope",
+                        message: "Catalog does not have a scope for groups",
+                        data: {
+                            scope: "group",
+                        },
                     },
-                };
-                fn = getProp(fnHash, apiType + "." + filterType);
-                if (!fn) {
-                    throw new HubError$1("hubSearch", "Search via \"" + filterType + "\" filter against \"" + apiType + "\" api is not implemented");
-                }
-                return [2 /*return*/, fn(cloneObject$1(query), options)];
+                ];
+                return Promise.resolve(result);
+            }
+            else {
+                // ensure it's an group search
+                options.targetEntity = "group";
+                return this.search(query, options);
+            }
+        };
+        /**
+         * Search for Users
+         * Will throw if the Catalog does not have a scope defined for users
+         * @param query
+         * @param options
+         * @returns
+         */
+        Catalog.prototype.searchUsers = function (query, options) {
+            if (options === void 0) { options = {}; }
+            if (!this.getScope("user")) {
+                var result = this.getEmptyResult();
+                result.messages = [
+                    {
+                        code: "missingScope",
+                        message: "Catalog does not have a scope for user",
+                        data: {
+                            scope: "user",
+                        },
+                    },
+                ];
+                return Promise.resolve(result);
+            }
+            else {
+                // ensure it's an group search
+                options.targetEntity = "user";
+                return this.search(query, options);
+            }
+        };
+        /**
+         * Execute a search against all the collections in the Catalog
+         * @param query
+         * @param options
+         * @returns
+         */
+        Catalog.prototype.searchCollections = function (query, options) {
+            if (options === void 0) { options = {}; }
+            return __awaiter(this, void 0, void 0, function () {
+                var qry, promiseKeys, promises, responses, hash, i;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            qry = {
+                                targetEntity: "item",
+                                filters: [
+                                    {
+                                        predicates: [
+                                            {
+                                                term: query,
+                                            },
+                                        ],
+                                    },
+                                ],
+                            };
+                            promiseKeys = [];
+                            promises = this.collectionNames.map(function (name) {
+                                var col = _this.getCollection(name);
+                                promiseKeys.push(name);
+                                qry.targetEntity = col.targetEntity;
+                                return col.search(qry, options);
+                            });
+                            return [4 /*yield*/, Promise.all(promises)];
+                        case 1:
+                            responses = _a.sent();
+                            hash = {};
+                            for (i = 0; i < promiseKeys.length; i++) {
+                                hash[promiseKeys[i]] = responses[i];
+                            }
+                            return [2 /*return*/, hash];
+                    }
+                });
             });
-        });
-    }
+        };
+        /**
+         * Execute a search against all the scopes in the Catalog
+         * @param query
+         * @param options
+         * @returns
+         */
+        Catalog.prototype.searchScopes = function (query, options) {
+            if (options === void 0) { options = {}; }
+            return __awaiter(this, void 0, void 0, function () {
+                var qry, promiseKeys, promises, responses, hash, i;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            qry = {
+                                targetEntity: "item",
+                                filters: [
+                                    {
+                                        predicates: [
+                                            {
+                                                term: query,
+                                            },
+                                        ],
+                                    },
+                                ],
+                            };
+                            promiseKeys = [];
+                            promises = this.availableScopes.map(function (name) {
+                                promiseKeys.push(name);
+                                // make clones
+                                var qryClone = cloneObject$1(qry);
+                                var optsClone = cloneObject$1(options);
+                                // set the target entity
+                                qryClone.targetEntity = name;
+                                optsClone.targetEntity = name;
+                                // return the search promise
+                                return _this.search(qryClone, optsClone);
+                            });
+                            return [4 /*yield*/, Promise.all(promises)];
+                        case 1:
+                            responses = _a.sent();
+                            hash = {};
+                            for (i = 0; i < promiseKeys.length; i++) {
+                                hash[promiseKeys[i]] = responses[i];
+                            }
+                            return [2 /*return*/, hash];
+                    }
+                });
+            });
+        };
+        /**
+         * Execute a search against the Catalog as a whole
+         * @param query
+         * @param targetEntity
+         * @returns
+         */
+        Catalog.prototype.search = function (query, options) {
+            var targetEntity = options.targetEntity;
+            var qry;
+            if (typeof query === "string") {
+                qry = {
+                    targetEntity: targetEntity,
+                    filters: [
+                        {
+                            predicates: [
+                                {
+                                    term: query,
+                                },
+                            ],
+                        },
+                    ],
+                };
+            }
+            else {
+                qry = cloneObject$1(query);
+            }
+            // Now merge in catalog scope level filters
+            qry.filters = __spreadArrays(qry.filters, this.getScope(targetEntity).filters);
+            var opts = cloneObject$1(options);
+            // An Catalog instance always uses the context so we remove/replace any passed in auth
+            delete opts.authentication;
+            opts.requestOptions = this._context.hubRequestOptions;
+            return hubSearch(qry, opts);
+        };
+        /**
+         * Construct an empty result. Returned when a search is performed against an entity type that
+         * does not have a scope defined.
+         * @returns
+         */
+        Catalog.prototype.getEmptyResult = function () {
+            return {
+                results: [],
+                total: 0,
+                hasNext: false,
+                next: null,
+            };
+        };
+        return Catalog;
+    }());
 
     /**
      * Enrich a generic search result
@@ -20430,6 +19378,8 @@
 
     exports.ArcGISContext = ArcGISContext;
     exports.ArcGISContextManager = ArcGISContextManager;
+    exports.Catalog = Catalog;
+    exports.Collection = Collection;
     exports.DEFAULT_THEME = DEFAULT_THEME;
     exports.ENTERPRISE_SITE_ITEM_TYPE = ENTERPRISE_SITE_ITEM_TYPE;
     exports.GLOBAL_EXTENT = GLOBAL_EXTENT;
@@ -20479,9 +19429,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;
@@ -20491,7 +19438,6 @@
     exports.addSiteDomains = addSiteDomains;
     exports.addSolutionResourceUrlToAssets = addSolutionResourceUrlToAssets;
     exports.addUsersToGroup = addUsersToGroup;
-    exports.applyCollectionState = applyCollectionState;
     exports.applyPropertiesToItems = applyPropertiesToItems;
     exports.arrayToObject = arrayToObject;
     exports.atob = abab.atob;
@@ -20518,12 +19464,8 @@
     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;
@@ -20561,10 +19503,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;
@@ -20665,8 +19603,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;
@@ -20685,13 +19621,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;
@@ -20713,16 +19643,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;
@@ -20741,6 +19664,7 @@
     exports.updateModel = updateModel;
     exports.updateProject = updateProject;
     exports.updateSite = updateSite;
+    exports.upgradeCatalogSchema = upgradeCatalogSchema;
     exports.upgradeProtocol = upgradeProtocol;
     exports.upgradeSiteSchema = upgradeSiteSchema;
     exports.uploadResourcesFromUrl = uploadResourcesFromUrl;