@vertigis/arcgis-extensions 52.2.0 → 53.1.0

package/support/esri.d.ts

@@ -10,17 +10,13 @@ import type PieChartMediaInfo from "@arcgis/core/popup/content/PieChartMediaInfo
  */
 declare const DeprecatedCollection: typeof Collection;
 export { DeprecatedCollection as Collection };
-export type BuildingComponentSublayerCapabilities = __esri.BuildingComponentSublayerCapabilities;
-export type BuildingComponentSublayerCapabilitiesData = __esri.BuildingComponentSublayerCapabilitiesData;
 export type CIMLineSymbol = __esri.CIMLineSymbol;
 export type CIMPointSymbol = __esri.CIMPointSymbol;
 export type CIMPolygonSymbol = __esri.CIMPolygonSymbol;
 export type CIMSymbolReference = __esri.CIMSymbolReference;
 export type CollectionAfterAddEventHandler<T> = __esri.CollectionAfterAddEventHandler<T>;
-export type CollectionAfterChangesEventHandler = __esri.CollectionAfterChangesEventHandler;
 export type CollectionAfterRemoveEventHandler<T> = __esri.CollectionAfterRemoveEventHandler<T>;
 export type CollectionBeforeAddEventHandler<T> = __esri.CollectionBeforeAddEventHandler<T>;
-export type CollectionBeforeChangesEventHandler = __esri.CollectionBeforeChangesEventHandler;
 export type CollectionBeforeRemoveEventHandler<T> = __esri.CollectionBeforeRemoveEventHandler<T>;
 export type CollectionEvent = __esri.CollectionEvent;
 export type CollectionItemEvent<T> = __esri.CollectionItemEvent<T>;
@@ -36,7 +32,6 @@ export type EventHandler = __esri.EventHandler;
 export type FeatureEditResult = __esri.FeatureEditResult;
 export type FeatureLayerApplyEdits = __esri.FeatureLayerApplyEditsEdits;
 export type FeatureLayerCapabilities = __esri.Capabilities;
-export type FeatureLayerElevationInfo = __esri.FeatureLayerBaseElevationInfo;
 export type FeatureLayerProperties = __esri.FeatureLayerProperties;
 export type FieldProperties = __esri.FieldProperties;
 export type GraphicHit = __esri.GraphicHit;
@@ -151,7 +146,7 @@ export type PortalItemType = "Web Map" | "Web Scene" | "Feature Service" | "Map
 /**
  * Raised when items are added, removed, or moved from a Collection.
  */
-export interface ChangeEvent<T> {
+export interface ChangeEvent<T, Target = Collection<T>> {
     /**
      * The items that were added.
      */
@@ -167,7 +162,7 @@ export interface ChangeEvent<T> {
     /**
      * The Collection that raised the event.
      */
-    target: Collection<T>;
+    target: Target;
 }
 /**
  * A callback that is invoked.

package/support/observableUtils.d.ts

@@ -1,6 +1,6 @@
 import Accessor from "@arcgis/core/core/Accessor";
-import Collection from "@arcgis/core/core/Collection.js";
-import type Evented from "@arcgis/core/core/Evented.js";
+import Collection, { type ReadonlyCollection } from "@arcgis/core/core/Collection.js";
+import type { Evented, EventedCallback, EventNames, EventTypes } from "@arcgis/core/core/Evented.js";
 import { type ObservableMap } from "../utilities/ObservableMap.js";
 import type { ObservableSet } from "../utilities/ObservableSet.js";
 /**
@@ -14,7 +14,7 @@ export type Observable = ObservableMixin | Accessor;
  * Represents an object that is collection like and can be observed. This can be
  * an esri collection, an ObservableMap, or an ObservableSet.
  */
-type ObservableCollectionLike<T> = Collection<T> | ObservableMap<any, T> | ObservableSet<T>;
+type ObservableCollectionLike<T> = Collection<T> | ReadonlyCollection<T> | ObservableMap<any, T> | ObservableSet<T>;
 /**
  * Represents a path to a property on an observable or esri class with a base
  * class of accessor. Only traverses to 3 levels deep.
@@ -122,10 +122,10 @@ type NestedEventedPropertyPath<T extends Observable, Depth extends number[]> = {
  */
 type EventedTypeFromPath<T extends Observable, P extends string> = P extends keyof T ? T[P] : P extends `${infer K}.${infer Rest}` ? K extends keyof T ? NonNullable<T[K]> extends Observable ? // Keep recursing through the path to get the type of the
 EventedTypeFromPath<NonNullable<T[K]>, Rest> | (undefined extends T[K] ? undefined : never) : unknown : unknown : unknown;
-type OverloadProps<TOverload> = Pick<TOverload, keyof TOverload>;
-type OverloadUnionRecursive<TOverload, TPartialOverload = unknown> = TOverload extends (...args: infer TArgs) => infer TReturn ? TPartialOverload extends TOverload ? never : OverloadUnionRecursive<TPartialOverload & TOverload, TPartialOverload & ((...args: TArgs) => TReturn) & OverloadProps<TOverload>> | ((...args: TArgs) => TReturn) : never;
-type OverloadUnion<TOverload extends (...args: any[]) => any> = Exclude<OverloadUnionRecursive<(() => never) & TOverload>, TOverload extends () => never ? never : () => never>;
-type OverloadParameters<T extends (...args: any[]) => any> = Parameters<OverloadUnion<T>>;
+/**
+ * Ensures that the given object is an evented object.
+ */
+export type EventTarget<TTarget> = TTarget extends Evented ? TTarget : never;
 /**
  * Options for {@link support/observableUtils!watch}.
  */
@@ -511,7 +511,7 @@ export declare function onWatch<TObsv extends ObservableMixin>(obj: TObsv, path:
  * @throws Error if the object is not observable.
  * @throws Error if the path is to a non-configurable property on an observable.
  */
-export declare function watchEvent<TObsv extends Observable, TPath extends EventedPropertyPath<TObsv>, TTarget extends EventedTypeFromPath<TObsv, TPath>>(obj: TObsv, path: TPath, event: OverloadParameters<NonNullable<TTarget>["on"]>, watchCallback?: (newTarget: TTarget, oldTarget: TTarget) => void): IHandle;
+export declare function watchEvent<TObsv extends Observable, TPath extends EventedPropertyPath<TObsv>, TTarget extends EventedTypeFromPath<TObsv, TPath>, TEventName extends EventNames<EventTarget<TTarget>>>(obj: TObsv, path: TPath, event: [TEventName, EventedCallback<EventTypes<EventTarget<TTarget>>[TEventName]>], watchCallback?: (newTarget: TTarget, oldTarget: TTarget) => void): IHandle;
 /**
  * Watches the given path on the given object and invokes the callback when the
  * value of the property becomes truthy.

package/support/observableUtils.js

@@ -1 +1 @@
-import t from"@arcgis/core/core/Accessor";import e from"@arcgis/core/core/Collection.js";import{watch as n}from"@arcgis/core/core/reactiveUtils";import{}from"../utilities/ObservableMap.js";import{generateUuid as r}from"../utilities/uuid.js";function o(t){return null!=t&&"object"==typeof t&&"__isObservable"in t&&t.__isObservable}function s(t){if(o(t))return t}function i(e){return e instanceof t}function c(t){return t instanceof e||null!=t&&"esri.core.Collection"===t.declaredClass}function a(t){return o(t)&&"ObservableMap"===t[Symbol.toStringTag]}function l(t){return c(t)||a(t)||function(t){return o(t)&&"ObservableSet"===t[Symbol.toStringTag]}(t)}class h{}export function observable(t){return class extends(t??h){__isObservable=!0;_subscribedPaths=new Map;_onWatchPaths=new Map;_onWatch(t,e){let n,o;"string"==typeof t?(n=t,o=e):o=t;let s=this._onWatchPaths.get(n);null==s&&(s=new Map,this._onWatchPaths.set(n,s));const i=r();if(s.set(i,o),null!=n&&this._subscribedPaths.has(n)){this._subscribedPaths.get(n).onWatchHandles.set(i,o())}else if(null==n&&this._subscribedPaths.size>0)for(const[t,e]of this._subscribedPaths){const n=o(t);e.onWatchHandles.set(i,n)}const c=new WeakRef(this);return{remove:()=>{const t=c.deref();if(null==t)return;if(!t._onWatchPaths.has(n))return;const e=t._onWatchPaths.get(n);if(e.delete(i),null!=n&&t._subscribedPaths.has(n)){const e=t._subscribedPaths.get(n),r=e.onWatchHandles.get(i);null!=r&&(r.remove(),e.onWatchHandles.delete(i))}else if(null==n&&t._subscribedPaths.size>0)for(const[,e]of t._subscribedPaths){const t=e.onWatchHandles.get(i);null!=t&&(t.remove(),e.onWatchHandles.delete(i))}0===e.size&&t._onWatchPaths.delete(n)}}}_notifyChange(t){let e;e=null==t?this._subscribedPaths.keys():[t];for(const t of e){const e=this._subscribedPaths.get(t);if(null==e)continue;const n=e.currentValue,r=this[t];if(Object.is(r,n))continue;e.currentValue=r;const o=[...e.callbacks.values()];for(const t of o)t(r,n,this)}}_watch(t,e,n){const r=[];if(t.includes(".")){if(t.includes("[]"))return this._recurseCollectionWatch(t,e,n);const o=t.split("."),s=o.shift(),i=new AbortController,{signal:c}=i,a=new WeakRef(this);let l;const h=p(e,t),u=()=>{if(c.aborted)return void(l=void 0);const t=a.deref();if(null==t){for(const t of r)t.remove();return r.length=0,void(l=void 0)}let e=t[s],n=t;for(let t=0;t<o.length;t++)if(n=e,e=e?.[o[t]],null==e){t<o.length-1&&(n=void 0);break}if(e!==l){const t=l;l=e,h(e,t,n)}},f=n?.sync?p(u,t):w(u,t,c);let b,v,_;if([l,_,b,v]=this._recurseWatch(t,f),r.push(g(b,v)),n?.initial){(n?.sync?p(e,t):w(e,t,c))(l,l,_)}return d(r,i)}return this._watchSingle(t,e,n)}_recurseWatch(t,e){const n=t.split("."),r=n.shift(),c=[];let a,l;if(n.length>0){const t=this[r];if(o(t)){const[r,o,i,h]=s(t)._recurseWatch(n.join("."),e);c.push(g(i,h)),a=r,l=o}else if(i(t)){const[r,o,s]=f(t,n,e,{sync:!0});c.push(s),a=r,l=o}}const h=this._watchSingle(r,((t,r)=>{if(t!==r){if(n.length>0){if(o(r)||i(r)){for(const t of c)t.remove();c.length=0}if(o(t)){const[,,r,o]=s(t)._recurseWatch(n.join("."),e);c.push(g(r,o))}else if(i(t)){const[,,r]=f(t,n,e,{sync:!0});c.push(r)}}e()}}),{sync:!0});return[n.length>0?a:this._subscribedPaths.get(r)?.currentValue,n.length>0?l:this,c,h]}_recurseCollectionWatch(t,e,n){const r=t.split("."),c=r.shift();if("[]"===r[0])return this._collectionWatch(c,r,e,n);{const t=[],a=this._watchSingle(c,(c=>{for(const e of t)e.remove();t.length=0,o(c)?t.push(s(c)._recurseCollectionWatch(r.join("."),e,n)):i(c)&&t.push(f(c,r,e,n)[2])})),l=this[c];return o(l)?t.push(s(l)._recurseCollectionWatch(r.join("."),e,n)):i(l)&&t.push(f(l,r,e,n)[2]),g(t,a)}}_collectionWatch(t,e,n,r){const o=[];l(this[t])&&o.push(b(this[t],e.join("."),n,r));const s=this._watchSingle(t,((t,s)=>{if(l(s)){for(const t of o)t.remove();o.length=0}l(t)&&o.push(b(t,e.join("."),n,r))}),{sync:!0});return g(o,s)}_watchSingle(t,e,n){let o=this._subscribedPaths.get(t)?.callbacks;if(null==o){let e=Object.getOwnPropertyDescriptor(this,t),n=this;for(;null==e&&(n=Object.getPrototypeOf(n),null!=n);)e=Object.getOwnPropertyDescriptor(n,t);if(null==e)return console.warn(`[observableUtils]: The property ${t.toString()} you are trying to watch does not exist on the object and will not be watched. This is likely a coding error or an optional property on an interface that is not implemented on the object. Please check the property name and ensure it exists on the object. Only properties that exist on the object at the time they are watched can be observed for changes.`),{remove:()=>{}};if(!1===e.configurable)throw new Error(`Property "${t.toString()}" is not configurable so it cannot be watched`);o=new Map;const r=new Map;if(this._subscribedPaths.set(t,{callbacks:o,currentValue:this[t],onWatchHandles:r}),!0!==e.writable&&null==e.set||(this._subscribedPaths.get(t).originalDescriptor=e,null!=e.value&&(e.value=void 0),this._createWatchDescriptor(t,e)),this._onWatchPaths.has(t))for(const[e,n]of this._onWatchPaths.get(t))r.set(e,n());if(this._onWatchPaths.has(void 0))for(const[e,n]of this._onWatchPaths.get(void 0))r.set(e,n(t))}const s=new AbortController,i=p(e,t.toString()),{currentValue:c}=this._subscribedPaths.get(t);let a=c;const l=(t,e,n)=>{const r=a;a=t,i(t,r,n)},h=n?.sync?p(l,t.toString()):w(l,t.toString(),s.signal),u=r();return o.set(u,h),n?.initial&&h(c,c,this),this._createSingleWatchRemoveHandle(t,u,s)}_createWatchDescriptor(t,e){const n={configurable:!0,enumerable:e.enumerable};null==e.get?(n.get=()=>this._subscribedPaths.get(t).currentValue,n.set=e=>{const n=this._subscribedPaths.get(t),r=n.currentValue;if(Object.is(r,e))return;n.currentValue=e;const o=[...n.callbacks.values()];for(const t of o)t(e,r,this)}):(n.get=e.get,n.set=n=>{const r=this._subscribedPaths.get(t),o=r.currentValue;if(Object.is(o,n))return void e.set.call(this,n);r.currentValue=n,e.set.call(this,n);const s=[...r.callbacks.values()];for(const t of s)t(n,o,this)}),Object.defineProperty(this,t,n)}_createSingleWatchRemoveHandle(t,e,n){const r=new WeakRef(this);return{remove:()=>{n.abort();const o=r.deref();if(null==o)return;if(!o._subscribedPaths.has(t))return;const{callbacks:s}=o._subscribedPaths.get(t);if(s.delete(e),0===s.size){const e=o._subscribedPaths.get(t);o._subscribedPaths.delete(t);for(const t of e.onWatchHandles.values())t.remove();null!=e.originalDescriptor&&(null==e.originalDescriptor.get&&(e.originalDescriptor.value=e.currentValue),Object.defineProperty(o,t,e.originalDescriptor))}}}}}}const u=new FinalizationRegistry((t=>{t.remove()}));export function watch(t,e,n,r){if(!o(t)&&i(t))return _(t,f(t,e.split("."),n,r)[2]);const c=s(t);if(null==c)throw new Error("Object is not observable");if(r?.once){let t;const o=new AbortController,{signal:s}=o,i=r?.sync?p(n,e):w(n,e,s);let a=!1;const l=(e,n,r)=>{s.aborted||(a=!0,t?.remove(),t=void 0,i(e,n,r))};t=c._watch(e,l,{...r,sync:!0});const h=d([t],o);return a?(h.remove(),h):_(c,h)}return _(c,c._watch(e,n,r))}export function watchEach(t,e,n,r){if(l(t)&&e.startsWith("[]."))return _(t,b(t,e,n,r));if(!o(t)&&i(t))return _(t,f(t,e.split("."),n,r)[2]);const c=s(t);if(null==c)throw new Error("Object is not observable");return _(c,c._watch(e,n,r))}export async function once(t,e,n){const{signal:r}=n??{};return new Promise(((n,o)=>{if(r?.aborted)return void o();const s=()=>{i.remove(),o()},i=watch(t,e,(()=>{r?.removeEventListener("abort",s),n()}),{once:!0});r?.addEventListener("abort",s)}))}export function notifyChange(t,e){const n=s(t);if(null==n)throw new Error("Object is not observable");if(null!=e&&"string"!=typeof e)throw new Error("Path must be a string");n._notifyChange(e)}export function onWatch(t,e,n){const r=s(t);if(null==r)throw new Error("Object is not observable");if("string"==typeof e)return _(r,r._onWatch(e,n));if("function"!=typeof e)throw new Error("Path must be a string or a function");return _(r,r._onWatch(e))}export function watchEvent(t,e,n,r){const o=n[0],s=n[1],i=new WeakMap,c=new Set;let a;return a=watch(t,e,((t,e)=>{if(null!=e&&i.has(e)){const t=i.get(e);t.remove(),i.delete(e),c.delete(t)}if(null!=t&&!i.has(t)){const e=t.on(o,s);i.set(t,e),c.add(e)}t!==e&&r?.(t,e)}),{sync:!0,initial:!0}),_(t,g(c,a))}export function when(t,e,n,r){const{invert:o=!1,once:s,...i}=r??{};let c;const a=p(n,e);let l=!1;return c=watch(t,e,(t=>{!t===o&&(a(),s&&(l=!0,c?.remove(),c=void 0))}),{...i,initial:!0}),s&&l&&c?.remove(),c}export function whenOnce(t,e,n){const{signal:r,invert:o=!1}=n??{};return new Promise(((n,s)=>{if(r?.aborted)return void s();const i=()=>{r?.removeEventListener("abort",i),c.remove(),s()},c=when(t,e,(()=>{r?.aborted||(r?.removeEventListener("abort",i),n())}),{invert:o,once:!0});r?.addEventListener("abort",i)}))}export function createIHandle(t){return{remove:()=>{for(const e of t)e.remove()}}}function f(t,e,r,o){const s=e.indexOf("[]");if(-1!==s){const n=e.slice(0,s),i=e.slice(s),c=[],[a,h,u]=f(t,n,((t,e)=>{if(l(e)){for(const t of c)t.remove();c.length=0}l(t)&&c.push(b(t,i.join("."),r,o))}),{sync:!0});return l(a)&&c.push(b(a,i.join("."),r,o)),[a,h,g(c,u)]}return function(t,e,r,o){const s=new WeakRef(t);let i;const c=()=>{let t=s.deref();if(null==t)return i?.remove(),[void 0,void 0];let n=t;for(let r=0;r<e.length;r++)if(t=n,n=t[e[r]],null==n){r<e.length-1&&(t=void 0);break}return[n,t]},a=new AbortController,{signal:l}=a,h=o?.initial&&!1===o?.sync?w(r,e.join("."),l):p(r,e.join(".")),u=function(t){const e=(e,n)=>{Object.is(e[0],n?.[0])||t(e[0],n?.[0],e[1])};return e}(h),[f,b]=c();return o?.initial&&o?.once?(h(f,f,b),[f,b,d([],a)]):(i=n(c,u,{...o,initial:!1}),o?.initial&&h(f,f,b),[f,b,d([i],a)])}(t,e,r,o)}function b(t,e,n,r){const s=new WeakMap,l=new Set,h=e.slice(3),u=t=>{if(!o(t)&&!i(t)||s.has(t))return;if(!(h.split(".")[0]in t))return;const e=watch(t,h,n,r);s.set(t,e),l.add(e)};l.add(t.on("after-add",(t=>{let e=t.item;"target"in t&&a(t.target)&&(e=t.item[1]),u(e)}))),l.add(t.on("after-remove",(t=>{let e=t.item;if("target"in t&&a(t.target)&&(e=t.item[1]),!o(e)&&!i(e))return;const n=s.get(e);null!=n&&(n.remove(),s.delete(e),l.delete(n))})));for(const e of c(t)?t:t.values())u(e);return g(l)}function d(t,e){return{remove:()=>{e?.abort();for(const e of t)e.remove()}}}function g(t,...e){return{remove:()=>{for(const e of t)e.remove();for(const t of e)t.remove()}}}const v="[observableUtils]: Error thrown by watch callback. Thrown errors from watch callbacks should be avoided where possible, they affect the performance of the entire watch system. Watch property:";function p(t,e){return(...n)=>{try{const r=t(...n);"object"==typeof r&&r instanceof Promise&&r.catch((t=>{console.error(`${v} ${e}`,t)}))}catch(t){console.error(`${v} ${e}`,t)}}}function w(t,e,n){const r=p(t,e);let o=new AbortController;return(...t)=>{o.abort(),o=new AbortController;const{signal:e}=o;queueMicrotask((()=>{n.aborted||e.aborted||r(...t)}))}}function _(t,e){return u.register(t,e,e),{remove:()=>{u.unregister(e),e.remove()}}}
+import e from"@arcgis/core/core/Accessor";import t,{}from"@arcgis/core/core/Collection.js";import{watch as n}from"@arcgis/core/core/reactiveUtils";import{}from"../utilities/ObservableMap.js";import{generateUuid as r}from"../utilities/uuid.js";function o(e){return null!=e&&"object"==typeof e&&"__isObservable"in e&&e.__isObservable}function s(e){if(o(e))return e}function i(t){return t instanceof e}function c(e){return e instanceof t||null!=e&&"esri.core.Collection"===e.declaredClass}function a(e){return o(e)&&"ObservableMap"===e[Symbol.toStringTag]}function l(e){return c(e)||a(e)||function(e){return o(e)&&"ObservableSet"===e[Symbol.toStringTag]}(e)}class h{}export function observable(e){return class extends(e??h){__isObservable=!0;_subscribedPaths=new Map;_onWatchPaths=new Map;_onWatch(e,t){let n,o;"string"==typeof e?(n=e,o=t):o=e;let s=this._onWatchPaths.get(n);null==s&&(s=new Map,this._onWatchPaths.set(n,s));const i=r();if(s.set(i,o),null!=n&&this._subscribedPaths.has(n)){this._subscribedPaths.get(n).onWatchHandles.set(i,o())}else if(null==n&&this._subscribedPaths.size>0)for(const[e,t]of this._subscribedPaths){const n=o(e);t.onWatchHandles.set(i,n)}const c=new WeakRef(this);return{remove:()=>{const e=c.deref();if(null==e)return;if(!e._onWatchPaths.has(n))return;const t=e._onWatchPaths.get(n);if(t.delete(i),null!=n&&e._subscribedPaths.has(n)){const t=e._subscribedPaths.get(n),r=t.onWatchHandles.get(i);null!=r&&(r.remove(),t.onWatchHandles.delete(i))}else if(null==n&&e._subscribedPaths.size>0)for(const[,t]of e._subscribedPaths){const e=t.onWatchHandles.get(i);null!=e&&(e.remove(),t.onWatchHandles.delete(i))}0===t.size&&e._onWatchPaths.delete(n)}}}_notifyChange(e){let t;t=null==e?this._subscribedPaths.keys():[e];for(const e of t){const t=this._subscribedPaths.get(e);if(null==t)continue;const n=t.currentValue,r=this[e];if(Object.is(r,n))continue;t.currentValue=r;const o=[...t.callbacks.values()];for(const e of o)e(r,n,this)}}_watch(e,t,n){const r=[];if(e.includes(".")){if(e.includes("[]"))return this._recurseCollectionWatch(e,t,n);const o=e.split("."),s=o.shift(),i=new AbortController,{signal:c}=i,a=new WeakRef(this);let l;const h=p(t,e),u=()=>{if(c.aborted)return void(l=void 0);const e=a.deref();if(null==e){for(const e of r)e.remove();return r.length=0,void(l=void 0)}let t=e[s],n=e;for(let e=0;e<o.length;e++)if(n=t,t=t?.[o[e]],null==t){e<o.length-1&&(n=void 0);break}if(t!==l){const e=l;l=t,h(t,e,n)}},f=n?.sync?p(u,e):w(u,e,c);let b,v,m;if([l,m,b,v]=this._recurseWatch(e,f),r.push(g(b,v)),n?.initial){(n?.sync?p(t,e):w(t,e,c))(l,l,m)}return d(r,i)}return this._watchSingle(e,t,n)}_recurseWatch(e,t){const n=e.split("."),r=n.shift(),c=[];let a,l;if(n.length>0){const e=this[r];if(o(e)){const[r,o,i,h]=s(e)._recurseWatch(n.join("."),t);c.push(g(i,h)),a=r,l=o}else if(i(e)){const[r,o,s]=f(e,n,t,{sync:!0});c.push(s),a=r,l=o}}const h=this._watchSingle(r,((e,r)=>{if(e!==r){if(n.length>0){if(o(r)||i(r)){for(const e of c)e.remove();c.length=0}if(o(e)){const[,,r,o]=s(e)._recurseWatch(n.join("."),t);c.push(g(r,o))}else if(i(e)){const[,,r]=f(e,n,t,{sync:!0});c.push(r)}}t()}}),{sync:!0});return[n.length>0?a:this._subscribedPaths.get(r)?.currentValue,n.length>0?l:this,c,h]}_recurseCollectionWatch(e,t,n){const r=e.split("."),c=r.shift();if("[]"===r[0])return this._collectionWatch(c,r,t,n);{const e=[],a=this._watchSingle(c,(c=>{for(const t of e)t.remove();e.length=0,o(c)?e.push(s(c)._recurseCollectionWatch(r.join("."),t,n)):i(c)&&e.push(f(c,r,t,n)[2])})),l=this[c];return o(l)?e.push(s(l)._recurseCollectionWatch(r.join("."),t,n)):i(l)&&e.push(f(l,r,t,n)[2]),g(e,a)}}_collectionWatch(e,t,n,r){const o=[];l(this[e])&&o.push(b(this[e],t.join("."),n,r));const s=this._watchSingle(e,((e,s)=>{if(l(s)){for(const e of o)e.remove();o.length=0}l(e)&&o.push(b(e,t.join("."),n,r))}),{sync:!0});return g(o,s)}_watchSingle(e,t,n){let o=this._subscribedPaths.get(e)?.callbacks;if(null==o){let t=Object.getOwnPropertyDescriptor(this,e),n=this;for(;null==t&&(n=Object.getPrototypeOf(n),null!=n);)t=Object.getOwnPropertyDescriptor(n,e);if(null==t)return console.warn(`[observableUtils]: The property ${e.toString()} you are trying to watch does not exist on the object and will not be watched. This is likely a coding error or an optional property on an interface that is not implemented on the object. Please check the property name and ensure it exists on the object. Only properties that exist on the object at the time they are watched can be observed for changes.`),{remove:()=>{}};if(!1===t.configurable)throw new Error(`Property "${e.toString()}" is not configurable so it cannot be watched`);o=new Map;const r=new Map;if(this._subscribedPaths.set(e,{callbacks:o,currentValue:this[e],onWatchHandles:r}),!0!==t.writable&&null==t.set||(this._subscribedPaths.get(e).originalDescriptor=t,null!=t.value&&(t.value=void 0),this._createWatchDescriptor(e,t)),this._onWatchPaths.has(e))for(const[t,n]of this._onWatchPaths.get(e))r.set(t,n());if(this._onWatchPaths.has(void 0))for(const[t,n]of this._onWatchPaths.get(void 0))r.set(t,n(e))}const s=new AbortController,i=p(t,e.toString()),{currentValue:c}=this._subscribedPaths.get(e);let a=c;const l=(e,t,n)=>{const r=a;a=e,i(e,r,n)},h=n?.sync?p(l,e.toString()):w(l,e.toString(),s.signal),u=r();return o.set(u,h),n?.initial&&h(c,c,this),this._createSingleWatchRemoveHandle(e,u,s)}_createWatchDescriptor(e,t){const n={configurable:!0,enumerable:t.enumerable};null==t.get?(n.get=()=>this._subscribedPaths.get(e).currentValue,n.set=t=>{const n=this._subscribedPaths.get(e),r=n.currentValue;if(Object.is(r,t))return;n.currentValue=t;const o=[...n.callbacks.values()];for(const e of o)e(t,r,this)}):(n.get=t.get,n.set=n=>{const r=this._subscribedPaths.get(e),o=r.currentValue;if(Object.is(o,n))return void t.set.call(this,n);r.currentValue=n,t.set.call(this,n);const s=[...r.callbacks.values()];for(const e of s)e(n,o,this)}),Object.defineProperty(this,e,n)}_createSingleWatchRemoveHandle(e,t,n){const r=new WeakRef(this);return{remove:()=>{n.abort();const o=r.deref();if(null==o)return;if(!o._subscribedPaths.has(e))return;const{callbacks:s}=o._subscribedPaths.get(e);if(s.delete(t),0===s.size){const t=o._subscribedPaths.get(e);o._subscribedPaths.delete(e);for(const e of t.onWatchHandles.values())e.remove();null!=t.originalDescriptor&&(null==t.originalDescriptor.get&&(t.originalDescriptor.value=t.currentValue),Object.defineProperty(o,e,t.originalDescriptor))}}}}}}const u=new FinalizationRegistry((e=>{e.remove()}));export function watch(e,t,n,r){if(!o(e)&&i(e))return m(e,f(e,t.split("."),n,r)[2]);const c=s(e);if(null==c)throw new Error("Object is not observable");if(r?.once){let e;const o=new AbortController,{signal:s}=o,i=r?.sync?p(n,t):w(n,t,s);let a=!1;const l=(t,n,r)=>{s.aborted||(a=!0,e?.remove(),e=void 0,i(t,n,r))};e=c._watch(t,l,{...r,sync:!0});const h=d([e],o);return a?(h.remove(),h):m(c,h)}return m(c,c._watch(t,n,r))}export function watchEach(e,t,n,r){if(l(e)&&t.startsWith("[]."))return m(e,b(e,t,n,r));if(!o(e)&&i(e))return m(e,f(e,t.split("."),n,r)[2]);const c=s(e);if(null==c)throw new Error("Object is not observable");return m(c,c._watch(t,n,r))}export async function once(e,t,n){const{signal:r}=n??{};return new Promise(((n,o)=>{if(r?.aborted)return void o();const s=()=>{i.remove(),o()},i=watch(e,t,(()=>{r?.removeEventListener("abort",s),n()}),{once:!0});r?.addEventListener("abort",s)}))}export function notifyChange(e,t){const n=s(e);if(null==n)throw new Error("Object is not observable");if(null!=t&&"string"!=typeof t)throw new Error("Path must be a string");n._notifyChange(t)}export function onWatch(e,t,n){const r=s(e);if(null==r)throw new Error("Object is not observable");if("string"==typeof t)return m(r,r._onWatch(t,n));if("function"!=typeof t)throw new Error("Path must be a string or a function");return m(r,r._onWatch(t))}export function watchEvent(e,t,n,r){const o=n[0],s=n[1],i=new WeakMap,c=new Set;let a;return a=watch(e,t,((e,t)=>{if(null!=t&&i.has(t)){const e=i.get(t);e.remove(),i.delete(t),c.delete(e)}if(null!=e&&!i.has(e)){const t=e.on(o,s);i.set(e,t),c.add(t)}e!==t&&r?.(e,t)}),{sync:!0,initial:!0}),m(e,g(c,a))}export function when(e,t,n,r){const{invert:o=!1,once:s,...i}=r??{};let c;const a=p(n,t);let l=!1;return c=watch(e,t,(e=>{!e===o&&(a(),s&&(l=!0,c?.remove(),c=void 0))}),{...i,initial:!0}),s&&l&&c?.remove(),c}export function whenOnce(e,t,n){const{signal:r,invert:o=!1}=n??{};return new Promise(((n,s)=>{if(r?.aborted)return void s();const i=()=>{r?.removeEventListener("abort",i),c.remove(),s()},c=when(e,t,(()=>{r?.aborted||(r?.removeEventListener("abort",i),n())}),{invert:o,once:!0});r?.addEventListener("abort",i)}))}export function createIHandle(e){return{remove:()=>{for(const t of e)t.remove()}}}function f(e,t,r,o){const s=t.indexOf("[]");if(-1!==s){const n=t.slice(0,s),i=t.slice(s),c=[],[a,h,u]=f(e,n,((e,t)=>{if(l(t)){for(const e of c)e.remove();c.length=0}l(e)&&c.push(b(e,i.join("."),r,o))}),{sync:!0});return l(a)&&c.push(b(a,i.join("."),r,o)),[a,h,g(c,u)]}return function(e,t,r,o){const s=new WeakRef(e);let i;const c=()=>{let e=s.deref();if(null==e)return i?.remove(),[void 0,void 0];let n=e;for(let r=0;r<t.length;r++)if(e=n,n=e[t[r]],null==n){r<t.length-1&&(e=void 0);break}return[n,e]},a=new AbortController,{signal:l}=a,h=o?.initial&&!1===o?.sync?w(r,t.join("."),l):p(r,t.join(".")),u=function(e){const t=(t,n)=>{Object.is(t[0],n?.[0])||e(t[0],n?.[0],t[1])};return t}(h),[f,b]=c();return o?.initial&&o?.once?(h(f,f,b),[f,b,d([],a)]):(i=n(c,u,{...o,initial:!1}),o?.initial&&h(f,f,b),[f,b,d([i],a)])}(e,t,r,o)}function b(e,t,n,r){const s=new WeakMap,l=new Set,h=t.slice(3),u=e=>{if(!o(e)&&!i(e)||s.has(e))return;if(!(h.split(".")[0]in e))return;const t=watch(e,h,n,r);s.set(e,t),l.add(t)},f=e=>{if(!o(e)&&!i(e))return;const t=s.get(e);null!=t&&(t.remove(),s.delete(e),l.delete(t))};a(e)?(l.add(e.on("after-add",(e=>{u(e.item[1])}))),l.add(e.on("after-remove",(e=>{f(e.item[1])})))):(l.add(e.on("after-add",(e=>{u(e.item)}))),l.add(e.on("after-remove",(e=>{f(e.item)}))));for(const t of c(e)?e:e.values())u(t);return g(l)}function d(e,t){return{remove:()=>{t?.abort();for(const t of e)t.remove()}}}function g(e,...t){return{remove:()=>{for(const t of e)t.remove();for(const e of t)e.remove()}}}const v="[observableUtils]: Error thrown by watch callback. Thrown errors from watch callbacks should be avoided where possible, they affect the performance of the entire watch system. Watch property:";function p(e,t){return(...n)=>{try{const r=e(...n);"object"==typeof r&&r instanceof Promise&&r.catch((e=>{console.error(`${v} ${t}`,e)}))}catch(e){console.error(`${v} ${t}`,e)}}}function w(e,t,n){const r=p(e,t);let o=new AbortController;return(...e)=>{o.abort(),o=new AbortController;const{signal:t}=o;queueMicrotask((()=>{n.aborted||t.aborted||r(...e)}))}}function m(e,t){return u.register(e,t,t),{remove:()=>{u.unregister(t),t.remove()}}}

package/tasks/identify/ArcGISSublayerIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import { type Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { MapImageSublayerExtension } from "../../mapping/MapImageSublayerExtension.js";

package/tasks/identify/BuildingComponentSublayerHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { BuildingComponentSublayerExtension } from "../../mapping/BuildingComponentSublayerExtension.js";
 import { HitTestIdentifyProvider } from "./HitTestIdentifyProvider.js";

package/tasks/identify/CSVLayer3DHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import { HitTestIdentifyProvider } from "./HitTestIdentifyProvider.js";
 import type { IdentifyOptions } from "./IdentifyOptions.js";

package/tasks/identify/CSVLayerClientSideQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/FeatureLayer3DHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import { FeatureLayerQueryProvider } from "../query/FeatureLayerQueryProvider.js";
 import { HitTestIdentifyProvider } from "./HitTestIdentifyProvider.js";

package/tasks/identify/FeatureLayerClientSideIdentifyProvider.d.ts

@@ -1,5 +1,5 @@
 import type Graphic from "@arcgis/core/Graphic";
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { FeatureLayerExtension } from "../../mapping/FeatureLayerExtension.js";
 import { ClientSideIdentifyProvider } from "./ClientSideIdentifyProvider.js";

package/tasks/identify/FeatureLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/GeoJSONLayer3DHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import { GeoJSONLayerClientSideQueryProvider } from "../query/GeoJSONLayerClientSideQueryProvider.js";
 import { HitTestIdentifyProvider } from "./HitTestIdentifyProvider.js";

package/tasks/identify/GeoJSONLayerClientSideQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/GeoRSSLayerIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/GraphicsLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/HitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { BuildingComponentSublayerExtension } from "../../mapping/BuildingComponentSublayerExtension.js";

package/tasks/identify/IdentifyProviderBase.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

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 { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import { MapExtension } from "../../mapping/MapExtension.js";

package/tasks/identify/ImageryLayerIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/KMLLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/MapNotesSublayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/PointCloudLayerHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { PointCloudLayerExtension } from "../../mapping/PointCloudLayerExtension.js";
 import { HitTestIdentifyProvider } from "./HitTestIdentifyProvider.js";

package/tasks/identify/RouteLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/SceneLayerHitTestIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { SceneLayerExtension } from "../../mapping/SceneLayerExtension.js";
 import { SceneLayerQueryProvider } from "../query/SceneLayerQueryProvider.js";

package/tasks/identify/SceneLayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { SceneLayerExtension } from "../../mapping/SceneLayerExtension.js";

package/tasks/identify/SubtypeSublayerQueryIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CountResult } from "../CountResult.js";

package/tasks/identify/WMSLayerFeatureInfoIdentifyProvider.d.ts

@@ -1,5 +1,5 @@
 import type SpatialReference from "@arcgis/core/geometry/SpatialReference.js";
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { WMSLayerExtension } from "../../mapping/WMSLayerExtension.js";

package/tasks/identify/WMSSublayerIdentifyProvider.d.ts

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { WMSSublayerExtension } from "../../mapping/WMSSublayerExtension.js";

package/tasks/query/QueryOptions.d.ts

@@ -1,5 +1,5 @@
 import type SpatialReference from "@arcgis/core/geometry/SpatialReference";
-import type { GeometryUnion } from "@arcgis/core/unionTypes.js";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CancelToken } from "../../support/Cancellable.js";
 /**

package/tasks/query/SubtypeSublayerQueryProvider.d.ts

@@ -1,5 +1,6 @@
 import type { Feature } from "../../data/Feature.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
+import type { SubtypeSublayerExtension } from "../../mapping/SubtypeSublayerExtension.js";
 import type { CountResult } from "../CountResult.js";
 import { QueryOptions } from "./QueryOptions.js";
 import { QueryProviderBase } from "./QueryProviderBase.js";
@@ -14,8 +15,8 @@ export declare class SubtypeSublayerQueryProvider extends QueryProviderBase {
     /**
      * @inheritDoc
      */
-    protected _query(source: FeatureSource, where: string, options: QueryOptions): AsyncIterable<Feature>;
-    protected _queryMany(sources: FeatureSource[], where: string, options?: QueryOptions): AsyncIterable<Feature>;
+    protected _query(source: SubtypeSublayerExtension, where: string, options: QueryOptions): AsyncIterable<Feature>;
+    protected _queryMany(sources: SubtypeSublayerExtension[], where: string, options?: QueryOptions): AsyncIterable<Feature>;
     /**
      * @inheritDoc
      */

package/tasks/search/SearchOptions.d.ts

@@ -1,6 +1,6 @@
 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 { GeometryUnion } from "@arcgis/core/geometry/types.js";
 import type { FeatureSource } from "../../data/FeatureSource.js";
 import type { CancelToken } from "../../support/Cancellable.js";
 import type { TaskResult } from "../TaskResult.js";

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

@@ -1,4 +1,4 @@
-import type { GeometryUnion } from "@arcgis/core/unionTypes";
+import type { GeometryUnion } from "@arcgis/core/geometry/types.js";
 /**
  * The expanded search area and scale.
  */

package/utilities/CollectionProxy.d.ts

@@ -1,6 +1,9 @@
+import type { GroupKey } from "@arcgis/core/core/Accessor.js";
 import type Collection from "@arcgis/core/core/Collection";
-import Evented from "@arcgis/core/core/Evented.js";
-import type { ItemCallback, ItemCompareCallback, ItemMapCallback, ItemReduceCallback, ItemTestCallback, CollectionAfterAddEventHandler, CollectionChangeEventHandler, CollectionAfterChangesEventHandler, CollectionAfterRemoveEventHandler, CollectionBeforeAddEventHandler, CollectionBeforeChangesEventHandler, CollectionBeforeRemoveEventHandler, EventHandler } from "../support/esri.js";
+import type { CollectionEvents, ItemCallback, ReadonlyArrayOrCollection } from "@arcgis/core/core/Collection";
+import { Evented } from "@arcgis/core/core/Evented.js";
+import type { ItemCompareCallback, ItemMapCallback, ItemReduceCallback, ItemTestCallback } from "../support/esri.js";
+import { type IHandle } from "../support/observableUtils.js";
 /**
  * Merge typings of Collection and CollectionProxy.
  */
@@ -13,20 +16,24 @@ declare const CollectionProxy_base: typeof Evented & (abstract new (...args: any
  * default implementations of each method and property accessor simply forward
  * to the wrapped collection. Methods that add or remove elements from the
  * collection are implemented in terms of add() and removeAt(), so subclasses
- * that need to implement special add/remove logic only need to override those
- * methods.
+ * that need to implement special add/remove logic only need to those methods.
  */
-export declare abstract class CollectionProxy<T> extends CollectionProxy_base implements Omit<Collection<T>, "notifyChange"> {
-    private readonly _handles;
+export declare abstract class CollectionProxy<T> extends CollectionProxy_base implements Collection<T> {
     /**
-     * The number of items in the collection.
+     * @deprecated Do not directly reference this property. Use EventNames and
+     *   EventTypes helpers from @arcgis/core/Evented.
      */
-    get length(): number;
+    "@eventTypes": CollectionEvents<T>;
     /**
      * The declared class name. This is always `"esri.core.Collection"` for
      * compatibility with Esri's API.
      */
-    get declaredClass(): string;
+    declaredClass: string;
+    private readonly _handles;
+    /**
+     * The number of items in the collection.
+     */
+    get length(): number;
     /**
      * Whether the collection has been destroyed.
      */
@@ -72,7 +79,7 @@ export declare abstract class CollectionProxy<T> extends CollectionProxy_base im
      * @param index Zero-based index of where in the collection to add the
      *   items. If not specified, the items will be added at the end.
      */
-    addMany(items: ArrayLike<T> | Collection<T>, index?: number): this;
+    addMany(items: ReadonlyArrayOrCollection<T>, index?: number): this;
     /**
      * Creates a deep clone of the Collection. To create a shallow clone of the
      * collection, use slice().
@@ -86,6 +93,18 @@ export declare abstract class CollectionProxy<T> extends CollectionProxy_base im
      *   Collection.
      */
     concat(value: T[] | Collection<T>): Collection<T>;
+    /**
+     * @inheritdoc
+     */
+    destroyAll(): void;
+    /**
+     * @inheritdoc
+     */
+    destroyMany(items: ReadonlyArrayOrCollection<T>): T[];
+    /**
+     * @inheritdoc
+     */
+    drain(callback: ItemCallback<T>, thisArg?: any): void;
     /**
      * Removes all event listeners and destroys the collection.
      */
@@ -199,17 +218,6 @@ export declare abstract class CollectionProxy<T> extends CollectionProxy_base im
      *   and returns a new value at the same index of the original item.
      */
     map<U>(callback: ItemMapCallback<T, U>): Collection<U>;
-    /**
-     * @inheritdoc
-     */
-    on(type: "after-add", listener: CollectionAfterAddEventHandler<T>): IHandle;
-    on(type: "after-changes", listener: CollectionAfterChangesEventHandler): IHandle;
-    on(type: "after-remove", listener: CollectionAfterRemoveEventHandler<T>): IHandle;
-    on(type: "before-add", listener: CollectionBeforeAddEventHandler<T>): IHandle;
-    on(type: "before-changes", listener: CollectionBeforeChangesEventHandler): IHandle;
-    on(type: "before-remove", listener: CollectionBeforeRemoveEventHandler<T>): IHandle;
-    on(type: "change", listener: CollectionChangeEventHandler<T>): IHandle;
-    on(type: string, listener: EventHandler): IHandle;
     /**
      * Removes the last item from the collection and returns it.
      */
@@ -262,7 +270,7 @@ export declare abstract class CollectionProxy<T> extends CollectionProxy_base im
      *
      * @param items The items to remove.
      */
-    removeMany(items: ArrayLike<T> | Collection<T>): T[];
+    removeMany(items: ReadonlyArrayOrCollection<T>): T[];
     /**
      * Moves an item in the Collection to a specified index. The change event is
      * fired after an item is moved in the Collection.

package/utilities/CollectionProxy.js

@@ -1 +1 @@
-import t from"@arcgis/core/core/Evented.js";import{notifyChange as e,observable as o,onWatch as i,watch as n}from"../support/observableUtils.js";import{_generateChangeEvent as r}from"./collection.js";const s="collection-proxy-collection-change-handles";export class CollectionProxy extends(o(t)){_handles=new Map;get length(){return this._collection.length}get declaredClass(){return"esri.core.Collection"}get destroyed(){return this._destroyed}set destroyed(t){this._destroyed=t}get initialized(){return this._initialized}set initialized(t){this._initialized=t}get _collection(){if(void 0===this._collectionField)throw new Error("CollectionProxy requires a backing collection.");return this._collectionField}set _collection(t){if(this._collectionField===t)return;const o=this._collectionField;this.removeHandles(s);const i=r(o,t);if(null!=i){for(const t of i.added){const e={item:t,cancellable:!1,defaultPrevented:!1,preventDefault:()=>{},target:this};this.emit("before-add",e)}for(const t of i.removed){const e={item:t,cancellable:!1,defaultPrevented:!1,preventDefault:()=>{},target:this};this.emit("before-remove",e)}this.emit("before-changes",{cancellable:!1,defaultPrevented:!1,preventDefault:()=>{},target:this})}if(this._collectionField=t,this._addForwardingEvents(),null!=i){this.emit("change",i);for(const t of i.added)this.emit("after-add",{item:t,target:this});for(const t of i.removed)this.emit("after-remove",{item:t,target:this});this.emit("after-changes")}e(this,"length")}_destroyed=!1;_initialized=!0;_collectionField;constructor(t){super(),this._collectionField=t,this._addForwardingEvents()}*[Symbol.iterator](){for(const t of this._collection)yield t}add(t,e){return this._collection.add(t,e),this}addMany(t,e){if(!t)return this;if(arguments.length>1){let o=e;for(let e=0;e<t.length;e++)"function"==typeof t.getItemAt?this.add(t.getItemAt(e),o++):this.add(t[e],o++)}else for(let e=0;e<t.length;e++)"function"==typeof t.getItemAt?this.add(t.getItemAt(e)):this.add(t[e]);return this}clone(){const t=Object.create(Object.getPrototypeOf(this));return t._collection=this._collection,t}concat(t){return this._collection.concat(t)}destroy(){this.removeHandles(),this._destroyed=!0,this._initialized=!1,this._collection.destroy()}every(t){return this._collection.every(t)}filter(t){return this._collection.filter(t)}find(t){return this._collection.find(t)}findIndex(t){return this._collection.findIndex(t)}flatten(t){return this._collection.flatten(t)}forEach(t){return this._collection.forEach(t)}at(t){return this.getItemAt(t)}getItemAt(t){return this._collection.getItemAt(t)}includes(t){return this._collection.includes(t)}indexOf(t,e){return this._collection.indexOf(t,e)}join(t){return this._collection.join(t)}lastIndexOf(t,e){return this._collection.lastIndexOf(t,e)}map(t){return this._collection.map(t)}on(t,e){return super.on(t,e)}pop(){return this.removeAt(this.length-1)}push(t){return this.add(t,this.length),this.length}reduce(t,e){return this._collection.reduce(t,e)}reduceRight(t,e){return this._collection.reduceRight(t,e)}remove(t){return this.removeAt(this.indexOf(t))}removeAll(){const t=[];for(;this.length;){const e=this.pop();e&&t.push(e)}return t}removeAt(t){return this._collection.removeAt(t)}removeMany(t){const e=[];for(let o=0;o<t.length;o++){const i="function"==typeof t.getItemAt?t.getItemAt(o):t[o],n=this.indexOf(i);if(n>=0){const t=this.removeAt(n);t&&e.push(t)}}return e}reorder(t,e){return this._collection.reorder(t,e)}reverse(){return this._collection.reverse(),this}shift(){return this.removeAt(0)}slice(t,e){return this._collection.slice(t,e)}some(t){return this._collection.some(t)}sort(t){return this._collection.sort(t),this}splice(t,e,...o){const i=[];for(let o=e;o>0;o--){const e=this.removeAt(t);e&&i.push(e)}let n=t;return o.forEach((t=>{this.add(t,n),n++})),i}toArray(){return this._collection.toArray()}unshift(t){return this.add(t,0),this.length}set(t,e){throw new Error("set is not supported on CollectionProxy.")}get(t){throw new Error("get is not supported on CollectionProxy.")}watch(t,e,o){throw new Error("watch is not supported on CollectionProxy. Use watch from @vertigis/arcgis-extensions/support/observableUtils instead.")}addHandles(t,e){const o=Array.isArray(t)?t:[t],i=e??"default";this._handles.has(i)||this._handles.set(i,[]),this._handles.get(i).push(...o)}removeHandles(t){if(null==t)for(const t of this._handles.values())for(const e of t)e.remove();else{const e=this._handles.get(t);if(null!=e){for(const t of e)t.remove();this._handles.delete(t)}}}hasHandles(t){return null==t?this._handles.size>0:this._handles.has(t)}notifyChange(t){throw new Error("notifyChange is not supported on CollectionProxy.")}_get(t){const e=t.split(".");let o=this;for(;o&&"object"==typeof o&&e.length;)o=o[e.shift()];return e.length?void 0:o}_set(t,e){const o=t.split(".");let i=this;for(;i&&"object"==typeof i&&o.length>1;)i=i[o.shift()];return i&&"object"==typeof i&&(i[o[0]]=e),this}_addForwardingEvents(){null!=this._collectionField&&this.addHandles([this._collectionField.on("before-add",(t=>this.emit("before-add",t))),this._collectionField.on("before-changes",(t=>this.emit("before-changes",t))),this._collectionField.on("before-remove",(t=>this.emit("before-remove",t))),this._collectionField.on("change",(t=>this.emit("change",t))),this._collectionField.on("after-add",(t=>this.emit("after-add",t))),this._collectionField.on("after-changes",(t=>this.emit("after-changes",t))),this._collectionField.on("after-remove",(t=>this.emit("after-remove",t))),i(this,"length",(()=>n(this._collectionField,"length",(()=>e(this,"length")),{sync:!0})))],s)}}
+import{Evented as t}from"@arcgis/core/core/Evented.js";import{notifyChange as e,observable as o,onWatch as i,watch as n}from"../support/observableUtils.js";import{_generateChangeEvent as r}from"./collection.js";const s="collection-proxy-collection-change-handles";export class CollectionProxy extends(o(t)){declaredClass="esri.core.Collection";_handles=new Map;get length(){return this._collection.length}get destroyed(){return this._destroyed}set destroyed(t){this._destroyed=t}get initialized(){return this._initialized}set initialized(t){this._initialized=t}get _collection(){if(void 0===this._collectionField)throw new Error("CollectionProxy requires a backing collection.");return this._collectionField}set _collection(t){if(this._collectionField===t)return;const o=this._collectionField;this.removeHandles(s);const i=r(o,t);if(null!=i){for(const t of i.added){const e={item:t,cancellable:!1,defaultPrevented:!1,preventDefault:()=>{},target:this};this.emit("before-add",e)}for(const t of i.removed){const e={item:t,cancellable:!1,defaultPrevented:!1,preventDefault:()=>{},target:this};this.emit("before-remove",e)}this.emit("before-changes",{cancellable:!1,defaultPrevented:!1,preventDefault:()=>{},item:void 0})}if(this._collectionField=t,this._addForwardingEvents(),null!=i){this.emit("change",i);for(const t of i.added)this.emit("after-add",{item:t});for(const t of i.removed)this.emit("after-remove",{item:t});this.emit("after-changes")}e(this,"length")}_destroyed=!1;_initialized=!0;_collectionField;constructor(t){super(),this._collectionField=t,this._addForwardingEvents()}*[Symbol.iterator](){for(const t of this._collection)yield t}add(t,e){return this._collection.add(t,e),this}addMany(t,e){if(!t)return this;if(arguments.length>1){let o=e;for(let e=0;e<t.length;e++)"function"==typeof t.getItemAt?this.add(t.getItemAt(e),o++):this.add(t[e],o++)}else for(let e=0;e<t.length;e++)"function"==typeof t.getItemAt?this.add(t.getItemAt(e)):this.add(t[e]);return this}clone(){const t=Object.create(Object.getPrototypeOf(this));return t._collection=this._collection,t}concat(t){return this._collection.concat(t)}destroyAll(){return this._collection.destroyAll()}destroyMany(t){return this._collection.destroyMany(t)}drain(t,e){this._collection.drain(t,e)}destroy(){this.removeHandles(),this._destroyed=!0,this._initialized=!1,this._collection.destroy()}every(t){return this._collection.every(t)}filter(t){return this._collection.filter(t)}find(t){return this._collection.find(t)}findIndex(t){return this._collection.findIndex(t)}flatten(t){return this._collection.flatten(t)}forEach(t){return this._collection.forEach(t)}at(t){return this.getItemAt(t)}getItemAt(t){return this._collection.getItemAt(t)}includes(t){return this._collection.includes(t)}indexOf(t,e){return this._collection.indexOf(t,e)}join(t){return this._collection.join(t)}lastIndexOf(t,e){return this._collection.lastIndexOf(t,e)}map(t){return this._collection.map(t)}pop(){return this.removeAt(this.length-1)}push(t){return this.add(t,this.length),this.length}reduce(t,e){return this._collection.reduce(t,e)}reduceRight(t,e){return this._collection.reduceRight(t,e)}remove(t){return this.removeAt(this.indexOf(t))}removeAll(){const t=[];for(;this.length;){const e=this.pop();e&&t.push(e)}return t}removeAt(t){return this._collection.removeAt(t)}removeMany(t){const e=[];for(let o=0;o<t.length;o++){const i="function"==typeof t.getItemAt?t.getItemAt(o):t[o],n=this.indexOf(i);if(n>=0){const t=this.removeAt(n);t&&e.push(t)}}return e}reorder(t,e){return this._collection.reorder(t,e)}reverse(){return this._collection.reverse(),this}shift(){return this.removeAt(0)}slice(t,e){return this._collection.slice(t,e)}some(t){return this._collection.some(t)}sort(t){return this._collection.sort(t),this}splice(t,e,...o){const i=[];for(let o=e;o>0;o--){const e=this.removeAt(t);e&&i.push(e)}let n=t;return o.forEach((t=>{this.add(t,n),n++})),i}toArray(){return this._collection.toArray()}unshift(t){return this.add(t,0),this.length}set(t,e){throw new Error("set is not supported on CollectionProxy.")}get(t){throw new Error("get is not supported on CollectionProxy.")}watch(t,e,o){throw new Error("watch is not supported on CollectionProxy. Use watch from @vertigis/arcgis-extensions/support/observableUtils instead.")}addHandles(t,e){const o=Array.isArray(t)?t:[t],i=e??"default";this._handles.has(i)||this._handles.set(i,[]),this._handles.get(i).push(...o)}removeHandles(t){if(null==t)for(const t of this._handles.values())for(const e of t)e.remove();else{const e=this._handles.get(t);if(null!=e){for(const t of e)t.remove();this._handles.delete(t)}}}hasHandles(t){return null==t?this._handles.size>0:this._handles.has(t)}notifyChange(t){throw new Error("notifyChange is not supported on CollectionProxy.")}_get(t){const e=t.split(".");let o=this;for(;o&&"object"==typeof o&&e.length;)o=o[e.shift()];return e.length?void 0:o}_set(t,e){const o=t.split(".");let i=this;for(;i&&"object"==typeof i&&o.length>1;)i=i[o.shift()];return i&&"object"==typeof i&&(i[o[0]]=e),this}_addForwardingEvents(){null!=this._collectionField&&this.addHandles([this._collectionField.on("before-add",(t=>this.emit("before-add",t))),this._collectionField.on("before-changes",(t=>this.emit("before-changes",t))),this._collectionField.on("before-remove",(t=>this.emit("before-remove",t))),this._collectionField.on("change",(t=>this.emit("change",t))),this._collectionField.on("after-add",(t=>this.emit("after-add",t))),this._collectionField.on("after-changes",(t=>this.emit("after-changes",t))),this._collectionField.on("after-remove",(t=>this.emit("after-remove",t))),i(this,"length",(()=>n(this._collectionField,"length",(()=>e(this,"length")),{sync:!0})))],s)}}

package/utilities/MapTransformCollection.js

@@ -1 +1 @@
-import{onWatch as e,watch as t,notifyChange as i}from"../support/observableUtils.js";import{ReadOnlyCollection as a}from"./ReadOnlyCollection.js";export class MapTransformCollection extends a{get _collection(){return this._originalCollection.map(this._callback)}_callback;_originalCollection;constructor(a,s){super(),this._callback=s,this._originalCollection=a,a.on("change",(e=>{this.hasEventListener("change")&&this.emit("change",{added:e.added.map(this._callback),removed:e.removed.map(this._callback),moved:e.moved.map(this._callback),target:this})})),a.on("before-add",(e=>{this.hasEventListener("before-add")&&this.emit("before-add",{...e,item:this._callback(e.item),target:this})})),a.on("before-remove",(e=>{this.hasEventListener("before-remove")&&this.emit("before-remove",{...e,item:this._callback(e.item),target:this})})),a.on("before-changes",(e=>{this.hasEventListener("before-changes")&&this.emit("before-changes",{...e,target:this})})),a.on("after-add",(e=>{this.hasEventListener("after-add")&&this.emit("after-add",{...e,item:this._callback(e.item),target:this})})),a.on("after-remove",(e=>{this.hasEventListener("after-remove")&&this.emit("after-remove",{...e,item:this._callback(e.item),target:this})})),a.on("after-changes",(e=>{this.hasEventListener("after-changes")&&this.emit("after-changes",{...e,target:this})})),e(this,"length",(()=>t(this._originalCollection,"length",(()=>i(this,"length")),{sync:!0})))}}
+import{onWatch as e,watch as t,notifyChange as i}from"../support/observableUtils.js";import{ReadOnlyCollection as a}from"./ReadOnlyCollection.js";export class MapTransformCollection extends a{get _collection(){return this._originalCollection.map(this._callback)}_callback;_originalCollection;constructor(a,s){super(),this._callback=s,this._originalCollection=a,a.on("change",(e=>{this.hasEventListener("change")&&this.emit("change",{added:e.added.map(this._callback),removed:e.removed.map(this._callback),moved:e.moved.map(this._callback)})})),a.on("before-add",(e=>{this.hasEventListener("before-add")&&this.emit("before-add",{...e,item:this._callback(e.item)})})),a.on("before-remove",(e=>{this.hasEventListener("before-remove")&&this.emit("before-remove",{...e,item:this._callback(e.item)})})),a.on("after-add",(e=>{this.hasEventListener("after-add")&&this.emit("after-add",{...e,item:this._callback(e.item)})})),a.on("after-remove",(e=>{this.hasEventListener("after-remove")&&this.emit("after-remove",{...e,item:this._callback(e.item)})})),a.on("after-changes",(e=>{this.hasEventListener("after-changes")&&this.emit("after-changes",{...e})})),e(this,"length",(()=>t(this._originalCollection,"length",(()=>i(this,"length")),{sync:!0})))}}

package/utilities/ObservableMap.d.ts

@@ -1,5 +1,4 @@
-import Evented from "@arcgis/core/core/Evented.js";
-import type { EventHandler } from "../support/esri.js";
+import { Evented } from "@arcgis/core/core/Evented.js";
 import type { AfterItemChangeEvent } from "./collection.js";
 /**
  * Raised when items are added or removed from an {@link ObservableMap}.
@@ -18,11 +17,40 @@ export interface MapChangeEvent<K, V> {
      */
     target: ObservableMap<K, V>;
 }
+/**
+ * Raised after an item is added or removed from an {@link ObservableMap}.
+ */
+export interface MapAfterItemEvent<K, V> extends AfterItemChangeEvent<ObservableMap<K, V>, [K, V]> {
+}
+/**
+ * A type that maps event names to their corresponding event object types for an
+ * {@link ObservableMap}.
+ */
+export interface MapEvents<K, V> {
+    /**
+     * Fires after an item has been Added or removed from the Map. From the
+     * Collection.
+     */
+    change: MapChangeEvent<K, V>;
+    /**
+     * Fires after an item has been added to the Map.
+     */
+    "after-add": MapAfterItemEvent<K, V>;
+    /**
+     * Fires after an item has been removed from the Map.
+     */
+    "after-remove": MapAfterItemEvent<K, V>;
+}
 declare const ObservableMap_base: typeof Evented & (abstract new (...args: any[]) => import("../support/observableUtils.js").ObservableMixin);
 /**
  * A Map that supports observability.
  */
 export declare class ObservableMap<K, V> extends ObservableMap_base implements Map<K, V> {
+    /**
+     * @deprecated Do not directly reference this property. Use EventNames and
+     *   EventTypes helpers from @arcgis/core/Evented.
+     */
+    "@eventTypes": MapEvents<K, V>;
     /**
      * Used by Object.toString().
      */
@@ -84,9 +112,5 @@ export declare class ObservableMap<K, V> extends ObservableMap_base implements M
      * Returns a serializable representation of the map.
      */
     toJSON(): unknown;
-    on(name: "change", callback: (event: MapChangeEvent<K, V>) => void): IHandle;
-    on(name: "after-add", callback: (event: AfterItemChangeEvent<ObservableMap<K, V>, [K, V]>) => void): IHandle;
-    on(name: "after-remove", callback: (event: AfterItemChangeEvent<ObservableMap<K, V>, [K, V]>) => void): IHandle;
-    on(name: string, callback: EventHandler): IHandle;
 }
 export {};

package/utilities/ObservableMap.js

@@ -1 +1 @@
-import t from"@arcgis/core/core/Evented.js";import{notifyChange as e,observable as i}from"../support/observableUtils.js";import{toJSON as r}from"./object.js";export class ObservableMap extends(i(t)){[Symbol.toStringTag]="ObservableMap";get size(){return this._originalMap.size}_originalMap;constructor(){super(),this._originalMap=new Map}clear(){if(!this.size)return;const t=Array.from(this.entries());if(this._originalMap.clear(),e(this,"size"),this.hasEventListener("after-remove"))for(const[e,i]of t)this.emit("after-remove",{item:[e,i],target:this});this.emit("change",{added:[],removed:t,target:this})}delete(t){if(!this.has(t))return!1;const i=this.get(t);return this._originalMap.delete(t),e(this,"size"),this.emit("after-remove",{item:[t,i],target:this}),this.emit("change",{added:[],removed:[[t,i]],target:this}),!0}forEach(t,e){this._originalMap.forEach(t,e)}get(t){return this._originalMap.get(t)}has(t){return this._originalMap.has(t)}set(t,i){const r=!this.has(t),s=this.get(t);return this._originalMap.set(t,i),e(this,"size"),r||this.emit("after-remove",{item:[t,s],target:this}),this.emit("after-add",{item:[t,i],target:this}),this.emit("change",{added:[[t,i]],removed:r?[]:[[t,s]],target:this}),this}entries(){return this._originalMap.entries()}keys(){return this._originalMap.keys()}values(){return this._originalMap.values()}[Symbol.iterator](){return this._originalMap[Symbol.iterator]()}toJSON(){return r([...this])}on(t,e){return super.on(t,e)}}
+import{Evented as t}from"@arcgis/core/core/Evented.js";import{notifyChange as e,observable as i}from"../support/observableUtils.js";import{toJSON as r}from"./object.js";export class ObservableMap extends(i(t)){[Symbol.toStringTag]="ObservableMap";get size(){return this._originalMap.size}_originalMap;constructor(){super(),this._originalMap=new Map}clear(){if(!this.size)return;const t=Array.from(this.entries());if(this._originalMap.clear(),e(this,"size"),this.hasEventListener("after-remove"))for(const[e,i]of t)this.emit("after-remove",{item:[e,i],target:this});this.emit("change",{added:[],removed:t,target:this})}delete(t){if(!this.has(t))return!1;const i=this.get(t);return this._originalMap.delete(t),e(this,"size"),this.emit("after-remove",{item:[t,i],target:this}),this.emit("change",{added:[],removed:[[t,i]],target:this}),!0}forEach(t,e){this._originalMap.forEach(t,e)}get(t){return this._originalMap.get(t)}has(t){return this._originalMap.has(t)}set(t,i){const r=!this.has(t),s=this.get(t);return this._originalMap.set(t,i),e(this,"size"),r||this.emit("after-remove",{item:[t,s],target:this}),this.emit("after-add",{item:[t,i],target:this}),this.emit("change",{added:[[t,i]],removed:r?[]:[[t,s]],target:this}),this}entries(){return this._originalMap.entries()}keys(){return this._originalMap.keys()}values(){return this._originalMap.values()}[Symbol.iterator](){return this._originalMap[Symbol.iterator]()}toJSON(){return r([...this])}}