@esri/hub-common 9.25.4 → 9.25.7

package/dist/node/content/fetch.js

@@ -14,8 +14,22 @@ const compose_1 = require("./compose");
 const hasFeatures = (contentType) => ["Feature Layer", "Table"].includes(contentType);
 const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
     // determine if this is a client-side feature layer view
-    const { item, data, layers } = itemAndEnrichments;
-    const layer = layers && compose_1.getItemLayer(item, layers, options && options.layerId);
+    const { item, data } = itemAndEnrichments;
+    let { layers } = itemAndEnrichments;
+    let layer = layers && compose_1.getItemLayer(item, layers, options && options.layerId);
+    // TODO: Remove once we stop supporting ArcGIS Servers below version 10.5.
+    // The /layers endpoint of some earlier servers return layers and tables
+    // without certain critical properties, such as type. If this is the case,
+    // fetch the fully hydrated target layer and stab it onto the layers array.
+    // See https://devtopia.esri.com/dc/hub/issues/3488 for more details
+    if (layer && !layer.type) {
+        const layerUrl = arcgis_rest_feature_layer_1.parseServiceUrl(item.url) + "/" + layer.id;
+        const getLayerOptions = Object.assign({ url: layerUrl }, options); // works whether options is defined or not
+        layer = await arcgis_rest_feature_layer_1.getLayer(getLayerOptions);
+        layers = layers.map((unhydratedLayer) => {
+            return unhydratedLayer.id === layer.id ? layer : unhydratedLayer;
+        });
+    }
     // TODO: add recordCount here too?
     const layerEnrichments = layer && compose_1.isLayerView(layer) && !data
         ? // NOTE: I'm not sure what conditions causes a layer view
@@ -26,11 +40,17 @@ const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
         : undefined;
     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]) });
+        errors: _array_1.maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]), 
+        // Also remove once we stop supporting ArcGIS Servers below version 10.5
+        layers });
 };
 const fetchItemAndEnrichments = async (itemId, options) => {
     // fetch the item
     const item = await arcgis_rest_portal_1.getItem(itemId, options);
+    // The Hub Application expects the item url of proxied CSVs to point to the
+    // proxying feature service. Stabbing it on here maintains that consistency
+    // and also helps us fetch and calculate the correct reference layer
+    item.url = compose_1.getProxyUrl(item, options) || item.url;
     // fetch the enrichments
     const enrichmentsToFetch = (options === null || options === void 0 ? void 0 : options.enrichments) || _fetch_1.getContentEnrichments(item);
     const enrichments = await _enrichments_1.fetchItemEnrichments(item, enrichmentsToFetch, options);

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/types/content/_internal.d.ts

@@ -1,16 +1,5 @@
-/**
- * Use this module for functions that do not need to be used by consumers (yet),
- * but may be shared between hub.js modules, and/or need to be tested
- * to get 100% coverage w/o writing cumbersome tests of higher level functions.
- *
- * Consuming will not be able to import these functions.
- *
- * It's probably a good pattern to add functions here first and then
- * move them to index.ts only when they are needed by a consumer.
- */
-import { ILayerDefinition, IFeatureServiceDefinition } from "@esri/arcgis-rest-feature-layer";
 import { IItem } from "@esri/arcgis-rest-portal";
-import { ISpatialReference } from "@esri/arcgis-rest-types";
+import { ILayerDefinition, ISpatialReference } from "@esri/arcgis-rest-types";
 import { IHubContent } from "../core";
 import { IHubGeography, GeographyProvenance, IHubRequestOptions } from "../types";
 import { IHubAdditionalResource } from "../core/types/IHubAdditionalResource";
@@ -98,7 +87,7 @@ export declare const setContentBoundary: (content: IHubContent, boundary: Geogra
     ownerUser?: import("@esri/arcgis-rest-portal").IUser;
     org?: Partial<import("@esri/arcgis-rest-portal").IPortal>;
     errors?: import("../types").IEnrichmentErrorInfo[];
-    server?: Partial<IFeatureServiceDefinition>;
+    server?: Partial<import("@esri/arcgis-rest-feature-layer").IFeatureServiceDefinition>;
     layers?: Partial<ILayerDefinition>[];
     recordCount?: number;
     created: number;
@@ -242,6 +231,16 @@ interface IAGOAdditionalResource {
  * @private
  */
 export declare const getAdditionalResources: (item: IItem, metadata?: any, requestOptions?: IHubRequestOptions) => IHubAdditionalResource[];
+/**
+ * @private
+ *
+ * Extracts additional resources from formal item metadata.
+ * If none are available, null is returned.
+ *
+ * @param metadata the formal item metadata
+ * @returns an array of all additional resources, or null
+ */
+export declare const extractRawResources: (metadata?: any) => IAGOAdditionalResource[];
 /**
  * Determines whether a raw additional resource (i.e. extracted out of formal
  * metadata with no transformation) references the underlying service that backs
@@ -266,4 +265,22 @@ export declare const isDataSourceOfItem: (resource: IAGOAdditionalResource, item
  * @private
  */
 export declare const getAdditionalResourceUrl: (resource: IAGOAdditionalResource, item: IItem, requestOptions?: IHubRequestOptions) => string;
+/**
+ * @private
+ *
+ * Contains fallback logic for determining a content's extent.
+ *
+ * The fallback priority is as follows:
+ * 1) item's extent (if valid bbox)
+ * 2) extent enrichment from the hub api (if coordinates are valid bbox)
+ * 3) layer's extent (if spatial reference is 4326)
+ *
+ * If none of these conditions are met, undefined is returned.
+ *
+ * @param item
+ * @param layer
+ * @param extentEnrichment
+ * @returns the correct extent in a bbox format, or undefined
+ */
+export declare const determineExtent: (item: IItem, extentEnrichment?: any, layer?: ILayerDefinition) => any;
 export {};

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.25.3 - Thu Mar 31 2022 16:05:42 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.25.6 - Mon Apr 04 2022 23:16:31 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -6172,6 +6172,26 @@
         return request(layersUrl, requestOptions);
     }
 
+    /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
+     * Apache-2.0 */
+    /**
+     * ```js
+     * import { getLayer } from '@esri/arcgis-rest-feature-layer';
+     * //
+     * getLayer({
+     *   url: "https://sampleserver6.arcgisonline.com/arcgis/rest/services/ServiceRequest/FeatureServer/0"
+     * })
+     *   .then(response) // { name: "311", id: 0, ... }
+     * ```
+     * Layer (Feature Service) request. See the [REST Documentation](https://developers.arcgis.com/rest/services-reference/layer-feature-service-.htm) for more information.
+     *
+     * @param options - Options for the request.
+     * @returns A Promise that will resolve with the addFeatures response.
+     */
+    function getLayer(options) {
+        return request(cleanUrl(options.url), options);
+    }
+
     /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
      * Apache-2.0 */
     /**
@@ -6629,17 +6649,49 @@
      * @private
      */
     var getAdditionalResources = function (item, metadata, requestOptions) {
-        var rawResources = getProp(metadata, "metadata.distInfo.distTranOps.onLineSrc") || null;
-        if (rawResources === null) {
-            return null;
-        }
-        // Coerce to array since rawResources will be an object if only 1 resource is available
-        rawResources = Array.isArray(rawResources) ? rawResources : [rawResources];
-        return rawResources.map(function (resource) { return ({
-            name: resource.orName,
-            url: getAdditionalResourceUrl(resource, item, requestOptions),
-            isDataSource: isDataSourceOfItem(resource, item),
-        }); });
+        var rawResources = extractRawResources(metadata);
+        return (rawResources &&
+            rawResources.map(function (resource) { return ({
+                name: resource.orName,
+                url: getAdditionalResourceUrl(resource, item, requestOptions),
+                isDataSource: isDataSourceOfItem(resource, item),
+            }); }));
+    };
+    /**
+     * @private
+     *
+     * Extracts additional resources from formal item metadata.
+     * If none are available, null is returned.
+     *
+     * @param metadata the formal item metadata
+     * @returns an array of all additional resources, or null
+     */
+    var extractRawResources = function (metadata) {
+        var rawResources = [];
+        // The property path to additional resources should be fairly simple.
+        // In many cases, it's just `metadata.metadata.distInfo.distTranOps.onLineSrc`.
+        // However, since `distInfo`, `distTranOps` and `onLineSrc` can be either
+        // Objects OR Arrays, we have to do all this looping.
+        castToArray(getProp(metadata, "metadata.distInfo") || []).forEach(function (distInfo) {
+            castToArray(distInfo.distTranOps || []).forEach(function (distTranOps) {
+                castToArray(distTranOps.onLineSrc || []).forEach(function (onLineSrc) {
+                    rawResources.push(onLineSrc);
+                });
+            });
+        });
+        return rawResources.length ? rawResources : null;
+    };
+    /**
+     * @private
+     *
+     * Arrays are returned as-is.
+     * Objects are wrapped into a 1 element array.
+     *
+     * @param objectOrArray
+     * @returns the casted array
+     */
+    var castToArray = function (objectOrArray) {
+        return Array.isArray(objectOrArray) ? objectOrArray : [objectOrArray];
     };
     /**
      * Determines whether a raw additional resource (i.e. extracted out of formal
@@ -6679,6 +6731,33 @@
         }
         return result;
     };
+    /**
+     * @private
+     *
+     * Contains fallback logic for determining a content's extent.
+     *
+     * The fallback priority is as follows:
+     * 1) item's extent (if valid bbox)
+     * 2) extent enrichment from the hub api (if coordinates are valid bbox)
+     * 3) layer's extent (if spatial reference is 4326)
+     *
+     * If none of these conditions are met, undefined is returned.
+     *
+     * @param item
+     * @param layer
+     * @param extentEnrichment
+     * @returns the correct extent in a bbox format, or undefined
+     */
+    var determineExtent = function (item, extentEnrichment, layer) {
+        var itemExtent = isBBox(item.extent) ? item.extent : undefined;
+        var extentEnrichmentCoordinates = isBBox(extentEnrichment === null || extentEnrichment === void 0 ? void 0 : extentEnrichment.coordinates)
+            ? extentEnrichment.coordinates
+            : undefined;
+        var layerExtent = getProp(layer, "extent.spatialReference.wkid") === 4326
+            ? extentToBBox(layer.extent)
+            : undefined;
+        return itemExtent || extentEnrichmentCoordinates || layerExtent;
+    };
 
     var STANDARD_LICENSES = [
         {
@@ -7010,17 +7089,18 @@
         var layer = layers && layers.length === 1 ? layers[0] : undefined;
         return layer && layer.capabilities.includes("Query") ? layer : undefined;
     };
-    var shouldUseLayerInfo = function (layer, layers, url) {
-        return (layer &&
+    var shouldUseLayerInfo = function (item, layer, layers, requestOptions) {
+        return (!isProxiedCSV(item, requestOptions) &&
+            layer &&
             layers &&
             layers.length > 1 &&
             // we use item info instead of layer info for single layer items
-            !getLayerIdFromUrl(url));
+            !getLayerIdFromUrl(item.url));
     };
     // this logic adapted from hub-indexer's determineName(), see
     // https://github.com/ArcGIS/hub-indexer/blob/8f4dd6f928124c1f35dd02bc11bd996191ee1160/packages/duke/compose/common.js#L7-L34
-    var getContentName = function (item, layer, layers) {
-        return ((shouldUseLayerInfo(layer, layers, item.url)
+    var getContentName = function (item, layer, layers, requestOptions) {
+        return ((shouldUseLayerInfo(item, layer, layers, requestOptions)
             ? layer.name
             : item.title || item.name) || "").replace(/_/g, " ");
     };
@@ -7268,7 +7348,9 @@
     var getProxyUrl = function (item, requestOptions) {
         var result;
         if (isProxiedCSV(item, requestOptions)) {
-            result = getHubApiUrl(requestOptions) + "/datasets/" + item.id + "_0/FeatureServer/0";
+            // Sometimes hubApiUrl includes /api/v3, sometimes it doesn't
+            var baseUrl = getHubApiUrl(requestOptions).replace("/api/v3", "");
+            result = baseUrl + "/datasets/" + item.id + "_0/FeatureServer/0";
         }
         return result;
     };
@@ -7408,6 +7490,18 @@
     var isLayerView = function (layer) {
         return layer.isView;
     };
+    var determineHubId = function (item, layer, requestOptions) {
+        // Proxied CSVs are one offs in that we don't index the proxied layer,
+        // so we cannot append _0. Return item id instead.
+        if (isProxiedCSV(item, requestOptions)) {
+            return item.id;
+        }
+        return canUseHubApiForItem(item, requestOptions)
+            ? layer
+                ? item.id + "_" + layer.id
+                : getItemHubId(item)
+            : undefined;
+    };
     /**
      * Compose a new content object out of an item, enrichments, and context
      * @param item
@@ -7420,15 +7514,12 @@
         // set common variables that we will use in the derived properties below
         var layer = getItemLayer(item, layers, options === null || options === void 0 ? void 0 : options.layerId);
         // NOTE: we only set hubId for public items in online
-        var hubId = canUseHubApiForItem(item, requestOptions)
-            ? layer
-                ? item.id + "_" + layer.id
-                : getItemHubId(item)
-            : undefined;
+        var hubId = determineHubId(item, layer, requestOptions);
         var identifier = slug || hubId || item.id;
         // whether or not we should show layer info for name, description, etc
-        var name = getContentName(item, layer, layers);
-        var _layerDescription = shouldUseLayerInfo(layer, layers, item.url) && layer.description;
+        var name = getContentName(item, layer, layers, requestOptions);
+        var _layerDescription = shouldUseLayerInfo(item, layer, layers, requestOptions) &&
+            layer.description;
         // so much depends on type
         var type = layer
             ? // use layer type (Feature Layer, Table, etc) for layer content
@@ -7507,15 +7598,8 @@
                     control: item.itemControl || "view",
                 };
             },
-            // TODO: do we want to add dataset extent logic as a getter here?
             get extent() {
-                return !isBBox(item.extent) && extent && isBBox(extent.coordinates)
-                    ? // we fall back to the extent derived by the Hub API
-                        // which prefers layer or service extents and ultimately
-                        // falls back to the org's extent
-                        extent.coordinates
-                    : // prefer item extent
-                        item.extent;
+                return determineExtent(item, extent, layer);
             },
             // would require us to do client-side projection of server/layer extent
             get boundary() {
@@ -8994,31 +9078,45 @@
         return ["Feature Layer", "Table"].includes(contentType);
     };
     var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var item, data, layers, layer, layerEnrichments, _a;
+        var item, data, layers, layer, layerUrl, getLayerOptions, layerEnrichments, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    item = itemAndEnrichments.item, data = itemAndEnrichments.data, layers = itemAndEnrichments.layers;
+                    item = itemAndEnrichments.item, data = itemAndEnrichments.data;
+                    layers = itemAndEnrichments.layers;
                     layer = layers && getItemLayer(item, layers, options && options.layerId);
-                    if (!(layer && isLayerView(layer) && !data)) return [3 /*break*/, 2];
+                    if (!(layer && !layer.type)) return [3 /*break*/, 2];
+                    layerUrl = parseServiceUrl(item.url) + "/" + layer.id;
+                    getLayerOptions = Object.assign({ url: layerUrl }, options);
+                    return [4 /*yield*/, getLayer(getLayerOptions)];
+                case 1:
+                    layer = _b.sent();
+                    layers = layers.map(function (unhydratedLayer) {
+                        return unhydratedLayer.id === layer.id ? layer : unhydratedLayer;
+                    });
+                    _b.label = 2;
+                case 2:
+                    if (!(layer && isLayerView(layer) && !data)) return [3 /*break*/, 4];
                     // to store (at least part of) it's view definition in item data
                     // it seems that most do not, but until we have a reliable signal
                     // we just fetch the item data for all layer views
                     return [4 /*yield*/, fetchItemEnrichments(item, ["data"], options)];
-                case 1:
+                case 3:
                     // to store (at least part of) it's view definition in item data
                     // it seems that most do not, but until we have a reliable signal
                     // we just fetch the item data for all layer views
                     _a = _b.sent();
-                    return [3 /*break*/, 3];
-                case 2:
+                    return [3 /*break*/, 5];
+                case 4:
                     _a = undefined;
-                    _b.label = 3;
-                case 3:
+                    _b.label = 5;
+                case 5:
                     layerEnrichments = _a;
                     return [2 /*return*/, __assign(__assign(__assign({}, itemAndEnrichments), layerEnrichments), { 
                             // merge error arrays
-                            errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]) })];
+                            errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]), 
+                            // Also remove once we stop supporting ArcGIS Servers below version 10.5
+                            layers: layers })];
             }
         });
     }); };
@@ -9029,6 +9127,10 @@
                 case 0: return [4 /*yield*/, getItem(itemId, options)];
                 case 1:
                     item = _a.sent();
+                    // The Hub Application expects the item url of proxied CSVs to point to the
+                    // proxying feature service. Stabbing it on here maintains that consistency
+                    // and also helps us fetch and calculate the correct reference layer
+                    item.url = getProxyUrl(item, options) || item.url;
                     enrichmentsToFetch = (options === null || options === void 0 ? void 0 : options.enrichments) || getContentEnrichments(item);
                     return [4 /*yield*/, fetchItemEnrichments(item, enrichmentsToFetch, options)];
                 case 2: