@esri/hub-common 9.25.0 → 9.25.1

package/dist/node/content/_fetch.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchHubEnrichmentsById = exports.fetchHubEnrichmentsBySlug = exports.getContentEnrichments = void 0;
+const _enrichments_1 = require("../items/_enrichments");
 const request_1 = require("../request");
 const urls_1 = require("../urls");
 const util_1 = require("../util");
@@ -44,7 +45,9 @@ exports.getContentEnrichments = (item) => {
 // that we fetch from the Hub API, and to optionally filter by slug
 const getHubEnrichmentsOptions = (requestOptions, slug) => {
     const opts = util_1.cloneObject(requestOptions);
-    opts.params = Object.assign(Object.assign({}, opts.params), { "fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
+    opts.params = Object.assign(Object.assign({}, opts.params), { 
+        // TODO: we should fetch errors too
+        "fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
     if (slug) {
         opts.params["filter[slug]"] = slug;
     }
@@ -73,6 +76,9 @@ const getDatasetEnrichments = (dataset) => {
  * @private
  */
 exports.fetchHubEnrichmentsBySlug = async (slug, requestOptions) => {
+    // NOTE: we don't catch errors here b/c
+    // searching by slug is the first step in fetchContent()
+    // and if this fails, we don't have an id to fall back on
     const response = await request_1.hubApiRequest(`/datasets`, getHubEnrichmentsOptions(requestOptions, slug));
     return getDatasetEnrichments(response.data[0]);
 };
@@ -84,7 +90,14 @@ exports.fetchHubEnrichmentsBySlug = async (slug, requestOptions) => {
  * @private
  */
 exports.fetchHubEnrichmentsById = async (hubId, requestOptions) => {
-    const response = await request_1.hubApiRequest(`/datasets/${hubId}`, getHubEnrichmentsOptions(requestOptions));
-    return getDatasetEnrichments(response.data);
+    try {
+        const response = await request_1.hubApiRequest(`/datasets/${hubId}`, getHubEnrichmentsOptions(requestOptions));
+        return getDatasetEnrichments(response.data);
+    }
+    catch (e) {
+        // dataset record not found, just log the error
+        // b/c we can still look up the item and enrichments by id
+        return { errors: _enrichments_1.getEnrichmentErrors(e) };
+    }
 };
 //# sourceMappingURL=_fetch.js.map

package/dist/node/content/_fetch.js.map

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

package/dist/node/content/fetch.js

@@ -6,6 +6,7 @@ const arcgis_rest_feature_layer_1 = require("@esri/arcgis-rest-feature-layer");
 const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
 const _enrichments_1 = require("../items/_enrichments");
 const util_1 = require("../util");
+const _array_1 = require("../utils/_array");
 const slugs_1 = require("./slugs");
 const _fetch_1 = require("./_fetch");
 const _internal_1 = require("./_internal");
@@ -23,8 +24,9 @@ const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
             // we just fetch the item data for all layer views
             await _enrichments_1.fetchItemEnrichments(item, ["data"], options)
         : undefined;
-    // TODO: merge errors
-    return Object.assign(Object.assign({}, itemAndEnrichments), layerEnrichments);
+    return Object.assign(Object.assign(Object.assign({}, itemAndEnrichments), layerEnrichments), { 
+        // merge error arrays
+        errors: _array_1.maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]) });
 };
 const fetchItemAndEnrichments = async (itemId, options) => {
     // fetch the item
@@ -42,14 +44,17 @@ const fetchContentById = async (hubId, options) => {
     const specifiedLayerId = options && options.layerId;
     // if this is a public item and we're not in enterprise
     // fetch the slug and remaining enrichments from the Hub API
-    const { slug, layerId, boundary, extent, searchDescription, statistics } = _internal_1.canUseHubApiForItem(item, options)
+    // const { slug, layerId, boundary, extent, searchDescription, statistics } =
+    const hubEnrichments = _internal_1.canUseHubApiForItem(item, options)
         ? await _fetch_1.fetchHubEnrichmentsById(hubId, options)
         : {};
+    const layerId = hubEnrichments.layerId;
     // return a new content object composed from the item and enrichments we fetched
-    return compose_1.composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), { slug, layerId: util_1.isNil(specifiedLayerId) ? layerId : specifiedLayerId, boundary,
-        extent,
-        searchDescription,
-        statistics }));
+    return compose_1.composeContent(item, Object.assign(Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { 
+        // prefer specified layer id if any
+        layerId: util_1.isNil(specifiedLayerId) ? layerId : specifiedLayerId, 
+        // merge error arrays
+        errors: _array_1.maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }));
 };
 const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
     // we only have a slug, not an item id, so we start by
@@ -63,24 +68,23 @@ const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
     // did the caller request a specific layer
     const specifiedLayerId = options && options.layerId;
     if (!util_1.isNil(specifiedLayerId) && specifiedLayerId !== layerId) {
-        // we fetched Hub enrichments by slug for another dataset,
-        // most likely for the parent service of this layer,
-        // we need to fetch them for the specified layer instead
+        // we fetched Hub enrichments by slug for another record,
+        // most likely the record for the parent service of this layer,
+        // so we need to fetch them for the specified layer instead
         layerId = specifiedLayerId;
-        hubEnrichments = await _fetch_1.fetchHubEnrichmentsById(`${itemId}_${layerId}`, options);
+        hubEnrichments = Object.assign(Object.assign({}, hubEnrichments), (await _fetch_1.fetchHubEnrichmentsById(`${itemId}_${layerId}`, options)));
     }
-    // Note that we are not extracting the slug for the specified layer.
-    // It seems that the old client composer code always populated the slug
-    // field with the slug that was passed into the function (typically the
-    // slug of the parent service). To maintain parity, we do the same here.
-    //
-    // TODO: should we prefer the slug of the fetched layer instead?
-    const { boundary, extent, searchDescription, statistics } = hubEnrichments;
-    // return a new content object composed from the item and enrichments we fetched
-    return compose_1.composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), { layerId, slug: fullyQualifiedSlug, boundary,
-        extent,
-        searchDescription,
-        statistics }));
+    return compose_1.composeContent(item, Object.assign(Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { layerId, 
+        // Note that we are not extracting the slug for the specified layer.
+        // It seems that the old client composer code always populated the slug
+        // field with the slug that was passed into the function (typically the
+        // slug of the parent service). To maintain parity, we do the same here.
+        //
+        // TODO: should we prefer the slug of the fetched layer instead?
+        // return a new content object composed from the item and enrichments we fetched
+        slug: fullyQualifiedSlug, 
+        // merge error arrays
+        errors: _array_1.maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }));
 };
 const fetchContentRecordCount = async (content, requestOptions) => {
     const { url, viewDefinition } = content;

package/dist/node/content/fetch.js.map

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

package/dist/node/items/_enrichments.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchItemEnrichments = void 0;
+exports.fetchItemEnrichments = exports.getEnrichmentErrors = void 0;
 const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
 const arcgis_rest_feature_layer_1 = require("@esri/arcgis-rest-feature-layer");
 const utils_1 = require("../utils");
@@ -129,29 +129,44 @@ const enrichLayers = (input) => {
 const handleEnrichmentError = (error, input, opId) => {
     const { data, stack, requestOptions } = input;
     stack.finish(opId, { error });
-    const message = typeof error === "string"
-        ? /* istanbul ignore next our tests only throw Error objects */
-            error
-        : error.message;
-    const errors = data.errors || [];
-    errors.push({
-        // NOTE: for now we just return the message and type "Other"
-        // but we could later introspect for HTTP or AGO errors
-        // and/or return the status code if available
-        type: "Other",
-        message,
-    });
-    return { data: Object.assign(Object.assign({}, data), { errors }), stack, requestOptions };
+    return {
+        data: Object.assign(Object.assign({}, data), { errors: exports.getEnrichmentErrors(error, data.errors) }),
+        stack,
+        requestOptions,
+    };
 };
 const enrichmentOperations = {
     groupIds: enrichGroupIds,
     metadata: enrichMetadata,
     ownerUser: enrichOwnerUser,
-    // TOOD: org
     data: enrichData,
     server: enrichServer,
     layers: enrichLayers,
 };
+/**
+ * convert an error to an enrichment error info format
+ * and optionally append it to an existing array of those
+ * @param error
+ * @param errors an array of existing enrichment error info
+ * @returns a new array of enrichment error info
+ * @private
+ */
+exports.getEnrichmentErrors = (error, errors = []) => {
+    const message = typeof error === "string"
+        ? /* istanbul ignore next our tests only throw Error objects */
+            error
+        : error.message;
+    return [
+        ...errors,
+        {
+            // NOTE: for now we just return the message and type "Other"
+            // but we could later introspect for HTTP or AGO errors
+            // and/or return the status code if available
+            type: "Other",
+            message,
+        },
+    ];
+};
 /**
  * Fetch enrichments for an item
  * @param item

package/dist/node/items/_enrichments.js.map

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

package/dist/node/utils/_array.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maybeConcat = void 0;
+/**
+ * concat an array of arrays
+ * excluding any elements of the top level array
+ * that are not actually arrays
+ * @param arrays An array of arrays
+ * @returns concatenated array
+ * @private
+ */
+exports.maybeConcat = (arrays) => {
+    const result = [].concat.apply([], arrays.filter(Array.isArray));
+    return result.length ? result : undefined;
+};
+//# sourceMappingURL=_array.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"_array.js","sourceRoot":"","sources":["../../../src/utils/_array.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACU,QAAA,WAAW,GAAG,CAAC,MAAe,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5C,CAAC,CAAC"}

package/dist/types/content/_fetch.d.ts

@@ -1,6 +1,6 @@
 import { IItem } from "@esri/arcgis-rest-portal";
 import { ItemOrServerEnrichment } from "../items/_enrichments";
-import { BBox, IHubRequestOptions, IHubGeography } from "../types";
+import { BBox, IHubRequestOptions, IHubGeography, IEnrichmentErrorInfo } from "../types";
 /**
  * get the default list of enrichments to fetch for content
  * @param item
@@ -18,7 +18,7 @@ export interface IHubExtent {
  * The set of enrichments that we fetch from the Hub API
  */
 export interface IDatasetEnrichments {
-    itemId: string;
+    itemId?: string;
     layerId?: number;
     slug?: string;
     /**
@@ -41,6 +41,11 @@ export interface IDatasetEnrichments {
      * Pre-computed field statistics (min, max, average, etc)
      */
     statistics?: any;
+    /**
+     * Any errors encountered when fetching enrichments
+     * see https://github.com/ArcGIS/hub-indexer/blob/master/docs/errors.md#response-formatting-for-errors
+     */
+    errors?: IEnrichmentErrorInfo[];
 }
 /**
  * fetch enrichment from the Hub API by slug
@@ -49,7 +54,7 @@ export interface IDatasetEnrichments {
  * @returns enrichments from the Hub API (slug, boundary, statistic, etc)
  * @private
  */
-export declare const fetchHubEnrichmentsBySlug: (slug: string, requestOptions: IHubRequestOptions) => Promise<IDatasetEnrichments>;
+export declare const fetchHubEnrichmentsBySlug: (slug: string, requestOptions?: IHubRequestOptions) => Promise<IDatasetEnrichments>;
 /**
  * fetch enrichment from the Hub API by id
  * @param slug
@@ -57,4 +62,4 @@ export declare const fetchHubEnrichmentsBySlug: (slug: string, requestOptions: I
  * @returns enrichments from the Hub API (slug, boundary, statistic, etc)
  * @private
  */
-export declare const fetchHubEnrichmentsById: (hubId: string, requestOptions: IHubRequestOptions) => Promise<IDatasetEnrichments>;
+export declare const fetchHubEnrichmentsById: (hubId: string, requestOptions?: IHubRequestOptions) => Promise<IDatasetEnrichments>;

package/dist/types/items/_enrichments.d.ts

@@ -1,6 +1,6 @@
 import { IItem } from "@esri/arcgis-rest-portal";
 import { IItemEnrichments, IServerEnrichments } from "../core";
-import { IHubRequestOptions } from "../types";
+import { IEnrichmentErrorInfo, IHubRequestOptions } from "../types";
 /**
  * An object containing the item and fetched enrichments
  */
@@ -13,6 +13,15 @@ export interface IItemAndEnrichments extends IItemEnrichments, IServerEnrichment
  * or from the server that the item points to
  */
 export declare type ItemOrServerEnrichment = keyof IItemEnrichments | keyof IServerEnrichments;
+/**
+ * convert an error to an enrichment error info format
+ * and optionally append it to an existing array of those
+ * @param error
+ * @param errors an array of existing enrichment error info
+ * @returns a new array of enrichment error info
+ * @private
+ */
+export declare const getEnrichmentErrors: (error: Error | string, errors?: IEnrichmentErrorInfo[]) => IEnrichmentErrorInfo[];
 /**
  * Fetch enrichments for an item
  * @param item

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

@@ -0,0 +1,9 @@
+/**
+ * concat an array of arrays
+ * excluding any elements of the top level array
+ * that are not actually arrays
+ * @param arrays An array of arrays
+ * @returns concatenated array
+ * @private
+ */
+export declare const maybeConcat: (arrays: any[][]) => any[];

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.24.2 - Wed Mar 23 2022 22:47:07 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.25.0 - Thu Mar 24 2022 17:15:40 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -8755,29 +8755,44 @@
     var handleEnrichmentError = function (error, input, opId) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
         stack.finish(opId, { error: error });
-        var message = typeof error === "string"
-            ? /* istanbul ignore next our tests only throw Error objects */
-                error
-            : error.message;
-        var errors = data.errors || [];
-        errors.push({
-            // NOTE: for now we just return the message and type "Other"
-            // but we could later introspect for HTTP or AGO errors
-            // and/or return the status code if available
-            type: "Other",
-            message: message,
-        });
-        return { data: __assign(__assign({}, data), { errors: errors }), stack: stack, requestOptions: requestOptions };
+        return {
+            data: __assign(__assign({}, data), { errors: getEnrichmentErrors(error, data.errors) }),
+            stack: stack,
+            requestOptions: requestOptions,
+        };
     };
     var enrichmentOperations = {
         groupIds: enrichGroupIds,
         metadata: enrichMetadata,
         ownerUser: enrichOwnerUser,
-        // TOOD: org
         data: enrichData,
         server: enrichServer,
         layers: enrichLayers,
     };
+    /**
+     * convert an error to an enrichment error info format
+     * and optionally append it to an existing array of those
+     * @param error
+     * @param errors an array of existing enrichment error info
+     * @returns a new array of enrichment error info
+     * @private
+     */
+    var getEnrichmentErrors = function (error, errors) {
+        if (errors === void 0) { errors = []; }
+        var message = typeof error === "string"
+            ? /* istanbul ignore next our tests only throw Error objects */
+                error
+            : error.message;
+        return __spreadArrays(errors, [
+            {
+                // NOTE: for now we just return the message and type "Other"
+                // but we could later introspect for HTTP or AGO errors
+                // and/or return the status code if available
+                type: "Other",
+                message: message,
+            },
+        ]);
+    };
     /**
      * Fetch enrichments for an item
      * @param item
@@ -8803,6 +8818,19 @@
         }).then(function (output) { return output.data; });
     };
 
+    /**
+     * concat an array of arrays
+     * excluding any elements of the top level array
+     * that are not actually arrays
+     * @param arrays An array of arrays
+     * @returns concatenated array
+     * @private
+     */
+    var maybeConcat = function (arrays) {
+        var result = [].concat.apply([], arrays.filter(Array.isArray));
+        return result.length ? result : undefined;
+    };
+
     /**
      * remote server error
      */
@@ -8906,7 +8934,9 @@
     // that we fetch from the Hub API, and to optionally filter by slug
     var getHubEnrichmentsOptions = function (requestOptions, slug) {
         var opts = cloneObject$1(requestOptions);
-        opts.params = __assign(__assign({}, opts.params), { "fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
+        opts.params = __assign(__assign({}, opts.params), { 
+            // TODO: we should fetch errors too
+            "fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
         if (slug) {
             opts.params["filter[slug]"] = slug;
         }
@@ -8953,13 +8983,21 @@
      * @private
      */
     var fetchHubEnrichmentsById = function (hubId, requestOptions) { return __awaiter(void 0, void 0, void 0, function () {
-        var response;
+        var response, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, hubApiRequest("/datasets/" + hubId, getHubEnrichmentsOptions(requestOptions))];
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, hubApiRequest("/datasets/" + hubId, getHubEnrichmentsOptions(requestOptions))];
                 case 1:
                     response = _a.sent();
                     return [2 /*return*/, getDatasetEnrichments(response.data)];
+                case 2:
+                    e_1 = _a.sent();
+                    // dataset record not found, just log the error
+                    // b/c we can still look up the item and enrichments by id
+                    return [2 /*return*/, { errors: getEnrichmentErrors(e_1) }];
+                case 3: return [2 /*return*/];
             }
         });
     }); };
@@ -8990,8 +9028,9 @@
                     _b.label = 3;
                 case 3:
                     layerEnrichments = _a;
-                    // TODO: merge errors
-                    return [2 /*return*/, __assign(__assign({}, itemAndEnrichments), layerEnrichments)];
+                    return [2 /*return*/, __assign(__assign(__assign({}, itemAndEnrichments), layerEnrichments), { 
+                            // merge error arrays
+                            errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]) })];
             }
         });
     }); };
@@ -9011,62 +9050,69 @@
         });
     }); };
     var fetchContentById = function (hubId, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var itemId, _a, item, itemEnrichments, specifiedLayerId, _b, slug, layerId, boundary, extent, searchDescription, statistics, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var itemId, _a, item, itemEnrichments, specifiedLayerId, hubEnrichments, _b, layerId;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     itemId = parseDatasetId(hubId).itemId;
                     return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
                 case 1:
-                    _a = _d.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
+                    _a = _c.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
                     specifiedLayerId = options && options.layerId;
                     if (!canUseHubApiForItem(item, options)) return [3 /*break*/, 3];
                     return [4 /*yield*/, fetchHubEnrichmentsById(hubId, options)];
                 case 2:
-                    _c = _d.sent();
+                    _b = _c.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    _c = {};
-                    _d.label = 4;
+                    _b = {};
+                    _c.label = 4;
                 case 4:
-                    _b = _c, slug = _b.slug, layerId = _b.layerId, boundary = _b.boundary, extent = _b.extent, searchDescription = _b.searchDescription, statistics = _b.statistics;
+                    hubEnrichments = _b;
+                    layerId = hubEnrichments.layerId;
                     // return a new content object composed from the item and enrichments we fetched
-                    return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { slug: slug, layerId: isNil(specifiedLayerId) ? layerId : specifiedLayerId, boundary: boundary,
-                            extent: extent,
-                            searchDescription: searchDescription,
-                            statistics: statistics }))];
+                    return [2 /*return*/, composeContent(item, __assign(__assign(__assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { 
+                            // prefer specified layer id if any
+                            layerId: isNil(specifiedLayerId) ? layerId : specifiedLayerId, 
+                            // merge error arrays
+                            errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }))];
             }
         });
     }); };
     var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, boundary, extent, searchDescription, statistics;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, fetchHubEnrichmentsBySlug(fullyQualifiedSlug, options)];
                 case 1:
-                    hubEnrichments = _b.sent();
+                    hubEnrichments = _c.sent();
                     itemId = hubEnrichments.itemId;
                     layerId = hubEnrichments.layerId;
                     return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
                 case 2:
-                    _a = _b.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
+                    _a = _c.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
                     specifiedLayerId = options && options.layerId;
                     if (!(!isNil(specifiedLayerId) && specifiedLayerId !== layerId)) return [3 /*break*/, 4];
-                    // we fetched Hub enrichments by slug for another dataset,
-                    // most likely for the parent service of this layer,
-                    // we need to fetch them for the specified layer instead
+                    // we fetched Hub enrichments by slug for another record,
+                    // most likely the record for the parent service of this layer,
+                    // so we need to fetch them for the specified layer instead
                     layerId = specifiedLayerId;
+                    _b = [__assign({}, hubEnrichments)];
                     return [4 /*yield*/, fetchHubEnrichmentsById(itemId + "_" + layerId, options)];
                 case 3:
-                    hubEnrichments = _b.sent();
-                    _b.label = 4;
-                case 4:
-                    boundary = hubEnrichments.boundary, extent = hubEnrichments.extent, searchDescription = hubEnrichments.searchDescription, statistics = hubEnrichments.statistics;
-                    // return a new content object composed from the item and enrichments we fetched
-                    return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId, slug: fullyQualifiedSlug, boundary: boundary,
-                            extent: extent,
-                            searchDescription: searchDescription,
-                            statistics: statistics }))];
+                    hubEnrichments = __assign.apply(void 0, _b.concat([(_c.sent())]));
+                    _c.label = 4;
+                case 4: return [2 /*return*/, composeContent(item, __assign(__assign(__assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { layerId: layerId, 
+                        // Note that we are not extracting the slug for the specified layer.
+                        // It seems that the old client composer code always populated the slug
+                        // field with the slug that was passed into the function (typically the
+                        // slug of the parent service). To maintain parity, we do the same here.
+                        //
+                        // TODO: should we prefer the slug of the fetched layer instead?
+                        // return a new content object composed from the item and enrichments we fetched
+                        slug: fullyQualifiedSlug, 
+                        // merge error arrays
+                        errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }))];
             }
         });
     }); };