@esri/hub-common 17.21.0 → 18.0.0

package/dist/esm/search/_internal/commonHelpers/getApi.js

@@ -1,40 +1,20 @@
-import { expandApi } from "../../utils";
 import { shouldUseOgcApi } from "./shouldUseOgcApi";
-import { getOgcApiDefinition } from "./getOgcApiDefinition";
 import { shouldUseDiscussionsApi } from "./shouldUseDiscussionsApi";
-import { getDiscussionsApiDefinition } from "./getDiscussionsApiDefinition";
 import { shouldUseEventsApi } from "./shouldUseEventsApi";
 /**
  * @private
  * Determines Which API should be hit for the given search parameters.
- * Hierarchy:
- * - Target options.api if available
- * - Target the environment-level OGC API if current parameters allow
- * - Target the Portal API based off options.requestOptions.portal
+ * Defaults to the Portal API unless parameters indicate that a Hub API should be used.
  * @param targetEntity target entity of the query
  * @param options search options
- * @returns an API Definition object describing what should be targeted
+ * @returns the target API, either 'portal' or 'hub'
  */
 export function getApi(targetEntity, options) {
-    const { api, requestOptions: { portal }, } = options;
-    let result;
-    if (api) {
-        result = expandApi(api);
-    }
-    else if (shouldUseDiscussionsApi(targetEntity, options)) {
-        result = getDiscussionsApiDefinition();
-    }
-    else if (shouldUseEventsApi(targetEntity, options)) {
-        // Currently, url is null because this is handled internally by the
-        // events request method called by searchEvents, which relies on
-        // the URL defined in the request options.hubApiUrl
-        result = { type: "arcgis-hub", url: null };
-    }
-    else if (shouldUseOgcApi(targetEntity, options)) {
-        result = getOgcApiDefinition(targetEntity, options.requestOptions);
-    }
-    else {
-        result = { type: "arcgis", url: portal };
+    let result = "portal";
+    if (shouldUseDiscussionsApi(targetEntity, options) ||
+        shouldUseEventsApi(targetEntity, options) ||
+        shouldUseOgcApi(targetEntity, options)) {
+        result = "hub";
     }
     return result;
 }

package/dist/esm/search/_internal/commonHelpers/getApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"getApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getApi.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,MAAM,UAAU,MAAM,CACpB,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,GAAG,EACH,cAAc,EAAE,EAAE,MAAM,EAAE,GAC3B,GAAG,OAAO,CAAC;IAEZ,IAAI,MAAsB,CAAC;IAC3B,IAAI,GAAG,EAAE;QACP,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;KACzB;SAAM,IAAI,uBAAuB,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACzD,MAAM,GAAG,2BAA2B,EAAE,CAAC;KACxC;SAAM,IAAI,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACpD,mEAAmE;QACnE,gEAAgE;QAChE,mDAAmD;QACnD,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;KAC5C;SAAM,IAAI,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACjD,MAAM,GAAG,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;KACpE;SAAM;QACL,MAAM,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;KAC1C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"getApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getApi.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;;;GAOG;AACH,MAAM,UAAU,MAAM,CACpB,YAAwB,EACxB,OAA0B;IAE1B,IAAI,MAAM,GAAc,QAAQ,CAAC;IACjC,IACE,uBAAuB,CAAC,YAAY,EAAE,OAAO,CAAC;QAC9C,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC;QACzC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,EACtC;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/esm/search/_internal/commonHelpers/shouldUseOgcApi.js

@@ -5,11 +5,11 @@
  * @param options search options
  */
 export function shouldUseOgcApi(targetEntity, options) {
-    const { site, requestOptions: { isPortal }, } = options;
+    const { api, requestOptions: { isPortal }, } = options;
     if (isPortal)
         return false;
     if (targetEntity === "discussionPost")
         return true;
-    return targetEntity === "item" && !!site;
+    return targetEntity === "item" && api === "hub";
 }
 //# sourceMappingURL=shouldUseOgcApi.js.map

package/dist/esm/search/_internal/commonHelpers/shouldUseOgcApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"shouldUseOgcApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/shouldUseOgcApi.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,IAAI,EACJ,cAAc,EAAE,EAAE,QAAQ,EAAE,GAC7B,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,YAAY,KAAK,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,YAAY,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"shouldUseOgcApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/shouldUseOgcApi.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,GAAG,EACH,cAAc,EAAE,EAAE,QAAQ,EAAE,GAC7B,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,YAAY,KAAK,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,YAAY,KAAK,MAAM,IAAI,GAAG,KAAK,KAAK,CAAC;AAClD,CAAC"}

package/dist/esm/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOgcAggregationQueryParams.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,UAAU,4BAA4B,CAC1C,KAAa,EACb,OAA0B;IAE1B,0DAA0D;IAC1D,MAAM,YAAY,GAAG,iBAAiB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;IACnE,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAC;IAEtE,OAAO;QACL,YAAY;QACZ,MAAM;QACN,KAAK;KACN,CAAC;AACJ,CAAC"}
+{"version":3,"file":"getOgcAggregationQueryParams.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,MAAM,UAAU,4BAA4B,CAC1C,KAAa,EACb,OAA0B;IAE1B,0DAA0D;IAC1D,MAAM,YAAY,GAAG,iBAAiB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;IACnE,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,OAAO,CACnB,OAAO,EACP,qCAAqC,CAC5B,CAAC;IAEZ,OAAO;QACL,YAAY;QACZ,MAAM;QACN,KAAK;KACN,CAAC;AACJ,CAAC"}

package/dist/esm/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.js

@@ -10,12 +10,9 @@
  * @returns the collection url
  */
 export function getOgcCollectionUrl(query, options) {
-    const apiDefinition = options.api;
-    // Discussion posts as a target entity will be searchable with one collection,
-    // so simply use that for the URL
-    if (query.targetEntity === "discussionPost") {
-        return `${apiDefinition.url}/collections/discussion-post`;
-    }
-    return `${apiDefinition.url}/collections/all`;
+    const umbrellaDomain = new URL(options.requestOptions.hubApiUrl).hostname;
+    return query.targetEntity === "discussionPost"
+        ? `https://${umbrellaDomain}/api/search/v2/collections/discussion-post`
+        : `https://${umbrellaDomain}/api/search/v1/collections/all`;
 }
 //# sourceMappingURL=getOgcCollectionUrl.js.map

package/dist/esm/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOgcCollectionUrl.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAAa,EACb,OAA0B;IAE1B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAqB,CAAC;IACpD,8EAA8E;IAC9E,iCAAiC;IACjC,IAAI,KAAK,CAAC,YAAY,KAAK,gBAAgB,EAAE;QAC3C,OAAO,GAAG,aAAa,CAAC,GAAG,8BAA8B,CAAC;KAC3D;IACD,OAAO,GAAG,aAAa,CAAC,GAAG,kBAAkB,CAAC;AAChD,CAAC"}
+{"version":3,"file":"getOgcCollectionUrl.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAAa,EACb,OAA0B;IAE1B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC1E,OAAO,KAAK,CAAC,YAAY,KAAK,gBAAgB;QAC5C,CAAC,CAAC,WAAW,cAAc,4CAA4C;QACvE,CAAC,CAAC,WAAW,cAAc,gCAAgC,CAAC;AAChE,CAAC"}

package/dist/esm/search/_internal/hubSearchItemsHelpers/ogcApiRequest.js

@@ -5,40 +5,19 @@ import { getQueryString } from "./getQueryString";
  * Wrapper over fetch for performing common operations when executing a request to an OGC API, such as:
  * - Creating the query string
  * - URL encoding query string values
- * - Appending the ?target query param if needed
  * - Checking whether the response is ok
  * - Returning the .json() of the response body
  *
- * Note: the ?target query param is only appended if the target site (options.site) is _different_ from the
- * the site that will have its OGC API hit (url). This allows us to use the environment-level OGC API's url while
- * actually targeting a specific Hub Site's catalog. It's a powerful capability that significantly eases local development.
- *
- * Example: https://hubqa.arcgis.com/api/search/v1?target="my-actual-hub.hub.arcgis.com"
- *
- * We omit the ?target query when the site and url are the same because it would be redundant.
- *
- * Bad example: https://hubqa.arcgis.com/api/search/v1?target="hubqa.arcgis.com"
- * Good example: https://hubqa.arcgis.com/api/search/v1
- *
  * @param url the OGC API endpoint that should actually be hit
- * @param queryParams query params that should be serialized with the request (excluding `target`)
- * @param options options to customize the search, such as the site whose catalogs we're targeting
+ * @param queryParams query params that should be serialized with the request
+ * @param options options to customize the search
  * @returns the JSON response from the endpoint
  */
 export async function ogcApiRequest(url, queryParams, options) {
-    var _a;
     const updatedQueryParams = cloneObject(queryParams);
-    let targetDomain;
-    if (options.site) {
-        targetDomain = new URL(options.site).hostname;
-    }
-    const urlDomain = new URL(url).hostname;
-    if (targetDomain && targetDomain !== urlDomain) {
-        updatedQueryParams.target = targetDomain;
-    }
     const withQueryString = url + getQueryString(updatedQueryParams);
     // use fetch override if any
-    const _fetch = ((_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.fetch) || fetch;
+    const _fetch = options.requestOptions.fetch || fetch;
     const response = await _fetch(withQueryString, { method: "GET" });
     if (!response.ok) {
         throw new RemoteServerError(response.statusText, withQueryString, response.status);

package/dist/esm/search/_internal/hubSearchItemsHelpers/ogcApiRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ogcApiRequest.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/ogcApiRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,WAAgC,EAChC,OAA+B;;IAE/B,MAAM,kBAAkB,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IAEpD,IAAI,YAAY,CAAC;IACjB,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,YAAY,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;KAC/C;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;IACxC,IAAI,YAAY,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9C,kBAAkB,CAAC,MAAM,GAAG,YAAY,CAAC;KAC1C;IAED,MAAM,eAAe,GAAG,GAAG,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAAC;IAEjE,4BAA4B;IAC5B,MAAM,MAAM,GAAG,OAAA,OAAO,CAAC,cAAc,0CAAE,KAAK,KAAI,KAAK,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,iBAAiB,CACzB,QAAQ,CAAC,UAAU,EACnB,eAAe,EACf,QAAQ,CAAC,MAAM,CAChB,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC"}
+{"version":3,"file":"ogcApiRequest.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/ogcApiRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,WAA6D,EAC7D,OAA+B;IAE/B,MAAM,kBAAkB,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,GAAG,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAAC;IAEjE,4BAA4B;IAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,KAAK,CAAC;IACrD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,iBAAiB,CACzB,QAAQ,CAAC,UAAU,EACnB,eAAe,EACf,QAAQ,CAAC,MAAM,CAChB,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC"}

package/dist/esm/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.js

@@ -5,7 +5,7 @@ import { ogcApiRequest } from "./ogcApiRequest";
 export async function searchOgcAggregations(query, options) {
     const url = `${getOgcCollectionUrl(query, options)}/aggregations`;
     const queryParams = getOgcAggregationQueryParams(query, options);
-    const rawResponse = await ogcApiRequest(url, queryParams, options);
+    const rawResponse = (await ogcApiRequest(url, queryParams, options));
     return formatOgcAggregationsResponse(rawResponse);
 }
 //# sourceMappingURL=searchOgcAggregations.js.map

package/dist/esm/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchOgcAggregations.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAa,EACb,OAA0B;IAE1B,MAAM,GAAG,GAAG,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;IAClE,MAAM,WAAW,GAAG,4BAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEjE,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEnE,OAAO,6BAA6B,CAAC,WAAW,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"searchOgcAggregations.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAa,EACb,OAA0B;IAE1B,MAAM,GAAG,GAAG,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;IAClE,MAAM,WAAW,GAAG,4BAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEjE,MAAM,WAAW,GAAG,CAAC,MAAM,aAAa,CACtC,GAAG,EACH,WAAW,EACX,OAAO,CACR,CAA6B,CAAC;IAE/B,OAAO,6BAA6B,CAAC,WAAW,CAAC,CAAC;AACpD,CAAC"}

package/dist/esm/search/_internal/hubSearchItemsHelpers/searchOgcItems.js

@@ -3,7 +3,7 @@ import { getOgcItemQueryParams } from "./getOgcItemQueryParams";
 import { ogcApiRequest } from "./ogcApiRequest";
 export async function searchOgcItems(url, query, options) {
     const queryParams = getOgcItemQueryParams(query, options);
-    const rawResponse = await ogcApiRequest(url, queryParams, options);
+    const rawResponse = (await ogcApiRequest(url, queryParams, options));
     return formatOgcItemsResponse(rawResponse, url, query, options);
 }
 //# sourceMappingURL=searchOgcItems.js.map

package/dist/esm/search/_internal/hubSearchItemsHelpers/searchOgcItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchOgcItems.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcItems.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAW,EACX,KAAa,EACb,OAA+B;IAE/B,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAsB,MAAM,aAAa,CACxD,GAAG,EACH,WAAW,EACX,OAAO,CACR,CAAC;IAEF,OAAO,sBAAsB,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC"}
+{"version":3,"file":"searchOgcItems.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcItems.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAW,EACX,KAAa,EACb,OAA+B;IAE/B,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,CAAC,MAAM,aAAa,CACtC,GAAG,EACH,WAAW,EACX,OAAO,CACR,CAAsB,CAAC;IAExB,OAAO,sBAAsB,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC"}

package/dist/esm/search/hubSearch.js

@@ -50,7 +50,7 @@ export async function hubSearch(query, options) {
     formattedOptions.requestOptions = requestOptions;
     formattedOptions.api = getApi(filterType, formattedOptions);
     const fnHash = {
-        arcgis: {
+        portal: {
             item: portalSearchItems,
             group: portalSearchGroups,
             user: searchPortalUsersLegacy,
@@ -59,7 +59,7 @@ export async function hubSearch(query, options) {
             groupMember: portalSearchGroupMembers,
             organization: portalFetchOrgs,
         },
-        "arcgis-hub": {
+        hub: {
             item: hubSearchItems,
             channel: hubSearchChannels,
             discussionPost: hubSearchItems,
@@ -67,9 +67,9 @@ export async function hubSearch(query, options) {
             eventAttendee: hubSearchEventAttendees,
         },
     };
-    const fn = getProp(fnHash, `${formattedOptions.api.type}.${filterType}`);
+    const fn = getProp(fnHash, `${formattedOptions.api}.${filterType}`);
     if (!fn) {
-        throw new HubError(`hubSearch`, `Search via "${filterType}" filter against "${formattedOptions.api.type}" api is not implemented. Please ensure "targetEntity" is defined on the query.`);
+        throw new HubError(`hubSearch`, `Search via "${filterType}" filter against "${formattedOptions.api}" api is not implemented. Please ensure "targetEntity" is defined on the query.`);
     }
     return fn(cloneObject(query), formattedOptions);
 }

package/dist/esm/search/hubSearch.js.map

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

package/dist/esm/search/searchAssociatedContent.js

@@ -1,7 +1,7 @@
 import { getTypeFromEntity } from "../core/getTypeFromEntity";
 import { HUB_ITEM_ENTITY_TYPES, } from "../core/types/HubEntityType";
 import HubError from "../HubError";
-import { getOgcApiDefinition } from "./_internal/commonHelpers/getOgcApiDefinition";
+import { getOgcCollectionUrl } from "./_internal/hubSearchItemsHelpers/getOgcCollectionUrl";
 import { searchOgcItems } from "./_internal/hubSearchItemsHelpers/searchOgcItems";
 /**
  * Searches for content that is associated with a given entity.
@@ -37,8 +37,8 @@ export async function searchAssociatedContent(opts) {
     const hubId = layerId ? `${entity.id}_${layerId}` : entity.id;
     // Construct the OGC API URL
     const { association } = opts;
-    const api = getOgcApiDefinition(scope.targetEntity, searchOptions.requestOptions);
-    const url = `${api.url}/collections/all/items/${hubId}/${association}`;
-    return searchOgcItems(url, scope, searchOptions);
+    const collectionUrl = getOgcCollectionUrl(scope, searchOptions);
+    const associationUrl = `${collectionUrl}/items/${hubId}/${association}`;
+    return searchOgcItems(associationUrl, scope, searchOptions);
 }
 //# sourceMappingURL=searchAssociatedContent.js.map

package/dist/esm/search/searchAssociatedContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchAssociatedContent.js","sourceRoot":"","sources":["../../../src/search/searchAssociatedContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EACL,qBAAqB,GAEtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAOlF;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAChD,MAAM,aAAa,GAA2B;QAC5C,cAAc;QACd,GAAG;KACJ,CAAC;IAEF,iDAAiD;IACjD,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAsB,CAAC;IACvE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC/C,MAAM,IAAI,QAAQ,CAChB,yBAAyB,EACzB,wDAAwD,UAAU,GAAG,CACtE,CAAC;KACH;IAED,mFAAmF;IACnF,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE;QACjC,MAAM,IAAI,QAAQ,CAChB,yBAAyB,EACzB,2DAA2D,KAAK,CAAC,YAAY,GAAG,CACjF,CAAC;KACH;IAED,iDAAiD;IACjD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,EAAE;QACrD,MAAM,IAAI,QAAQ,CAChB,yBAAyB,EACzB,yDAAyD,CAC1D,CAAC;KACH;IAED,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAE9D,4BAA4B;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,GAAG,GAAG,mBAAmB,CAC7B,KAAK,CAAC,YAAY,EAClB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACF,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,0BAA0B,KAAK,IAAI,WAAW,EAAE,CAAC;IAEvE,OAAO,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"searchAssociatedContent.js","sourceRoot":"","sources":["../../../src/search/searchAssociatedContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EACL,qBAAqB,GAEtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAC;AAE5F,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAOlF;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAChD,MAAM,aAAa,GAA2B;QAC5C,cAAc;QACd,GAAG;KACJ,CAAC;IAEF,iDAAiD;IACjD,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAsB,CAAC;IACvE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC/C,MAAM,IAAI,QAAQ,CAChB,yBAAyB,EACzB,wDAAwD,UAAU,GAAG,CACtE,CAAC;KACH;IAED,mFAAmF;IACnF,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE;QACjC,MAAM,IAAI,QAAQ,CAChB,yBAAyB,EACzB,2DAA2D,KAAK,CAAC,YAAY,GAAG,CACjF,CAAC;KACH;IAED,iDAAiD;IACjD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,EAAE;QACrD,MAAM,IAAI,QAAQ,CAChB,yBAAyB,EACzB,yDAAyD,CAC1D,CAAC;KACH;IAED,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAE9D,4BAA4B;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,GAAG,aAAa,UAAU,KAAK,IAAI,WAAW,EAAE,CAAC;IAExE,OAAO,cAAc,CAAC,cAAc,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC"}

package/dist/esm/search/utils.js

@@ -5,67 +5,6 @@ import { cloneObject } from "../util";
 import { isLegacySearchCategory, } from "./_internal/commonHelpers/isLegacySearchCategory";
 import { toCollectionKey } from "./_internal/commonHelpers/toCollectionKey";
 import { applyWellKnownItemPredicates, expandPredicates, } from "./_internal/portalSearchItems";
-/**
- * Well known APIs
- * Short-forms for specifying common APIs
- * We will likely deprecate this
- */
-export const SEARCH_APIS = {
-    arcgis: {
-        label: "ArcGIS Online",
-        url: "https://www.arcgis.com",
-        type: "arcgis",
-    },
-    arcgisQA: {
-        label: "ArcGIS Online QAEXT",
-        url: "https://qaext.arcgis.com",
-        type: "arcgis",
-    },
-    arcgisDEV: {
-        label: "ArcGIS Online DEVEXT",
-        url: "https://devext.arcgis.com",
-        type: "arcgis",
-    },
-    hub: {
-        label: "ArcGIS Hub",
-        url: "https://hub.arcgis.com/api",
-        type: "arcgis-hub",
-    },
-    hubDEV: {
-        label: "ArcGIS Hub DEV",
-        url: "https://hubdev.arcgis.com/api",
-        type: "arcgis-hub",
-    },
-    hubQA: {
-        label: "ArcGIS Hub QA",
-        url: "https://hubqa.arcgis.com/api",
-        type: "arcgis-hub",
-    },
-};
-/**
- * @private
- * Convert array of api "names" into full ApiDefinitions
- * @param apis
- * @returns
- */
-export function expandApis(apis) {
-    return apis.map(expandApi);
-}
-/**
- * @private
- * Convert an api "name" into a full ApiDefinition
- * @param api
- * @returns
- */
-export function expandApi(api) {
-    if (typeof api === "string" && api in SEARCH_APIS) {
-        return SEARCH_APIS[api];
-    }
-    else {
-        // it's an object, so we trust that it's well formed
-        return api;
-    }
-}
 /**
  * @private
  * Convert a field value into a MatchOptions if it's not already one

package/dist/esm/search/utils.js.map

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

package/dist/node/search/_internal/commonHelpers/getApi.js

@@ -1,43 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApi = void 0;
-const utils_1 = require("../../utils");
 const shouldUseOgcApi_1 = require("./shouldUseOgcApi");
-const getOgcApiDefinition_1 = require("./getOgcApiDefinition");
 const shouldUseDiscussionsApi_1 = require("./shouldUseDiscussionsApi");
-const getDiscussionsApiDefinition_1 = require("./getDiscussionsApiDefinition");
 const shouldUseEventsApi_1 = require("./shouldUseEventsApi");
 /**
  * @private
  * Determines Which API should be hit for the given search parameters.
- * Hierarchy:
- * - Target options.api if available
- * - Target the environment-level OGC API if current parameters allow
- * - Target the Portal API based off options.requestOptions.portal
+ * Defaults to the Portal API unless parameters indicate that a Hub API should be used.
  * @param targetEntity target entity of the query
  * @param options search options
- * @returns an API Definition object describing what should be targeted
+ * @returns the target API, either 'portal' or 'hub'
  */
 function getApi(targetEntity, options) {
-    const { api, requestOptions: { portal }, } = options;
-    let result;
-    if (api) {
-        result = utils_1.expandApi(api);
-    }
-    else if (shouldUseDiscussionsApi_1.shouldUseDiscussionsApi(targetEntity, options)) {
-        result = getDiscussionsApiDefinition_1.getDiscussionsApiDefinition();
-    }
-    else if (shouldUseEventsApi_1.shouldUseEventsApi(targetEntity, options)) {
-        // Currently, url is null because this is handled internally by the
-        // events request method called by searchEvents, which relies on
-        // the URL defined in the request options.hubApiUrl
-        result = { type: "arcgis-hub", url: null };
-    }
-    else if (shouldUseOgcApi_1.shouldUseOgcApi(targetEntity, options)) {
-        result = getOgcApiDefinition_1.getOgcApiDefinition(targetEntity, options.requestOptions);
-    }
-    else {
-        result = { type: "arcgis", url: portal };
+    let result = "portal";
+    if (shouldUseDiscussionsApi_1.shouldUseDiscussionsApi(targetEntity, options) ||
+        shouldUseEventsApi_1.shouldUseEventsApi(targetEntity, options) ||
+        shouldUseOgcApi_1.shouldUseOgcApi(targetEntity, options)) {
+        result = "hub";
     }
     return result;
 }

package/dist/node/search/_internal/commonHelpers/getApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"getApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getApi.ts"],"names":[],"mappings":";;;AAGA,uCAAwC;AACxC,uDAAoD;AACpD,+DAA4D;AAC5D,uEAAoE;AACpE,+EAA4E;AAC5E,6DAA0D;AAE1D;;;;;;;;;;GAUG;AACH,SAAgB,MAAM,CACpB,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,GAAG,EACH,cAAc,EAAE,EAAE,MAAM,EAAE,GAC3B,GAAG,OAAO,CAAC;IAEZ,IAAI,MAAsB,CAAC;IAC3B,IAAI,GAAG,EAAE;QACP,MAAM,GAAG,iBAAS,CAAC,GAAG,CAAC,CAAC;KACzB;SAAM,IAAI,iDAAuB,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACzD,MAAM,GAAG,yDAA2B,EAAE,CAAC;KACxC;SAAM,IAAI,uCAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACpD,mEAAmE;QACnE,gEAAgE;QAChE,mDAAmD;QACnD,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;KAC5C;SAAM,IAAI,iCAAe,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACjD,MAAM,GAAG,yCAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;KACpE;SAAM;QACL,MAAM,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;KAC1C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,wBA0BC"}
+{"version":3,"file":"getApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getApi.ts"],"names":[],"mappings":";;;AAGA,uDAAoD;AACpD,uEAAoE;AACpE,6DAA0D;AAE1D;;;;;;;GAOG;AACH,SAAgB,MAAM,CACpB,YAAwB,EACxB,OAA0B;IAE1B,IAAI,MAAM,GAAc,QAAQ,CAAC;IACjC,IACE,iDAAuB,CAAC,YAAY,EAAE,OAAO,CAAC;QAC9C,uCAAkB,CAAC,YAAY,EAAE,OAAO,CAAC;QACzC,iCAAe,CAAC,YAAY,EAAE,OAAO,CAAC,EACtC;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAdD,wBAcC"}

package/dist/node/search/_internal/commonHelpers/shouldUseOgcApi.js

@@ -8,12 +8,12 @@ exports.shouldUseOgcApi = void 0;
  * @param options search options
  */
 function shouldUseOgcApi(targetEntity, options) {
-    const { site, requestOptions: { isPortal }, } = options;
+    const { api, requestOptions: { isPortal }, } = options;
     if (isPortal)
         return false;
     if (targetEntity === "discussionPost")
         return true;
-    return targetEntity === "item" && !!site;
+    return targetEntity === "item" && api === "hub";
 }
 exports.shouldUseOgcApi = shouldUseOgcApi;
 //# sourceMappingURL=shouldUseOgcApi.js.map

package/dist/node/search/_internal/commonHelpers/shouldUseOgcApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"shouldUseOgcApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/shouldUseOgcApi.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,SAAgB,eAAe,CAC7B,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,IAAI,EACJ,cAAc,EAAE,EAAE,QAAQ,EAAE,GAC7B,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,YAAY,KAAK,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,YAAY,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC;AAC3C,CAAC;AAXD,0CAWC"}
+{"version":3,"file":"shouldUseOgcApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/shouldUseOgcApi.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,SAAgB,eAAe,CAC7B,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,GAAG,EACH,cAAc,EAAE,EAAE,QAAQ,EAAE,GAC7B,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,YAAY,KAAK,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,YAAY,KAAK,MAAM,IAAI,GAAG,KAAK,KAAK,CAAC;AAClD,CAAC;AAXD,0CAWC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOgcAggregationQueryParams.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AAGpD,+DAA4D;AAE5D,SAAgB,4BAA4B,CAC1C,KAAa,EACb,OAA0B;IAE1B,0DAA0D;IAC1D,MAAM,YAAY,GAAG,iBAAiB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;IACnE,MAAM,MAAM,GAAG,yCAAmB,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,kBAAO,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAC;IAEtE,OAAO;QACL,YAAY;QACZ,MAAM;QACN,KAAK;KACN,CAAC;AACJ,CAAC;AAdD,oEAcC"}
+{"version":3,"file":"getOgcAggregationQueryParams.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AAGpD,+DAA4D;AAQ5D,SAAgB,4BAA4B,CAC1C,KAAa,EACb,OAA0B;IAE1B,0DAA0D;IAC1D,MAAM,YAAY,GAAG,iBAAiB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;IACnE,MAAM,MAAM,GAAG,yCAAmB,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,kBAAO,CACnB,OAAO,EACP,qCAAqC,CAC5B,CAAC;IAEZ,OAAO;QACL,YAAY;QACZ,MAAM;QACN,KAAK;KACN,CAAC;AACJ,CAAC;AAjBD,oEAiBC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.js

@@ -13,13 +13,10 @@ exports.getOgcCollectionUrl = void 0;
  * @returns the collection url
  */
 function getOgcCollectionUrl(query, options) {
-    const apiDefinition = options.api;
-    // Discussion posts as a target entity will be searchable with one collection,
-    // so simply use that for the URL
-    if (query.targetEntity === "discussionPost") {
-        return `${apiDefinition.url}/collections/discussion-post`;
-    }
-    return `${apiDefinition.url}/collections/all`;
+    const umbrellaDomain = new URL(options.requestOptions.hubApiUrl).hostname;
+    return query.targetEntity === "discussionPost"
+        ? `https://${umbrellaDomain}/api/search/v2/collections/discussion-post`
+        : `https://${umbrellaDomain}/api/search/v1/collections/all`;
 }
 exports.getOgcCollectionUrl = getOgcCollectionUrl;
 //# sourceMappingURL=getOgcCollectionUrl.js.map

package/dist/node/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOgcCollectionUrl.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.ts"],"names":[],"mappings":";;;AAIA;;;;;;;;;;GAUG;AACH,SAAgB,mBAAmB,CACjC,KAAa,EACb,OAA0B;IAE1B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAqB,CAAC;IACpD,8EAA8E;IAC9E,iCAAiC;IACjC,IAAI,KAAK,CAAC,YAAY,KAAK,gBAAgB,EAAE;QAC3C,OAAO,GAAG,aAAa,CAAC,GAAG,8BAA8B,CAAC;KAC3D;IACD,OAAO,GAAG,aAAa,CAAC,GAAG,kBAAkB,CAAC;AAChD,CAAC;AAXD,kDAWC"}
+{"version":3,"file":"getOgcCollectionUrl.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.ts"],"names":[],"mappings":";;;AAGA;;;;;;;;;;GAUG;AACH,SAAgB,mBAAmB,CACjC,KAAa,EACb,OAA0B;IAE1B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC1E,OAAO,KAAK,CAAC,YAAY,KAAK,gBAAgB;QAC5C,CAAC,CAAC,WAAW,cAAc,4CAA4C;QACvE,CAAC,CAAC,WAAW,cAAc,gCAAgC,CAAC;AAChE,CAAC;AARD,kDAQC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/ogcApiRequest.js

@@ -8,40 +8,19 @@ const getQueryString_1 = require("./getQueryString");
  * Wrapper over fetch for performing common operations when executing a request to an OGC API, such as:
  * - Creating the query string
  * - URL encoding query string values
- * - Appending the ?target query param if needed
  * - Checking whether the response is ok
  * - Returning the .json() of the response body
  *
- * Note: the ?target query param is only appended if the target site (options.site) is _different_ from the
- * the site that will have its OGC API hit (url). This allows us to use the environment-level OGC API's url while
- * actually targeting a specific Hub Site's catalog. It's a powerful capability that significantly eases local development.
- *
- * Example: https://hubqa.arcgis.com/api/search/v1?target="my-actual-hub.hub.arcgis.com"
- *
- * We omit the ?target query when the site and url are the same because it would be redundant.
- *
- * Bad example: https://hubqa.arcgis.com/api/search/v1?target="hubqa.arcgis.com"
- * Good example: https://hubqa.arcgis.com/api/search/v1
- *
  * @param url the OGC API endpoint that should actually be hit
- * @param queryParams query params that should be serialized with the request (excluding `target`)
- * @param options options to customize the search, such as the site whose catalogs we're targeting
+ * @param queryParams query params that should be serialized with the request
+ * @param options options to customize the search
  * @returns the JSON response from the endpoint
  */
 async function ogcApiRequest(url, queryParams, options) {
-    var _a;
     const updatedQueryParams = util_1.cloneObject(queryParams);
-    let targetDomain;
-    if (options.site) {
-        targetDomain = new URL(options.site).hostname;
-    }
-    const urlDomain = new URL(url).hostname;
-    if (targetDomain && targetDomain !== urlDomain) {
-        updatedQueryParams.target = targetDomain;
-    }
     const withQueryString = url + getQueryString_1.getQueryString(updatedQueryParams);
     // use fetch override if any
-    const _fetch = ((_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.fetch) || fetch;
+    const _fetch = options.requestOptions.fetch || fetch;
     const response = await _fetch(withQueryString, { method: "GET" });
     if (!response.ok) {
         throw new request_1.RemoteServerError(response.statusText, withQueryString, response.status);

package/dist/node/search/_internal/hubSearchItemsHelpers/ogcApiRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ogcApiRequest.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/ogcApiRequest.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AACrD,wCAA4C;AAC5C,qDAAkD;AAGlD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACI,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,WAAgC,EAChC,OAA+B;;IAE/B,MAAM,kBAAkB,GAAG,kBAAW,CAAC,WAAW,CAAC,CAAC;IAEpD,IAAI,YAAY,CAAC;IACjB,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,YAAY,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;KAC/C;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;IACxC,IAAI,YAAY,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9C,kBAAkB,CAAC,MAAM,GAAG,YAAY,CAAC;KAC1C;IAED,MAAM,eAAe,GAAG,GAAG,GAAG,+BAAc,CAAC,kBAAkB,CAAC,CAAC;IAEjE,4BAA4B;IAC5B,MAAM,MAAM,GAAG,OAAA,OAAO,CAAC,cAAc,0CAAE,KAAK,KAAI,KAAK,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,2BAAiB,CACzB,QAAQ,CAAC,UAAU,EACnB,eAAe,EACf,QAAQ,CAAC,MAAM,CAChB,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC;AA/BD,sCA+BC"}
+{"version":3,"file":"ogcApiRequest.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/ogcApiRequest.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AACrD,wCAA4C;AAG5C,qDAAkD;AAGlD;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,WAA6D,EAC7D,OAA+B;IAE/B,MAAM,kBAAkB,GAAG,kBAAW,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,GAAG,GAAG,+BAAc,CAAC,kBAAkB,CAAC,CAAC;IAEjE,4BAA4B;IAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,KAAK,CAAC;IACrD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,2BAAiB,CACzB,QAAQ,CAAC,UAAU,EACnB,eAAe,EACf,QAAQ,CAAC,MAAM,CAChB,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC;AArBD,sCAqBC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.js

@@ -8,7 +8,7 @@ const ogcApiRequest_1 = require("./ogcApiRequest");
 async function searchOgcAggregations(query, options) {
     const url = `${getOgcCollectionUrl_1.getOgcCollectionUrl(query, options)}/aggregations`;
     const queryParams = getOgcAggregationQueryParams_1.getOgcAggregationQueryParams(query, options);
-    const rawResponse = await ogcApiRequest_1.ogcApiRequest(url, queryParams, options);
+    const rawResponse = (await ogcApiRequest_1.ogcApiRequest(url, queryParams, options));
     return formatOgcAggregationsResponse_1.formatOgcAggregationsResponse(rawResponse);
 }
 exports.searchOgcAggregations = searchOgcAggregations;

package/dist/node/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchOgcAggregations.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.ts"],"names":[],"mappings":";;;AAIA,mFAAgF;AAChF,iFAA8E;AAC9E,+DAA4D;AAC5D,mDAAgD;AAEzC,KAAK,UAAU,qBAAqB,CACzC,KAAa,EACb,OAA0B;IAE1B,MAAM,GAAG,GAAG,GAAG,yCAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;IAClE,MAAM,WAAW,GAAG,2DAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEjE,MAAM,WAAW,GAAG,MAAM,6BAAa,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEnE,OAAO,6DAA6B,CAAC,WAAW,CAAC,CAAC;AACpD,CAAC;AAVD,sDAUC"}
+{"version":3,"file":"searchOgcAggregations.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcAggregations.ts"],"names":[],"mappings":";;;AAIA,mFAAgF;AAChF,iFAA8E;AAC9E,+DAA4D;AAE5D,mDAAgD;AAEzC,KAAK,UAAU,qBAAqB,CACzC,KAAa,EACb,OAA0B;IAE1B,MAAM,GAAG,GAAG,GAAG,yCAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;IAClE,MAAM,WAAW,GAAG,2DAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEjE,MAAM,WAAW,GAAG,CAAC,MAAM,6BAAa,CACtC,GAAG,EACH,WAAW,EACX,OAAO,CACR,CAA6B,CAAC;IAE/B,OAAO,6DAA6B,CAAC,WAAW,CAAC,CAAC;AACpD,CAAC;AAdD,sDAcC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/searchOgcItems.js

@@ -6,7 +6,7 @@ const getOgcItemQueryParams_1 = require("./getOgcItemQueryParams");
 const ogcApiRequest_1 = require("./ogcApiRequest");
 async function searchOgcItems(url, query, options) {
     const queryParams = getOgcItemQueryParams_1.getOgcItemQueryParams(query, options);
-    const rawResponse = await ogcApiRequest_1.ogcApiRequest(url, queryParams, options);
+    const rawResponse = (await ogcApiRequest_1.ogcApiRequest(url, queryParams, options));
     return formatOgcItemsResponse_1.formatOgcItemsResponse(rawResponse, url, query, options);
 }
 exports.searchOgcItems = searchOgcItems;

package/dist/node/search/_internal/hubSearchItemsHelpers/searchOgcItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchOgcItems.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcItems.ts"],"names":[],"mappings":";;;AAGA,qEAAkE;AAClE,mEAAgE;AAEhE,mDAAgD;AAEzC,KAAK,UAAU,cAAc,CAClC,GAAW,EACX,KAAa,EACb,OAA+B;IAE/B,MAAM,WAAW,GAAG,6CAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAsB,MAAM,6BAAa,CACxD,GAAG,EACH,WAAW,EACX,OAAO,CACR,CAAC;IAEF,OAAO,+CAAsB,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC;AAdD,wCAcC"}
+{"version":3,"file":"searchOgcItems.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/searchOgcItems.ts"],"names":[],"mappings":";;;AAGA,qEAAkE;AAClE,mEAAgE;AAEhE,mDAAgD;AAEzC,KAAK,UAAU,cAAc,CAClC,GAAW,EACX,KAAa,EACb,OAA+B;IAE/B,MAAM,WAAW,GAAG,6CAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,CAAC,MAAM,6BAAa,CACtC,GAAG,EACH,WAAW,EACX,OAAO,CACR,CAAsB,CAAC;IAExB,OAAO,+CAAsB,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC;AAdD,wCAcC"}

package/dist/node/search/hubSearch.js

@@ -53,7 +53,7 @@ async function hubSearch(query, options) {
     formattedOptions.requestOptions = requestOptions;
     formattedOptions.api = getApi_1.getApi(filterType, formattedOptions);
     const fnHash = {
-        arcgis: {
+        portal: {
             item: portalSearchItems_1.portalSearchItems,
             group: portalSearchGroups_1.portalSearchGroups,
             user: portalSearchUsers_1.searchPortalUsersLegacy,
@@ -62,7 +62,7 @@ async function hubSearch(query, options) {
             groupMember: portalSearchGroupMembers_1.portalSearchGroupMembers,
             organization: portalFetchOrgs_1.portalFetchOrgs,
         },
-        "arcgis-hub": {
+        hub: {
             item: hubSearchItems_1.hubSearchItems,
             channel: hubSearchChannels_1.hubSearchChannels,
             discussionPost: hubSearchItems_1.hubSearchItems,
@@ -70,9 +70,9 @@ async function hubSearch(query, options) {
             eventAttendee: hubSearchEventAttendees_1.hubSearchEventAttendees,
         },
     };
-    const fn = objects_1.getProp(fnHash, `${formattedOptions.api.type}.${filterType}`);
+    const fn = objects_1.getProp(fnHash, `${formattedOptions.api}.${filterType}`);
     if (!fn) {
-        throw new HubError_1.default(`hubSearch`, `Search via "${filterType}" filter against "${formattedOptions.api.type}" api is not implemented. Please ensure "targetEntity" is defined on the query.`);
+        throw new HubError_1.default(`hubSearch`, `Search via "${filterType}" filter against "${formattedOptions.api}" api is not implemented. Please ensure "targetEntity" is defined on the query.`);
     }
     return fn(util_1.cloneObject(query), formattedOptions);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAOtC,6DAA0D;AAC1D,mFAAgF;AAChF,qEAAkE;AAClE,uEAAoE;AACpE,qEAIuC;AACvC,+DAA4D;AAC5D,qEAAkE;AAClE,iEAA8D;AAC9D,iFAA8E;AAC9E,iEAA8D;AAE9D;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QACzB,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,yCAAyC,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,wFAAwF;IACxF,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,kBAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,kBAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,eAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,qCAAiB;YACvB,KAAK,EAAE,uCAAkB;YACzB,IAAI,EAAE,2CAAuB;YAC7B,UAAU,EAAE,qCAAiB;YAC7B,aAAa,EAAE,wCAAoB;YACnC,WAAW,EAAE,mDAAwB;YACrC,YAAY,EAAE,iCAAe;SAC9B;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,+BAAc;YACpB,OAAO,EAAE,qCAAiB;YAC1B,cAAc,EAAE,+BAAc;YAC9B,KAAK,EAAE,iCAAe;YACtB,aAAa,EAAE,iDAAuB;SACvC;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,CAAC,IAAI,iFAAiF,CACzJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC;AArED,8BAqEC"}
+{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAEtC,6DAA0D;AAC1D,mFAAgF;AAChF,qEAAkE;AAClE,uEAAoE;AACpE,qEAIuC;AACvC,+DAA4D;AAC5D,qEAAkE;AAClE,iEAA8D;AAC9D,iFAA8E;AAC9E,iEAA8D;AAc9D;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QACzB,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,yCAAyC,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,wFAAwF;IACxF,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,kBAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,kBAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,eAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAA4C;QACtD,MAAM,EAAE;YACN,IAAI,EAAE,qCAAiB;YACvB,KAAK,EAAE,uCAAkB;YACzB,IAAI,EAAE,2CAAuB;YAC7B,UAAU,EAAE,qCAAiB;YAC7B,aAAa,EAAE,wCAAoB;YACnC,WAAW,EAAE,mDAAwB;YACrC,YAAY,EAAE,iCAAe;SAC9B;QACD,GAAG,EAAE;YACH,IAAI,EAAE,+BAAc;YACpB,OAAO,EAAE,qCAAiB;YAC1B,cAAc,EAAE,+BAAc;YAC9B,KAAK,EAAE,iCAAe;YACtB,aAAa,EAAE,iDAAuB;SACvC;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAChB,MAAM,EACN,GAAG,gBAAgB,CAAC,GAAG,IAAI,UAAU,EAAE,CACnB,CAAC;IACvB,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,iFAAiF,CACpJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC;AAxED,8BAwEC"}

package/dist/node/search/searchAssociatedContent.js

@@ -4,7 +4,7 @@ exports.searchAssociatedContent = void 0;
 const getTypeFromEntity_1 = require("../core/getTypeFromEntity");
 const HubEntityType_1 = require("../core/types/HubEntityType");
 const HubError_1 = require("../HubError");
-const getOgcApiDefinition_1 = require("./_internal/commonHelpers/getOgcApiDefinition");
+const getOgcCollectionUrl_1 = require("./_internal/hubSearchItemsHelpers/getOgcCollectionUrl");
 const searchOgcItems_1 = require("./_internal/hubSearchItemsHelpers/searchOgcItems");
 /**
  * Searches for content that is associated with a given entity.
@@ -40,9 +40,9 @@ async function searchAssociatedContent(opts) {
     const hubId = layerId ? `${entity.id}_${layerId}` : entity.id;
     // Construct the OGC API URL
     const { association } = opts;
-    const api = getOgcApiDefinition_1.getOgcApiDefinition(scope.targetEntity, searchOptions.requestOptions);
-    const url = `${api.url}/collections/all/items/${hubId}/${association}`;
-    return searchOgcItems_1.searchOgcItems(url, scope, searchOptions);
+    const collectionUrl = getOgcCollectionUrl_1.getOgcCollectionUrl(scope, searchOptions);
+    const associationUrl = `${collectionUrl}/items/${hubId}/${association}`;
+    return searchOgcItems_1.searchOgcItems(associationUrl, scope, searchOptions);
 }
 exports.searchAssociatedContent = searchAssociatedContent;
 //# sourceMappingURL=searchAssociatedContent.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"searchAssociatedContent.js","sourceRoot":"","sources":["../../../src/search/searchAssociatedContent.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAC9D,+DAGqC;AACrC,0CAAmC;AACnC,uFAAoF;AAEpF,qFAAkF;AAOlF;;;;;;;;;GASG;AACI,KAAK,UAAU,uBAAuB,CAC3C,IAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAChD,MAAM,aAAa,GAA2B;QAC5C,cAAc;QACd,GAAG;KACJ,CAAC;IAEF,iDAAiD;IACjD,MAAM,UAAU,GAAG,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAsB,CAAC;IACvE,IAAI,CAAC,qCAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC/C,MAAM,IAAI,kBAAQ,CAChB,yBAAyB,EACzB,wDAAwD,UAAU,GAAG,CACtE,CAAC;KACH;IAED,mFAAmF;IACnF,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAChB,yBAAyB,EACzB,2DAA2D,KAAK,CAAC,YAAY,GAAG,CACjF,CAAC;KACH;IAED,iDAAiD;IACjD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,EAAE;QACrD,MAAM,IAAI,kBAAQ,CAChB,yBAAyB,EACzB,yDAAyD,CAC1D,CAAC;KACH;IAED,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAE9D,4BAA4B;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,GAAG,GAAG,yCAAmB,CAC7B,KAAK,CAAC,YAAY,EAClB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACF,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,0BAA0B,KAAK,IAAI,WAAW,EAAE,CAAC;IAEvE,OAAO,+BAAc,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;AACnD,CAAC;AA/CD,0DA+CC"}
+{"version":3,"file":"searchAssociatedContent.js","sourceRoot":"","sources":["../../../src/search/searchAssociatedContent.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAC9D,+DAGqC;AACrC,0CAAmC;AACnC,+FAA4F;AAE5F,qFAAkF;AAOlF;;;;;;;;;GASG;AACI,KAAK,UAAU,uBAAuB,CAC3C,IAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAChD,MAAM,aAAa,GAA2B;QAC5C,cAAc;QACd,GAAG;KACJ,CAAC;IAEF,iDAAiD;IACjD,MAAM,UAAU,GAAG,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAsB,CAAC;IACvE,IAAI,CAAC,qCAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC/C,MAAM,IAAI,kBAAQ,CAChB,yBAAyB,EACzB,wDAAwD,UAAU,GAAG,CACtE,CAAC;KACH;IAED,mFAAmF;IACnF,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAChB,yBAAyB,EACzB,2DAA2D,KAAK,CAAC,YAAY,GAAG,CACjF,CAAC;KACH;IAED,iDAAiD;IACjD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,EAAE;QACrD,MAAM,IAAI,kBAAQ,CAChB,yBAAyB,EACzB,yDAAyD,CAC1D,CAAC;KACH;IAED,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAE9D,4BAA4B;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,aAAa,GAAG,yCAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,GAAG,aAAa,UAAU,KAAK,IAAI,WAAW,EAAE,CAAC;IAExE,OAAO,+BAAc,CAAC,cAAc,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC;AA5CD,0DA4CC"}

package/dist/node/search/utils.js

@@ -2,75 +2,12 @@
 /* Copyright (c) 2018-2021 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandPortalQuery = exports.getKilobyteSizeOfQuery = exports.addDefaultItemSearchPredicates = exports.getResultSiteRelativeLink = exports.getGroupPredicate = exports.getScopeGroupPredicate = exports.migrateToCollectionKey = exports.getUserThumbnailUrl = exports.getGroupThumbnailUrl = exports.relativeDateToDateRange = exports.valueToMatchOptions = exports.expandApi = exports.expandApis = exports.SEARCH_APIS = void 0;
+exports.expandPortalQuery = exports.getKilobyteSizeOfQuery = exports.addDefaultItemSearchPredicates = exports.getResultSiteRelativeLink = exports.getGroupPredicate = exports.getScopeGroupPredicate = exports.migrateToCollectionKey = exports.getUserThumbnailUrl = exports.getGroupThumbnailUrl = exports.relativeDateToDateRange = exports.valueToMatchOptions = void 0;
 const internalContentUtils_1 = require("../content/_internal/internalContentUtils");
 const util_1 = require("../util");
 const isLegacySearchCategory_1 = require("./_internal/commonHelpers/isLegacySearchCategory");
 const toCollectionKey_1 = require("./_internal/commonHelpers/toCollectionKey");
 const portalSearchItems_1 = require("./_internal/portalSearchItems");
-/**
- * Well known APIs
- * Short-forms for specifying common APIs
- * We will likely deprecate this
- */
-exports.SEARCH_APIS = {
-    arcgis: {
-        label: "ArcGIS Online",
-        url: "https://www.arcgis.com",
-        type: "arcgis",
-    },
-    arcgisQA: {
-        label: "ArcGIS Online QAEXT",
-        url: "https://qaext.arcgis.com",
-        type: "arcgis",
-    },
-    arcgisDEV: {
-        label: "ArcGIS Online DEVEXT",
-        url: "https://devext.arcgis.com",
-        type: "arcgis",
-    },
-    hub: {
-        label: "ArcGIS Hub",
-        url: "https://hub.arcgis.com/api",
-        type: "arcgis-hub",
-    },
-    hubDEV: {
-        label: "ArcGIS Hub DEV",
-        url: "https://hubdev.arcgis.com/api",
-        type: "arcgis-hub",
-    },
-    hubQA: {
-        label: "ArcGIS Hub QA",
-        url: "https://hubqa.arcgis.com/api",
-        type: "arcgis-hub",
-    },
-};
-/**
- * @private
- * Convert array of api "names" into full ApiDefinitions
- * @param apis
- * @returns
- */
-function expandApis(apis) {
-    return apis.map(expandApi);
-}
-exports.expandApis = expandApis;
-/**
- * @private
- * Convert an api "name" into a full ApiDefinition
- * @param api
- * @returns
- */
-function expandApi(api) {
-    if (typeof api === "string" && api in exports.SEARCH_APIS) {
-        return exports.SEARCH_APIS[api];
-    }
-    else {
-        // it's an object, so we trust that it's well formed
-        return api;
-    }
-}
-exports.expandApi = expandApi;
 /**
  * @private
  * Convert a field value into a MatchOptions if it's not already one

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

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

package/dist/types/search/_internal/commonHelpers/getApi.d.ts

@@ -1,15 +1,12 @@
 import { EntityType } from "../../types/IHubCatalog";
 import { IHubSearchOptions } from "../../types/IHubSearchOptions";
-import { IApiDefinition } from "../../types/types";
+import { ApiTarget } from "../../types/types";
 /**
  * @private
  * Determines Which API should be hit for the given search parameters.
- * Hierarchy:
- * - Target options.api if available
- * - Target the environment-level OGC API if current parameters allow
- * - Target the Portal API based off options.requestOptions.portal
+ * Defaults to the Portal API unless parameters indicate that a Hub API should be used.
  * @param targetEntity target entity of the query
  * @param options search options
- * @returns an API Definition object describing what should be targeted
+ * @returns the target API, either 'portal' or 'hub'
  */
-export declare function getApi(targetEntity: EntityType, options: IHubSearchOptions): IApiDefinition;
+export declare function getApi(targetEntity: EntityType, options: IHubSearchOptions): ApiTarget;

package/dist/types/search/_internal/hubSearchItemsHelpers/getOgcAggregationQueryParams.d.ts

@@ -1,7 +1,8 @@
 import { IQuery } from "../../types/IHubCatalog";
 import { IHubSearchOptions } from "../../types/IHubSearchOptions";
-export declare function getOgcAggregationQueryParams(query: IQuery, options: IHubSearchOptions): {
+export interface IOgcAggregationQueryParams {
     aggregations: string;
-    filter: string;
-    token: any;
-};
+    filter?: string;
+    token?: string;
+}
+export declare function getOgcAggregationQueryParams(query: IQuery, options: IHubSearchOptions): IOgcAggregationQueryParams;

package/dist/types/search/_internal/hubSearchItemsHelpers/ogcApiRequest.d.ts

@@ -1,26 +1,16 @@
+import { IOgcAggregationQueryParams } from "./getOgcAggregationQueryParams";
+import { IOgcItemQueryParams } from "./getOgcItemQueryParams";
 import { ISearchOgcItemsOptions } from "./interfaces";
 /**
  * Wrapper over fetch for performing common operations when executing a request to an OGC API, such as:
  * - Creating the query string
  * - URL encoding query string values
- * - Appending the ?target query param if needed
  * - Checking whether the response is ok
  * - Returning the .json() of the response body
  *
- * Note: the ?target query param is only appended if the target site (options.site) is _different_ from the
- * the site that will have its OGC API hit (url). This allows us to use the environment-level OGC API's url while
- * actually targeting a specific Hub Site's catalog. It's a powerful capability that significantly eases local development.
- *
- * Example: https://hubqa.arcgis.com/api/search/v1?target="my-actual-hub.hub.arcgis.com"
- *
- * We omit the ?target query when the site and url are the same because it would be redundant.
- *
- * Bad example: https://hubqa.arcgis.com/api/search/v1?target="hubqa.arcgis.com"
- * Good example: https://hubqa.arcgis.com/api/search/v1
- *
  * @param url the OGC API endpoint that should actually be hit
- * @param queryParams query params that should be serialized with the request (excluding `target`)
- * @param options options to customize the search, such as the site whose catalogs we're targeting
+ * @param queryParams query params that should be serialized with the request
+ * @param options options to customize the search
  * @returns the JSON response from the endpoint
  */
-export declare function ogcApiRequest(url: string, queryParams: Record<string, any>, options: ISearchOgcItemsOptions): Promise<any>;
+export declare function ogcApiRequest(url: string, queryParams: IOgcItemQueryParams | IOgcAggregationQueryParams, options: ISearchOgcItemsOptions): Promise<unknown>;

package/dist/types/search/hubSearch.d.ts

@@ -1,4 +1,7 @@
-import { IHubSearchOptions, IHubSearchResponse, IHubSearchResult, IQuery } from "./types";
+import { IQuery } from "./types/IHubCatalog";
+import { IHubSearchResponse } from "./types/IHubSearchResponse";
+import { IHubSearchOptions } from "./types/IHubSearchOptions";
+import { IHubSearchResult } from "./types/IHubSearchResult";
 /**
  * Main entrypoint for searching via Hub
  *

package/dist/types/search/types/IHubSearchOptions.d.ts

@@ -1,8 +1,8 @@
 import type { ArcGISIdentityManager } from "@esri/arcgis-rest-request";
 import { IHubRequestOptions } from "../../hub-types";
 import { EntityType } from "./IHubCatalog";
-import { NamedApis, IApiDefinition } from "./types";
 import { HTTPMethods } from "@esri/arcgis-rest-request";
+import { ApiTarget } from "./types";
 export declare type Enrichments = "data" | "metadata" | "org" | "service" | "layers";
 /**
  * Paging Options
@@ -46,15 +46,9 @@ export interface IHubSearchOptions extends IPagingOptions, ISortOptions {
      */
     aggLimit?: number;
     /**
-     * TODO: Deprecate in favor of `requestOptions` and `siteUrl`
-     * Specify API to call. Defaults to ArcGIS Online Portal API
+     * Specify API to call. Defaults to Portal API defined in requestOptions.
      */
-    api?: NamedApis | IApiDefinition;
-    /**
-     * Site whose API should be targeted. Ignored in an enterprise context.
-     * e.g., https://my-site.hub.arcgis.com
-     */
-    site?: string;
+    api?: ApiTarget;
     /**
      * DEPRECATE in favor of requestOptions
      */

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

@@ -61,20 +61,7 @@ export interface IMatchOptions {
      */
     exact?: string | string[];
 }
-export interface IWellKnownApis {
-    arcgis: IApiDefinition;
-    arcgisQA: IApiDefinition;
-    arcgisDEV: IApiDefinition;
-    hub: IApiDefinition;
-    hubQA: IApiDefinition;
-    hubDEV: IApiDefinition;
-}
-export declare type NamedApis = keyof IWellKnownApis;
-export interface IApiDefinition {
-    label?: string;
-    url: string;
-    type: "arcgis" | "arcgis-hub";
-}
+export declare type ApiTarget = "portal" | "hub";
 /**
  * Base options when checking catalog containment
  */
@@ -92,8 +79,7 @@ export interface IContainsOptions {
 /**
  * Basic information about a catalog
  */
-export interface ICatalogInfo extends Partial<IDeepCatalogInfo> {
-}
+export declare type ICatalogInfo = Partial<IDeepCatalogInfo>;
 /**
  * Cacheable information about a catalog
  */
@@ -134,8 +120,7 @@ export interface ICatalogSearchResponse {
  * Response from a Catalog search operation where the responses for different collections
  * or entities are grouped into a single object.
  */
-export interface ISearchResponseHash extends Record<string, IHubSearchResponse<IHubSearchResult>> {
-}
+export declare type ISearchResponseHash = Record<string, IHubSearchResponse<IHubSearchResult>>;
 /**
  * Type wrapper for a kilobyte
  * This is complete syntactic sugar, it makes sizes easier to understand

package/dist/types/search/utils.d.ts

@@ -3,29 +3,9 @@ import { IGroup, SearchQueryBuilder } from "@esri/arcgis-rest-portal";
 import { IHubSite } from "../core";
 import { IHubSearchResult } from "./types";
 import { IPredicate, IQuery } from "./types/IHubCatalog";
-import { IMatchOptions, IDateRange, IRelativeDate, IWellKnownApis, IApiDefinition, NamedApis, Kilobyte } from "./types/types";
+import { IMatchOptions, IDateRange, IRelativeDate, Kilobyte } from "./types/types";
 import { WellKnownCollection } from "./wellKnownCatalog";
 import { LegacySearchCategory } from "./_internal/commonHelpers/isLegacySearchCategory";
-/**
- * Well known APIs
- * Short-forms for specifying common APIs
- * We will likely deprecate this
- */
-export declare const SEARCH_APIS: IWellKnownApis;
-/**
- * @private
- * Convert array of api "names" into full ApiDefinitions
- * @param apis
- * @returns
- */
-export declare function expandApis(apis: Array<NamedApis | IApiDefinition>): IApiDefinition[];
-/**
- * @private
- * Convert an api "name" into a full ApiDefinition
- * @param api
- * @returns
- */
-export declare function expandApi(api: NamedApis | IApiDefinition): IApiDefinition;
 /**
  * @private
  * Convert a field value into a MatchOptions if it's not already one

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/hub-common",
-  "version": "17.21.0",
+  "version": "18.0.0",
   "description": "Common TypeScript types and utility functions for @esri/hub.js.",
   "main": "dist/node/index.js",
   "module": "dist/esm/index.js",

package/dist/esm/search/_internal/commonHelpers/getDiscussionsApiDefinition.js

@@ -1,10 +0,0 @@
-export function getDiscussionsApiDefinition() {
-    // Currently, url is null because this is handled internally by the
-    // discussions request method called by searchChannels, which relies on
-    // the URL defined in the request options.hubApiUrl
-    return {
-        type: "arcgis-hub",
-        url: null,
-    };
-}
-//# sourceMappingURL=getDiscussionsApiDefinition.js.map

package/dist/esm/search/_internal/commonHelpers/getDiscussionsApiDefinition.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDiscussionsApiDefinition.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getDiscussionsApiDefinition.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,2BAA2B;IACzC,mEAAmE;IACnE,uEAAuE;IACvE,mDAAmD;IACnD,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,IAAI;KACV,CAAC;AACJ,CAAC"}

package/dist/esm/search/_internal/commonHelpers/getOgcApiDefinition.js

@@ -1,20 +0,0 @@
-/**
- * @private
- * Returns information about the current environment's OGC API
- *
- * @param options IHubRequestOptions to derive OGC API info from
- * @returns an IApiDefinition with needed info to target the OGC API
- */
-export function getOgcApiDefinition(targetEntity, requestOptions) {
-    const umbrellaDomain = new URL(requestOptions.hubApiUrl).hostname;
-    return targetEntity === "discussionPost"
-        ? {
-            type: "arcgis-hub",
-            url: `https://${umbrellaDomain}/api/search/v2`,
-        }
-        : {
-            type: "arcgis-hub",
-            url: `https://${umbrellaDomain}/api/search/v1`,
-        };
-}
-//# sourceMappingURL=getOgcApiDefinition.js.map

package/dist/esm/search/_internal/commonHelpers/getOgcApiDefinition.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOgcApiDefinition.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getOgcApiDefinition.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CACjC,YAAwB,EACxB,cAAkC;IAElC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAClE,OAAO,YAAY,KAAK,gBAAgB;QACtC,CAAC,CAAC;YACE,IAAI,EAAE,YAAY;YAClB,GAAG,EAAE,WAAW,cAAc,gBAAgB;SAC/C;QACH,CAAC,CAAC;YACE,IAAI,EAAE,YAAY;YAClB,GAAG,EAAE,WAAW,cAAc,gBAAgB;SAC/C,CAAC;AACR,CAAC"}

package/dist/node/search/_internal/commonHelpers/getDiscussionsApiDefinition.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDiscussionsApiDefinition = void 0;
-function getDiscussionsApiDefinition() {
-    // Currently, url is null because this is handled internally by the
-    // discussions request method called by searchChannels, which relies on
-    // the URL defined in the request options.hubApiUrl
-    return {
-        type: "arcgis-hub",
-        url: null,
-    };
-}
-exports.getDiscussionsApiDefinition = getDiscussionsApiDefinition;
-//# sourceMappingURL=getDiscussionsApiDefinition.js.map

package/dist/node/search/_internal/commonHelpers/getDiscussionsApiDefinition.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDiscussionsApiDefinition.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getDiscussionsApiDefinition.ts"],"names":[],"mappings":";;;AAEA,SAAgB,2BAA2B;IACzC,mEAAmE;IACnE,uEAAuE;IACvE,mDAAmD;IACnD,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,IAAI;KACV,CAAC;AACJ,CAAC;AARD,kEAQC"}

package/dist/node/search/_internal/commonHelpers/getOgcApiDefinition.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOgcApiDefinition = void 0;
-/**
- * @private
- * Returns information about the current environment's OGC API
- *
- * @param options IHubRequestOptions to derive OGC API info from
- * @returns an IApiDefinition with needed info to target the OGC API
- */
-function getOgcApiDefinition(targetEntity, requestOptions) {
-    const umbrellaDomain = new URL(requestOptions.hubApiUrl).hostname;
-    return targetEntity === "discussionPost"
-        ? {
-            type: "arcgis-hub",
-            url: `https://${umbrellaDomain}/api/search/v2`,
-        }
-        : {
-            type: "arcgis-hub",
-            url: `https://${umbrellaDomain}/api/search/v1`,
-        };
-}
-exports.getOgcApiDefinition = getOgcApiDefinition;
-//# sourceMappingURL=getOgcApiDefinition.js.map

package/dist/node/search/_internal/commonHelpers/getOgcApiDefinition.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOgcApiDefinition.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getOgcApiDefinition.ts"],"names":[],"mappings":";;;AAIA;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,YAAwB,EACxB,cAAkC;IAElC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAClE,OAAO,YAAY,KAAK,gBAAgB;QACtC,CAAC,CAAC;YACE,IAAI,EAAE,YAAY;YAClB,GAAG,EAAE,WAAW,cAAc,gBAAgB;SAC/C;QACH,CAAC,CAAC;YACE,IAAI,EAAE,YAAY;YAClB,GAAG,EAAE,WAAW,cAAc,gBAAgB;SAC/C,CAAC;AACR,CAAC;AAdD,kDAcC"}

package/dist/types/search/_internal/commonHelpers/getDiscussionsApiDefinition.d.ts

@@ -1,2 +0,0 @@
-import { IApiDefinition } from "../../types/types";
-export declare function getDiscussionsApiDefinition(): IApiDefinition;

package/dist/types/search/_internal/commonHelpers/getOgcApiDefinition.d.ts

@@ -1,11 +0,0 @@
-import { IHubRequestOptions } from "../../../hub-types";
-import { EntityType } from "../../types";
-import { IApiDefinition } from "../../types/types";
-/**
- * @private
- * Returns information about the current environment's OGC API
- *
- * @param options IHubRequestOptions to derive OGC API info from
- * @returns an IApiDefinition with needed info to target the OGC API
- */
-export declare function getOgcApiDefinition(targetEntity: EntityType, requestOptions: IHubRequestOptions): IApiDefinition;