npm - @esri/hub-common - Versions diffs - 13.0.0-next.2 → 13.0.0 - Mend

@esri/hub-common 13.0.0-next.2 → 13.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (274) hide show

package/dist/node/projects/_internal/setStatusKeyword.js ADDED Viewed

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setStatusKeyword = void 0;
+/**
+ * adds/updates the project status typekeyword and returns
+ * a new array of typekeywords
+ * @param typeKeywords project's current typekeywords
+ * @param status project status
+ */
+function setStatusKeyword(typeKeywords, status) {
+    // filter out the existing status typekeyword
+    const filteredTypekeywords = typeKeywords.filter((typekeyword) => {
+        return !typekeyword.startsWith("status|");
+    });
+    // add the new/updated status typekeyword
+    filteredTypekeywords.push(`status|${status}`);
+    return filteredTypekeywords;
+}
+exports.setStatusKeyword = setStatusKeyword;
+//# sourceMappingURL=setStatusKeyword.js.map

package/dist/node/projects/_internal/setStatusKeyword.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"setStatusKeyword.js","sourceRoot":"","sources":["../../../../src/projects/_internal/setStatusKeyword.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,SAAgB,gBAAgB,CAC9B,YAAsB,EACtB,MAAwB;IAExB,6CAA6C;IAC7C,MAAM,oBAAoB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,WAAmB,EAAE,EAAE;QACvE,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,oBAAoB,CAAC,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC;IAC9C,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAZD,4CAYC"}

package/dist/node/projects/edit.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteProject = exports.updateProject = exports.createProject = void 0;
+exports.getHubProjectEditorConfig = exports.deleteProject = exports.updateProject = exports.createProject = void 0;
 // Note - we separate these imports so we can cleanly spy on things in tests
 const models_1 = require("../models");
 const slugs_1 = require("../items/slugs");
@@ -9,7 +9,9 @@ const PropertyMapper_1 = require("../core/_internal/PropertyMapper");
 const defaults_1 = require("./defaults");
 const computeProps_1 = require("./_internal/computeProps");
 const getPropertyMap_1 = require("./_internal/getPropertyMap");
+const setStatusKeyword_1 = require("./_internal/setStatusKeyword");
 const util_1 = require("../util");
+const schemas_1 = require("../core/schemas");
 /**
  * @private
  * Create a new Hub Project item
@@ -29,8 +31,9 @@ async function createProject(partialProject, requestOptions) {
     }
     // Ensure slug is  unique
     project.slug = await slugs_1.getUniqueSlug({ slug: project.slug }, requestOptions);
-    // add slug to keywords
+    // add slug and status to keywords
     project.typeKeywords = slugs_1.setSlugKeyword(project.typeKeywords, project.slug);
+    project.typeKeywords = setStatusKeyword_1.setStatusKeyword(project.typeKeywords, project.status);
     // Map project object onto a default project Model
     const mapper = new PropertyMapper_1.PropertyMapper(getPropertyMap_1.getPropertyMap());
     // create model from object, using the default model as a starting point
@@ -53,6 +56,8 @@ exports.createProject = createProject;
 async function updateProject(project, requestOptions) {
     // verify that the slug is unique, excluding the current project
     project.slug = await slugs_1.getUniqueSlug({ slug: project.slug, existingId: project.id }, requestOptions);
+    // update the status keyword
+    project.typeKeywords = setStatusKeyword_1.setStatusKeyword(project.typeKeywords, project.status);
     // get the backing item & data
     const model = await models_1.getModel(project.id, requestOptions);
     // create the PropertyMapper
@@ -83,4 +88,20 @@ async function deleteProject(id, requestOptions) {
     return;
 }
 exports.deleteProject = deleteProject;
+/**
+ * DEPRECATED: the following will be removed at next breaking version
+ * use the getEntityEditorSchemas function instead (which this function
+ * has already been refactored to consume)
+ *
+ * Get the editor config for for the HubProject entity.
+ * @param i18nScope translation scope to be interpolated into the uiSchema
+ * @param type editor type - corresonds to the returned uiSchema
+ * @param options optional hash of dynamic uiSchema element options
+ */
+/* istanbul ignore next deprecated */
+async function getHubProjectEditorConfig(i18nScope, type, options = []) {
+    const editorType = `hub:project:${type}`;
+    return schemas_1.getEntityEditorSchemas(i18nScope, editorType, options);
+}
+exports.getHubProjectEditorConfig = getHubProjectEditorConfig;
 //# sourceMappingURL=edit.js.map

package/dist/node/projects/edit.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../src/projects/edit.ts"],"names":[],"mappings":";;;AAEA,4EAA4E;AAC5E,sCAA+D;AAC/D,0CAA8E;AAC9E,iEAAwE;AACxE,qEAAkE;AAElE,yCAAoE;AACpE,2DAAwD;AACxD,+DAA4D;~~AAC5D~~,kCAAsC;~~AAEtC~~;;;;;;;;GAQG;AACI,KAAK,UAAU,aAAa,CACjC,cAAoC,EACpC,cAAmC;IAEnC,kCAAkC;IAClC,2CAA2C;IAC3C,MAAM,OAAO,mCAAQ,0BAAe,GAAK,cAAc,CAAE,CAAC;IAE1D,uDAAuD;IACvD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO,CAAC,IAAI,GAAG,qBAAa,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;KAC/D;IACD,yBAAyB;IACzB,OAAO,CAAC,IAAI,GAAG,MAAM,qBAAa,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC,CAAC;IAC3E,~~uBAAuB~~;~~IACvB~~,OAAO,CAAC,YAAY,GAAG,sBAAc,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,kDAAkD;IAClD,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAuB,+BAAc,EAAE,CAAC,CAAC;IAC1E,wEAAwE;IACxE,IAAI,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAW,CAAC,gCAAqB,CAAC,CAAC,CAAC;IAC9E,kBAAkB;IAClB,KAAK,GAAG,MAAM,oBAAW,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACjD,wCAAwC;IACxC,IAAI,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACjD,UAAU,GAAG,2BAAY,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IAC7D,gBAAgB;IAChB,OAAO,UAAyB,CAAC;AACnC,CAAC;~~AA3BD~~,~~sCA2BC~~;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CACjC,OAAoB,EACpB,cAAmC;IAEnC,gEAAgE;IAChE,OAAO,CAAC,IAAI,GAAG,MAAM,qBAAa,CAChC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,EAC9C,cAAc,CACf,CAAC;IACF,8BAA8B;IAC9B,MAAM,KAAK,GAAG,MAAM,iBAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IACzD,4BAA4B;IAC5B,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAuB,+BAAc,EAAE,CAAC,CAAC;IAC1E,0EAA0E;IAC1E,wEAAwE;IACxE,sDAAsD;IACtD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3D,0BAA0B;IAC1B,MAAM,YAAY,GAAG,MAAM,oBAAW,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACtE,8CAA8C;IAC9C,IAAI,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACjE,cAAc,GAAG,2BAAY,CAAC,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IACrE,qEAAqE;IACrE,uCAAuC;IACvC,OAAO,cAA6B,CAAC;AACvC,CAAC;~~AAzBD~~,~~sCAyBC~~;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CACjC,EAAU,EACV,cAAmC;IAEnC,MAAM,EAAE,GAAG,gCAAK,cAAc,GAAK,EAAE,EAAE,EAAE,CAAsB,CAAC;IAChE,MAAM,+BAAU,CAAC,EAAE,CAAC,CAAC;IACrB,OAAO;AACT,CAAC;AAPD,sCAOC"}
1	+ {"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../src/projects/edit.ts"],"names":[],"mappings":"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"}

package/dist/node/projects/fetch.js CHANGED Viewed

@@ -63,6 +63,7 @@ exports.convertItemToProject = convertItemToProject;
  * @returns
  */
 async function enrichProjectSearchResult(item, include, requestOptions) {
+    var _a;
     // Create the basic structure
     const result = {
         access: item.access,
@@ -107,7 +108,11 @@ async function enrichProjectSearchResult(item, include, requestOptions) {
     // TODO: Link handling should be an enrichment
     result.links.thumbnail = get_item_thumbnail_url_1.getItemThumbnailUrl(item, requestOptions);
     result.links.self = get_item_home_url_1.getItemHomeUrl(result.id, requestOptions);
-    result.links.siteRelative = internalContentUtils_1.getHubRelativeUrl(result.type, result.id, item.typeKeywords);
+    let slugOrId = item.id;
+    if ((_a = item.properties) === null || _a === void 0 ? void 0 : _a.slug) {
+        slugOrId = item.properties.slug.replace("|", "::");
+    }
+    result.links.siteRelative = internalContentUtils_1.getHubRelativeUrl(result.type, slugOrId, item.typeKeywords);
     return result;
 }
 exports.enrichProjectSearchResult = enrichProjectSearchResult;

package/dist/node/projects/fetch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/projects/fetch.ts"],"names":[],"mappings":"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~~MAAM~~,~~CAAC~~,~~EAAE,EACT,~~IAAI,CAAC,YAAY,CAClB,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;~~AA1DD~~,~~8DA0DC~~"}
1	+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/projects/fetch.ts"],"names":[],"mappings":"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"}

package/dist/node/search/Catalog.js CHANGED Viewed

@@ -130,6 +130,15 @@ class Catalog {
      * @returns
      */
     getCollection(name) {
+        const json = this.getCollectionJson(name);
+        return Collection_1.Collection.fromJson(json, this._context);
+    }
+    /**
+     * Get the Collection json by name
+     * @param name
+     * @returns
+     */
+    getCollectionJson(name) {
         const json = this.collections.find((entry) => entry.key === name);
         if (json) {
             // clone it then merge in the associated scope filter
@@ -138,12 +147,47 @@ class Catalog {
             if (catalogScope === null || catalogScope === void 0 ? void 0 : catalogScope.filters) {
                 clone.scope.filters = [...clone.scope.filters, ...catalogScope.filters];
             }
-            return Collection_1.Collection.fromJson(clone, this._context);
+            return clone;
         }
         else {
-            throw new HubError_1.default("getCollection", `Collection "${name}" is not present in the Catalog`);
+            throw new HubError_1.default("getCollectionJson", `Collection "${name}" is not present in the Catalog`);
         }
     }
+    /**
+     * Get a Collection instance, based on a specific entity type and filters
+     * This extends from the base scope for the entity type
+     * @param type
+     * @param filters
+     * @returns
+     */
+    getCustomCollection(type, filters) {
+        // create the collection
+        const collection = this.getCustomCollectionJson(type, filters);
+        // create instance
+        return Collection_1.Collection.fromJson(collection, this._context);
+    }
+    /**
+     * Create a custom collection based on a specific entity type and filters
+     * Returned collection extends from the base scope for the entity type
+     * @param type
+     * @param filters
+     * @returns
+     */
+    getCustomCollectionJson(type, filters) {
+        // get the scope
+        const scopeQuery = this.getScope(type);
+        // create the collection
+        const collection = {
+            key: `${type}-custom`,
+            label: `${type} Custom`,
+            targetEntity: type,
+            scope: {
+                targetEntity: type,
+                filters: [...((scopeQuery === null || scopeQuery === void 0 ? void 0 : scopeQuery.filters) || []), ...filters],
+            },
+        };
+        return collection;
+    }
     /**
      * Search for Items
      * Will throw if the Catalog does not have a scope defined for items
@@ -423,6 +467,7 @@ class Catalog {
         qry.filters = [...qry.filters, ...this.getScope(targetEntity).filters];
         const opts = util_1.cloneObject(options);
         // An Catalog instance always uses the context so we remove/replace any passed in auth
+        delete opts.authentication;
         opts.requestOptions = this._context.hubRequestOptions;
         return hubSearch_1.hubSearch(qry, opts);
     }

package/dist/node/search/Catalog.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Catalog.js","sourceRoot":"","sources":["../../../src/search/Catalog.ts"],"names":[],"mappings":";;;AACA,kEAA+D;AAC/D,0CAAmC;AACnC,kCAAsC;AACtC,oCAAyC;AACzC,6CAA0C;AAC1C,iDAA8C;AAC9C,2CAAwC;~~AAcxC~~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~~KAAK~~,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;~~SAClD~~;~~aAAM~~;~~YACL~~,MAAM,IAAI,~~kBAAQ~~,~~CAChB~~,~~eAAe~~,~~EACf~~,~~eAAe~~,IAAI,~~iCAAiC~~,~~CACrD~~,CAAC;~~SACH~~;~~IACH~~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~~AAzeD~~,~~0BAyeC~~"}
1	+ {"version":3,"file":"Catalog.js","sourceRoot":"","sources":["../../../src/search/Catalog.ts"],"names":[],"mappings":"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"}

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

@@ -1,25 +1,31 @@
 "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");
 /**
  * @private
  * Determines Which API should be hit for the given search parameters.
  * Hierarchy:
- * - Target the OGC API if current parameters allow
+ * - Target options.api if available
+ * - Target the environment-level OGC API if current parameters allow
  * - Target the Portal API based off options.requestOptions.portal
  * @param targetEntity target entity of the query
  * @param options search options
  * @returns an API Definition object describing what should be targeted
  */
 function getApi(targetEntity, options) {
-    const { site, requestOptions: { portal }, } = options;
-    let result = { type: "arcgis", url: portal };
-    if (shouldUseOgcApi_1.shouldUseOgcApi(targetEntity, options)) {
-        result = {
-            type: "arcgis-hub",
-            url: `${site}/api/search/v1`,
-        };
+    const { api, requestOptions: { portal }, } = options;
+    let result;
+    if (api) {
+        result = utils_1.expandApi(api);
+    }
+    else if (shouldUseOgcApi_1.shouldUseOgcApi(targetEntity, options)) {
+        result = getOgcApiDefinition_1.getOgcApiDefinition(options);
+    }
+    else {
+        result = { type: "arcgis", url: portal };
     }
     return result;
 }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"getApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getApi.ts"],"names":[],"mappings":";;;AAGA,uDAAoD;~~AAEpD;;;;;;;;;GASG~~;AACH,SAAgB,MAAM,CACpB,YAAwB,EACxB,OAA0B;IAE1B,MAAM,EACJ,~~IAAI~~,~~EACJ~~,cAAc,EAAE,EAAE,MAAM,EAAE,GAC3B,GAAG,OAAO,CAAC;IAEZ,IAAI,~~MAAM~~,~~GAAmB~~,~~EAAE,~~IAAI,EAAE,~~QAAQ~~,~~EAAE,~~GAAG,~~EAAE~~,~~MAAM~~,~~EAAE~~,CAAC;~~IAC7D~~,IAAI,iCAAe,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;~~QAC1C~~,MAAM,GAAG;~~YACP~~,IAAI,EAAE,~~YAAY;YAClB~~,GAAG,EAAE,~~GAAG~~,~~IAAI~~,~~gBAAgB;SAC7B,~~CAAC;~~KACH~~;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;~~AAlBD~~,~~wBAkBC~~"}
1	+ {"version":3,"file":"getApi.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getApi.ts"],"names":[],"mappings":";;;AAGA,uCAAwC;AACxC,uDAAoD;AACpD,+DAA4D;AAE5D;;;;;;;;;;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,iCAAe,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QACjD,MAAM,GAAG,yCAAmB,CAAC,OAAO,CAAC,CAAC;KACvC;SAAM;QACL,MAAM,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;KAC1C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAnBD,wBAmBC"}

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

@@ -0,0 +1,19 @@
+"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(options) {
+    const umbrellaDomain = new URL(options.requestOptions.hubApiUrl).hostname;
+    return {
+        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 ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"getOgcApiDefinition.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/getOgcApiDefinition.ts"],"names":[],"mappings":";;;AAGA;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,OAA0B;IAE1B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC1E,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,WAAW,cAAc,gBAAgB;KAC/C,CAAC;AACJ,CAAC;AARD,kDAQC"}

package/dist/node/search/_internal/commonHelpers/isLegacySearchCategory.js ADDED Viewed

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLegacySearchCategory = void 0;
+/**
+ * @private
+ * Determines whether a string corresponds to a search category (as opposed to a collection)
+ *
+ * @param value value to verify
+ * @returns whether the value represents one of the old search categories
+ */
+function isLegacySearchCategory(value) {
+    const categories = [
+        "Site",
+        "Event",
+        "Dataset",
+        "Document",
+        "App,Map",
+    ];
+    return categories.includes(value);
+}
+exports.isLegacySearchCategory = isLegacySearchCategory;
+//# sourceMappingURL=isLegacySearchCategory.js.map

package/dist/node/search/_internal/commonHelpers/isLegacySearchCategory.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"isLegacySearchCategory.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/isLegacySearchCategory.ts"],"names":[],"mappings":";;;AAOA;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAAC,KAAa;IAClD,MAAM,UAAU,GAA2B;QACzC,MAAM;QACN,OAAO;QACP,SAAS;QACT,UAAU;QACV,SAAS;KACV,CAAC;IACF,OAAO,UAAU,CAAC,QAAQ,CAAC,KAA6B,CAAC,CAAC;AAC5D,CAAC;AATD,wDASC"}

package/dist/node/search/_internal/commonHelpers/toCollectionKey.js ADDED Viewed

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toCollectionKey = void 0;
+/**
+ * @private
+ * Converts a search category key to its corresponding wellknown collection key
+ *
+ * @param legacySearchCategory search category key to transform
+ * @returns the wellknown collection key
+ */
+function toCollectionKey(legacySearchCategory) {
+    return legacySearchCategory === "App,Map"
+        ? "appAndMap"
+        : legacySearchCategory.toLowerCase();
+}
+exports.toCollectionKey = toCollectionKey;
+//# sourceMappingURL=toCollectionKey.js.map

package/dist/node/search/_internal/commonHelpers/toCollectionKey.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"toCollectionKey.js","sourceRoot":"","sources":["../../../../../src/search/_internal/commonHelpers/toCollectionKey.ts"],"names":[],"mappings":";;;AAGA;;;;;;GAMG;AACH,SAAgB,eAAe,CAC7B,oBAA0C;IAE1C,OAAO,oBAAoB,KAAK,SAAS;QACvC,CAAC,CAAC,WAAW;QACb,CAAC,CAAE,oBAAoB,CAAC,WAAW,EAA0B,CAAC;AAClE,CAAC;AAND,0CAMC"}

package/dist/node/search/_internal/expandPredicate.js CHANGED Viewed

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandPredicate = void 0;
 const objects_1 = require("../../objects");
 const util_1 = require("../../util");
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 /**
  * @private
  * Expand a predicate
@@ -22,6 +22,7 @@ function expandPredicate(predicate) {
         "isopendata",
         "searchUserName",
         "bbox",
+        "isviewonly",
     ];
     const nonMatchOptionsFields = [...dateProps, ...copyProps];
     // Do the conversion

package/dist/node/search/_internal/expandPredicate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"expandPredicate.js","sourceRoot":"","sources":["../../../../src/search/_internal/expandPredicate.ts"],"names":[],"mappings":";;;AAAA,2CAAiD;AACjD,qCAAyC;AAEzC,~~mCAAuE~~;~~AAEvE~~;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,SAAqB;IACnD,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG;QAChB,YAAY;QACZ,mBAAmB;QACnB,gBAAgB;QAChB,MAAM;QACN,kBAAkB;QAClB,YAAY;QACZ,gBAAgB;QAChB,MAAM;~~KACP~~,CAAC;IACF,MAAM,qBAAqB,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;IAC3D,oBAAoB;IACpB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,6BAA6B;QAC7B,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxC,iBAAO,CAAC,GAAG,EAAE,2BAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;SAClD;QACD,qBAAqB;QACrB,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3B,MAAM,cAAc,GAAG,kBAAW,CAAC,iBAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;YAC5D,IAAI,iBAAO,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,eAAe,EAAE;gBACzD,iBAAO,CAAC,GAAG,EAAE,+BAAuB,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;aAC/D;iBAAM;gBACL,iBAAO,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;aACtC;SACF;QACD,6CAA6C;QAC7C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAC5D,iBAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;~~AAnCD~~,~~0CAmCC~~"}
1	+ {"version":3,"file":"expandPredicate.js","sourceRoot":"","sources":["../../../../src/search/_internal/expandPredicate.ts"],"names":[],"mappings":";;;AAAA,2CAAiD;AACjD,qCAAyC;AAEzC,oCAAwE;AAExE;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,SAAqB;IACnD,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG;QAChB,YAAY;QACZ,mBAAmB;QACnB,gBAAgB;QAChB,MAAM;QACN,kBAAkB;QAClB,YAAY;QACZ,gBAAgB;QAChB,MAAM;QACN,YAAY;KACb,CAAC;IACF,MAAM,qBAAqB,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;IAC3D,oBAAoB;IACpB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,6BAA6B;QAC7B,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxC,iBAAO,CAAC,GAAG,EAAE,2BAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;SAClD;QACD,qBAAqB;QACrB,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3B,MAAM,cAAc,GAAG,kBAAW,CAAC,iBAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;YAC5D,IAAI,iBAAO,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,eAAe,EAAE;gBACzD,iBAAO,CAAC,GAAG,EAAE,+BAAuB,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;aAC/D;iBAAM;gBACL,iBAAO,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;aACtC;SACF;QACD,6CAA6C;QAC7C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAC5D,iBAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,0CAoCC"}

package/dist/node/search/_internal/hubSearchItems.js CHANGED Viewed

@@ -10,13 +10,10 @@ const searchOgcItems_1 = require("./hubSearchItemsHelpers/searchOgcItems");
  * @param options
  * @returns
  */
-async function hubSearchItems(query, options, api) {
+async function hubSearchItems(query, options) {
     var _a;
-    if (!options.useBeta) {
-        throw new Error("Not implemented");
-    }
-    return ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) ? searchOgcAggregations_1.searchOgcAggregations(query, options, api)
-        : searchOgcItems_1.searchOgcItems(query, options, api);
+    return ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) ? searchOgcAggregations_1.searchOgcAggregations(query, options)
+        : searchOgcItems_1.searchOgcItems(query, options);
 }
 exports.hubSearchItems = hubSearchItems;
 //# sourceMappingURL=hubSearchItems.js.map

package/dist/node/search/_internal/hubSearchItems.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hubSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchItems.ts"],"names":[],"mappings":";;;~~AAOA~~,yFAAsF;AACtF,2EAAwE;AAExE;;;;;;GAMG;AACI,KAAK,UAAU,cAAc,CAClC,KAAa,EACb,OAA0B~~,EAC1B,GAAmB~~;;~~IAEnB~~,~~IAAI,CAAC,~~OAAO,~~CAAC,OAAO,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IACD,OAAO,~~OAAA,OAAO,CAAC,SAAS,0CAAE,MAAM,EAC9B,CAAC,CAAC,6CAAqB,CAAC,KAAK,EAAE,OAAO,~~EAAE,GAAG,~~CAAC;~~QAC5C~~,CAAC,CAAC,+BAAc,CAAC,KAAK,EAAE,OAAO,~~EAAE,GAAG,~~CAAC,CAAC;~~AAC1C~~,CAAC;~~AAXD~~,~~wCAWC~~"}
1	+ {"version":3,"file":"hubSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchItems.ts"],"names":[],"mappings":";;;AAMA,yFAAsF;AACtF,2EAAwE;AAExE;;;;;;GAMG;AACI,KAAK,UAAU,cAAc,CAClC,KAAa,EACb,OAA0B;;IAE1B,OAAO,OAAA,OAAO,CAAC,SAAS,0CAAE,MAAM,EAC9B,CAAC,CAAC,6CAAqB,CAAC,KAAK,EAAE,OAAO,CAAC;QACvC,CAAC,CAAC,+BAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAPD,wCAOC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/formatOgcItemsResponse.js CHANGED Viewed

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatOgcItemsResponse = void 0;
 const getNextOgcCallback_1 = require("./getNextOgcCallback");
 const ogcItemToSearchResult_1 = require("./ogcItemToSearchResult");
-async function formatOgcItemsResponse(response, originalQuery, originalOptions, api) {
+async function formatOgcItemsResponse(response, originalQuery, originalOptions) {
     const formattedResults = await Promise.all(response.features.map((f) => ogcItemToSearchResult_1.ogcItemToSearchResult(f, originalOptions.include, originalOptions.requestOptions)));
-    const next = getNextOgcCallback_1.getNextOgcCallback(response, originalQuery, originalOptions, api);
+    const next = getNextOgcCallback_1.getNextOgcCallback(response, originalQuery, originalOptions);
     const nextLink = response.links.find((l) => l.rel === "next");
     return {
         total: response.numberMatched,

package/dist/node/search/_internal/hubSearchItemsHelpers/formatOgcItemsResponse.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"formatOgcItemsResponse.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/formatOgcItemsResponse.ts"],"names":[],"mappings":";;;~~AAKA~~,6DAA0D;AAE1D,mEAAgE;AAEzD,KAAK,UAAU,sBAAsB,CAC1C,QAA2B,EAC3B,aAAqB,EACrB,eAAkC~~,EAClC,GAAmB~~;~~IAEnB~~,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,6CAAqB,CACnB,CAAC,EACD,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,cAAc,CAC/B,CACF,CACF,CAAC;IACF,MAAM,IAAI,GAAG,uCAAkB,~~CAC7B~~,QAAQ,~~EACR~~,aAAa,~~EACb~~,eAAe,~~EACf~~,~~GAAG,CACJ,~~CAAC;~~IACF~~,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;IAE9D,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,aAAa;QAC7B,OAAO,EAAE,gBAAgB;QACzB,OAAO,EAAE,CAAC,CAAC,QAAQ;QACnB,IAAI;KACL,CAAC;AACJ,CAAC;~~AA7BD~~,~~wDA6BC~~"}
1	+ {"version":3,"file":"formatOgcItemsResponse.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/formatOgcItemsResponse.ts"],"names":[],"mappings":";;;AAIA,6DAA0D;AAE1D,mEAAgE;AAEzD,KAAK,UAAU,sBAAsB,CAC1C,QAA2B,EAC3B,aAAqB,EACrB,eAAkC;IAElC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,6CAAqB,CACnB,CAAC,EACD,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,cAAc,CAC/B,CACF,CACF,CAAC;IACF,MAAM,IAAI,GAAG,uCAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;IAE9D,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,aAAa;QAC7B,OAAO,EAAE,gBAAgB;QACzB,OAAO,EAAE,CAAC,CAAC,QAAQ;QACnB,IAAI;KACL,CAAC;AACJ,CAAC;AAvBD,wDAuBC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.js ADDED Viewed

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBboxQueryParam = void 0;
+const getTopLevelPredicate_1 = require("../commonHelpers/getTopLevelPredicate");
+/**
+ * @private
+ * Extracts the bbox value that the search should be filtered by.
+ * Also validates that the bbox predicate is not combined in some
+ * invalid way with other predicates.
+ *
+ * @param query query to extract the bbox predicate from
+ * @returns the bbox value to filter by
+ */
+function getBboxQueryParam(query) {
+    const bboxPredicate = getTopLevelPredicate_1.getTopLevelPredicate("bbox", query.filters);
+    return bboxPredicate === null || bboxPredicate === void 0 ? void 0 : bboxPredicate.bbox;
+}
+exports.getBboxQueryParam = getBboxQueryParam;
+//# sourceMappingURL=getBboxQueryParam.js.map

package/dist/node/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"getBboxQueryParam.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.ts"],"names":[],"mappings":";;;AACA,gFAA6E;AAE7E;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,MAAM,aAAa,GAAG,2CAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,OAAO,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC;AAC7B,CAAC;AAHD,8CAGC"}

package/dist/node/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.js CHANGED Viewed

@@ -2,27 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatPredicate = exports.formatFilterBlock = exports.getFilterQueryParam = void 0;
 function getFilterQueryParam(query) {
-    return (query.filters
+    return query.filters
         .map(formatFilterBlock)
-        // TODO: this a bandaid fix, remove once q can be passed into the filter query string
-        .filter((f) => f !== "()")
-        .join(" AND "));
+        .filter(removeEmptyClauses)
+        .join(" AND ");
 }
 exports.getFilterQueryParam = getFilterQueryParam;
 function formatFilterBlock(filter) {
     const operation = filter.operation || "OR";
     const formatted = filter.predicates
         .map(formatPredicate)
-        // TODO: this a bandaid fix, remove once q can be passed into the filter query string
-        .filter((p) => p !== "()")
+        .filter(removeEmptyClauses)
         .join(` ${operation} `);
     return `(${formatted})`;
 }
 exports.formatFilterBlock = formatFilterBlock;
 function formatPredicate(predicate) {
     const formatted = Object.entries(predicate)
-        // Remove predicates that use `term` (handled in `getQQueryParam`) and undefined entries
-        .filter(([field, value]) => field !== "term" && !!value)
+        // Remove predicates that use `term` (handled in `getQQueryParam`),
+        // `bbox` (handled in `getBboxQueryParam) or have undefined entries
+        .filter(([field, value]) => field !== "term" && field !== "bbox" && !!value)
         // Create sections for each field
         .reduce((acc, [field, value]) => {
         let section;
@@ -101,4 +100,17 @@ function maybeAddSingleQuotes(value) {
     const whitespaceRegex = /\s/;
     return whitespaceRegex.test(value) ? `'${value}'` : value;
 }
+/**
+ * Returns whether a clause is non-empty and should be included in the
+ * final serialized string.
+ *
+ * Empty clauses appear when certain predicates are detected that are invalid
+ * in the OGC API's ?filter string (i.e. `term`, `bbox`)
+ *
+ * @param clause stringified clause to inspect
+ * @returns whether the clause should be included in the final serialization
+ */
+function removeEmptyClauses(clause) {
+    return clause !== "()";
+}
 //# sourceMappingURL=getFilterQueryParam.js.map

package/dist/node/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getFilterQueryParam.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.ts"],"names":[],"mappings":";;;AAGA,SAAgB,mBAAmB,CAAC,KAAa;IAC/C,OAAO,~~CACL,~~KAAK,CAAC,OAAO;~~SACV~~,GAAG,CAAC,iBAAiB,CAAC;~~QACvB~~,~~qFAAqF;SACpF,~~MAAM,CAAC,~~CAAC~~,CAAC~~,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC~~;~~SACzB~~,IAAI,CAAC,OAAO,CAAC,~~CACjB,~~CAAC;~~AACJ~~,CAAC;~~AARD~~,~~kDAQC~~;AAED,SAAgB,iBAAiB,CAAC,MAAe;IAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC;IAC3C,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU;SAChC,GAAG,CAAC,eAAe,CAAC;~~QACrB~~,~~qFAAqF;SACpF,~~MAAM,CAAC,~~CAAC~~,CAAC~~,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC~~;~~SACzB~~,IAAI,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC;IAC1B,OAAO,IAAI,SAAS,GAAG,CAAC;AAC1B,CAAC;~~AARD~~,~~8CAQC~~;AAED,SAAgB,eAAe,CAAC,SAAqB;IACnD,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;QACzC,~~wFAAwF~~;~~SACvF~~,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC;~~QACxD~~,iCAAiC;SAChC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9B,IAAI,OAAO,CAAC;QACZ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,GAAG,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SAChD;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,OAAO,GAAG,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACpD;aAAM,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE;YAC7B,OAAO,GAAG,wBAAwB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SAClD;aAAM;YACL,OAAO,GAAG,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SAChD;QACD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC;QACN,sCAAsC;SACrC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEjB,OAAO,IAAI,SAAS,GAAG,CAAC;AAC1B,CAAC;~~AAvBD~~,~~0CAuBC~~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"}
1	+ {"version":3,"file":"getFilterQueryParam.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.ts"],"names":[],"mappings":"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"}

package/dist/node/search/_internal/hubSearchItemsHelpers/getNextOgcCallback.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextOgcCallback = void 0;
 const searchOgcItems_1 = require("./searchOgcItems");
-function getNextOgcCallback(response, originalQuery, originalOptions, api) {
+function getNextOgcCallback(response, originalQuery, originalOptions) {
     const nextLink = response.links.find((l) => l.rel === "next");
     let callback = () => null;
     if (nextLink) {
@@ -10,7 +10,7 @@ function getNextOgcCallback(response, originalQuery, originalOptions, api) {
             const nextUrl = new URL(nextLink.href);
             const start = +nextUrl.searchParams.get("startindex");
             const nextOptions = Object.assign(Object.assign({}, originalOptions), { start });
-            return searchOgcItems_1.searchOgcItems(originalQuery, nextOptions, api);
+            return searchOgcItems_1.searchOgcItems(originalQuery, nextOptions);
         };
     }
     return callback;

package/dist/node/search/_internal/hubSearchItemsHelpers/getNextOgcCallback.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getNextOgcCallback.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getNextOgcCallback.ts"],"names":[],"mappings":";;;~~AAMA~~,qDAAkD;AAElD,SAAgB,kBAAkB,CAChC,QAA2B,EAC3B,aAAqB,EACrB,eAAkC~~,EAClC,GAAmB~~;~~IAEnB~~,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;IAE9D,IAAI,QAAQ,GAAG,GAAkD,EAAE,CAAC,IAAI,CAAC;IACzE,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,GAAG,EAAE;YACd,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACtD,MAAM,WAAW,mCAA2B,eAAe,KAAE,KAAK,GAAE,CAAC;YACrE,OAAO,+BAAc,CAAC,aAAa,EAAE,WAAW,~~EAAE,GAAG,~~CAAC,CAAC;~~QACzD~~,CAAC,CAAC;KACH;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;~~AAnBD~~,~~gDAmBC~~"}
1	+ {"version":3,"file":"getNextOgcCallback.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getNextOgcCallback.ts"],"names":[],"mappings":";;;AAKA,qDAAkD;AAElD,SAAgB,kBAAkB,CAChC,QAA2B,EAC3B,aAAqB,EACrB,eAAkC;IAElC,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;IAE9D,IAAI,QAAQ,GAAG,GAAkD,EAAE,CAAC,IAAI,CAAC;IACzE,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,GAAG,EAAE;YACd,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACtD,MAAM,WAAW,mCAA2B,eAAe,KAAE,KAAK,GAAE,CAAC;YACrE,OAAO,+BAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACpD,CAAC,CAAC;KACH;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAlBD,gDAkBC"}

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

@@ -9,12 +9,13 @@ exports.getOgcCollectionUrl = void 0;
  * the all collection is targeted.
  *
  * @param query the query the request is based on
- * @param api definition object for the OGC API to be targeted
+ * @param options request options, including the base OGC api url
  * @returns the collection url
  */
-function getOgcCollectionUrl(query, api) {
+function getOgcCollectionUrl(query, options) {
+    const apiDefinition = options.api;
     const collectionId = query.collection || "all";
-    return `${api.url}/collections/${collectionId}`;
+    return `${apiDefinition.url}/collections/${collectionId}`;
 }
 exports.getOgcCollectionUrl = getOgcCollectionUrl;
 //# sourceMappingURL=getOgcCollectionUrl.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"getOgcCollectionUrl.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.ts"],"names":[],"mappings":";;;~~AAGA~~;;;;;;;;;;GAUG;AACH,SAAgB,mBAAmB,CAAC,KAAa,EAAE,~~GAAmB~~;~~IACpE~~,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC;IAC/C,OAAO,GAAG,~~GAAG~~,CAAC,GAAG,gBAAgB,YAAY,EAAE,CAAC;~~AAClD~~,CAAC;~~AAHD~~,~~kDAGC~~"}
1	+ {"version":3,"file":"getOgcCollectionUrl.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcCollectionUrl.ts"],"names":[],"mappings":";;;AAIA;;;;;;;;;;GAUG;AACH,SAAgB,mBAAmB,CAAC,KAAa,EAAE,OAA0B;IAC3E,MAAM,aAAa,GAAG,OAAO,CAAC,GAAqB,CAAC;IACpD,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC;IAC/C,OAAO,GAAG,aAAa,CAAC,GAAG,gBAAgB,YAAY,EAAE,CAAC;AAC5D,CAAC;AAJD,kDAIC"}