@arcgis/core 5.2.0-next.162 → 5.2.0-next.164

package/layers/mixins/TemporalLayer.d.ts

@@ -57,28 +57,24 @@ export interface TemporalLayerProperties extends Partial<Pick<TemporalLayer, "us
    */
   timeExtent?: TimeExtentProperties | null;
   /**
-   * TimeInfo provides information such as date fields that store
-   * [start](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField)
-   * and [end](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#endField) time
-   * for each feature and the [fullTimeExtent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent)
-   * for the layer. The `timeInfo` property, along with its `startField` and `endField` properties, must be set at the
-   * time of layer initialization if it is being set for a
-   * [CSVLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/CSVLayer/),
-   * [GeoJSONLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/GeoJSONLayer/),
-   * [OGCFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/OGCFeatureLayer/) or
-   * [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/)
-   * initialized from [client-side features](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/#creating-a-featurelayer).
-   * The [fullTimeExtent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent) for `timeInfo` is
-   * automatically calculated based on its `startField` and `endField` properties.
-   * The timeInfo parameters cannot be changed after the layer is [loaded](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/#load).
+   * Defines temporal information for a layer, such as [start](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField) and [end](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#endField)
+   * date fields used to track when features remain visible, as well as the layer's [full time extent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent).
+   * If `timeInfo` is configured on the underlying service, it is automatically read and used by the layer.
    *
-   * TimeInfo's [TimeInfo.startField](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField) and [endField](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField)
-   * can be `date`, `date-only` or `timestamp-offset` [field type](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Field/#type) for [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/)
-   * and [MapImageLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/MapImageLayer/).
+   * The `timeInfo` can be set or overridden on the following feature based layers in the layer constructor or at runtime: [AnnotationFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/AnnotationFeatureLayer/),
+   * [CSVLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/CSVLayer/), [CatalogLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/CatalogLayer/), [DimensionFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/DimensionFeatureLayer/), [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/),
+   * [GeoJSONLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/GeoJSONLayer/), [OGCFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/OGCFeatureLayer/), [OrientedImageryLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/OrientedImageryLayer/), [SceneLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/SceneLayer/),
+   * [StreamLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/StreamLayer/), and [SubtypeGroupLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/SubtypeGroupLayer/).
    *
-   * @since 4.11
+   * When overriding a layer's `timeInfo`, ensure that `startField` and `endField` correspond to valid date fields in the layer's schema.
+   * To calculate a `fullTimeExtent` that covers all dates in the configured `startField` and `endField`, call
+   * [getTimeExtentFromLayers()](https://developers.arcgis.com/javascript/latest/references/core/support/timeUtils/#getTimeExtentFromLayers) method. Then assign the result to `layer.timeInfo.fullTimeExtent`.
+   *
+   * The `startField` and `endField` properties accept `date`, `date-only`, or `timestamp-offset` field types.
+   *
+   * @see [Samples using time-aware layers](https://developers.arcgis.com/javascript/latest/sample-code/?tagged=arcgis-time-bar)
    * @example
-   * // create geojson layer from usgs earthquakes geojson feed
+   * // create geojson layer from USGS earthquakes GeoJSON feed
    * const geojsonLayer = new GeoJSONLayer({
    *   url: "https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_month.geojson",
    *   copyright: "USGS Earthquakes",
@@ -89,14 +85,28 @@ export interface TemporalLayerProperties extends Partial<Pick<TemporalLayer, "us
    *     { "name": "depth", "type": "double" }
    *   ],
    *   // timeInfo can be used to do temporal queries
-   *   // set the startField and endField.
-   *   // timeExtent is automatically calculated from the
-   *   // the start and end date fields
-   *   // The date values must be in milliseconds number from the UNIX epoch specified in UTC.
    *   timeInfo: {
-   *     startField: "time"
+   *     startField: "time",
+   *     fullTimeExtent: {
+   *       start: new Date(1970, 0, 1),
+   *       end: new Date(2000, 11, 31)
+   *     },
+   *     timeZone: "UTC"
    *   }
    * });
+   * @example
+   * // update layer's timeInfo at runtime after the feature layer is loaded
+   * featureLayer.timeInfo = {
+   *   startField: "DateField",
+   *   timeZone: "UTC"
+   * };
+   *
+   * // calculate the fullTimeExtent based on startField
+   * const fullTimeExtent = getTimeExtentFromLayers([featureLayer]);
+   * featureLayer.timeInfo.fullTimeExtent = fullTimeExtent;
+   * @example
+   * // set layer's timeInfo to null
+   * layer.timeInfo = null;
    */
   timeInfo?: TimeInfoProperties | null;
   /**
@@ -107,6 +117,7 @@ export interface TemporalLayerProperties extends Partial<Pick<TemporalLayer, "us
    * A time offset can be used for display purposes only. The query and selection are not affected by the offset.
    *
    * @since 4.14
+   * @see [Sample - Time Bar with actions and layer timeOffset](https://developers.arcgis.com/javascript/latest/sample-code/time-bar-time-offset/)
    * @example
    * // Offset a CSV Layer containing hurricanes from 2015 so that they appear in 2019 (+4 years).
    * let layer = new CSVLayer({
@@ -195,28 +206,24 @@ export abstract class TemporalLayer {
   get timeExtent(): TimeExtent | null | undefined;
   set timeExtent(value: TimeExtentProperties | null | undefined);
   /**
-   * TimeInfo provides information such as date fields that store
-   * [start](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField)
-   * and [end](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#endField) time
-   * for each feature and the [fullTimeExtent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent)
-   * for the layer. The `timeInfo` property, along with its `startField` and `endField` properties, must be set at the
-   * time of layer initialization if it is being set for a
-   * [CSVLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/CSVLayer/),
-   * [GeoJSONLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/GeoJSONLayer/),
-   * [OGCFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/OGCFeatureLayer/) or
-   * [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/)
-   * initialized from [client-side features](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/#creating-a-featurelayer).
-   * The [fullTimeExtent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent) for `timeInfo` is
-   * automatically calculated based on its `startField` and `endField` properties.
-   * The timeInfo parameters cannot be changed after the layer is [loaded](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/#load).
+   * Defines temporal information for a layer, such as [start](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField) and [end](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#endField)
+   * date fields used to track when features remain visible, as well as the layer's [full time extent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent).
+   * If `timeInfo` is configured on the underlying service, it is automatically read and used by the layer.
    *
-   * TimeInfo's [TimeInfo.startField](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField) and [endField](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField)
-   * can be `date`, `date-only` or `timestamp-offset` [field type](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Field/#type) for [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/)
-   * and [MapImageLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/MapImageLayer/).
+   * The `timeInfo` can be set or overridden on the following feature based layers in the layer constructor or at runtime: [AnnotationFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/AnnotationFeatureLayer/),
+   * [CSVLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/CSVLayer/), [CatalogLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/CatalogLayer/), [DimensionFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/DimensionFeatureLayer/), [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/),
+   * [GeoJSONLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/GeoJSONLayer/), [OGCFeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/OGCFeatureLayer/), [OrientedImageryLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/OrientedImageryLayer/), [SceneLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/SceneLayer/),
+   * [StreamLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/StreamLayer/), and [SubtypeGroupLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/SubtypeGroupLayer/).
    *
-   * @since 4.11
+   * When overriding a layer's `timeInfo`, ensure that `startField` and `endField` correspond to valid date fields in the layer's schema.
+   * To calculate a `fullTimeExtent` that covers all dates in the configured `startField` and `endField`, call
+   * [getTimeExtentFromLayers()](https://developers.arcgis.com/javascript/latest/references/core/support/timeUtils/#getTimeExtentFromLayers) method. Then assign the result to `layer.timeInfo.fullTimeExtent`.
+   *
+   * The `startField` and `endField` properties accept `date`, `date-only`, or `timestamp-offset` field types.
+   *
+   * @see [Samples using time-aware layers](https://developers.arcgis.com/javascript/latest/sample-code/?tagged=arcgis-time-bar)
    * @example
-   * // create geojson layer from usgs earthquakes geojson feed
+   * // create geojson layer from USGS earthquakes GeoJSON feed
    * const geojsonLayer = new GeoJSONLayer({
    *   url: "https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_month.geojson",
    *   copyright: "USGS Earthquakes",
@@ -227,14 +234,28 @@ export abstract class TemporalLayer {
    *     { "name": "depth", "type": "double" }
    *   ],
    *   // timeInfo can be used to do temporal queries
-   *   // set the startField and endField.
-   *   // timeExtent is automatically calculated from the
-   *   // the start and end date fields
-   *   // The date values must be in milliseconds number from the UNIX epoch specified in UTC.
    *   timeInfo: {
-   *     startField: "time"
+   *     startField: "time",
+   *     fullTimeExtent: {
+   *       start: new Date(1970, 0, 1),
+   *       end: new Date(2000, 11, 31)
+   *     },
+   *     timeZone: "UTC"
    *   }
    * });
+   * @example
+   * // update layer's timeInfo at runtime after the feature layer is loaded
+   * featureLayer.timeInfo = {
+   *   startField: "DateField",
+   *   timeZone: "UTC"
+   * };
+   *
+   * // calculate the fullTimeExtent based on startField
+   * const fullTimeExtent = getTimeExtentFromLayers([featureLayer]);
+   * featureLayer.timeInfo.fullTimeExtent = fullTimeExtent;
+   * @example
+   * // set layer's timeInfo to null
+   * layer.timeInfo = null;
    */
   get timeInfo(): TimeInfo | null | undefined;
   set timeInfo(value: TimeInfoProperties | null | undefined);
@@ -246,6 +267,7 @@ export abstract class TemporalLayer {
    * A time offset can be used for display purposes only. The query and selection are not affected by the offset.
    *
    * @since 4.14
+   * @see [Sample - Time Bar with actions and layer timeOffset](https://developers.arcgis.com/javascript/latest/sample-code/time-bar-time-offset/)
    * @example
    * // Offset a CSV Layer containing hurricanes from 2015 so that they appear in 2019 (+4 years).
    * let layer = new CSVLayer({

package/layers/mixins/TiledImagery.d.ts

@@ -4,7 +4,6 @@ import type SpatialReference from "../../geometry/SpatialReference.js";
 import type DimensionalDefinition from "../support/DimensionalDefinition.js";
 import type MultidimensionalSubset from "../support/MultidimensionalSubset.js";
 import type RasterInfo from "../support/RasterInfo.js";
-import type TimeInfo from "../support/TimeInfo.js";
 import type ImageSampleParameters from "../../rest/support/ImageSampleParameters.js";
 import type ImageSampleResult from "../../rest/support/ImageSampleResult.js";
 import type TimeExtent from "../../time/TimeExtent.js";
@@ -273,16 +272,6 @@ export abstract class TiledImagery {
    * });
    */
   abstract accessor timeExtent: TimeExtent | null | undefined;
-  /**
-   * TimeInfo provides information such as date fields that store
-   * [start](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField)
-   * and [end](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#endField) time
-   * for each feature and the [TimeInfo.fullTimeExtent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent)
-   * for the layer.
-   *
-   * @since 4.22
-   */
-  abstract accessor timeInfo: TimeInfo | null | undefined;
   /**
    * A temporary offset of the time data based on a certain [TimeInterval](https://developers.arcgis.com/javascript/latest/references/core/time/TimeInterval/). This allows
    * users to overlay features from two or more time-aware layers with different time extents.

package/layers/support/LabelClass.d.ts

@@ -20,11 +20,20 @@ export interface LabelClassProperties extends Partial<Pick<LabelClass, "allowOve
    * property. If `true`, then [labelExpression](https://developers.arcgis.com/javascript/latest/references/core/layers/support/LabelClass/#labelExpression) or labelExpressionInfo can be used.
    * If `false`, then only labelExpression can be used.
    *
+   * This property supports [formatting tags](https://doc.esri.com/en/arcgis-pro/latest/help/mapping/text/text-formatting-tags.html) if
+   * the associated [Font.family](https://developers.arcgis.com/javascript/latest/references/core/symbols/Font/#family) supports it. See the [Labeling guide](https://developers.arcgis.com/javascript/latest/labeling/#formatting-tags)
+   * for more details.
+   *
    * @see [Arcade Labeling Profile](https://developers.arcgis.com/javascript/latest/arcade/#labeling)
    * @example
    * // For Spokane County, WA, label will display: "Spokane County, Washington"
    * labelClass.labelExpressionInfo = {
-   *   expression: "$feature.COUNTY_NAME + ' County, ' + $feature.STATE_NAME"
+   *   expression: "$feature.COUNTY_NAME + ' County, ' + $feature.STATE_NAME",
+   * };
+   * @example
+   * // For Spokane County, WA, label will display: "Spokane County, Washington" where "Washington" is bold and underlined
+   * labelClass.labelExpressionInfo = {
+   *   expression: "return `${$feature.COUNTY_NAME} County, <BOL><UND>${$feature.STATE_NAME}</UND></BOL>`",
    * };
    */
   labelExpressionInfo?: LabelExpressionInfoProperties | null;
@@ -230,11 +239,20 @@ export default class LabelClass extends JSONSupport {
    * property. If `true`, then [labelExpression](https://developers.arcgis.com/javascript/latest/references/core/layers/support/LabelClass/#labelExpression) or labelExpressionInfo can be used.
    * If `false`, then only labelExpression can be used.
    *
+   * This property supports [formatting tags](https://doc.esri.com/en/arcgis-pro/latest/help/mapping/text/text-formatting-tags.html) if
+   * the associated [Font.family](https://developers.arcgis.com/javascript/latest/references/core/symbols/Font/#family) supports it. See the [Labeling guide](https://developers.arcgis.com/javascript/latest/labeling/#formatting-tags)
+   * for more details.
+   *
    * @see [Arcade Labeling Profile](https://developers.arcgis.com/javascript/latest/arcade/#labeling)
    * @example
    * // For Spokane County, WA, label will display: "Spokane County, Washington"
    * labelClass.labelExpressionInfo = {
-   *   expression: "$feature.COUNTY_NAME + ' County, ' + $feature.STATE_NAME"
+   *   expression: "$feature.COUNTY_NAME + ' County, ' + $feature.STATE_NAME",
+   * };
+   * @example
+   * // For Spokane County, WA, label will display: "Spokane County, Washington" where "Washington" is bold and underlined
+   * labelClass.labelExpressionInfo = {
+   *   expression: "return `${$feature.COUNTY_NAME} County, <BOL><UND>${$feature.STATE_NAME}</UND></BOL>`",
    * };
    */
   get labelExpressionInfo(): LabelExpressionInfo | null | undefined;

package/layers/support/Sublayer.d.ts

@@ -245,6 +245,19 @@ export interface SublayerProperties extends LoadableMixinProperties, Identifiabl
    *     }
    *   }]
    * });
+   * @example
+   * ```js
+   * const layer = new MapImageLayer({
+   *   url: "<your-map-service-url>",
+   *   sublayers: [{
+   *     source: {
+   *       type: "workspace-layer",
+   *       workspaceId: "lyrx_folder",
+   *       layerId: "WorldCities.lyrx"
+   *     }
+   *   }]
+   * });
+   * ```
    */
   source?: (DynamicMapLayerProperties & { type: "map-layer" }) | (DynamicDataLayerProperties & { type: "data-layer" }) | (DynamicWorkspaceLayerProperties & { type: "workspace-layer" });
   /**
@@ -295,8 +308,9 @@ export interface SublayerProperties extends LoadableMixinProperties, Identifiabl
  * ## Dynamic layers
  *
  * Sublayers may be rendered on the fly as dynamic layers. Dynamic layers are created using
- * the [source](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Sublayer/#source) property of the sublayer. There are two types of dynamic layers:
- * [dynamic map layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicMapLayer/) and [dynamic data layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicDataLayer/).
+ * the [source](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Sublayer/#source) property of the sublayer. There are three types of dynamic layers:
+ * [dynamic map layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicMapLayer/), [dynamic data layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicDataLayer/), and
+ * [dynamic workspace layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicWorkspaceLayer/).
  *
  * [Dynamic map layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicMapLayer/) allow you to override sublayers in the map service with new renderers,
  * definition expressions, opacity, scale visibility, etc. Multiple dynamic map layers may exist
@@ -309,6 +323,9 @@ export interface SublayerProperties extends LoadableMixinProperties, Identifiabl
  * published and configured with the ArcGIS Server Manager. Data from tables may be joined to other
  * tables or dynamic map layers.
  *
+ * [Dynamic workspace layers](https://developers.arcgis.com/javascript/latest/references/core/rest/layerSources/DynamicWorkspaceLayer/) let you create sublayers from pre-authored
+ * ArcGIS Pro layer files (`.lyrx`) in registered workspaces.
+ *
  * @since 4.1
  * @see [MapImageLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/MapImageLayer/)
  * @see [Sample - MapImageLayer: toggle sublayer visibility](https://developers.arcgis.com/javascript/latest/sample-code/layers-mapimagelayer-sublayers/)
@@ -888,6 +905,19 @@ export default class Sublayer extends SublayerSuperclass {
    *     }
    *   }]
    * });
+   * @example
+   * ```js
+   * const layer = new MapImageLayer({
+   *   url: "<your-map-service-url>",
+   *   sublayers: [{
+   *     source: {
+   *       type: "workspace-layer",
+   *       workspaceId: "lyrx_folder",
+   *       layerId: "WorldCities.lyrx"
+   *     }
+   *   }]
+   * });
+   * ```
    */
   get source(): DynamicMapLayer | DynamicDataLayer | DynamicWorkspaceLayer;
   set source(value: (DynamicMapLayerProperties & { type: "map-layer" }) | (DynamicDataLayerProperties & { type: "data-layer" }) | (DynamicWorkspaceLayerProperties & { type: "workspace-layer" }));

package/layers/support/TimeInformation.js

@@ -0,0 +1,2 @@
+/* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
+import{__decorate as e}from"tslib";import t from"../../core/Accessor.js";import{isMultiOriginJSONMixin as n}from"../../core/multiOriginJSONSupportUtils.js";import{sqlAnd as r,sqlName as i,sqlLiteral as a}from"../../core/sql.js";import{property as o}from"../../core/accessorSupport/decorators/property.js";import{subclass as s}from"../../core/accessorSupport/decorators/subclass.js";import{timeExtentToQueryParameter as c}from"../../rest/support/timeUtils.js";function l(e,t,n,r){let o=r.get(e)?.type,s=r.getTimeZone(e);return`${i(e)} ${t} ${a(n,{type:`date`},{type:o,timeZone:s})}`}let u=class extends t{constructor(e){super(e),this.fieldsIndex=null,this.layer=null}getExpression(e){let{layer:t}=this;if(!t)return;if(!n(t))return{type:`where`,value:this._getLayerCondition(e)};let r=t.timeInfo,i=t.getAtOrigin(`timeInfo`,`service`);if(i)return r?r===i||(r.startField===i.startField||!r.startField&&!i.startField)&&(r.endField===i.endField||!r.endField&&!i.endField)?{type:`time`,value:c(e)}:{type:`where`,value:this._getLayerCondition(e)}:void 0;if(r)return{type:`where`,value:this._getLayerCondition(e)}}_getLayerCondition(e){let{fieldsIndex:t,layer:n}=this;if(!t||!n)return;let{timeInfo:i}=n;if(!i)return;let{startField:a,endField:o}=i,{start:s,end:c}=e;if(!s&&!c||!a&&!o)return;let u=a??o,d=o??a;if(u&&d){if(s&&c){if(s.getTime()===c.getTime())return l(u,`==`,s,t);if(!a||!o){let e=l(u,`>=`,s,t),n=l(u,`<=`,c,t);return r(e,n)}let e=l(a,`>=`,s,t),n=l(o,`<=`,c,t);return r(e,n)}if(s)return l(u,`>=`,s,t);if(c)return l(d,`<=`,c,t)}}};e([o({constructOnly:!0})],u.prototype,`fieldsIndex`,void 0),e([o({constructOnly:!0})],u.prototype,`layer`,void 0),u=e([s(`esri.layers.support.TimeInformation`)],u);export{u as default};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcgis/core",
-  "version": "5.2.0-next.162",
+  "version": "5.2.0-next.164",
   "description": "ArcGIS Maps SDK for JavaScript: A complete 2D and 3D mapping and data visualization API",
   "keywords": [
     "ArcGIS",
@@ -20,7 +20,7 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@amcharts/amcharts5": "~5.20.8",
-    "@arcgis/toolkit": "5.2.0-next.162",
+    "@arcgis/toolkit": "5.2.0-next.164",
     "@esri/arcgis-html-sanitizer": "~4.2.0-next.2",
     "@esri/calcite-components": "^5.2.0",
     "@vaadin/grid": "~25.3.2",

package/popup/content.d.ts

@@ -36,6 +36,7 @@
  * }
  * ```
  *
+ * @deprecated at 5.2. Use individual content imports instead.
  * @since 4.11
  * @see [PopupTemplate](https://developers.arcgis.com/javascript/latest/references/core/PopupTemplate/)
  * @see [TextContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/TextContent/)
@@ -58,98 +59,134 @@ import type UtilityNetworkAssociationsContentClass from "./content/UtilityNetwor
 /**
  * AttachmentsContent represents an attachment element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [AttachmentsContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/AttachmentsContent/) directly instead.
  */
 export type AttachmentsContent = AttachmentsContentClass;
 
 /**
  * AttachmentsContent represents an attachment element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [AttachmentsContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/AttachmentsContent/) directly instead.
  */
 export const AttachmentsContent: typeof AttachmentsContentClass;
 
 /**
  * CustomContent represents a custom content element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [CustomContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/CustomContent/) directly instead.
  */
 export type CustomContent = CustomContentClass;
 
 /**
  * CustomContent represents a custom content element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [CustomContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/CustomContent/) directly instead.
  */
 export const CustomContent: typeof CustomContentClass;
 
 /**
  * ExpressionContent represents an expression element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [ExpressionContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/ExpressionContent/) directly instead.
  */
 export type ExpressionContent = ExpressionContentClass;
 
 /**
  * ExpressionContent represents an expression element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [ExpressionContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/ExpressionContent/) directly instead.
  */
 export const ExpressionContent: typeof ExpressionContentClass;
 
 /**
  * FieldsContent represents the [FieldInfo](https://developers.arcgis.com/javascript/latest/references/core/popup/FieldInfo/) associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [FieldsContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/FieldsContent/) directly instead.
  */
 export type FieldsContent = FieldsContentClass;
 
 /**
  * FieldsContent represents the [FieldInfo](https://developers.arcgis.com/javascript/latest/references/core/popup/FieldInfo/) associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [FieldsContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/FieldsContent/) directly instead.
  */
 export const FieldsContent: typeof FieldsContentClass;
 
 /**
  * MediaContent contains an individual or array of chart and/or image media elements
  * to display within a popup's content.
+ *
+ * @deprecated at 5.2. Import [MediaContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/MediaContent/) directly instead.
  */
 export type MediaContent = MediaContentClass;
 
 /**
  * MediaContent contains an individual or array of chart and/or image media elements
  * to display within a popup's content.
+ *
+ * @deprecated at 5.2. Import [MediaContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/MediaContent/) directly instead.
  */
 export const MediaContent: typeof MediaContentClass;
 
 /**
  * RelationshipContent represents a relationship element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [RelationshipContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/RelationshipContent/) directly instead.
  */
 export type RelationshipContent = RelationshipContentClass;
 
 /**
  * RelationshipContent represents a relationship element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [RelationshipContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/RelationshipContent/) directly instead.
  */
 export const RelationshipContent: typeof RelationshipContentClass;
 
 /**
  * TextContent defines descriptive text as an element within the [PopupTemplate's](https://developers.arcgis.com/javascript/latest/references/core/PopupTemplate/)
  * content.
+ *
+ * @deprecated at 5.2. Import [TextContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/TextContent/) directly instead.
  */
 export type TextContent = TextContentClass;
 
 /**
  * TextContent defines descriptive text as an element within the [PopupTemplate's](https://developers.arcgis.com/javascript/latest/references/core/PopupTemplate/)
  * content.
+ *
+ * @deprecated at 5.2. Import [TextContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/TextContent/) directly instead.
  */
 export const TextContent: typeof TextContentClass;
 
 /**
  * UtilityNetworkAssociationsContent represents an utility network associations element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [UtilityNetworkAssociationsContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/UtilityNetworkAssociationsContent/) directly instead.
  */
 export type UtilityNetworkAssociationsContent = UtilityNetworkAssociationsContentClass;
 
 /**
  * UtilityNetworkAssociationsContent represents an utility network associations element associated with a
  * feature.
+ *
+ * @deprecated at 5.2. Import [UtilityNetworkAssociationsContent](https://developers.arcgis.com/javascript/latest/references/core/popup/content/UtilityNetworkAssociationsContent/) directly instead.
  */
 export const UtilityNetworkAssociationsContent: typeof UtilityNetworkAssociationsContentClass;
 
-/** Popup content element types. */
+/**
+ * Popup content element types.
+ *
+ * @deprecated at 5.2. Use individual content imports instead.
+ */
 export type Content = AttachmentsContent | FieldsContent | MediaContent | TextContent | CustomContent | ExpressionContent | RelationshipContent | UtilityNetworkAssociationsContent;

package/popup/content.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import e from"./content/AttachmentsContent.js";import t from"./content/Content.js";import n from"./content/CustomContent.js";import r from"./content/ExpressionContent.js";import i from"./content/FieldsContent.js";import a from"./content/MediaContent.js";import o from"./content/RelationshipContent.js";import s from"./content/TextContent.js";import c from"./content/UtilityNetworkAssociationsContent.js";const l=e,u=t,d=n,f=r,p=i,m=a,h=o,g=s,_=c;function v(e){return e instanceof u}const y={base:null,key:`type`,typeMap:{attachment:l,media:m,text:g,expression:f,field:p,relationship:h,utilityNetworkAssociations:_}},b={base:null,key:`type`,typeMap:{attachment:l,media:m,text:g,expression:f,field:p,relationship:h}};export{l as AttachmentsContent,u as BaseContent,d as CustomContent,f as ExpressionContent,p as FieldsContent,m as MediaContent,h as RelationshipContent,g as TextContent,_ as UtilityNetworkAssociationsContent,v as isContent,y as persistableTypes,b as persistableWebSceneTypes};
+import{deprecatedModule as e}from"../core/deprecate.js";import t from"../core/Logger.js";import n from"./content/AttachmentsContent.js";import r from"./content/Content.js";import i from"./content/CustomContent.js";import a from"./content/ExpressionContent.js";import o from"./content/FieldsContent.js";import s from"./content/MediaContent.js";import c from"./content/RelationshipContent.js";import l from"./content/TextContent.js";import u from"./content/UtilityNetworkAssociationsContent.js";e(t.getLogger(`esri.popup.content`),`esri.popup.content`,{replacement:`Individual content module imports`,version:`5.2`,warnOnce:!0});const d=n,f=r,p=i,m=a,h=o,g=s,_=c,v=l,y=u;function b(e){return e instanceof f}const x={base:null,key:`type`,typeMap:{attachment:d,media:g,text:v,expression:m,field:h,relationship:_,utilityNetworkAssociations:y}},S={base:null,key:`type`,typeMap:{attachment:d,media:g,text:v,expression:m,field:h,relationship:_}};export{d as AttachmentsContent,f as BaseContent,p as CustomContent,m as ExpressionContent,h as FieldsContent,g as MediaContent,_ as RelationshipContent,v as TextContent,y as UtilityNetworkAssociationsContent,b as isContent,x as persistableTypes,S as persistableWebSceneTypes};

package/rest/layerSources/DynamicWorkspaceLayer.d.ts

@@ -4,21 +4,24 @@ import type { JSONSupport } from "../../core/JSONSupport.js";
 export interface DynamicWorkspaceLayerProperties extends Partial<Pick<DynamicWorkspaceLayer, "definitionExpression" | "layerId" | "workspaceId">> {}
 
 /**
- * A dynamic workspace layer refers to a pre-authored Layer File (.lyrx) created from ArcGIS Pro.
- * These files reside in a registered folder. It allows you to dynamically use a pre-authored layer,
- * with an advanced renderer and cartographically enriched symbols that are not supported by map service's REST API specifications,
- * to a map service operation on a per request basis.
+ * A dynamic workspace layer references a pre-authored ArcGIS Pro layer file (`.lyrx`) stored in a registered folder.
+ * It allows a map service to use the layer's advanced renderer and cartographically enriched symbols, including
+ * symbols that are not supported by the map service's REST API specifications.
+ *
+ * Use it as the [source](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Sublayer/#source) of a sublayer in a [MapImageLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/MapImageLayer/), or as the
+ * [dynamic data source](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/#dynamicDataSource) of a [FeatureLayer](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/).
  *
  * > [!WARNING]
  * >
  * > **Known Limitations**
  * >
- * > [Sublayers](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Sublayer/) with a `DynamicWorkspaceLayer` source cannot be [saved](https://developers.arcgis.com/javascript/latest/references/core/WebMap/#save) to web maps.
+ * > [Sublayers](https://developers.arcgis.com/javascript/latest/references/core/layers/support/Sublayer/) and [FeatureLayers](https://developers.arcgis.com/javascript/latest/references/core/layers/FeatureLayer/) with a `DynamicWorkspaceLayer` source cannot be persisted to web maps, web scenes, link charts, or portal items.
  *
  * @since 5.2
  * @see [ArcGIS REST API - Layer source object](https://developers.arcgis.com/rest/services-reference/enterprise/layer-source-object/#dynamic-workspace-layer)
  * @see [ArcGIS Server - Enabling dynamic layers](https://enterprise.arcgis.com/en/server/latest/publish-services/windows/about-dynamic-layers.htm#GUID-C302852F-9E23-44C6-A71E-09E95EAF0E49)
  * @example
+ * ```js
  * const sublayer = new Sublayer({
  *   source: new DynamicWorkspaceLayer({
  *     workspaceId: "lyrx_folder",
@@ -27,9 +30,10 @@ export interface DynamicWorkspaceLayerProperties extends Partial<Pick<DynamicWor
  * });
  *
  * const layer = new MapImageLayer({
- *   url: "<your-map-service-url>"
+ *   url: "<your-map-service-url>",
  *   sublayers: [sublayer]
  * });
+ * ```
  */
 export default class DynamicWorkspaceLayer extends DynamicWorkspaceLayerSuperclass {
   constructor(properties?: DynamicWorkspaceLayerProperties);

package/rest/query/operations/queryUtils.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{getJsonType as e}from"../../../geometry/support/jsonTypeUtils.js";import{srToRESTValue as t}from"../../../geometry/support/spatialReferenceUtils.js";function n(e,t){if(t&&e.type===`extent`)return`${e.xmin},${e.ymin},${e.xmax},${e.ymax}`;if(t&&e.type===`point`)return`${e.x},${e.y}`;let n=e.toJSON();return delete n.spatialReference,JSON.stringify(n)}function r(r,i,a){let{geometry:o}=r,s=r.compactGeometryEnabled??!1,c=r.toJSON();delete c.compactGeometryEnabled,delete c.defaultSpatialReferenceEnabled;let l=c,u,d,f;if(o&&(d=o.spatialReference,f=t(d),l.geometryType=e(o),l.geometry=n(o,s),l.inSR=f),c.groupByFieldsForStatistics&&(l.groupByFieldsForStatistics=c.groupByFieldsForStatistics.join(`,`)),c.objectIds)switch(a?.uniqueIdFields?.length){case void 0:l.objectIds=c.objectIds.join(`,`);break;case 1:l.uniqueIds=JSON.stringify(c.objectIds),delete l.objectIds;break;default:l.uniqueIds=JSON.stringify(c.objectIds.map(e=>JSON.parse(e))),delete l.objectIds}if(c.orderByFields&&(l.orderByFields=c.orderByFields.join(`,`)),c.outFields&&(c.returnDistinctValues||!(i?.returnCountOnly||i?.returnExtentOnly||i?.returnIdsOnly))?l.outFields=c.outFields.includes(`*`)?`*`:c.outFields.join(`,`):delete l.outFields,c.outSR?(l.outSR=t(c.outSR),u=r.outSpatialReference):o&&(c.returnGeometry||c.returnCentroid)&&(l.outSR=l.inSR,u=d),c.returnGeometry&&delete c.returnGeometry,c.outStatistics&&(l.outStatistics=JSON.stringify(c.outStatistics)),c.outDistance&&(l.outDistance=JSON.stringify(c.outDistance)),c.fullText&&(l.fullText=JSON.stringify(c.fullText)),c.pixelSize&&(l.pixelSize=JSON.stringify(c.pixelSize)),c.quantizationParameters&&(r.defaultSpatialReferenceEnabled&&d!=null&&r.quantizationParameters?.extent!=null&&d.equals(r.quantizationParameters.extent.spatialReference)&&delete c.quantizationParameters.extent.spatialReference,l.quantizationParameters=JSON.stringify(c.quantizationParameters)),c.parameterValues&&(l.parameterValues=JSON.stringify(c.parameterValues)),c.rangeValues&&(l.rangeValues=JSON.stringify(c.rangeValues)),c.dynamicDataSource){if(`definitionExpression`in c.dynamicDataSource&&c.dynamicDataSource.definitionExpression){let{definitionExpression:e,...t}=c.dynamicDataSource;l.layer=JSON.stringify({query:e,source:t})}else l.layer=JSON.stringify({source:c.dynamicDataSource});delete c.dynamicDataSource}if(c.timeExtent){let{start:e,end:t}=c.timeExtent;(e!=null||t!=null)&&(l.time=e===t?e:`${e??`null`},${t??`null`}`),delete c.timeExtent}return r.defaultSpatialReferenceEnabled&&d!=null&&u!=null&&d.equals(u)&&(l.defaultSR=l.inSR,delete l.inSR,delete l.outSR),l}const i=`json`;export{n as encodeGeometry,r as queryLikeToQueryStringParameters,i as safeExtentResultFormat};
+import{sqlAnd as e}from"../../../core/sql.js";import{getJsonType as t}from"../../../geometry/support/jsonTypeUtils.js";import{srToRESTValue as n}from"../../../geometry/support/spatialReferenceUtils.js";import{timeExtentToQueryParameter as r}from"../../support/timeUtils.js";function i(e,t){if(t&&e.type===`extent`)return`${e.xmin},${e.ymin},${e.xmax},${e.ymax}`;if(t&&e.type===`point`)return`${e.x},${e.y}`;let n=e.toJSON();return delete n.spatialReference,JSON.stringify(n)}function a(a,o,s){let{geometry:c}=a,l=a.compactGeometryEnabled??!1,u=a.toJSON();delete u.compactGeometryEnabled,delete u.defaultSpatialReferenceEnabled;let d=u,f,p,m;if(c&&(p=c.spatialReference,m=n(p),d.geometryType=t(c),d.geometry=i(c,l),d.inSR=m),u.groupByFieldsForStatistics&&(d.groupByFieldsForStatistics=u.groupByFieldsForStatistics.join(`,`)),u.objectIds)switch(s?.uniqueIdFields?.length){case void 0:d.objectIds=u.objectIds.join(`,`);break;case 1:d.uniqueIds=JSON.stringify(u.objectIds),delete d.objectIds;break;default:d.uniqueIds=JSON.stringify(u.objectIds.map(e=>JSON.parse(e))),delete d.objectIds}if(u.orderByFields&&(d.orderByFields=u.orderByFields.join(`,`)),u.outFields&&(u.returnDistinctValues||!(o?.returnCountOnly||o?.returnExtentOnly||o?.returnIdsOnly))?d.outFields=u.outFields.includes(`*`)?`*`:u.outFields.join(`,`):delete d.outFields,u.outSR?(d.outSR=n(u.outSR),f=a.outSpatialReference):c&&(u.returnGeometry||u.returnCentroid)&&(d.outSR=d.inSR,f=p),u.returnGeometry&&delete u.returnGeometry,u.outStatistics&&(d.outStatistics=JSON.stringify(u.outStatistics)),u.outDistance&&(d.outDistance=JSON.stringify(u.outDistance)),u.fullText&&(d.fullText=JSON.stringify(u.fullText)),u.pixelSize&&(d.pixelSize=JSON.stringify(u.pixelSize)),u.quantizationParameters&&(a.defaultSpatialReferenceEnabled&&p!=null&&a.quantizationParameters?.extent!=null&&p.equals(a.quantizationParameters.extent.spatialReference)&&delete u.quantizationParameters.extent.spatialReference,d.quantizationParameters=JSON.stringify(u.quantizationParameters)),u.parameterValues&&(d.parameterValues=JSON.stringify(u.parameterValues)),u.rangeValues&&(d.rangeValues=JSON.stringify(u.rangeValues)),u.dynamicDataSource){if(`definitionExpression`in u.dynamicDataSource&&u.dynamicDataSource.definitionExpression){let{definitionExpression:e,...t}=u.dynamicDataSource;d.layer=JSON.stringify({query:e,source:t})}else d.layer=JSON.stringify({source:u.dynamicDataSource});delete u.dynamicDataSource}if(a.timeExtent){let t=s?.timeInformation;if(t){let n=t.getExpression(a.timeExtent);switch(n?.type){case`time`:d.time=n.value;break;case`where`:n.value&&(d.where=e(d.where,n.value))}}else d.time=r(a.timeExtent);delete u.timeExtent}return a.defaultSpatialReferenceEnabled&&p!=null&&f!=null&&p.equals(f)&&(d.defaultSR=d.inSR,delete d.inSR,delete d.outSR),d}const o=`json`;export{i as encodeGeometry,a as queryLikeToQueryStringParameters,o as safeExtentResultFormat};

package/rest/support/timeUtils.js

@@ -0,0 +1,2 @@
+/* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
+function e(e){let{start:t,end:n}=e;if(t||n){if(!t&&n)return`null,${n.getTime()}`;if(!n&&t)return`${t.getTime()},null`;if(n&&t)return t.getTime()===n.getTime()?`${t.getTime()}`:`${t.getTime()},${n.getTime()}`}}export{e as timeExtentToQueryParameter};

package/smartMapping/popup/support/clusterUtils.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{substitute as e}from"../../../intl/substitute.js";import{numericTypes as t}from"../../../layers/support/fieldUtils.js";import{TextContent as n}from"../../../popup/content.js";import r from"../../../popup/ExpressionInfo.js";import i from"../../../popup/FieldInfo.js";import a from"../../../popup/support/FieldInfoFormat.js";import{getFieldAndExpressionInfos as o,getContentFromFieldInfos as s}from"./utils.js";import{getStatisticInfos as c,getClusterField as l,getPredominantTypeExpression as u,clusterCountField as d}from"../../support/clusterUtils.js";import{isClusterCompatibleRenderer as f}from"../../../views/2d/layers/support/clusterUtils.js";function p(e){let{fieldName:n,label:r,type:o}=e,s=o!=null&&t.includes(o),c=new i({fieldName:n,label:r,visible:!0,format:s?new a({places:o===`integer`||o===`small-integer`?0:2,digitSeparator:!0}):void 0});return o===`date`&&(c.format=new a({dateFormat:`short-date-short-time`})),c}function m(e,t){let n=e?t.getField(e):null;return n==null?void 0:n.alias||n.name}function h(t,n,r){let{attributeInfo:i,statisticType:a}=n,{field:o,normalizationField:s}=i,c=``,l;if(a===`avg`?l=s?r.clusters.avgNormFieldLabel:r.clusters.avgFieldLabel:a===`type`&&(l=r.clusters.predominantFieldLabel),l){let n=i.valueExpression?i.valueExpressionTitle:m(o,t),r=s&&m(s,t);c=e(l,{fieldLabel:n||``,normFieldLabel:r||``})}return c}function g(t,n,r,i){let{attributeInfo:a,statisticType:o}=n,{field:s,normalizationField:c}=a,l=``,u;if(o===`avg`?u=c?i.clusters.avgNormFieldSummary:i.clusters.avgFieldSummary:o===`type`&&(u=i.clusters.predominantFieldSummary),u){let n=a.valueExpression?a.valueExpressionTitle:m(s,t),i=c&&m(c,t);l=e(u,{fieldLabel:n||``,normFieldLabel:i||``,fieldValue:`{`+r+`}`})}return l}function _(t){return{fieldInfo:p({fieldName:d,label:t.clusters.numFeatures,type:`integer`}),fieldSummary:new n({text:e(t.clusters.countSummary,{count:`{${d}}`})})}}async function v(e,t,i){if(!f(t))return null;let a=c(e,t),o=i.clusters.predominantNoneValue,s=t.type===`unique-value`?t.uniqueValueInfos??[]:[],{fieldInfo:d,fieldSummary:m}=_(i),v=[m],y=[d],b=[];for(let t of a){let{statisticType:a,attributeInfo:c}=t,d=l(c,a),f=h(e,t,i);if(a===`avg`)v.push(new n({text:g(e,t,d,i)})),y.push(p({fieldName:d,label:f,type:`double`}));else if(a===`type`){let a=`expression/${d}`;v.push(new n({text:g(e,t,a,i)})),b.push(new r({name:d,title:f,returnType:`string`,expression:u(s,d,o)})),y.push(p({fieldName:a}))}}return{fieldInfos:y,expressionInfos:b,content:v}}async function y(e,t,n){if(!f(t))return null;let{fieldInfo:r,fieldSummary:i}=_(n),a=[i],c=[r],l=[],{fieldInfos:u,expressionInfos:d}=await o({renderer:t,layer:e,isFeatureReduction:!0}),p=await s(e,{fieldInfos:u,expressionInfos:d},!0);return a.push(...p),c.push(...u),l.push(...d),{fieldInfos:c,expressionInfos:l,content:a}}export{v as getContentAndInfos,y as getContentAndInfosForPieChart};
+import{substitute as e}from"../../../intl/substitute.js";import{numericTypes as t}from"../../../layers/support/fieldUtils.js";import n from"../../../popup/ExpressionInfo.js";import r from"../../../popup/FieldInfo.js";import i from"../../../popup/content/TextContent.js";import a from"../../../popup/support/FieldInfoFormat.js";import{getFieldAndExpressionInfos as o,getContentFromFieldInfos as s}from"./utils.js";import{getStatisticInfos as c,getClusterField as l,getPredominantTypeExpression as u,clusterCountField as d}from"../../support/clusterUtils.js";import{isClusterCompatibleRenderer as f}from"../../../views/2d/layers/support/clusterUtils.js";function p(e){let{fieldName:n,label:i,type:o}=e,s=o!=null&&t.includes(o),c=new r({fieldName:n,label:i,visible:!0,format:s?new a({places:o===`integer`||o===`small-integer`?0:2,digitSeparator:!0}):void 0});return o===`date`&&(c.format=new a({dateFormat:`short-date-short-time`})),c}function m(e,t){let n=e?t.getField(e):null;return n==null?void 0:n.alias||n.name}function h(t,n,r){let{attributeInfo:i,statisticType:a}=n,{field:o,normalizationField:s}=i,c=``,l;if(a===`avg`?l=s?r.clusters.avgNormFieldLabel:r.clusters.avgFieldLabel:a===`type`&&(l=r.clusters.predominantFieldLabel),l){let n=i.valueExpression?i.valueExpressionTitle:m(o,t),r=s&&m(s,t);c=e(l,{fieldLabel:n||``,normFieldLabel:r||``})}return c}function g(t,n,r,i){let{attributeInfo:a,statisticType:o}=n,{field:s,normalizationField:c}=a,l=``,u;if(o===`avg`?u=c?i.clusters.avgNormFieldSummary:i.clusters.avgFieldSummary:o===`type`&&(u=i.clusters.predominantFieldSummary),u){let n=a.valueExpression?a.valueExpressionTitle:m(s,t),i=c&&m(c,t);l=e(u,{fieldLabel:n||``,normFieldLabel:i||``,fieldValue:`{`+r+`}`})}return l}function _(t){return{fieldInfo:p({fieldName:d,label:t.clusters.numFeatures,type:`integer`}),fieldSummary:new i({text:e(t.clusters.countSummary,{count:`{${d}}`})})}}async function v(e,t,r){if(!f(t))return null;let a=c(e,t),o=r.clusters.predominantNoneValue,s=t.type===`unique-value`?t.uniqueValueInfos??[]:[],{fieldInfo:d,fieldSummary:m}=_(r),v=[m],y=[d],b=[];for(let t of a){let{statisticType:a,attributeInfo:c}=t,d=l(c,a),f=h(e,t,r);if(a===`avg`)v.push(new i({text:g(e,t,d,r)})),y.push(p({fieldName:d,label:f,type:`double`}));else if(a===`type`){let a=`expression/${d}`;v.push(new i({text:g(e,t,a,r)})),b.push(new n({name:d,title:f,returnType:`string`,expression:u(s,d,o)})),y.push(p({fieldName:a}))}}return{fieldInfos:y,expressionInfos:b,content:v}}async function y(e,t,n){if(!f(t))return null;let{fieldInfo:r,fieldSummary:i}=_(n),a=[i],c=[r],l=[],{fieldInfos:u,expressionInfos:d}=await o({renderer:t,layer:e,isFeatureReduction:!0}),p=await s(e,{fieldInfos:u,expressionInfos:d},!0);return a.push(...p),c.push(...u),l.push(...d),{fieldInfos:c,expressionInfos:l,content:a}}export{v as getContentAndInfos,y as getContentAndInfosForPieChart};

package/smartMapping/popup/support/utils.js

@@ -1,6 +1,6 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{unique as e}from"../../../core/arrayUtils.js";import"../../../core/has.js";import{fetchMessageBundle as t}from"../../../intl/messages.js";import{substitute as n}from"../../../intl/substitute.js";import{numericTypes as r}from"../../../layers/support/fieldUtils.js";import{FieldsContent as i,TextContent as a}from"../../../popup/content.js";import o from"../../../popup/ExpressionInfo.js";import s from"../../../popup/FieldInfo.js";import c from"../../../popup/support/FieldInfoFormat.js";import{getAttributes as l}from"../../../renderers/support/utils.js";import{viewScaleRE as u}from"../../../renderers/visualVariables/support/visualVariableUtils.js";import{getFeatureReductionFields as d}from"../../support/adapters/support/utils.js";let f=0;function p(e=0){}const m=`expression/`;function h(e){return!(`hasVisualVariables`in e)||!e.hasVisualVariables()?[]:e.visualVariables.filter(e=>!(u.test(e.valueExpression)||`target`in e&&e.target===`outline`))}function g(e,t){return t?d(e)?.find(e=>e.name.toLowerCase()===t.toLowerCase()):null}function _(e,t,n){let i=null;if(n&&`featureReduction`in e){let t=e.featureReduction;t&&`popupTemplate`in t&&t.popupTemplate&&(i=t.popupTemplate.fieldInfos)}else`popupTemplate`in e&&e.popupTemplate&&(i=e.popupTemplate.fieldInfos);let a=n?g(e,t):e.getField(t),o=null;if(i&&i.some(e=>e&&e.fieldName?.toLowerCase()===a?.name.toLowerCase()?(o=e.clone(),!0):!1),!o){let e=r.includes(a.type),t=a.type===`integer`||a.type===`small-integer`;o=new s({fieldName:a.name,isEditable:a.editable,visible:!0,format:e?new c({places:t?0:2,digitSeparator:!0}):void 0})}return o.label||(o.label=a.alias),o}function v(e){let{expression:t,title:n,returnType:r}=e;return new o({name:`expr${f++}`,expression:t,title:n,returnType:r})}function y(e){let t=e.returnType===`number`?new c({places:2,digitSeparator:!0}):void 0;return new s({fieldName:`${m}${e.name}`,visible:!0,format:t})}async function b(r){let i=await t(`esri/smartMapping/t9n/smartMapping`),{renderer:a,layer:o,normFieldExpressionTemplate:s,isFeatureReduction:c}=r,u=[],d=[],f=l(a,h);for(let e of f)if(e.type===`field`)u.push(_(o,e.field,c));else if(e.type===`normalized-field`){let t=c?g(o,e.field):o.getField(e.field),r=c?g(o,e.normalizationField):o.getField(e.normalizationField),a=v({expression:`
+import{unique as e}from"../../../core/arrayUtils.js";import"../../../core/has.js";import{fetchMessageBundle as t}from"../../../intl/messages.js";import{substitute as n}from"../../../intl/substitute.js";import{numericTypes as r}from"../../../layers/support/fieldUtils.js";import i from"../../../popup/ExpressionInfo.js";import a from"../../../popup/FieldInfo.js";import o from"../../../popup/content/FieldsContent.js";import s from"../../../popup/content/TextContent.js";import c from"../../../popup/support/FieldInfoFormat.js";import{getAttributes as l}from"../../../renderers/support/utils.js";import{viewScaleRE as u}from"../../../renderers/visualVariables/support/visualVariableUtils.js";import{getFeatureReductionFields as d}from"../../support/adapters/support/utils.js";let f=0;function p(e=0){}const m=`expression/`;function h(e){return!(`hasVisualVariables`in e)||!e.hasVisualVariables()?[]:e.visualVariables.filter(e=>!(u.test(e.valueExpression)||`target`in e&&e.target===`outline`))}function g(e,t){return t?d(e)?.find(e=>e.name.toLowerCase()===t.toLowerCase()):null}function _(e,t,n){let i=null;if(n&&`featureReduction`in e){let t=e.featureReduction;t&&`popupTemplate`in t&&t.popupTemplate&&(i=t.popupTemplate.fieldInfos)}else`popupTemplate`in e&&e.popupTemplate&&(i=e.popupTemplate.fieldInfos);let o=n?g(e,t):e.getField(t),s=null;if(i&&i.some(e=>e&&e.fieldName?.toLowerCase()===o?.name.toLowerCase()?(s=e.clone(),!0):!1),!s){let e=r.includes(o.type),t=o.type===`integer`||o.type===`small-integer`;s=new a({fieldName:o.name,isEditable:o.editable,visible:!0,format:e?new c({places:t?0:2,digitSeparator:!0}):void 0})}return s.label||(s.label=o.alias),s}function v(e){let{expression:t,title:n,returnType:r}=e;return new i({name:`expr${f++}`,expression:t,title:n,returnType:r})}function y(e){let t=e.returnType===`number`?new c({places:2,digitSeparator:!0}):void 0;return new a({fieldName:`${m}${e.name}`,visible:!0,format:t})}async function b(r){let i=await t(`esri/smartMapping/t9n/smartMapping`),{renderer:a,layer:o,normFieldExpressionTemplate:s,isFeatureReduction:c}=r,u=[],d=[],f=l(a,h);for(let e of f)if(e.type===`field`)u.push(_(o,e.field,c));else if(e.type===`normalized-field`){let t=c?g(o,e.field):o.getField(e.field),r=c?g(o,e.normalizationField):o.getField(e.normalizationField),a=v({expression:`
       $feature["${t.name}"];
       $feature["${r.name}"];
       ${s===`percentage`?`($feature["${t.name}"] / $feature["${r.name}"]) * 100;`:`$feature["${t.name}"] / $feature["${r.name}"];`}
-      `,title:n(s===`percentage`?i.normFieldLabelAsPercent:i.normFieldLabel,{expression1:t.alias,expression2:r.alias}),returnType:`number`});u.push(y(a),_(o,e.field,c),_(o,e.normalizationField,c)),d.push(a)}else if(e.type===`expression`){let t=v(e);u.push(y(t)),d.push(t)}return{fieldInfos:e(u,(e,t)=>e.fieldName===t.fieldName),expressionInfos:e(d,(e,t)=>e.expression===t.expression)}}async function x(e,r,o){let{fieldInfos:s,expressionInfos:c}=r,l=await t(`esri/smartMapping/t9n/smartMapping`);if(s.length>2)return[new i({fieldInfos:s})];let u=[];for(let t of s){let r=t.fieldName||``,i=t.label;if(!i){let t=o?g(e,r):e.getField(r);if(t)i=t.alias||r;else if(c){let e=r.split(m)[1],t=c[c.findIndex(t=>t.name===e)];t&&(i=t.title||t.name)}}u.push(new a({text:n(l.fieldInfo,{fieldLabel:i,fieldValue:`{${r}}`})}))}return u}function S(e){return`normalizationField`in e&&e.normalizationField?!0:`hasVisualVariables`in e&&e.hasVisualVariables()&&e.visualVariables.some(e=>!!(`normalizationField`in e&&e.normalizationField))}export{m as expressionFieldPrefix,x as getContentFromFieldInfos,v as getExpressionInfo,b as getFieldAndExpressionInfos,_ as getFieldInfo,y as getFieldInfoFromExpressionInfo,h as getPrimaryVisualVariables,S as hasNormalizedField,p as resetSuffixForTests};
+      `,title:n(s===`percentage`?i.normFieldLabelAsPercent:i.normFieldLabel,{expression1:t.alias,expression2:r.alias}),returnType:`number`});u.push(y(a),_(o,e.field,c),_(o,e.normalizationField,c)),d.push(a)}else if(e.type===`expression`){let t=v(e);u.push(y(t)),d.push(t)}return{fieldInfos:e(u,(e,t)=>e.fieldName===t.fieldName),expressionInfos:e(d,(e,t)=>e.expression===t.expression)}}async function x(e,r,i){let{fieldInfos:a,expressionInfos:c}=r,l=await t(`esri/smartMapping/t9n/smartMapping`);if(a.length>2)return[new o({fieldInfos:a})];let u=[];for(let t of a){let r=t.fieldName||``,a=t.label;if(!a){let t=i?g(e,r):e.getField(r);if(t)a=t.alias||r;else if(c){let e=r.split(m)[1],t=c[c.findIndex(t=>t.name===e)];t&&(a=t.title||t.name)}}u.push(new s({text:n(l.fieldInfo,{fieldLabel:a,fieldValue:`{${r}}`})}))}return u}function S(e){return`normalizationField`in e&&e.normalizationField?!0:`hasVisualVariables`in e&&e.hasVisualVariables()&&e.visualVariables.some(e=>!!(`normalizationField`in e&&e.normalizationField))}export{m as expressionFieldPrefix,x as getContentFromFieldInfos,v as getExpressionInfo,b as getFieldAndExpressionInfos,_ as getFieldInfo,y as getFieldInfoFromExpressionInfo,h as getPrimaryVisualVariables,S as hasNormalizedField,p as resetSuffixForTests};