@esri/hub-common 9.45.4 → 9.46.0

package/dist/node/search/index.js

@@ -13,6 +13,6 @@ tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./collectionState"), exports);
 tslib_1.__exportStar(require("./convertCatalog"), exports);
 tslib_1.__exportStar(require("./filter-utils"), exports);
-tslib_1.__exportStar(require("./ifilter-utils"), exports);
+tslib_1.__exportStar(require("./serializeQueryForPortal"), exports);
 tslib_1.__exportStar(require("./hubSearch"), exports);
 //# sourceMappingURL=index.js.map

package/dist/node/search/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/search/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,0DAAgC;AAChC,wDAA8B;AAC9B,uDAA6B;AAC7B,kDAAwB;AACxB,2DAAiC;AACjC,0DAAgC;AAChC,yDAA+B;AAC/B,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B;AAC/B,0DAAgC;AAChC,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/search/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,0DAAgC;AAChC,wDAA8B;AAC9B,uDAA6B;AAC7B,kDAAwB;AACxB,2DAAiC;AACjC,0DAAgC;AAChC,yDAA+B;AAC/B,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B;AAC/B,oEAA0C;AAC1C,sDAA4B"}

package/dist/node/search/{ifilter-utils.js → serializeQueryForPortal.js}

@@ -2,24 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeQueryForPortal = void 0;
 const ipredicate_utils_1 = require("./_internal/ipredicate-utils");
+/**
+ * Serialize IQuery into ISearchOptions for ArcGIS Portal
+ * @param query
+ * @returns
+ */
 function serializeQueryForPortal(query) {
     const filterSearchOptions = query.filters.map(serializeFilter);
-    const result = mergeSearchOptions(filterSearchOptions, "AND");
+    // remove any empty entries
+    const nonEmptyOptions = filterSearchOptions.filter(removeEmptyEntries);
+    const result = mergeSearchOptions(nonEmptyOptions, "AND");
     return result;
 }
 exports.serializeQueryForPortal = serializeQueryForPortal;
+/**
+ * Predicate to remove things from array
+ * @param e
+ * @returns
+ */
+function removeEmptyEntries(e) {
+    return !(typeof e === "undefined" || e === null || e === "");
+}
 function mergeSearchOptions(options, operation) {
     const result = options.reduce((acc, entry) => {
         // walk the props
         Object.entries(entry).forEach(([key, value]) => {
-            // if prop exists
-            if (acc[key]) {
+            // 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
-                acc[key] = value;
+                // just copy the value if it's not empty string
+                if (value !== "") {
+                    acc[key] = value;
+                }
             }
         });
         return acc;
@@ -34,7 +51,9 @@ function mergeSearchOptions(options, operation) {
 function serializeFilter(filter) {
     const operation = filter.operation || "AND";
     const predicates = filter.predicates.map(ipredicate_utils_1.expandPredicate);
-    const predicateSearchOptions = predicates.map(serializePredicate);
+    const predicateSearchOptions = predicates
+        .map(serializePredicate)
+        .filter((e) => e !== undefined && e !== null);
     // combine these searchOptions
     const searchOptions = mergeSearchOptions(predicateSearchOptions, operation);
     // wrap in parens if we have more than one predicate
@@ -89,6 +108,7 @@ function serializePredicate(predicate) {
         "snippet",
         "tags",
         "term",
+        "title",
         "type",
         "typekeywords",
         "userlicensetype",
@@ -103,7 +123,7 @@ function serializePredicate(predicate) {
         // not attempt to ensure the properties are used in the correct combinations
         if (portalAllowList.includes(key)) {
             const so = { q: "" };
-            if (!specialProps.includes(key)) {
+            if (!specialProps.includes(key) && key !== "term") {
                 qCount++;
                 so.q = serializeMatchOptions(key, value);
             }
@@ -125,13 +145,18 @@ function serializePredicate(predicate) {
             return so;
         }
     })
-        .filter((e) => e !== undefined);
+        .filter(removeEmptyEntries);
     // merge up all the searchOptions
-    const searchOptions = mergeSearchOptions(opts, "AND");
-    if (qCount > 1) {
-        searchOptions.q = `(${searchOptions.q})`;
+    if (opts.length) {
+        const searchOptions = mergeSearchOptions(opts, "AND");
+        if (qCount > 1) {
+            searchOptions.q = `(${searchOptions.q})`;
+        }
+        return searchOptions;
+    }
+    else {
+        return null;
     }
-    return searchOptions;
 }
 /**
  * Serialize MatchOptions into portal syntax
@@ -186,4 +211,4 @@ function serializeStringOrArray(join, key, value) {
     }
     return q;
 }
-//# sourceMappingURL=ifilter-utils.js.map
+//# sourceMappingURL=serializeQueryForPortal.js.map

package/dist/node/search/serializeQueryForPortal.js.map

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

package/dist/node/sites/HubSiteManager.js

@@ -123,12 +123,12 @@ class HubSiteManager {
      * @param filter
      * @param opts
      */
-    async search(filter, options) {
+    async search(query, options) {
         // if we were not passed auth, and we have a session, use it
         if (!options.authentication && this.context.session) {
             options.authentication = this.context.session;
         }
-        return HubSites_1.searchSites(filter, options);
+        return HubSites_1.searchSites(query, options);
     }
     /**
      * Set the thumbnail for the Site

package/dist/node/sites/HubSiteManager.js.map

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

package/dist/node/sites/HubSites.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enrichSiteSearchResult = exports.searchSites = exports.convertItemToSite = exports._fetchSite = exports.destroySite = exports.updateSite = exports.createSite = exports.ENTERPRISE_SITE_ITEM_TYPE = exports.HUB_SITE_ITEM_TYPE = void 0;
 const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
-const __1 = require("..");
+const index_1 = require("../index");
 const PropertyMapper_1 = require("../core/_internal/PropertyMapper");
 const _internal_1 = require("./_internal");
-const searchContentEntities_1 = require("../search/_internal/searchContentEntities");
+const searchEntities_1 = require("../search/_internal/searchEntities");
 const _enrichments_1 = require("../items/_enrichments");
 const parseInclude_1 = require("../search/_internal/parseInclude");
 const _internal_2 = require("../content/_internal");
+const createQueryFromString_1 = require("../search/_internal/createQueryFromString");
 exports.HUB_SITE_ITEM_TYPE = "Hub Site Application";
 exports.ENTERPRISE_SITE_ITEM_TYPE = "Site Application";
 /**
@@ -230,20 +231,20 @@ async function createSite(partialSite, requestOptions) {
         : exports.HUB_SITE_ITEM_TYPE;
     // Create a slug from the title if one is not passed in
     if (!site.slug) {
-        site.slug = __1.constructSlug(site.name, site.orgUrlKey);
+        site.slug = index_1.constructSlug(site.name, site.orgUrlKey);
     }
     // Ensure slug is  unique
     // site.slug = await getUniqueSlug({ slug: site.slug }, requestOptions);
     // add slug to keywords
-    site.typeKeywords = __1.setSlugKeyword(site.typeKeywords, site.slug);
+    site.typeKeywords = index_1.setSlugKeyword(site.typeKeywords, site.slug);
     if (!site.subdomain) {
-        site.subdomain = __1.slugify(site.name);
+        site.subdomain = index_1.slugify(site.name);
     }
-    site.subdomain = await __1.ensureUniqueDomainName(site.subdomain, requestOptions);
+    site.subdomain = await index_1.ensureUniqueDomainName(site.subdomain, requestOptions);
     // Domains
     if (!requestOptions.isPortal) {
         // now that we know the subdomain is available, set the defaultHostname
-        site.defaultHostname = `${site.subdomain}-${portal.urlKey}.${__1.stripProtocol(__1.getHubApiUrl(requestOptions))}`;
+        site.defaultHostname = `${site.subdomain}-${portal.urlKey}.${index_1.stripProtocol(index_1.getHubApiUrl(requestOptions))}`;
         // set the url
         site.url = `https://${site.customHostname ? site.customHostname : site.defaultHostname}`;
     }
@@ -259,7 +260,7 @@ async function createSite(partialSite, requestOptions) {
     site.orgUrlKey = portal.urlKey;
     // override only if not set...
     if (!site.theme) {
-        site.theme = __1.getOrgDefaultTheme(portal);
+        site.theme = index_1.getOrgDefaultTheme(portal);
     }
     if (!site.defaultExtent) {
         site.defaultExtent = portal.defaultExtent;
@@ -268,25 +269,25 @@ async function createSite(partialSite, requestOptions) {
         site.culture = portal.culture;
     }
     // pull the basemap from portalSelf
-    if (!__1.getProp(site, "map.basemaps.primary")) {
-        __1.setProp("map.basemaps.primary", portal.defaultBasemap, site);
+    if (!index_1.getProp(site, "map.basemaps.primary")) {
+        index_1.setProp("map.basemaps.primary", portal.defaultBasemap, site);
     }
     // Put the title into the header
-    if (!__1.getProp(site, "layout.header.component.settings.title")) {
-        __1.setProp("layout.header.component.settings.title", site.name, site);
+    if (!index_1.getProp(site, "layout.header.component.settings.title")) {
+        index_1.setProp("layout.header.component.settings.title", site.name, site);
     }
     // Now convert the IHubSite into an IModel
     const mapper = new PropertyMapper_1.PropertyMapper(getSitePropertyMap());
-    let model = mapper.objectToModel(site, __1.cloneObject(DEFAULT_SITE_MODEL));
+    let model = mapper.objectToModel(site, index_1.cloneObject(DEFAULT_SITE_MODEL));
     // create the backing item
-    model = await __1.createModel(model, requestOptions);
+    model = await index_1.createModel(model, requestOptions);
     // Register as an app
-    const registration = await __1.registerSiteAsApplication(model, requestOptions);
+    const registration = await index_1.registerSiteAsApplication(model, requestOptions);
     model.data.values.clientId = registration.client_id;
     // Register domains
-    await __1.addSiteDomains(model, requestOptions);
+    await index_1.addSiteDomains(model, requestOptions);
     // update the model
-    const updatedModel = await __1.updateModel(model, requestOptions);
+    const updatedModel = await index_1.updateModel(model, requestOptions);
     // convert the model into a IHubSite and return
     return mapper.modelToObject(updatedModel, {});
 }
@@ -306,19 +307,19 @@ async function updateSite(site, requestOptions) {
     // applying the site onto the default model ensures that a minimum
     // set of properties exist, regardless what may have been done to
     // the site pojo
-    const updatedModel = mapper.objectToModel(site, __1.cloneObject(DEFAULT_SITE_MODEL));
+    const updatedModel = mapper.objectToModel(site, index_1.cloneObject(DEFAULT_SITE_MODEL));
     // Fetch backing model from the portal
-    const currentModel = await __1.getModel(site.id, requestOptions);
+    const currentModel = await index_1.getModel(site.id, requestOptions);
     // handle any domain changes
     await _internal_1.handleDomainChanges(updatedModel, currentModel, requestOptions);
     if (updatedModel.item.properties.slug !== currentModel.item.properties.slug) {
         // ensure slug to keywords
-        updatedModel.item.typeKeywords = __1.setSlugKeyword(updatedModel.item.typeKeywords, updatedModel.item.properties.slug);
+        updatedModel.item.typeKeywords = index_1.setSlugKeyword(updatedModel.item.typeKeywords, updatedModel.item.properties.slug);
     }
     // merge the updated site onto the current model
     const modelToStore = mapper.objectToModel(site, currentModel);
     // update the model
-    const updatedSiteModel = await __1.updateModel(modelToStore, requestOptions);
+    const updatedSiteModel = await index_1.updateModel(modelToStore, requestOptions);
     // fetch updated model
     const updatedSite = mapper.modelToObject(updatedSiteModel, site);
     return updatedSite;
@@ -337,7 +338,7 @@ exports.updateSite = updateSite;
 async function destroySite(id, requestOptions) {
     // For AGO we need to remove the domain records for the site
     if (!requestOptions.isPortal) {
-        await __1.removeDomainsBySiteId(id, requestOptions);
+        await index_1.removeDomainsBySiteId(id, requestOptions);
     }
     // now we can remove the item
     const ro = Object.assign(Object.assign({}, requestOptions), { id });
@@ -354,7 +355,7 @@ exports.destroySite = destroySite;
  */
 async function _fetchSite(identifier, requestOptions) {
     // get the model
-    const model = await __1.fetchSiteModel(identifier, requestOptions);
+    const model = await index_1.fetchSiteModel(identifier, requestOptions);
     // convert to site
     const mapper = new PropertyMapper_1.PropertyMapper(getSitePropertyMap());
     const site = mapper.modelToObject(model, {});
@@ -363,7 +364,7 @@ async function _fetchSite(identifier, requestOptions) {
         const us = requestOptions.authentication;
         token = us.token;
     }
-    site.thumbnailUrl = __1.getItemThumbnailUrl(model.item, requestOptions, token);
+    site.thumbnailUrl = index_1.getItemThumbnailUrl(model.item, requestOptions, token);
     return site;
 }
 exports._fetchSite = _fetchSite;
@@ -375,7 +376,7 @@ exports._fetchSite = _fetchSite;
  * @returns
  */
 async function convertItemToSite(item, requestOptions) {
-    const model = await __1.fetchModelFromItem(item, requestOptions);
+    const model = await index_1.fetchModelFromItem(item, requestOptions);
     const mapper = new PropertyMapper_1.PropertyMapper(getSitePropertyMap());
     let token;
     if (requestOptions.authentication) {
@@ -383,7 +384,7 @@ async function convertItemToSite(item, requestOptions) {
         token = session.token;
     }
     const prj = mapper.modelToObject(model, {});
-    prj.thumbnailUrl = __1.getItemThumbnailUrl(model.item, requestOptions, token);
+    prj.thumbnailUrl = index_1.getItemThumbnailUrl(model.item, requestOptions, token);
     return prj;
 }
 exports.convertItemToSite = convertItemToSite;
@@ -393,16 +394,26 @@ exports.convertItemToSite = convertItemToSite;
  * @param options
  * @returns
  */
-async function searchSites(filter, options) {
-    // Scope to Hub Sites
-    const scopingFilter = {
-        filterType: "content",
-        type: "$site",
-    };
-    // merge filters
-    const sitesFilter = __1.mergeContentFilter([scopingFilter, filter]);
-    // delegate
-    return searchContentEntities_1.searchContentEntities(sitesFilter, convertItemToSite, options);
+async function searchSites(query, options) {
+    let qry;
+    if (typeof query === "string") {
+        qry = createQueryFromString_1.createQueryFromString(query, "term", "item");
+    }
+    else {
+        qry = index_1.cloneObject(query);
+    }
+    const scopingFilters = [
+        {
+            predicates: [
+                {
+                    type: "Hub Project",
+                },
+            ],
+        },
+    ];
+    // add filters from the passed in query
+    qry.filters = [...scopingFilters, ...qry.filters];
+    return searchEntities_1.searchEntities(qry, convertItemToSite, options);
 }
 exports.searchSites = searchSites;
 /**
@@ -425,7 +436,7 @@ async function enrichSiteSearchResult(item, include, requestOptions) {
         createdDateSource: "item.created",
         updatedDate: new Date(item.modified),
         updatedDateSource: "item.modified",
-        family: __1.getFamily(item.type),
+        family: index_1.getFamily(item.type),
         links: {
             self: "not-implemented",
             siteRelative: "not-implemented",
@@ -435,11 +446,11 @@ async function enrichSiteSearchResult(item, include, requestOptions) {
     // default includes
     const DEFAULTS = [];
     // merge includes
-    include = [...DEFAULTS, ...include].filter(__1.unique);
+    include = [...DEFAULTS, ...include].filter(index_1.unique);
     // Parse the includes into a valid set of enrichments
     const specs = include.map(parseInclude_1.parseInclude);
     // Extract out the low-level enrichments needed
-    const enrichments = __1.mapBy("enrichment", specs).filter(__1.unique);
+    const enrichments = index_1.mapBy("enrichment", specs).filter(index_1.unique);
     // fetch the enrichments
     let enriched = {};
     if (enrichments.length) {
@@ -448,10 +459,10 @@ async function enrichSiteSearchResult(item, include, requestOptions) {
     }
     // map the enriched props onto the result
     specs.forEach((spec) => {
-        result[spec.prop] = __1.getProp(enriched, spec.path);
+        result[spec.prop] = index_1.getProp(enriched, spec.path);
     });
     // Handle links
-    result.links.thumbnail = __1.getItemThumbnailUrl(item, requestOptions);
+    result.links.thumbnail = index_1.getItemThumbnailUrl(item, requestOptions);
     result.links.self = item.url;
     result.links.siteRelative = _internal_2.getHubRelativeUrl(result.type, result.id, item.typeKeywords);
     return result;

package/dist/node/sites/HubSites.js.map

@@ -1 +1 @@
-{"version":3,"file":"HubSites.js","sourceRoot":"","sources":["../../../src/sites/HubSites.ts"],"names":[],"mappings":";;;AACA,iEAA+E;AAE/E,0BAgCY;AAEZ,qEAAgF;AAEhF,2CAAkD;AAClD,qFAAkF;AAGlF,wDAA6D;AAC7D,mEAAgE;AAChE,oDAAyD;AAE5C,QAAA,kBAAkB,GAAG,sBAAsB,CAAC;AAC5C,QAAA,yBAAyB,GAAG,kBAAkB,CAAC;AAE5D;;GAEG;AACH,MAAM,YAAY,GAAsB;IACtC,IAAI,EAAE,mBAAmB;IACzB,IAAI,EAAE,EAAE;IACR,YAAY,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAC;IACrD,YAAY,EAAE;QACZ,cAAc;QACd,OAAO;QACP,SAAS;QACT,eAAe;QACf,iBAAiB;QACjB,kBAAkB;QAClB,YAAY;QACZ,UAAU;QACV,iBAAiB;QACjB,WAAW;QACX,eAAe;KAChB;IACD,OAAO,EAAE;QACP,MAAM,EAAE,EAAE;KACX;IACD,SAAS,EAAE,EAAE;IACb,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,IAAI;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,IAAI;IACX,YAAY,EAAE;QACZ,aAAa,EAAE;YACb,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,IAAI;SACf;KACF;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,kBAAkB,GAAW;IACjC,IAAI,EAAE;QACJ,6CAA6C;QAC7C,sCAAsC;QACtC,KAAK,EAAE,mBAAmB;QAC1B,WAAW,EAAE,yBAAyB;QACtC,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAC;QACrD,UAAU,EAAE;YACV,IAAI,EAAE,EAAE;YACR,SAAS,EAAE,EAAE;YACb,eAAe,EAAE,EAAE;YACnB,cAAc,EAAE,EAAE;YAClB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,aAAa,EAAE,GAAG;SACnB;QACD,GAAG,EAAE,EAAE;KACC;IACV,IAAI,EAAE;QACJ,OAAO,EAAE;YACP,MAAM,EAAE,EAAE;SACX;QACD,KAAK,EAAE,EAAE;QACT,MAAM,EAAE;YACN,KAAK,EAAE,EAAE;YACT,eAAe,EAAE,EAAE;YACnB,cAAc,EAAE,EAAE;YAClB,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAE,EAAE;YACZ,GAAG,EAAE;gBACH,QAAQ,EAAE,EAAE;aACb;YACD,aAAa,EAAE,EAAE;YACjB,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,MAAM,EAAE;gBACN,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE;oBACN,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;wBACnB,QAAQ,EAAE;4BACR,SAAS,EAAE,KAAK;4BAChB,YAAY,EAAE,OAAO;4BACrB,SAAS,EAAE,EAAE;4BACb,KAAK,EAAE,EAAE;4BACT,OAAO,EAAE,EAAE;4BACX,KAAK,EAAE,cAAc;4BACrB,QAAQ,EAAE,EAAE;4BACZ,UAAU,EAAE,SAAS;4BACrB,aAAa,EAAE,CAAC;4BAChB,QAAQ,EAAE,IAAI;4BACd,SAAS,EAAE,IAAI;4BACf,IAAI,EAAE;gCACJ,OAAO,EAAE,EAAE;gCACX,KAAK,EAAE,OAAO;6BACf;4BACD,UAAU,EAAE,EAAE;4BACd,SAAS,EAAE,EAAE;4BACb,WAAW,EAAE;gCACX,QAAQ,EAAE,EAAE;gCACZ,OAAO,EAAE,EAAE;gCACX,SAAS,EAAE,EAAE;gCACb,OAAO,EAAE,EAAE;6BACZ;yBACF;qBACF;oBACD,UAAU,EAAE,KAAK;iBAClB;gBACD,MAAM,EAAE;oBACN,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;wBACnB,QAAQ,EAAE;4BACR,UAAU,EAAE,MAAM;4BAClB,QAAQ,EAAE,EAAE;4BACZ,aAAa,EAAE,GAAG;yBACnB;qBACF;oBACD,UAAU,EAAE,KAAK;iBAClB;aACF;YACD,YAAY,EAAE;gBACZ,aAAa,EAAE;oBACb,GAAG,EAAE,IAAI;oBACT,GAAG,EAAE,IAAI;oBACT,OAAO,EAAE,IAAI;oBACb,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAI;iBACf;aACF;SACF;KACF;CACF,CAAC;AAEF;;;;;;;GAOG;AACH,SAAS,kBAAkB;IACzB,MAAM,SAAS,GAAG;QAChB,SAAS;QACT,SAAS;QACT,aAAa;QACb,QAAQ;QACR,IAAI;QACJ,UAAU;QACV,OAAO;QACP,SAAS;QACT,MAAM;QACN,cAAc;QACd,KAAK;QACL,MAAM;KACP,CAAC;IAEF,MAAM,GAAG,GAAmB,EAAE,CAAC;IAC/B,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACvC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG;QACjB,OAAO;QACP,OAAO;QACP,cAAc;QACd,WAAW;QACX,iBAAiB;QACjB,gBAAgB;QAChB,UAAU;QACV,eAAe;QACf,KAAK;QACL,WAAW;QACX,YAAY;KACb,CAAC;IACF,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,KAAK,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,2BAA2B;IAC3B,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,MAAM;QACjB,QAAQ,EAAE,sBAAsB;KACjC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,2BAA2B;KACtC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,MAAM;QACjB,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,4CAA4C;AAE5C;;;;;;GAMG;AACI,KAAK,UAAU,UAAU,CAC9B,WAA8B,EAC9B,cAAkC;IAElC,MAAM,IAAI,mCAAQ,YAAY,GAAK,WAAW,CAAE,CAAC;IACjD,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC;IACzC,0DAA0D;IAC1D,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC,QAAQ;QACjC,CAAC,CAAC,iCAAyB;QAC3B,CAAC,CAAC,0BAAkB,CAAC;IACvB,uDAAuD;IACvD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACd,IAAI,CAAC,IAAI,GAAG,iBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;KACtD;IACD,yBAAyB;IACzB,wEAAwE;IACxE,uBAAuB;IACvB,IAAI,CAAC,YAAY,GAAG,kBAAc,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;QACnB,IAAI,CAAC,SAAS,GAAG,WAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACrC;IAED,IAAI,CAAC,SAAS,GAAG,MAAM,0BAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAE9E,UAAU;IACV,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;QAC5B,uEAAuE;QACvE,IAAI,CAAC,eAAe,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,IAAI,iBAAa,CACxE,gBAAY,CAAC,cAAc,CAAC,CAC7B,EAAE,CAAC;QAEJ,cAAc;QACd,IAAI,CAAC,GAAG,GAAG,WACT,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,eACnD,EAAE,CAAC;KACJ;SAAM;QACL,kDAAkD;QAClD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,GAAG,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CACxD,eAAe,EACf,aAAa,CACd,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;KACzB;IAED,gEAAgE;IAChE,yEAAyE;IACzE,uEAAuE;IACvE,uCAAuC;IAEvC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IAE/B,8BAA8B;IAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;QACf,IAAI,CAAC,KAAK,GAAG,sBAAkB,CAAC,MAAM,CAAC,CAAC;KACzC;IAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;QACvB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;KAC3C;IAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;KAC/B;IACD,mCAAmC;IACnC,IAAI,CAAC,WAAO,CAAC,IAAI,EAAE,sBAAsB,CAAC,EAAE;QAC1C,WAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;KAC9D;IACD,gCAAgC;IAChC,IAAI,CAAC,WAAO,CAAC,IAAI,EAAE,wCAAwC,CAAC,EAAE;QAC5D,WAAO,CAAC,wCAAwC,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KACpE;IAED,0CAA0C;IAC1C,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAoB,kBAAkB,EAAE,CAAC,CAAC;IAC3E,IAAI,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,eAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACxE,0BAA0B;IAC1B,KAAK,GAAG,MAAM,eAAW,CACvB,KAAK,EACL,cAAgD,CACjD,CAAC;IAEF,qBAAqB;IACrB,MAAM,YAAY,GAAG,MAAM,6BAAyB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAC5E,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,YAAY,CAAC,SAAS,CAAC;IAEpD,mBAAmB;IACnB,MAAM,kBAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAE5C,mBAAmB;IACnB,MAAM,YAAY,GAAG,MAAM,eAAW,CACpC,KAAK,EACL,cAAgD,CACjD,CAAC;IAEF,+CAA+C;IAC/C,OAAO,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,CAAa,CAAC;AAC5D,CAAC;AAjGD,gCAiGC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,UAAU,CAC9B,IAAc,EACd,cAAkC;IAElC,iEAAiE;IACjE,4BAA4B;IAC5B,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAW,kBAAkB,EAAE,CAAC,CAAC;IAClE,kEAAkE;IAClE,iEAAiE;IACjE,gBAAgB;IAChB,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CACvC,IAAI,EACJ,eAAW,CAAC,kBAAkB,CAAC,CAChC,CAAC;IACF,sCAAsC;IACtC,MAAM,YAAY,GAAG,MAAM,YAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IAC7D,4BAA4B;IAC5B,MAAM,+BAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAEtE,IAAI,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;QAC3E,0BAA0B;QAC1B,YAAY,CAAC,IAAI,CAAC,YAAY,GAAG,kBAAc,CAC7C,YAAY,CAAC,IAAI,CAAC,YAAY,EAC9B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAClC,CAAC;KACH;IAED,gDAAgD;IAChD,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC9D,mBAAmB;IACnB,MAAM,gBAAgB,GAAG,MAAM,eAAW,CACxC,YAAY,EACZ,cAA6C,CAC9C,CAAC;IACF,sBAAsB;IACtB,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IACjE,OAAO,WAAW,CAAC;AACrB,CAAC;AArCD,gCAqCC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,WAAW,CAC/B,EAAU,EACV,cAAkC;IAElC,4DAA4D;IAC5D,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;QAC5B,MAAM,yBAAqB,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;KACjD;IACD,6BAA6B;IAC7B,MAAM,EAAE,GAAG,gCAAK,cAAc,GAAK,EAAE,EAAE,EAAE,CAAsB,CAAC;IAChE,MAAM,+BAAU,CAAC,EAAE,CAAC,CAAC;IACrB,OAAO;AACT,CAAC;AAZD,kCAYC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,UAAU,CAC9B,UAAkB,EAClB,cAAkC;IAElC,gBAAgB;IAChB,MAAM,KAAK,GAAG,MAAM,kBAAc,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAC/D,kBAAkB;IAClB,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAoB,kBAAkB,EAAE,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,CAAa,CAAC;IACzD,IAAI,KAAa,CAAC;IAClB,IAAI,cAAc,CAAC,cAAc,EAAE;QACjC,MAAM,EAAE,GAAgB,cAAc,CAAC,cAA6B,CAAC;QACrE,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC;KAClB;IAED,IAAI,CAAC,YAAY,GAAG,uBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IAC3E,OAAO,IAAI,CAAC;AACd,CAAC;AAjBD,gCAiBC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,iBAAiB,CACrC,IAAW,EACX,cAA+B;IAE/B,MAAM,KAAK,GAAG,MAAM,sBAAkB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAoB,kBAAkB,EAAE,CAAC,CAAC;IAC3E,IAAI,KAAa,CAAC;IAClB,IAAI,cAAc,CAAC,cAAc,EAAE;QACjC,MAAM,OAAO,GAAgB,cAAc,CAAC,cAA6B,CAAC;QAC1E,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,CAAa,CAAC;IACxD,GAAG,CAAC,YAAY,GAAG,uBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IAC1E,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,8CAcC;AAED;;;;;GAKG;AACI,KAAK,UAAU,WAAW,CAC/B,MAAyB,EACzB,OAA0B;IAE1B,qBAAqB;IACrB,MAAM,aAAa,GAAsB;QACvC,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,OAAO;KACd,CAAC;IACF,gBAAgB;IAChB,MAAM,WAAW,GAAG,sBAAkB,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,WAAW;IACX,OAAO,6CAAqB,CAAC,WAAW,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;AACxE,CAAC;AAbD,kCAaC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAC1C,IAAW,EACX,OAAiB,EACjB,cAAkC;IAElC,6BAA6B;IAC7B,MAAM,MAAM,GAAqB;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,KAAK;QAChB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW;QACzC,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,iBAAiB,EAAE,cAAc;QACjC,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,iBAAiB,EAAE,eAAe;QAClC,MAAM,EAAE,aAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,KAAK,EAAE;YACL,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,iBAAiB;YAC/B,SAAS,EAAE,iBAAiB;SAC7B;KACF,CAAC;IAEF,mBAAmB;IACnB,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,iBAAiB;IACjB,OAAO,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,UAAM,CAAC,CAAC;IACnD,qDAAqD;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,2BAAY,CAAC,CAAC;IACxC,+CAA+C;IAC/C,MAAM,WAAW,GAAG,SAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,UAAM,CAAC,CAAC;IAC9D,wBAAwB;IACxB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,mEAAmE;QACnE,QAAQ,GAAG,MAAM,mCAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;KAC1E;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,WAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,eAAe;IACf,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,uBAAmB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnE,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,6BAAiB,CAC3C,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,EAAE,EACT,IAAI,CAAC,YAAY,CAClB,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAvDD,wDAuDC"}
+{"version":3,"file":"HubSites.js","sourceRoot":"","sources":["../../../src/sites/HubSites.ts"],"names":[],"mappings":"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"}

package/dist/types/core/types/IHubEntityManager.d.ts

@@ -1,8 +1,7 @@
 import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
 import { IRequestOptions } from "@esri/arcgis-rest-request";
-import { Filter } from "../../search/types/types";
 import { IHubSearchOptions } from "../../search/types/IHubSearchOptions";
-import { ISearchResponse } from "../../types";
+import { IHubSearchResponse, IQuery } from "../../search";
 /**
  * Baseline CRUD+Search functions required for all Store classes
  */
@@ -40,8 +39,8 @@ export interface IHubEntityManager<T> {
      * not searching "within" the `T`.
      *
      * i.e. Searching for Teams, not searching for content shared to a team.
-     * @param filter
+     * @param query
      * @param opts
      */
-    search(filter: Filter<"content">, opts: IHubSearchOptions): Promise<ISearchResponse<T>>;
+    search(query: IQuery, opts: IHubSearchOptions): Promise<IHubSearchResponse<T>>;
 }

package/dist/types/projects/HubProjectManager.d.ts

@@ -1,7 +1,7 @@
 import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
 import { IRequestOptions } from "@esri/arcgis-rest-request";
 import { ArcGISContextManager } from "../ArcGISContextManager";
-import { Filter, IArcGISContext, IHubSearchOptions, ISearchResponse } from "..";
+import { IArcGISContext, IHubSearchOptions, IHubSearchResponse, IQuery } from "..";
 import { IHubEntityManager, IHubProject } from "../core/types";
 import { IHubItemEntityManager } from "../core/types/IHubItemEntityManager";
 import { IItem } from "@esri/arcgis-rest-types";
@@ -84,10 +84,10 @@ export declare class HubProjectManager implements IHubEntityManager<IHubProject>
     /**
      * Search for Projects
      *
-     * @param filter
+     * @param query
      * @param options
      */
-    search(filter: Filter<"content">, options: IHubSearchOptions): Promise<ISearchResponse<IHubProject>>;
+    search(query: string | IQuery, options: IHubSearchOptions): Promise<IHubSearchResponse<IHubProject>>;
     /**
      * Set the thumbnail for the Project
      * @param id

package/dist/types/projects/HubProjects.d.ts

@@ -1,9 +1,9 @@
 import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
-import { Filter, IHubSearchOptions, ISearchResponse, IHubRequestOptions } from "..";
+import { IHubSearchOptions, IHubRequestOptions } from "../index";
 import { IItem } from "@esri/arcgis-rest-portal";
 import { IRequestOptions } from "@esri/arcgis-rest-request";
 import { IHubProject } from "../core/types";
-import { IHubSearchResult } from "../search";
+import { IHubSearchResponse, IHubSearchResult, IQuery } from "../search";
 export declare const HUB_PROJECT_ITEM_TYPE = "Hub Project";
 /**
  * Create a new Hub Project item
@@ -35,13 +35,13 @@ export declare function destroyProject(id: string, requestOptions: IUserRequestO
 /**
  * Search for Projects, and get IHubProject results
  *
- * Different from `searchContent` in that this returns the specific entity type
+ * Different from `hubSearch` in that this returns the IHubProjects
  *
  * @param filter
  * @param options
  * @returns
  */
-export declare function searchProjects(filter: Filter<"content">, options: IHubSearchOptions): Promise<ISearchResponse<IHubProject>>;
+export declare function searchProjects(query: string | IQuery, options: IHubSearchOptions): Promise<IHubSearchResponse<IHubProject>>;
 /**
  * Convert an Hub Project Item into a Hub Project, fetching any additional
  * information that may be required

package/dist/types/search/_internal/createQueryFromString.d.ts

@@ -0,0 +1,10 @@
+import { EntityType, IQuery } from "../types";
+/**
+ * @private
+ * Construct a query from a string
+ * @param value
+ * @param predicateKey
+ * @param targetEntity
+ * @returns
+ */
+export declare function createQueryFromString(value: string, predicateKey: string, targetEntity: EntityType): IQuery;

package/dist/types/search/_internal/hubSearchItems.d.ts

@@ -1,6 +1,7 @@
 import { IHubContent } from "../..";
 import { IFilterGroup, IHubSearchOptions, IHubSearchResponse, IHubSearchResult, IFacet } from "../types";
 /**
+ * @private
  * Execute item search against the Hub API
  * @param filter
  * @param options

package/dist/types/search/_internal/index.d.ts

@@ -1,6 +1,7 @@
-export * from "./searchContentEntities";
+export * from "./searchEntities";
 export * from "./state";
 export * from "./portalSearchItems";
 export * from "./hubSearchItems";
 export * from "./portalSearchGroups";
 export * from "./portalSearchUsers";
+export * from "./createQueryFromString";

package/dist/types/search/_internal/ipredicate-utils.d.ts

@@ -1,2 +1,8 @@
 import { IPredicate } from "../types";
+/**
+ * @private
+ * Expand a predicate
+ * @param predicate
+ * @returns
+ */
 export declare function expandPredicate(predicate: IPredicate): IPredicate;

package/dist/types/search/_internal/searchEntities.d.ts

@@ -0,0 +1,23 @@
+import { ISearchOptions } from "@esri/arcgis-rest-portal";
+import { IRequestOptions } from "@esri/arcgis-rest-request";
+import { IItem } from "@esri/arcgis-rest-types";
+import { IHubSearchOptions, IHubSearchResponse, IQuery } from "../types";
+/**
+ * @private
+ */
+export declare type ConversionFunction<T> = (i: IItem, ro?: IRequestOptions) => Promise<T>;
+/**
+ * @private
+ * Execute a search and convert to a specific entity
+ * @param query
+ * @param convertFn
+ * @param options
+ * @returns
+ */
+export declare function searchEntities<T>(query: IQuery, convertFn: ConversionFunction<T>, options: IHubSearchOptions): Promise<IHubSearchResponse<T>>;
+/**
+ * @private
+ * @param convertFn
+ * @returns
+ */
+export declare function createEntitySearchFn<T>(convertFn: ConversionFunction<T>): (v: ISearchOptions) => Promise<IHubSearchResponse<T>>;

package/dist/types/search/_internal/state.d.ts

@@ -1,5 +1,6 @@
 import { IFacet, IFacetState, ISortOption } from "../types";
 /**
+ * @private
  * Apply the sortState to SortOptions
  *
  * @param sortOptions
@@ -8,6 +9,7 @@ import { IFacet, IFacetState, ISortOption } from "../types";
  */
 export declare function applySortState(sortOptions: ISortOption, sortState: string): ISortOption;
 /**
+ * @private
  * Apply FacetState to a Facet
  * @param facet
  * @param state
@@ -15,6 +17,7 @@ export declare function applySortState(sortOptions: ISortOption, sortState: stri
  */
 export declare function applyFacetState(facet: IFacet, state: IFacetState): IFacet;
 /**
+ * @private
  * Apply the Facet State onto a single-select facet
  *
  * Intentionally mutates the facet.
@@ -24,12 +27,14 @@ export declare function applyFacetState(facet: IFacet, state: IFacetState): IFac
  */
 export declare function applySingleSelectFacetState(facet: IFacet, state: IFacetState): IFacet;
 /**
+ * @private
  * Serialize single-select facet into IFacetState
  * @param facet
  * @returns
  */
 export declare function serializeSingleSelectFacetState(facet: IFacet): IFacetState;
 /**
+ * @private
  * Apply the Facet State onto a multi-select Facet
  *
  * Intentionally mutates the facet.
@@ -39,12 +44,14 @@ export declare function serializeSingleSelectFacetState(facet: IFacet): IFacetSt
  */
 export declare function applyMultiSelectFacetState(facet: IFacet, state: IFacetState): IFacet;
 /**
+ * @private
  * Serialize multi-select facet into IFacetState
  * @param facet
  * @returns
  */
 export declare function serializeMultiSelectFacetState(facet: IFacet): IFacetState;
 /**
+ * @private
  * Serialize the state of the SortOption into a key/value pair
  *
  * Called from the Sort component
@@ -53,6 +60,7 @@ export declare function serializeMultiSelectFacetState(facet: IFacet): IFacetSta
  */
 export declare function serializeSortState(sort: ISortOption): string;
 /**
+ * @private
  * Serialize the state of a facet into a key/value pair
  *
  * Called from the various facet components