@vertigis/arcgis-extensions 48.9.1 → 49.0.0

package/tasks/identify/HitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { BuildingComponentSublayerExtension } from "../../mapping/BuildingComponentSublayerExtension.js";
@@ -6,8 +6,6 @@ import type { CSVLayerExtension } from "../../mapping/CSVLayerExtension.js";
 import type { FeatureLayerExtension } from "../../mapping/FeatureLayerExtension.js";
 import type { PointCloudLayerExtension } from "../../mapping/PointCloudLayerExtension.js";
 import type { SceneLayerExtension } from "../../mapping/SceneLayerExtension.js";
-import type { LayerExtension } from "../../mapping/_LayerExtension.js";
-import type { SublayerExtension } from "../../mapping/_SublayerExtension.js";
 import type { CountResult } from "../CountResult.js";
 import type { QueryProvider } from "../query/QueryProvider.js";
 import type { IdentifyOptions } from "./IdentifyOptions.js";
@@ -32,21 +30,21 @@ export declare abstract class HitTestIdentifyProvider extends IdentifyProviderBa
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: HitTestLayerExtension | HitTestSublayerExtension, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identify(source: HitTestLayerExtension | HitTestSublayerExtension, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: HitTestLayerExtension, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: HitTestLayerExtension, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
     /**
      * If the featureSource supports query.
      *
      * @param featureSource The featureSource to be identified.
      */
-    protected _supportsQuery(featureSource: LayerExtension | SublayerExtension): boolean;
-    protected _applyTolerance(geometry: Geometry): Promise<Geometry>;
+    protected _supportsQuery(featureSource: HitTestLayerExtension | HitTestSublayerExtension): boolean;
+    protected _applyTolerance(geometry: GeometryUnion): Promise<GeometryUnion>;
 }
 export {};

package/tasks/identify/IdentifyProviderBase.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
@@ -12,15 +12,15 @@ export declare abstract class IdentifyProviderBase implements IdentifyProvider {
     /**
      * @inheritDoc
      */
-    abstract isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    abstract isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    identify(source: FeatureSource | FeatureSource[], geometry: Geometry, options?: IdentifyOptions): AsyncIterable<Feature>;
+    identify(source: FeatureSource | FeatureSource[], geometry: GeometryUnion, options?: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    count(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): Promise<CountResult>;
+    count(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): Promise<CountResult>;
     /**
      * Invoked to perform the work for {@link identify}. Default implementation
      * calls {@link _identify} for each source. Derived classes can override this
@@ -32,14 +32,14 @@ export declare abstract class IdentifyProviderBase implements IdentifyProvider {
      * @param geometryType The geometry type before a tolerance buffer is
      *   applied.
      */
-    protected _identifyMany(sources: FeatureSource[], geometry: Geometry, options: IdentifyOptions, geometryType?: string): AsyncIterable<Feature>;
+    protected _identifyMany(sources: FeatureSource[], geometry: GeometryUnion, options: IdentifyOptions, geometryType?: string): AsyncIterable<Feature>;
     /**
      * Adds a tolerance to input geometries if configured in the options.
      *
      * @param geometry The geometry to apply a tolerance to.
      * @param options The identify options object.
      */
-    protected _applyTolerance(geometry: Geometry, options?: IdentifyOptions): Promise<Geometry>;
+    protected _applyTolerance(geometry: GeometryUnion, options?: IdentifyOptions): Promise<GeometryUnion>;
     /**
      * Invoked to perform the actual work for {@link identify} on a single
      * source. Derived classes should override this method rather than
@@ -51,7 +51,7 @@ export declare abstract class IdentifyProviderBase implements IdentifyProvider {
      * @param geometryType The geometry type before a tolerance buffer is
      *   applied.
      */
-    protected abstract _identify(source: FeatureSource, geometry: Geometry, options: IdentifyOptions, geometryType?: string): AsyncIterable<Feature>;
+    protected abstract _identify(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions, geometryType?: string): AsyncIterable<Feature>;
     /**
      * Invoked to perform the actual work for {@link count}. Derived classes
      * should override this method rather than count().
@@ -62,5 +62,5 @@ export declare abstract class IdentifyProviderBase implements IdentifyProvider {
      * @param geometryType The geometry type before a tolerance buffer is
      *   applied.
      */
-    protected abstract _count(source: FeatureSource, geometry: Geometry, options: IdentifyOptions, geometryType?: string): Promise<CountResult>;
+    protected abstract _count(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions, geometryType?: string): Promise<CountResult>;
 }

package/tasks/identify/IdentifyService.d.ts

@@ -1,6 +1,6 @@
 import type EsriMap from "@arcgis/core/Map";
 import Collection from "@arcgis/core/core/Collection";
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import { MapExtension } from "../../mapping/MapExtension.js";
@@ -30,7 +30,7 @@ export declare class IdentifyService extends InitializableBase {
      * @param geometry The geometry to check.
      * @param options The options to check.
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * Identifies features that intersect a given geometry.
      *
@@ -43,7 +43,7 @@ export declare class IdentifyService extends InitializableBase {
      *   {@link support/Cancellable!Cancellation}, though it may still succeed
      *   and return all results.
      */
-    identify(sources: Iterable<FeatureSource> | Collection<FeatureSource>, geometry: Geometry | Geometry[], options?: IdentifyOptions): AsyncIterable<Feature>;
+    identify(sources: Iterable<FeatureSource> | Collection<FeatureSource>, geometry: GeometryUnion | GeometryUnion[], options?: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * Identifies features that intersect a given geometry.
      *
@@ -56,7 +56,7 @@ export declare class IdentifyService extends InitializableBase {
      *   {@link support/Cancellable!Cancellation}, though it may still succeed
      *   and return all results.
      */
-    identify(mapExtension: MapExtension, geometry: Geometry | Geometry[], options?: IdentifyOptions): AsyncIterable<Feature>;
+    identify(mapExtension: MapExtension, geometry: GeometryUnion | GeometryUnion[], options?: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * Identifies features that intersect a given geometry.
      *
@@ -69,7 +69,7 @@ export declare class IdentifyService extends InitializableBase {
      *   {@link support/Cancellable!Cancellation}, though it may still succeed
      *   and return all results.
      */
-    identify(map: EsriMap, geometry: Geometry | Geometry[], options?: IdentifyOptions): AsyncIterable<Feature>;
+    identify(map: EsriMap, geometry: GeometryUnion | GeometryUnion[], options?: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * Counts the features that intersect a given geometry.
      *
@@ -82,7 +82,7 @@ export declare class IdentifyService extends InitializableBase {
      *   {@link support/Cancellable!Cancellation}, though it may still succeed
      *   and return all count results.
      */
-    count(sources: Iterable<FeatureSource> | Collection<FeatureSource>, geometry: Geometry, options?: IdentifyOptions): AsyncIterable<CountResult>;
+    count(sources: Iterable<FeatureSource> | Collection<FeatureSource>, geometry: GeometryUnion, options?: IdentifyOptions): AsyncIterable<CountResult>;
     /**
      * Count the features that intersect a given geometry.
      *
@@ -95,7 +95,7 @@ export declare class IdentifyService extends InitializableBase {
      *   {@link support/Cancellable!Cancellation}, though it may still succeed
      *   and return all count results.
      */
-    count(mapExtension: MapExtension, geometry: Geometry, options?: IdentifyOptions): AsyncIterable<CountResult>;
+    count(mapExtension: MapExtension, geometry: GeometryUnion, options?: IdentifyOptions): AsyncIterable<CountResult>;
     /**
      * Count the features that intersect a given geometry.
      *
@@ -108,7 +108,7 @@ export declare class IdentifyService extends InitializableBase {
      *   {@link support/Cancellable!Cancellation}, though it may still succeed
      *   and return all count results.
      */
-    count(map: EsriMap, geometry: Geometry, options?: IdentifyOptions): AsyncIterable<CountResult>;
+    count(map: EsriMap, geometry: GeometryUnion, options?: IdentifyOptions): AsyncIterable<CountResult>;
     protected _onInitialize(): Promise<void>;
 }
 /**

package/tasks/identify/ImageryLayerIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
@@ -11,15 +11,15 @@ export declare class ImageryLayerIdentifyProvider extends IdentifyProviderBase {
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identify(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
     private _executeIdentifyTask;
     private _getPixelData;
     private _getResultFeatures;

package/tasks/identify/ImageryLayerIdentifyProvider.js

@@ -1 +1 @@
-import e from"@arcgis/core/geometry/Point";import t from"@arcgis/core/geometry/Polygon";import{identify as r}from"@arcgis/core/rest/imageService";import a from"@arcgis/core/rest/support/ImageIdentifyParameters";import i from"@arcgis/core/rest/support/ProjectParameters";import{Feature as s,toFeature as o}from"../../data/Feature.js";import{cancelifyWithAbortSignal as n}from"../../support/Cancellable.js";import{constrainQueryTimeExtentToView as l}from"../../support/_query.js";import{toArray as c}from"../../utilities/asyncIterable.js";import{isPoint as u,isPolygon as m,isPolyline as f}from"../../utilities/esri.js";import{isImageryLayerExtension as p}from"../../utilities/extensions.js";import{getLogger as y}from"../../utilities/log.js";import{isNumeric as g}from"../../utilities/number.js";import{IdentifyProviderBase as d}from"./IdentifyProviderBase.js";const I=y("ImageryLayerIdentifyProvider");export class ImageryLayerIdentifyProvider extends d{isSupported(e,t,r){return p(e)}async*_identify(r,a,i){const s=r;let o=a;if(a&&!u(a)&&!m(a))if(f(a)){I.debug("An identify on an Imagery Layer (ArcGISImageServiceLayer) was performed using polyline geometry, which is not supported. The center vertex of in the input geometry was used instead.");const t=a.paths[0][Math.floor(a.paths[0].length/2)];o=new e({spatialReference:a.spatialReference,x:t[0],y:t[1]})}else o=t.fromExtent(a.extent);const n=await this._executeIdentifyTask(s,o,i);yield*this._getResultFeatures(n,s,i)}async _count(e,t,r){const a=e;r.returnGeometry=!1;const i=await this._executeIdentifyTask(a,t,r);return{source:e,count:(await c(this._getResultFeatures(i,a,r))).length}}async _executeIdentifyTask(e,t,i){const{layer:s}=e,o=new a({geometry:t,mosaicRule:s.mosaicRule,rasterFunction:s.rasterFunction,returnCatalogItems:e.includeCatalogItems,returnGeometry:e.includeCatalogItems&&i.returnGeometry});l(o,e);return n((async e=>r(s.url,o,{signal:e})),i.cancelToken)}_getPixelData(e,t,r,a){const{layer:i}=a;let s=r.properties?.Values[e]??r.value,o=r.value;const n=i._rasterAttributeTableFieldPrefix;g(s)&&(s=parseFloat(s)),g(o)&&(o=parseFloat(o)),t.attributes.set(`${n}ServicePixelValue`,o),t.attributes.set(`${n}ServicePixelValue.Raw`,o),t.attributes.set(`${n}ItemPixelValue`,s);const l=i.serviceRasterInfo?.attributeTable??i.rasterInfo?.attributeTable;if(l){const{features:e,fields:r}=l,a=e.find((e=>e.getAttribute("Value")===s));r.forEach((e=>{"Value"!==e.name&&"oid"!==e.type&&t.attributes.set(`${n}${e.name}`,a?.getAttribute(e.name))}))}}async*_getResultFeatures(e,t,r){if("NoData"===e.value)return;const a=r.outSpatialReference&&r.outSpatialReference.wkid!==t.layer.spatialReference.wkid;if(t.includeCatalogItems&&e.catalogItems){let i=Promise.resolve([]);a&&r.returnGeometry&&(i=this._projectGeometries(t.layer.url,e.catalogItems.features.map((e=>e.geometry)),r.outSpatialReference,r.cancelToken));const s=[],n=r.outFields||t.featureSettings.outFields;e.catalogItems.features.forEach(((r,a)=>{const i=o(r,{source:t});if(n&&!n.includes("*"))for(const e of i.attributes.keys())n.includes(e)||i.attributes.delete(e);i.attributes.set("visible",1===e.catalogItemVisibilities[a]),this._getPixelData(a,i,e,t),s.push(i)}));const l=await i;l.length>0&&l.forEach(((e,t)=>s[t].geometry=e)),yield*s}if(!t.includeCatalogItems||!e.catalogItems){const i=new s({source:t});i.geometry=a?(await this._projectGeometries(t.layer.url,[e.location],r.outSpatialReference,r.cancelToken))[0]:e.location,this._getPixelData(0,i,e,t),yield i}}async _projectGeometries(e,t,r,a){const s=new i({geometries:t,outSpatialReference:r}),{project:o}=await import("@arcgis/core/rest/geometryService");return n((async t=>o(e,s,{signal:t})),a)}}
+import e from"@arcgis/core/geometry/Point";import t from"@arcgis/core/geometry/Polygon";import{identify as r}from"@arcgis/core/rest/imageService";import a from"@arcgis/core/rest/support/ImageIdentifyParameters";import i from"@arcgis/core/rest/support/ProjectParameters";import{Feature as s,toFeature as o}from"../../data/Feature.js";import{cancelifyWithAbortSignal as n}from"../../support/Cancellable.js";import{constrainQueryTimeExtentToView as c}from"../../support/_query.js";import{toArray as l}from"../../utilities/asyncIterable.js";import{isPoint as u,isPolygon as m,isPolyline as f}from"../../utilities/esri.js";import{isImageryLayerExtension as p}from"../../utilities/extensions.js";import{getLogger as y}from"../../utilities/log.js";import{isNumeric as g}from"../../utilities/number.js";import{IdentifyProviderBase as d}from"./IdentifyProviderBase.js";const I=y("ImageryLayerIdentifyProvider"),h="Raster.";export class ImageryLayerIdentifyProvider extends d{isSupported(e,t,r){return p(e)}async*_identify(r,a,i){const s=r;let o=a;if(a&&!u(a)&&!m(a))if(f(a)){I.debug("An identify on an Imagery Layer (ArcGISImageServiceLayer) was performed using polyline geometry, which is not supported. The center vertex of in the input geometry was used instead.");const t=a.paths[0][Math.floor(a.paths[0].length/2)];o=new e({spatialReference:a.spatialReference,x:t[0],y:t[1]})}else o=t.fromExtent(a.extent);const n=await this._executeIdentifyTask(s,o,i);yield*this._getResultFeatures(n,s,i)}async _count(e,t,r){const a=e;r.returnGeometry=!1;const i=await this._executeIdentifyTask(a,t,r);return{source:e,count:(await l(this._getResultFeatures(i,a,r))).length}}async _executeIdentifyTask(e,t,i){const{layer:s}=e,o=new a({geometry:t,mosaicRule:s.mosaicRule,rasterFunction:s.rasterFunction,returnCatalogItems:e.includeCatalogItems,returnGeometry:e.includeCatalogItems&&i.returnGeometry});c(o,e);return n((async e=>r(s.url,o,{signal:e})),i.cancelToken)}_getPixelData(e,t,r,a){const{layer:i}=a;let s=r.properties?.Values[e]??r.value,o=r.value;g(s)&&(s=parseFloat(s)),g(o)&&(o=parseFloat(o)),t.attributes.set(`${h}ServicePixelValue`,o),t.attributes.set(`${h}ServicePixelValue.Raw`,o),t.attributes.set(`${h}ItemPixelValue`,s);const n=i.serviceRasterInfo?.attributeTable??i.rasterInfo?.attributeTable;if(n){const{features:e,fields:r}=n,a=e.find((e=>e.getAttribute("Value")===s));r.forEach((e=>{"Value"!==e.name&&"oid"!==e.type&&t.attributes.set(`${h}${e.name}`,a?.getAttribute(e.name))}))}}async*_getResultFeatures(e,t,r){if("NoData"===e.value)return;const a=r.outSpatialReference&&r.outSpatialReference.wkid!==t.layer.spatialReference.wkid;if(t.includeCatalogItems&&e.catalogItems){let i=Promise.resolve([]);a&&r.returnGeometry&&(i=this._projectGeometries(t.layer.url,e.catalogItems.features.map((e=>e.geometry)),r.outSpatialReference,r.cancelToken));const s=[],n=r.outFields||t.featureSettings.outFields;e.catalogItems.features.forEach(((r,a)=>{const i=o(r,{source:t});if(n&&!n.includes("*"))for(const e of i.attributes.keys())n.includes(e)||i.attributes.delete(e);i.attributes.set("visible",1===e.catalogItemVisibilities[a]),this._getPixelData(a,i,e,t),s.push(i)}));const c=await i;c.length>0&&c.forEach(((e,t)=>s[t].geometry=e)),yield*s}if(!t.includeCatalogItems||!e.catalogItems){const i=new s({source:t});i.geometry=a?(await this._projectGeometries(t.layer.url,[e.location],r.outSpatialReference,r.cancelToken))[0]:e.location,this._getPixelData(0,i,e,t),yield i}}async _projectGeometries(e,t,r,a){const s=new i({geometries:t,outSpatialReference:r}),{project:o}=await import("@arcgis/core/rest/geometryService");return n((async t=>o(e,s,{signal:t})),a)}}

package/tasks/identify/KMLLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
@@ -13,13 +13,13 @@ export declare class KMLLayerQueryIdentifyProvider extends IdentifyProviderBase
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identify(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
 }

package/tasks/identify/MapNotesSublayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
@@ -11,13 +11,13 @@ export declare class MapNotesSublayerQueryIdentifyProvider extends IdentifyProvi
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identify(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
 }

package/tasks/identify/PointCloudLayerHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { PointCloudLayerExtension } from "../../mapping/PointCloudLayerExtension.js";
 import { HitTestIdentifyProvider } from "./HitTestIdentifyProvider.js";
@@ -8,6 +8,6 @@ import type { IdentifyOptions } from "./IdentifyOptions.js";
  * on the map.
  */
 export declare class PointCloudLayerHitTestIdentifyProvider extends HitTestIdentifyProvider {
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     protected _supportsQuery(featureSource: PointCloudLayerExtension): boolean;
 }

package/tasks/identify/RouteLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
@@ -11,14 +11,14 @@ export declare class RouteLayerQueryIdentifyProvider extends IdentifyProviderBas
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identify(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
     private _getAllGraphics;
 }

package/tasks/identify/SceneLayerHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { SceneLayerExtension } from "../../mapping/SceneLayerExtension.js";
 import { SceneLayerQueryProvider } from "../query/SceneLayerQueryProvider.js";
@@ -10,6 +10,6 @@ import type { IdentifyOptions } from "./IdentifyOptions.js";
  */
 export declare class SceneLayerHitTestIdentifyProvider extends HitTestIdentifyProvider {
     queryProvider: SceneLayerQueryProvider;
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     protected _supportsQuery(featureSource: SceneLayerExtension): boolean;
 }

package/tasks/identify/SceneLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { SceneLayerExtension } from "../../mapping/SceneLayerExtension.js";
@@ -17,15 +17,15 @@ export declare class SceneLayerQueryIdentifyProvider extends IdentifyProviderBas
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: SceneLayerExtension, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identify(source: SceneLayerExtension, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: SceneLayerExtension, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: SceneLayerExtension, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
     /**
      * If the featureSource supports query.
      *

package/tasks/identify/StreamLayerClientSideQueryIdentifyProvider.js

@@ -1 +1 @@
-import{isStreamLayer as e}from"../../utilities/_layers.js";import{isWebScene as r}from"../../utilities/mapping.js";import{ClientSideIdentifyProvider as i}from"./ClientSideIdentifyProvider.js";export class StreamLayerClientSideQueryIdentifyProvider extends i{isSupported(i,t,s){const o=i._layerView&&r(i.mapExtension?.map),{layer:n}=i;return e(n)&&!o}_createQuery(e,r,i){const t=super._createQuery(e,r,i),s=t.outFields?.findIndex((e=>"__esri_stream_id__"===e));return s>=0&&t.outFields.splice(s,1),t}}
+import{isStreamLayer as e}from"../../utilities/_layers.js";import{isWebScene as r}from"../../utilities/mapping.js";import{ClientSideIdentifyProvider as i}from"./ClientSideIdentifyProvider.js";export class StreamLayerClientSideQueryIdentifyProvider extends i{isSupported(i,t,s){const o=i._layerView&&r(i.mapExtension?.map),{layer:n}=i;return e(n)&&!o}_createQuery(e,r,i){const t=super._createQuery(e,r,i),s=t.outFields?.findIndex((e=>"__esri_stream_id__"===e))??-1;return s>=0&&t.outFields.splice(s,1),t}}

package/tasks/identify/SubtypeSublayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";
@@ -11,13 +11,13 @@ export declare class SubtypeSublayerQueryIdentifyProvider extends IdentifyProvid
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
-    protected _identify(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
-    protected _identifyMany(sources: FeatureSource[], geometry: Geometry, options: IdentifyOptions): AsyncIterable<Feature>;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
+    protected _identify(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
+    protected _identifyMany(sources: FeatureSource[], geometry: GeometryUnion, options: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: FeatureSource, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: FeatureSource, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
     private _createIdentifyQuery;
     private _createBasicQuery;
 }

package/tasks/identify/WMSLayerFeatureInfoIdentifyProvider.d.ts

@@ -1,5 +1,5 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
 import type SpatialReference from "@arcgis/core/geometry/SpatialReference.js";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { WMSLayerExtension } from "../../mapping/WMSLayerExtension.js";
@@ -14,15 +14,15 @@ export declare class WMSLayerFeatureInfoIdentifyProvider extends IdentifyProvide
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    protected _identify(source: WMSLayerExtension, geometry: Geometry, options: IdentifyOptions, geometryType?: string): AsyncIterable<Feature>;
+    protected _identify(source: WMSLayerExtension, geometry: GeometryUnion, options: IdentifyOptions, geometryType?: string): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    protected _count(source: WMSLayerExtension, geometry: Geometry, options: IdentifyOptions): Promise<CountResult>;
+    protected _count(source: WMSLayerExtension, geometry: GeometryUnion, options: IdentifyOptions): Promise<CountResult>;
     /**
      * Normalize a feature to work with the popup. This includes generating a
      * title and setting up the field infos.

package/tasks/identify/WMSSublayerIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { WMSSublayerExtension } from "../../mapping/WMSSublayerExtension.js";
@@ -17,15 +17,15 @@ export declare class WMSSublayerIdentifyProvider extends IdentifyProviderBase {
     /**
      * @inheritDoc
      */
-    isSupported(source: FeatureSource, geometry: Geometry, options?: IdentifyOptions): boolean;
+    isSupported(source: FeatureSource, geometry: GeometryUnion, options?: IdentifyOptions): boolean;
     /**
      * @inheritDoc
      */
-    _identify(source: WMSSublayerExtension, geometry: Geometry, options?: IdentifyOptions): AsyncIterable<Feature>;
+    _identify(source: WMSSublayerExtension, geometry: GeometryUnion, options?: IdentifyOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */
-    _count(source: WMSSublayerExtension, geometry: Geometry, options?: IdentifyOptions): Promise<CountResult>;
+    _count(source: WMSSublayerExtension, geometry: GeometryUnion, options?: IdentifyOptions): Promise<CountResult>;
     private _createGetFeatureSpatialQuery;
     private _createGetFeatureElement;
     private _createQueryElement;

package/tasks/identify/_utilities.js

@@ -1 +1 @@
-export async function hitTestForClusterFeatures(e,t){const r=e._layerView.view,i=await r.hitTest(r.toScreen("point"===t.type?t:t.extent.center));return i?.results.map((e=>e.graphic)).filter((t=>t?.layer?.id===e?.layer.id&&t.isAggregate))}
+export async function hitTestForClusterFeatures(e,t){const r=e._layerView.view,i=r.toScreen("point"===t.type?t:t.extent.center);if(!i)return[];const n=await r.hitTest(i);return n?.results.map((e=>e.graphic)).filter((t=>t?.layer?.id===e?.layer.id&&t.isAggregate))}

package/tasks/query/QueryOptions.d.ts

@@ -1,5 +1,5 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
 import type SpatialReference from "@arcgis/core/geometry/SpatialReference";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CancelToken } from "../../support/Cancellable.js";
 /**
@@ -16,7 +16,7 @@ export interface QueryOptions {
      * Spatial filter used to filter search results. If specified, results are
      * limited to features that intersect the geometry.
      */
-    spatialFilter?: Geometry;
+    spatialFilter?: GeometryUnion | undefined;
     /**
      * Whether geometry for features should be returned.
      */
@@ -28,7 +28,7 @@ export interface QueryOptions {
     /**
      * The spatial reference for the returned geometry.
      */
-    outSpatialReference?: SpatialReference;
+    outSpatialReference?: SpatialReference | undefined;
     /**
      * The maximum allowable offset used for generalizing geometries returned by
      * the query operation.

package/tasks/query/StreamLayerClientSideQueryProvider.js

@@ -1 +1 @@
-import{isStreamLayer as e}from"../../utilities/_layers.js";import{isWebScene as r}from"../../utilities/mapping.js";import{ClientSideQueryProvider as i}from"./ClientSideQueryProvider.js";export class StreamLayerClientSideQueryProvider extends i{get _waitForUpdatingFinished(){return!1}isSupported(i){const t=i._layerView&&r(i.mapExtension?.map),{layer:s}=i;return e(s)&&!t}_createQuery(e,r,i){const t=super._createQuery(e,r,i),s=t.outFields?.findIndex((e=>"__esri_stream_id__"===e));return s>=0&&t.outFields.splice(s,1),t}}
+import{isStreamLayer as e}from"../../utilities/_layers.js";import{isWebScene as r}from"../../utilities/mapping.js";import{ClientSideQueryProvider as i}from"./ClientSideQueryProvider.js";export class StreamLayerClientSideQueryProvider extends i{get _waitForUpdatingFinished(){return!1}isSupported(i){const t=i._layerView&&r(i.mapExtension?.map),{layer:s}=i;return e(s)&&!t}_createQuery(e,r,i){const t=super._createQuery(e,r,i),s=t.outFields?.findIndex((e=>"__esri_stream_id__"===e))??-1;return s>=0&&t.outFields.splice(s,1),t}}

package/tasks/search/QuerySearchProvider.js

@@ -1 +1 @@
-import{SCORE_FIELD as e,SCORE_FIELD_ORIGINAL as t}from"../../data/Feature.js";import{AsyncQueue as r}from"../../utilities/asyncIterable.js";import{map as s}from"../../utilities/promise.js";import{QueryService as a}from"../query/QueryService.js";import{SearchError as i}from"./SearchError.js";import{SearchOptions as o}from"./SearchOptions.js";import{SearchProviderBase as n}from"./SearchProviderBase.js";import{getSearchableValue as c}from"./_utilities.js";import{expandSearchArea as u,getSearchableFields as l,getWhereClause as m,initializeElasticlunrIndex as f,normalizeScores as p,separatorRegex as h}from"./support/_querySearchProviderUtils.js";export class QuerySearchProvider extends n{queryService=new a;quotedTermsRegex=/(?:"(.*?)")|(?:“(.*?)”)|(?:«(.*?)»)|(?:„(.*?)”)|(?:„(.*?)“)|(?:»(.*?)«)/g;isSupported(e){return this.queryService.isSupported(e)}getSearchTerms(e,t){const r=e.match(this.quotedTermsRegex),s=t(e.replace(this.quotedTermsRegex,""));return r?s.concat(r.map((e=>e.replace(/"|“|”|«|»|„/g,"")))):s}_search(s,a,n){const S=new r,x=new Map,d="__id";let g=0;const y=f(h),R=new i([]);return s.forEach((r=>{(async()=>{try{const{index:s,tokenizer:i}=await y;s.setRef(d);const f={...o.DEFAULTS,...o.fromFeatureSource(r),spatialFilter:n?.initialSearchArea,tokenizeSearchString:!0,...n},h=f.tokenizeSearchString?s.pipeline.run(this.getSearchTerms(a,i)):[a],g=l(r),R=m(r,h,g,f);if(!h.length||!g.length||!R)return;let{maxResults:w}=f;null!=f.maxQueryResults&&null!=f.maxResults&&(w=Math.max(f.maxQueryResults,f.maxResults));const F={...f,maxResults:w};let b=0,k=F.currentScale;const j=new Map,q=r.getFullExtent();for(const e of g)s.addField(e.name.toLowerCase());for(;;){if(S.isDone)return;const i=this.queryService.query(r,R,F),o=new Map;for await(const e of i){if(S.isDone)return;const t={};for(const r of g)t[r.name.toLowerCase()]=c(e,r);const a=`${r.id}-${e.primaryKey}`;t[d]=a,s.addDoc(t),o.set(a,e),x.set(a,e)}const n=s.search(a,{expand:!0});p(n);for(const r of n){const s=x.get(r.ref);if(s&&(s.attributes.set(e,r.score),s.attributes.set(t,r.score),o.has(r.ref)&&!j.has(r.ref)&&(j.set(r.ref,s),o.delete(r.ref),S.add(s),b++)),null!=f.maxResults&&b>=f.maxResults)break}for(const[r,s]of o){if(null!=f.maxResults&&b>=f.maxResults)break;s.attributes.set(e,50),s.attributes.set(t,50),j.has(r)||(j.set(r,s),S.add(s),b++)}if(null!=f.maxResults&&b>=f.maxResults)break;const{scale:l,geometry:m}=await u(F.spatialFilter?.extent,q,k,0===b?3:1);if(!m)break;F.spatialFilter=m,k=l}}catch(e){R.errors.set(r,e)}finally{++g===s.length&&(0===R.errors.size?S.done():S.reject(R))}})()})),S}async _count(e,t,r){return s(e,(async e=>{const{index:s,tokenizer:a}=await f(h),i={...o.fromFeatureSource(e),tokenizeSearchString:!0,...r,spatialFilter:r?.initialSearchArea,returnGeometry:!1},n=i.tokenizeSearchString?s.pipeline.run(this.getSearchTerms(t,a)):[t],c=l(e);if(!n.length||!c.length)return{source:e,count:0};const p=m(e,n,c,i);let S=i.currentScale;const x=e.getFullExtent();let d;for(;;){if(d=await this.queryService.count(e,p,i),d.count>=(i.maxResults??Number.MAX_SAFE_INTEGER))break;const{scale:t,geometry:r}=await u(i.spatialFilter?.extent,x,S,0===d.count?3:1);if(!r)break;i.spatialFilter=r.extent,S=t}return d}))}async _suggest(e,t,r){return[]}}
+import{SCORE_FIELD as e,SCORE_FIELD_ORIGINAL as t}from"../../data/Feature.js";import{AsyncQueue as r}from"../../utilities/asyncIterable.js";import{map as s}from"../../utilities/promise.js";import{QueryService as a}from"../query/QueryService.js";import{SearchError as i}from"./SearchError.js";import{SearchOptions as o}from"./SearchOptions.js";import{SearchProviderBase as n}from"./SearchProviderBase.js";import{getSearchableValue as c}from"./_utilities.js";import{expandSearchArea as u,getSearchableFields as l,getWhereClause as m,initializeElasticlunrIndex as f,normalizeScores as p,separatorRegex as h}from"./support/_querySearchProviderUtils.js";export class QuerySearchProvider extends n{queryService=new a;quotedTermsRegex=/(?:"(.*?)")|(?:“(.*?)”)|(?:«(.*?)»)|(?:„(.*?)”)|(?:„(.*?)“)|(?:»(.*?)«)/g;isSupported(e){return this.queryService.isSupported(e)}getSearchTerms(e,t){const r=e.match(this.quotedTermsRegex),s=t(e.replace(this.quotedTermsRegex,""));return r?s.concat(r.map((e=>e.replace(/"|“|”|«|»|„/g,"")))):s}_search(s,a,n){const S=new r,d=new Map,x="__id";let g=0;const y=f(h),R=new i([]);return s.forEach((r=>{(async()=>{try{const{index:s,tokenizer:i}=await y;s.setRef(x);const f={...o.DEFAULTS,...o.fromFeatureSource(r),spatialFilter:n?.initialSearchArea,tokenizeSearchString:!0,...n},h=f.tokenizeSearchString?s.pipeline.run(this.getSearchTerms(a,i)):[a],g=l(r),R=m(r,h,g,f);if(!h.length||!g.length||!R)return;let{maxResults:w}=f;null!=f.maxQueryResults&&null!=f.maxResults&&(w=Math.max(f.maxQueryResults,f.maxResults));const F={...f,maxResults:w};let b=0,k=F.currentScale;const v=new Map,j=r.getFullExtent();for(const e of g)s.addField(e.name.toLowerCase());for(;;){if(S.isDone)return;const i=this.queryService.query(r,R,F),o=new Map;for await(const e of i){if(S.isDone)return;const t={};for(const r of g)t[r.name.toLowerCase()]=c(e,r);const a=`${r.id}-${e.primaryKey}`;t[x]=a,s.addDoc(t),o.set(a,e),d.set(a,e)}const n=s.search(a,{expand:!0});p(n);for(const r of n){const s=d.get(r.ref);if(s&&(s.attributes.set(e,r.score),s.attributes.set(t,r.score),o.has(r.ref)&&!v.has(r.ref)&&(v.set(r.ref,s),o.delete(r.ref),S.add(s),b++)),null!=f.maxResults&&b>=f.maxResults)break}for(const[r,s]of o){if(null!=f.maxResults&&b>=f.maxResults)break;s.attributes.set(e,50),s.attributes.set(t,50),v.has(r)||(v.set(r,s),S.add(s),b++)}if(null!=f.maxResults&&b>=f.maxResults)break;const{scale:l,geometry:m}=await u(F.spatialFilter?.extent??void 0,j,k,0===b?3:1);if(!m)break;F.spatialFilter=m,k=l}}catch(e){R.errors.set(r,e)}finally{++g===s.length&&(0===R.errors.size?S.done():S.reject(R))}})()})),S}async _count(e,t,r){return s(e,(async e=>{const{index:s,tokenizer:a}=await f(h),i={...o.fromFeatureSource(e),tokenizeSearchString:!0,...r,spatialFilter:r?.initialSearchArea,returnGeometry:!1},n=i.tokenizeSearchString?s.pipeline.run(this.getSearchTerms(t,a)):[t],c=l(e);if(!n.length||!c.length)return{source:e,count:0};const p=m(e,n,c,i);let S=i.currentScale;const d=e.getFullExtent();let x;for(;;){if(x=await this.queryService.count(e,p,i),x.count>=(i.maxResults??Number.MAX_SAFE_INTEGER))break;const{scale:t,geometry:r}=await u(i.spatialFilter?.extent??void 0,d,S,0===x.count?3:1);if(!r)break;i.spatialFilter=r.extent??void 0,S=t}return x}))}async _suggest(e,t,r){return[]}}

package/tasks/search/SearchOptions.d.ts

@@ -1,6 +1,6 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
 import type Point from "@arcgis/core/geometry/Point";
 import type SpatialReference from "@arcgis/core/geometry/SpatialReference";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CancelToken } from "../../support/Cancellable.js";
 import type { TaskResult } from "../TaskResult.js";
@@ -24,7 +24,7 @@ export interface SearchOptions {
      * Initial search area. If possible the search area will be expanded until
      * the maximum number of results are fulfilled.
      */
-    initialSearchArea?: Geometry;
+    initialSearchArea?: GeometryUnion | undefined;
     /**
      * Indicates the current scale of the supplied search area. If not provided
      * the search area is limited to the initial search area.
@@ -42,7 +42,7 @@ export interface SearchOptions {
     /**
      * The spatial reference for the returned geometry.
      */
-    outSpatialReference?: SpatialReference;
+    outSpatialReference?: SpatialReference | undefined;
     /**
      * The maximum allowable offset used for generalizing geometries returned by
      * the query operation.

package/tasks/search/SubtypeSublayerQuerySearchProvider.js

@@ -1 +1 @@
-import{SCORE_FIELD as e,SCORE_FIELD_ORIGINAL as t}from"../../data/Feature.js";import{isSubtypeSublayer as r}from"../../utilities/_layers.js";import{AsyncQueue as s}from"../../utilities/asyncIterable.js";import{isSubtypeSublayerExtension as o}from"../../utilities/extensions.js";import{QueryError as n}from"../query/QueryError.js";import{SearchError as i}from"./SearchError.js";import{SearchOptions as u}from"./SearchOptions.js";import{SearchProviderBase as a}from"./SearchProviderBase.js";import{getSearchableValue as c}from"./_utilities.js";import{expandSearchArea as l,getSearchableFields as f,getWhereClause as p,initializeElasticlunrIndex as d,normalizeScores as y,separatorRegex as m}from"./support/_querySearchProviderUtils.js";export class SubtypeSublayerQuerySearchProvider extends a{_queryProvider;constructor(e){super(),this._queryProvider=e}isSupported(e){return o(e)&&r(e.sublayer)&&e.sublayer.layer&&e.layerExtension?.capabilities.supportsQuery}_search(r,a,h){const x=new s,g=new Map,w="__id",S=[],q=new Map,R=new Set,_=async()=>{let e=[a];if(h?.tokenizeSearchString??1){const{index:t,tokenizer:r}=await d(m);t.setRef(w),e=t.pipeline.run(this._queryProvider.getSearchTerms(a,r))}if(e.length)for(const t of r){const r={...u.DEFAULTS,...u.fromFeatureSource(t.layerExtension),spatialFilter:h?.initialSearchArea,tokenizeSearchString:!0,...h},s=f(t),o=p(t,e,s,r);if(!s.length||!o)continue;if(q.has(t.layerExtension)){q.get(t.layerExtension).sources.set(t,{fields:s,where:o});continue}const{index:n}=await d(m);n.setRef(w);for(const e of s)n.addField(e.name.toLowerCase());let{maxResults:i}=r;null!=r.maxQueryResults&&null!=r.maxResults&&(i=Math.max(r.maxQueryResults,r.maxResults));const a={...r,maxResults:i};R.add(t.layerExtension),q.set(t.layerExtension,{searchOptions:r,queryOptions:a,index:n,results:{count:0,lookup:new Map},sources:new Map([[t,{fields:s,where:o}]])})}},b=async e=>{const t=q.get(e),r=[];for(const[e,s]of t.sources)r.push({source:e,where:s.where,options:t.queryOptions});try{const e=this._queryProvider.queryService.query(r);for await(const t of e){if(x.isDone)return;const{source:e}=t;if(!o(e))continue;const{index:r,sources:s,results:{lookup:n}}=q.get(e.layerExtension),{fields:i}=s.get(e),u={};for(const e of i)u[e.name.toLowerCase()]=c(t,e);const a=`${e.id}-${t.primaryKey}`;!0!==g.get(a)?.queued&&(u[w]=a,r.addDoc(u),n.set(a,t),g.set(a,{feature:t,queued:!1}))}}catch(e){e instanceof n?S.push(e):S.push(new i([[[...t.sources.keys()],e]]))}},j=r=>{const{index:s,searchOptions:o,results:n}=q.get(r),i=s.search(a,{expand:!0});y(i);for(const s of i){const{feature:i,queued:u}=g.get(s.ref);if(i&&!u&&n.lookup.has(s.ref)&&(i.attributes.set(e,s.score),i.attributes.set(t,s.score),g.get(s.ref).queued=!0,x.add(i),n.lookup.delete(s.ref),n.count++),null!=o.maxResults&&n.count>=o.maxResults){R.delete(r);break}}for(const[s,i]of n.lookup){if(null!=o.maxResults&&n.count>=o.maxResults){R.delete(r);break}i.attributes.set(e,50),i.attributes.set(t,50),g.get(s).queued||(g.get(s).queued=!0,x.add(i),n.count++)}},k=async e=>{const{queryOptions:t,searchOptions:r,results:{count:s}}=q.get(e);if(null!=r.maxResults&&s>=r.maxResults)return void R.delete(e);const{scale:o,geometry:n}=await l(t.spatialFilter?.extent,e.getFullExtent(),r.currentScale,0===s?3:1);n?(t.spatialFilter=n,r.currentScale=o):R.delete(e)},v=async e=>{for(;R.size>0;){if(x.isDone)return;if(await b(e),x.isDone)return;j(e),await k(e)}};return(async()=>{await _();const e=[];for(const[t]of q)e.push(v(t));await Promise.all(e),S.length>0?x.reject(new i(S)):x.done()})(),x}async _count(e,t,r){return this._queryProvider.count(e,t,r)}_suggest(e,t,r){return this._queryProvider.suggest(e,t,r)}}
+import{SCORE_FIELD as e,SCORE_FIELD_ORIGINAL as t}from"../../data/Feature.js";import{isSubtypeSublayer as r}from"../../utilities/_layers.js";import{AsyncQueue as s}from"../../utilities/asyncIterable.js";import{isSubtypeSublayerExtension as o}from"../../utilities/extensions.js";import{QueryError as i}from"../query/QueryError.js";import{SearchError as n}from"./SearchError.js";import{SearchOptions as u}from"./SearchOptions.js";import{SearchProviderBase as a}from"./SearchProviderBase.js";import{getSearchableValue as c}from"./_utilities.js";import{expandSearchArea as l,getSearchableFields as f,getWhereClause as d,initializeElasticlunrIndex as p,normalizeScores as y,separatorRegex as m}from"./support/_querySearchProviderUtils.js";export class SubtypeSublayerQuerySearchProvider extends a{_queryProvider;constructor(e){super(),this._queryProvider=e}isSupported(e){return o(e)&&r(e.sublayer)&&e.sublayer.layer&&e.layerExtension?.capabilities.supportsQuery}_search(r,a,h){const x=new s,g=new Map,w="__id",S=[],q=new Map,R=new Set,_=async()=>{let e=[a];if(h?.tokenizeSearchString??1){const{index:t,tokenizer:r}=await p(m);t.setRef(w),e=t.pipeline.run(this._queryProvider.getSearchTerms(a,r))}if(e.length)for(const t of r){const r={...u.DEFAULTS,...u.fromFeatureSource(t.layerExtension),spatialFilter:h?.initialSearchArea,tokenizeSearchString:!0,...h},s=f(t),o=d(t,e,s,r);if(!s.length||!o)continue;if(q.has(t.layerExtension)){q.get(t.layerExtension).sources.set(t,{fields:s,where:o});continue}const{index:i}=await p(m);i.setRef(w);for(const e of s)i.addField(e.name.toLowerCase());let{maxResults:n}=r;null!=r.maxQueryResults&&null!=r.maxResults&&(n=Math.max(r.maxQueryResults,r.maxResults));const a={...r,maxResults:n};R.add(t.layerExtension),q.set(t.layerExtension,{searchOptions:r,queryOptions:a,index:i,results:{count:0,lookup:new Map},sources:new Map([[t,{fields:s,where:o}]])})}},b=async e=>{const t=q.get(e),r=[];for(const[e,s]of t.sources)r.push({source:e,where:s.where,options:t.queryOptions});try{const e=this._queryProvider.queryService.query(r);for await(const t of e){if(x.isDone)return;const{source:e}=t;if(!o(e))continue;const{index:r,sources:s,results:{lookup:i}}=q.get(e.layerExtension),{fields:n}=s.get(e),u={};for(const e of n)u[e.name.toLowerCase()]=c(t,e);const a=`${e.id}-${t.primaryKey}`;!0!==g.get(a)?.queued&&(u[w]=a,r.addDoc(u),i.set(a,t),g.set(a,{feature:t,queued:!1}))}}catch(e){e instanceof i?S.push(e):S.push(new n([[[...t.sources.keys()],e]]))}},v=r=>{const{index:s,searchOptions:o,results:i}=q.get(r),n=s.search(a,{expand:!0});y(n);for(const s of n){const{feature:n,queued:u}=g.get(s.ref);if(n&&!u&&i.lookup.has(s.ref)&&(n.attributes.set(e,s.score),n.attributes.set(t,s.score),g.get(s.ref).queued=!0,x.add(n),i.lookup.delete(s.ref),i.count++),null!=o.maxResults&&i.count>=o.maxResults){R.delete(r);break}}for(const[s,n]of i.lookup){if(null!=o.maxResults&&i.count>=o.maxResults){R.delete(r);break}n.attributes.set(e,50),n.attributes.set(t,50),g.get(s).queued||(g.get(s).queued=!0,x.add(n),i.count++)}},j=async e=>{const{queryOptions:t,searchOptions:r,results:{count:s}}=q.get(e);if(null!=r.maxResults&&s>=r.maxResults)return void R.delete(e);const{scale:o,geometry:i}=await l(t.spatialFilter?.extent??void 0,e.getFullExtent(),r.currentScale,0===s?3:1);i?(t.spatialFilter=i,r.currentScale=o):R.delete(e)},k=async e=>{for(;R.size>0;){if(x.isDone)return;if(await b(e),x.isDone)return;v(e),await j(e)}};return(async()=>{await _();const e=[];for(const[t]of q)e.push(k(t));await Promise.all(e),S.length>0?x.reject(new n(S)):x.done()})(),x}async _count(e,t,r){return this._queryProvider.count(e,t,r)}_suggest(e,t,r){return this._queryProvider.suggest(e,t,r)}}

package/tasks/search/support/_querySearchProviderUtils.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry.js";
+import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
 /**
  * The expanded search area and scale.
  */
@@ -6,7 +6,7 @@ export interface ExpandSearchAreaResult {
     /**
      * The new expanded geometry.
      */
-    geometry?: Geometry;
+    geometry?: GeometryUnion;
     /**
      * The new scale for the returned geometry.
      */