@vertigis/arcgis-extensions 37.2.1 → 37.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vertigis/arcgis-extensions",
   "license": "SEE LICENSE IN LICENSE",
-  "version": "37.2.1",
+  "version": "37.3.0",
   "repository": {
     "type": "git",
     "url": "https://geocortex.visualstudio.com/Geocortex/_git/geocortex-api-ts"

package/portal/SubtypeGroupLayer.js

@@ -1 +1 @@
-import{whenOnce}from"@arcgis/core/core/watchUtils.js";import{isSubtypeGroupLayer}from"../utilities/_layers.js";import{checkArg}from"../utilities/checkArg.js";import{LayerDefinition}from"./LayerDefinition.js";import{SubtypeSublayer}from"./SubtypeSublayer.js";import{ERR_LAYER_TYPE_MISMATCH,applyLayerBaseToEsriApiLayer,applyOperationalLayerToEsriApiLayer,fromEsriApiLayerToLayerBase,fromEsriApiLayerToOperationalLayer}from"./_layerHelper.js";export var SubtypeGroupLayer;!function(r){async function e(r,e){checkArg("layerJson",r).isNotMissing();const a=r.layerType||r.type;if(checkArg("layerJson.layerType",a).satisfies((r=>!r||"ArcGISSubtypeGroupLayer"===r),ERR_LAYER_TYPE_MISMATCH),checkArg("layer",e).isNotMissing().satisfies(isSubtypeGroupLayer,ERR_LAYER_TYPE_MISMATCH),applyLayerBaseToEsriApiLayer(r,e),applyOperationalLayerToEsriApiLayer(r,e),r.hasOwnProperty("url")&&(e.url=r.url),r.hasOwnProperty("customParameters")&&(e.customParameters={...r.customParameters},r.customParameters.hasOwnProperty("gdbVersion")&&(e.gdbVersion=r.customParameters.gdbVersion)),r.hasOwnProperty("layerDefinition")&&await LayerDefinition.applyToEsriApiLayer(r.layerDefinition,e),r.hasOwnProperty("layers")){const a=async()=>{await Promise.all(e.sublayers.map((e=>{const a=r.layers.find((r=>+r.subtypeCode===e.subtypeCode));if(a)return SubtypeSublayer.applyToEsriApiLayer(a,e)})))};e.loaded?await a():whenOnce(e,"loaded",a)}}r.toEsriApiLayer=async function(r){checkArg("layerJson",r).isNotMissing();const a=r.layerType||r.type;checkArg("layerJson.layerType",a).satisfies((r=>!r||"ArcGISSubtypeGroupLayer"===r),ERR_LAYER_TYPE_MISMATCH);const i=new((await import("@arcgis/core/layers/SubtypeGroupLayer")).default);return await e(r,i),i},r.applyToEsriApiLayer=e,r.fromEsriApiSubtypeGroupLayer=function(r){checkArg("subtypeGroupLayer",r).isNotMissing();const e={...fromEsriApiLayerToLayerBase(r),...fromEsriApiLayerToOperationalLayer(r),layerType:"ArcGISSubtypeGroupLayer",url:r.url,customParameters:{...r.customParameters,gdbVersion:r.gdbVersion},layerDefinition:LayerDefinition.fromEsriApiLayer(r),layers:[]};return r.sublayers.forEach((r=>{e.layers.push(SubtypeSublayer.fromEsriApiSubtypeSublayer(r))})),e}}(SubtypeGroupLayer||(SubtypeGroupLayer={}));
+import{whenOnce}from"@arcgis/core/core/reactiveUtils.js";import{isSubtypeGroupLayer}from"../utilities/_layers.js";import{checkArg}from"../utilities/checkArg.js";import{LayerDefinition}from"./LayerDefinition.js";import{SubtypeSublayer}from"./SubtypeSublayer.js";import{ERR_LAYER_TYPE_MISMATCH,applyLayerBaseToEsriApiLayer,applyOperationalLayerToEsriApiLayer,fromEsriApiLayerToLayerBase,fromEsriApiLayerToOperationalLayer}from"./_layerHelper.js";export var SubtypeGroupLayer;!function(r){async function e(r,e){checkArg("layerJson",r).isNotMissing();const a=r.layerType||r.type;if(checkArg("layerJson.layerType",a).satisfies((r=>!r||"ArcGISSubtypeGroupLayer"===r),ERR_LAYER_TYPE_MISMATCH),checkArg("layer",e).isNotMissing().satisfies(isSubtypeGroupLayer,ERR_LAYER_TYPE_MISMATCH),applyLayerBaseToEsriApiLayer(r,e),applyOperationalLayerToEsriApiLayer(r,e),r.hasOwnProperty("url")&&(e.url=r.url),r.hasOwnProperty("customParameters")&&(e.customParameters={...r.customParameters},r.customParameters.hasOwnProperty("gdbVersion")&&(e.gdbVersion=r.customParameters.gdbVersion)),r.hasOwnProperty("layerDefinition")&&await LayerDefinition.applyToEsriApiLayer(r.layerDefinition,e),r.hasOwnProperty("layers")){const a=async()=>{await Promise.all(e.sublayers.map((e=>{const a=r.layers.find((r=>+r.subtypeCode===e.subtypeCode));if(a)return SubtypeSublayer.applyToEsriApiLayer(a,e)})))};e.loaded?await a():(async()=>{await whenOnce((()=>e.loaded)),await a()})()}}r.toEsriApiLayer=async function(r){checkArg("layerJson",r).isNotMissing();const a=r.layerType||r.type;checkArg("layerJson.layerType",a).satisfies((r=>!r||"ArcGISSubtypeGroupLayer"===r),ERR_LAYER_TYPE_MISMATCH);const i=new((await import("@arcgis/core/layers/SubtypeGroupLayer")).default);return await e(r,i),i},r.applyToEsriApiLayer=e,r.fromEsriApiSubtypeGroupLayer=function(r){checkArg("subtypeGroupLayer",r).isNotMissing();const e={...fromEsriApiLayerToLayerBase(r),...fromEsriApiLayerToOperationalLayer(r),layerType:"ArcGISSubtypeGroupLayer",url:r.url,customParameters:{...r.customParameters,gdbVersion:r.gdbVersion},layerDefinition:LayerDefinition.fromEsriApiLayer(r),layers:[]};return r.sublayers.forEach((r=>{e.layers.push(SubtypeSublayer.fromEsriApiSubtypeSublayer(r))})),e}}(SubtypeGroupLayer||(SubtypeGroupLayer={}));

package/portal/WMSLayer.js

@@ -1 +1 @@
-import{once}from"@arcgis/core/core/watchUtils.js";import EsriExtent from"@arcgis/core/geometry/Extent";import EsriSpatialReference from"@arcgis/core/geometry/SpatialReference";import{geographicToWebMercator,webMercatorToGeographic}from"@arcgis/core/geometry/support/webMercatorUtils";import Portal from"@arcgis/core/portal/Portal";import PortalItem from"@arcgis/core/portal/PortalItem";import{isWMSLayer}from"../utilities/_layers.js";import{checkArg}from"../utilities/checkArg.js";import{parallelEach}from"../utilities/promise.js";import{SpatialReference}from"./SpatialReference.js";import{WMSSublayer}from"./WMSSublayer.js";import{applyLayerBaseToEsriApiLayer,applyBasemapLayerToEsriApiLayer,applyOperationalLayerToEsriApiLayer,fromEsriApiLayerToLayerBase,fromEsriApiLayerToOperationalLayer}from"./_layerHelper.js";export var WMSLayer;!function(e){async function r(e,r,a){if(checkArg("layerJson",e).isNotMissing(),checkArg("layer",r).isNotMissing().satisfies(isWMSLayer),checkArg("layerJson.layerType",e.layerType).satisfies((e=>!e||"WMS"===e)),applyLayerBaseToEsriApiLayer(e,r),applyBasemapLayerToEsriApiLayer(e,r),applyOperationalLayerToEsriApiLayer(e,r),e.hasOwnProperty("copyright")&&(r.copyright=e.copyright),e.hasOwnProperty("customLayerParameters")&&(r.customLayerParameters={...e.customLayerParameters}),e.hasOwnProperty("customParameters")&&(r.customParameters={...e.customParameters}),e.hasOwnProperty("featureInfoFormat")&&(r.featureInfoFormat=e.featureInfoFormat),e.hasOwnProperty("featureInfoUrl")&&(r.featureInfoUrl=e.featureInfoUrl),r.imageFormat=e.hasOwnProperty("format")?e.format:"image/png",e.hasOwnProperty("itemId")&&(r.portalItem?r.portalItem.id=e.itemId:r.portalItem=new PortalItem({id:e.itemId,portal:a||Portal.getDefault()})),e.hasOwnProperty("layers")){const a=async()=>{await parallelEach(e.layers,(async e=>{const a=r.sublayers.find((r=>r.name===e.name));a&&await WMSSublayer.applyToEsriApiWMSSublayer(e,a)})),r.sublayers.removeMany(r.sublayers.filter((r=>!e.layers.some((e=>e.name===r.name)))))};r.sublayers?await a():once(r,"sublayers",a)}if(e.hasOwnProperty("visibleLayers")){const a=()=>r.sublayers.forEach((r=>{r.visible=e.visibleLayers.includes(r.name)}));r.sublayers?a():once(r,"sublayers",a)}if(e.hasOwnProperty("mapUrl")&&(r.mapUrl=e.mapUrl),e.hasOwnProperty("maxHeight")&&(r.imageMaxHeight=e.maxHeight),e.hasOwnProperty("maxWidth")&&(r.imageMaxWidth=e.maxWidth),e.hasOwnProperty("spatialReferences")&&e.spatialReferences.length&&(r.spatialReferences=e.spatialReferences.slice(),r.spatialReference||(r.spatialReference=SpatialReference.toEsriApiSpatialReference({wkid:e.spatialReferences[0]}))),e.hasOwnProperty("extent")){const a=new EsriExtent({xmin:e.extent[0][0],ymin:e.extent[0][1],xmax:e.extent[1][0],ymax:e.extent[1][1],spatialReference:EsriSpatialReference.WGS84});(r.spatialReference.isWGS84||r.spatialReference.isWebMercator)&&(r.fullExtent=r.spatialReference.isWGS84?a:geographicToWebMercator(a))}e.hasOwnProperty("url")&&(r.url=e.url),e.hasOwnProperty("version")&&(r.version=e.version)}e.toEsriApiLayer=async function(e){checkArg("layerJson",e).isNotMissing(),checkArg("layerJson.layerType",e.layerType).satisfies((e=>!e||"WMS"===e));const a=new((await import("@arcgis/core/layers/WMSLayer")).default);return await r(e,a),a},e.applyToEsriApiLayer=r,e.fromEsriApiLayer=function(e){checkArg("layer",e).isNotMissing();const r={...fromEsriApiLayerToLayerBase(e),...fromEsriApiLayerToOperationalLayer(e),layerType:"WMS",visibleLayers:[]};if(e.copyright&&(r.copyright=e.copyright),e.customLayerParameters&&(r.customLayerParameters={...e.customLayerParameters}),e.customParameters&&(r.customParameters={...e.customParameters}),e.fullExtent&&(e.spatialReference.isWGS84||e.spatialReference.isWebMercator)){const a=e.spatialReference.isWGS84?e.fullExtent:webMercatorToGeographic(e.fullExtent,!1);r.extent=[[],[]],r.extent[0][0]=a.xmin,r.extent[0][1]=a.ymin,r.extent[1][0]=a.xmax,r.extent[1][1]=a.ymax}return e.featureInfoFormat&&(r.featureInfoFormat=e.featureInfoFormat),e.featureInfoUrl&&(r.featureInfoUrl=e.featureInfoUrl),e.imageFormat&&(r.format=e.imageFormat),e.portalItem&&(r.itemId=e.portalItem.id),e.sublayers&&(r.layers=[],e.sublayers.forEach((e=>{const a=WMSSublayer.fromEsriApiWMSSublayer(e);r.layers.unshift(a),e.visible&&r.visibleLayers.unshift(e.name)}))),e.imageMaxHeight&&(r.maxHeight=e.imageMaxHeight),e.imageMaxWidth&&(r.maxWidth=e.imageMaxWidth),e.mapUrl&&(r.mapUrl=e.mapUrl),e.spatialReferences&&(r.spatialReferences=e.spatialReferences.slice()),e.url&&(r.url=e.url),e.version&&(r.version=e.version),r}}(WMSLayer||(WMSLayer={}));
+import{whenOnce}from"@arcgis/core/core/reactiveUtils.js";import EsriExtent from"@arcgis/core/geometry/Extent";import EsriSpatialReference from"@arcgis/core/geometry/SpatialReference";import{geographicToWebMercator,webMercatorToGeographic}from"@arcgis/core/geometry/support/webMercatorUtils";import Portal from"@arcgis/core/portal/Portal";import PortalItem from"@arcgis/core/portal/PortalItem";import{isWMSLayer}from"../utilities/_layers.js";import{checkArg}from"../utilities/checkArg.js";import{parallelEach}from"../utilities/promise.js";import{SpatialReference}from"./SpatialReference.js";import{WMSSublayer}from"./WMSSublayer.js";import{applyLayerBaseToEsriApiLayer,applyBasemapLayerToEsriApiLayer,applyOperationalLayerToEsriApiLayer,fromEsriApiLayerToLayerBase,fromEsriApiLayerToOperationalLayer}from"./_layerHelper.js";export var WMSLayer;!function(e){async function r(e,r,a){if(checkArg("layerJson",e).isNotMissing(),checkArg("layer",r).isNotMissing().satisfies(isWMSLayer),checkArg("layerJson.layerType",e.layerType).satisfies((e=>!e||"WMS"===e)),applyLayerBaseToEsriApiLayer(e,r),applyBasemapLayerToEsriApiLayer(e,r),applyOperationalLayerToEsriApiLayer(e,r),e.hasOwnProperty("copyright")&&(r.copyright=e.copyright),e.hasOwnProperty("customLayerParameters")&&(r.customLayerParameters={...e.customLayerParameters}),e.hasOwnProperty("customParameters")&&(r.customParameters={...e.customParameters}),e.hasOwnProperty("featureInfoFormat")&&(r.featureInfoFormat=e.featureInfoFormat),e.hasOwnProperty("featureInfoUrl")&&(r.featureInfoUrl=e.featureInfoUrl),r.imageFormat=e.hasOwnProperty("format")?e.format:"image/png",e.hasOwnProperty("itemId")&&(r.portalItem?r.portalItem.id=e.itemId:r.portalItem=new PortalItem({id:e.itemId,portal:a||Portal.getDefault()})),e.hasOwnProperty("layers")){const a=async()=>{await parallelEach(e.layers,(async e=>{const a=r.sublayers.find((r=>r.name===e.name));a&&await WMSSublayer.applyToEsriApiWMSSublayer(e,a)})),r.sublayers.removeMany(r.sublayers.filter((r=>!e.layers.some((e=>e.name===r.name)))))};r.sublayers?await a():(async()=>{await whenOnce((()=>r.sublayers)),await a()})()}if(e.hasOwnProperty("visibleLayers")){const a=()=>r.sublayers.forEach((r=>{r.visible=e.visibleLayers.includes(r.name)}));r.sublayers?a():(async()=>{await whenOnce((()=>r.sublayers)),a()})()}if(e.hasOwnProperty("mapUrl")&&(r.mapUrl=e.mapUrl),e.hasOwnProperty("maxHeight")&&(r.imageMaxHeight=e.maxHeight),e.hasOwnProperty("maxWidth")&&(r.imageMaxWidth=e.maxWidth),e.hasOwnProperty("spatialReferences")&&e.spatialReferences.length&&(r.spatialReferences=e.spatialReferences.slice(),r.spatialReference||(r.spatialReference=SpatialReference.toEsriApiSpatialReference({wkid:e.spatialReferences[0]}))),e.hasOwnProperty("extent")){const a=new EsriExtent({xmin:e.extent[0][0],ymin:e.extent[0][1],xmax:e.extent[1][0],ymax:e.extent[1][1],spatialReference:EsriSpatialReference.WGS84});(r.spatialReference.isWGS84||r.spatialReference.isWebMercator)&&(r.fullExtent=r.spatialReference.isWGS84?a:geographicToWebMercator(a))}e.hasOwnProperty("url")&&(r.url=e.url),e.hasOwnProperty("version")&&(r.version=e.version)}e.toEsriApiLayer=async function(e){checkArg("layerJson",e).isNotMissing(),checkArg("layerJson.layerType",e.layerType).satisfies((e=>!e||"WMS"===e));const a=new((await import("@arcgis/core/layers/WMSLayer")).default);return await r(e,a),a},e.applyToEsriApiLayer=r,e.fromEsriApiLayer=function(e){checkArg("layer",e).isNotMissing();const r={...fromEsriApiLayerToLayerBase(e),...fromEsriApiLayerToOperationalLayer(e),layerType:"WMS",visibleLayers:[]};if(e.copyright&&(r.copyright=e.copyright),e.customLayerParameters&&(r.customLayerParameters={...e.customLayerParameters}),e.customParameters&&(r.customParameters={...e.customParameters}),e.fullExtent&&(e.spatialReference.isWGS84||e.spatialReference.isWebMercator)){const a=e.spatialReference.isWGS84?e.fullExtent:webMercatorToGeographic(e.fullExtent,!1);r.extent=[[],[]],r.extent[0][0]=a.xmin,r.extent[0][1]=a.ymin,r.extent[1][0]=a.xmax,r.extent[1][1]=a.ymax}return e.featureInfoFormat&&(r.featureInfoFormat=e.featureInfoFormat),e.featureInfoUrl&&(r.featureInfoUrl=e.featureInfoUrl),e.imageFormat&&(r.format=e.imageFormat),e.portalItem&&(r.itemId=e.portalItem.id),e.sublayers&&(r.layers=[],e.sublayers.forEach((e=>{const a=WMSSublayer.fromEsriApiWMSSublayer(e);r.layers.unshift(a),e.visible&&r.visibleLayers.unshift(e.name)}))),e.imageMaxHeight&&(r.maxHeight=e.imageMaxHeight),e.imageMaxWidth&&(r.maxWidth=e.imageMaxWidth),e.mapUrl&&(r.mapUrl=e.mapUrl),e.spatialReferences&&(r.spatialReferences=e.spatialReferences.slice()),e.url&&(r.url=e.url),e.version&&(r.version=e.version),r}}(WMSLayer||(WMSLayer={}));

package/support/Observable.d.ts

@@ -3,18 +3,7 @@ import { AccessorLike, Evented, WatchCallback } from "./esri.js";
  * An object whose properties can be observed for changes.
  */
 export declare class Observable extends Evented implements AccessorLike {
-    /**
-     * Property observers keyed by property name.
-     */
-    private _observers;
-    /**
-     * Properties that have changed since the last notification.
-     */
-    private _changed;
-    /**
-     * Determines whether a notification task is scheduled.
-     */
-    private _notifyPending;
+    constructor();
     /**
      * Watches for property changes.
      *
@@ -51,12 +40,12 @@ export declare class Observable extends Evented implements AccessorLike {
      */
     set(props: HashMap<any>): this;
     /**
-     * Indicates that the given property has changed, causing observers to be
-     * notified.
+     * Indicates that the given property might have changed, causing observers
+     * to be notified if it did.
      *
-     * @param property The property that changed (or might have changed).
+     * @param propertyName The property that changed (or might have changed).
      */
-    notifyChange(property: string): void;
+    notifyChange(propertyName: string): void;
     /**
      * Implements the watch() behavior for a single property. Subclasses that
      * need specialized watch handling should generally override this function
@@ -78,17 +67,12 @@ export declare class Observable extends Evented implements AccessorLike {
      * Indicates that the given property has changed, causing observers to be
      * notified.
      *
+     * @deprecated This function is no longer supported. Use `notifyChange()`
+     *   instead. The `force=true` behavior is no longer possible.
      * @param property The property that changed.
      * @param force Whether to always invoke the callback, even if the value
-     *   hasn't changed.
+     *   hasn't changed. NO LONGER SUPPORTED. This will always effectively be
+     *   `false`.
      */
     protected _notifyChange(property: string, force?: boolean): void;
-    private _hasObservers;
-    private _isDirty;
-    /**
-     * Makes a property observable.
-     *
-     * @param property The property to make observable.
-     */
-    private _observify;
 }

package/support/Observable.js

@@ -1 +1 @@
-import{remove}from"../utilities/array.js";import{getPropertyDescriptor}from"../utilities/object.js";import{Evented}from"./esri.js";export class Observable extends Evented{watch(e,t,s=!1){const r=[].concat(e),i=[];for(const e of r){const[r,o]=e.split(/\.(.*)/);if(this._observify(r),o?.length){let n;const h=this[r];h&&"function"==typeof h.watch&&(n=h.watch(o,((s,r)=>{t(s,r,e,this)}),s));const c=this._watchProperty(r,o,((r,i)=>{n&&n.remove(),r&&"function"==typeof r.watch&&(n=r.watch(o,((s,r)=>{t(s,r,e,this)}),s));const h="function"==typeof i?.get?i.get(o):void 0,c=this.get(e);t(c,h,e,this)}),s);i.push({remove:()=>{c.remove(),n&&n.remove()}})}else i.push(this._watchProperty(r,"",t,s))}return 1===i.length?i[0]:{remove:()=>i.forEach((e=>e.remove()))}}get(e){if(!e)return;const t=e.split(".");let s=this;for(;s&&"object"==typeof s&&t.length;)s=s[t.shift()];return t.length?void 0:s}set(e,t){if(!e)return this;if("string"==typeof e){const s=e.split(".");let r=this;for(;r&&"object"==typeof r&&s.length>1;)r=r[s.shift()];r&&"object"==typeof r&&(r[s[0]]=t)}else for(const t of Object.keys(e))this.set(t,e[t]);return this}notifyChange(e){this._notifyChange(e,!0)}_watchProperty(e,t,s,r){this._observify(e);const i={oldValue:this[e],callback:s,sync:r,remove:()=>{remove(this._observers.get(e),i)}};return this._observers.get(e).push(i),i}_notifyChange(e,t=!1){if(!this._hasObservers(e))return;const s=this._observers.get(e).filter((e=>e.sync)),r=this._observers.get(e).filter((e=>!e.sync));if(s.length){const r=this[e];for(const i of s)(t||i.oldValue!==r)&&(i.callback(r,i.oldValue,e,this),i.oldValue=r)}r.length&&!this._isDirty(e)&&(this._changed=this._changed||new Set,this._changed.add(e),this._notifyPending||(this._notifyPending=!0,setTimeout((()=>{const e=Array.from(this._changed);this._changed.clear(),this._notifyPending=!1;for(const s of e){const e=this[s],r=this._observers.get(s).filter((e=>!e.sync));for(const i of r)(t||i.oldValue!==e)&&(i.callback(e,i.oldValue,s,this),i.oldValue=e)}}),0)))}_hasObservers(e){return this._observers?.has(e)&&!!this._observers.get(e).length}_isDirty(e){return this._changed?.has(e)}_observify(e){if(this._observers=this._observers||new Map,this._observers.has(e))return;this._observers.set(e,[]);const t=getPropertyDescriptor(this,e);if(t){if(!t.configurable)throw new Error(`Cannot watch property "${e}" for changes since it is defined as configurable: false.`);if(t.set){const s={...t};s.set=s=>{t.set.call(this,s),this._notifyChange(e)},Object.defineProperty(this,e,s)}else if(!t.get&&t.writable){let s=t.value;const r={...t};delete r.value,delete r.writable,r.get=()=>s,r.set=t=>{s=t,this._notifyChange(e)},Object.defineProperty(this,e,r)}}else{let t;Object.defineProperty(this,e,{get:()=>t,set:s=>{t=s,this._notifyChange(e)},enumerable:!0,configurable:!0})}}}
+import{Property}from"@arcgis/core/core/accessorSupport/Property";import{trackAccess}from"@arcgis/core/core/accessorSupport/tracking";import{Evented}from"./esri.js";const classToProperties=new WeakMap;function getOrCreateProperty(t,e){classToProperties.has(t)||classToProperties.set(t,new Map);const r=classToProperties.get(t),o=String(e);if(!r.has(o)){const e=new Property({host:t},o,{});r.set(o,e)}return r.get(o)}const proxyHandler={get:(t,e,r)=>(trackAccess(getOrCreateProperty(r,e)),Reflect.get(t,e,r)),set:(t,e,r,o)=>(Reflect.set(t,e,r,o),o.notifyChange(String(e)),!0)};export class Observable extends Evented{constructor(){return super(),new Proxy(this,proxyHandler)}watch(t,e,r=!1){const o=[].concat(t),s=[];for(const t of o){const[o,n]=t.split(/\.(.*)/);if(n?.length){let i;const c=this[o];c&&"function"==typeof c.watch&&(i=c.watch(n,((r,o)=>{e(r,o,t,this)}),r));const a=this._watchProperty(o,n,((o,s)=>{i&&i.remove(),o&&"function"==typeof o.watch&&(i=o.watch(n,((r,o)=>{e(r,o,t,this)}),r));const c="function"==typeof s?.get?s.get(n):void 0,a=this.get(t);e(a,c,t,this)}),r);s.push({remove:()=>{a.remove(),i&&i.remove()}})}else s.push(this._watchProperty(o,"",e,r))}return 1===s.length?s[0]:{remove:()=>s.forEach((t=>t.remove()))}}get(t){if(!t)return;const e=t.split(".");let r=this;for(;r&&"object"==typeof r&&e.length;)r=r[e.shift()];return e.length?void 0:r}set(t,e){if(!t)return this;if("string"==typeof t){const r=t.split(".");let o=this;for(;o&&"object"==typeof o&&r.length>1;)o=o[r.shift()];o&&"object"==typeof o&&(o[r[0]]=e)}else for(const e of Object.keys(t))this.set(e,t[e]);return this}notifyChange(t){const e=getOrCreateProperty(this,t);e.invalidate(),e.commit()}_watchProperty(t,e,r,o){const s=o?new SyncObserver:new AsyncObserver;return s.callback=r,s.oldValue=this[t],s.property=getOrCreateProperty(this,t),s.property.observe(s)}_notifyChange(t,e=!1){console.warn("Observable._notifyChange() is deprecated and will be removed in a future update. Use notifyChange() instead."),this.notifyChange(t)}}class SyncObserver{onInvalidated(){}onCommitted(){const t=this.property.properties.host,{propertyName:e}=this.property,r=t[e];this.oldValue!==r&&(this.callback(r,this.oldValue,e,t),this.oldValue=r)}}class AsyncObserver{constructor(){this._notifyPending=!1}onInvalidated(){}onCommitted(){this._notifyPending||(this._notifyPending=!0,setTimeout((()=>{this._notifyPending=!1;const t=this.property.properties.host,{propertyName:e}=this.property,r=t[e];this.oldValue!==r&&(this.callback(r,this.oldValue,e,t),this.oldValue=r)}),0))}}

package/support/Settings.js

@@ -1 +1 @@
-import{CopyOnWriteCollection}from"../utilities/CopyOnWriteCollection.js";import{every}from"../utilities/iterable.js";import{isDefault,SerializableBase,shouldExcludeDefaults}from"./Serializable.js";import{Collection}from"./esri.js";export class Settings extends SerializableBase{get parent(){return this._parent}set parent(e){this._setParent(e)}reset(e){if(this._overrides)if(e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this._overrides.delete(e),this._notifyChange(e);else{const e=[...this._overrides.keys()];this._overrides.clear();for(const t of e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this._notifyChange(t)}}isModified(e){if(!this._overrides)return!1;if(e){if(!this._overrides.has(e))return!1;const t=this._overrides.get(e);return t instanceof CopyOnWriteCollection?t.isModified:!(t instanceof Settings)||t.isModified()}return!every(this._overrides.values(),(e=>e instanceof CopyOnWriteCollection&&!e.isModified||e instanceof Settings&&!e.isModified()))}toJSON(e="all"){const t=super.toJSON(e);if(t)for(const e of Object.keys(t))this.isModified(e)||delete t[e];if(!shouldExcludeDefaults(e)||!isDefault(t))return t}getDefaults(){return{}}_watchProperty(e,t,s,i){const r={path:`${e}${t?`.${t}`:""}`,handle:super._watchProperty(e,t,s,i),callback:s,remove:()=>{r.handle.remove(),r.parentHandle&&r.parentHandle.remove(),this._settingObservers.delete(r)}};return!this.isModified(e)&&this.parent&&this._watchParent(r),this._settingObservers=this._settingObservers||new Set,this._settingObservers.add(r),r}_getSetting(e,t){return this._overrides?.has(e)?this._overrides.get(e):this.parent?this.parent[e]:t}_getCollectionSetting(e){if(!this._overrides||!this._overrides.has(e)){const t=this.parent?this.parent[e]:new Collection;this._overrides=this._overrides||new Map,this._overrides.set(e,new CopyOnWriteCollection(t))}return this._overrides.get(e)}_getNestedSettings(e,t){if(!this._overrides||!this._overrides.has(e)){const s=t();this.parent&&(s.parent=this.parent[e]),this._overrides=this._overrides||new Map,this._overrides.set(e,s)}return this._overrides.get(e)}_setSetting(e,t){!this.isModified(e)&&this.parent&&this._settingObservers&&this._settingObservers.forEach((t=>{t.path===e&&this._unwatchParent(t)})),this._overrides=this._overrides||new Map,this._overrides.set(e,t)}_setParent(e){this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{e.parentHandle&&e.parentHandle.remove(),e.parentHandle=void 0})),e&&this._settingObservers&&this._settingObservers.forEach((t=>{this.isModified(t.path)||(t.parentHandle=e.watch(t.path,((e,s,i)=>{t.callback(e,s,i,this)})))})),this._parent=e,this._settingObservers&&this._settingObservers.forEach((e=>{this._notifyChange(e.path)})),this._overrides&&this._overrides.forEach(((t,s)=>{t instanceof CopyOnWriteCollection?t.originalCollection=e?e.get(s):new Collection:t instanceof Settings&&(t.parent=e?e.get(s):void 0)}))}_watchParent(e){e.parentHandle||(e.parentHandle=this.parent.watch(e.path,((t,s,i)=>{e.callback(t,s,i,this)})))}_unwatchParent(e){e.parentHandle&&(e.parentHandle.remove(),e.parentHandle=void 0)}}
+import{CopyOnWriteCollection}from"../utilities/CopyOnWriteCollection.js";import{every}from"../utilities/iterable.js";import{isDefault,SerializableBase,shouldExcludeDefaults}from"./Serializable.js";import{Collection}from"./esri.js";export class Settings extends SerializableBase{get parent(){return this._parent}set parent(e){this._setParent(e)}reset(e){if(this._overrides)if(e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this._overrides.delete(e),this.notifyChange(e);else{const e=[...this._overrides.keys()];this._overrides.clear();for(const t of e)this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{this._watchParent(e)})),this.notifyChange(t)}}isModified(e){if(!this._overrides)return!1;if(e){if(!this._overrides.has(e))return!1;const t=this._overrides.get(e);return t instanceof CopyOnWriteCollection?t.isModified:!(t instanceof Settings)||t.isModified()}return!every(this._overrides.values(),(e=>e instanceof CopyOnWriteCollection&&!e.isModified||e instanceof Settings&&!e.isModified()))}toJSON(e="all"){const t=super.toJSON(e);if(t)for(const e of Object.keys(t))this.isModified(e)||delete t[e];if(!shouldExcludeDefaults(e)||!isDefault(t))return t}getDefaults(){return{}}_watchProperty(e,t,s,i){const r={path:`${e}${t?`.${t}`:""}`,handle:super._watchProperty(e,t,s,i),callback:s,remove:()=>{r.handle.remove(),r.parentHandle&&r.parentHandle.remove(),this._settingObservers.delete(r)}};return!this.isModified(e)&&this.parent&&this._watchParent(r),this._settingObservers=this._settingObservers||new Set,this._settingObservers.add(r),r}_getSetting(e,t){return this._overrides?.has(e)?this._overrides.get(e):this.parent?this.parent[e]:t}_getCollectionSetting(e){if(!this._overrides||!this._overrides.has(e)){const t=this.parent?this.parent[e]:new Collection;this._overrides=this._overrides||new Map,this._overrides.set(e,new CopyOnWriteCollection(t))}return this._overrides.get(e)}_getNestedSettings(e,t){if(!this._overrides||!this._overrides.has(e)){const s=t();this.parent&&(s.parent=this.parent[e]),this._overrides=this._overrides||new Map,this._overrides.set(e,s)}return this._overrides.get(e)}_setSetting(e,t){!this.isModified(e)&&this.parent&&this._settingObservers&&this._settingObservers.forEach((t=>{t.path===e&&this._unwatchParent(t)})),this._overrides=this._overrides||new Map,this._overrides.set(e,t)}_setParent(e){this.parent&&this._settingObservers&&this._settingObservers.forEach((e=>{e.parentHandle&&e.parentHandle.remove(),e.parentHandle=void 0})),e&&this._settingObservers&&this._settingObservers.forEach((t=>{this.isModified(t.path)||(t.parentHandle=e.watch(t.path,((e,s,i)=>{t.callback(e,s,i,this)})))})),this._parent=e,this._settingObservers&&this._settingObservers.forEach((e=>{this.notifyChange(e.path)})),this._overrides&&this._overrides.forEach(((t,s)=>{t instanceof CopyOnWriteCollection?t.originalCollection=e?e.get(s):new Collection:t instanceof Settings&&(t.parent=e?e.get(s):void 0)}))}_watchParent(e){e.parentHandle||(e.parentHandle=this.parent.watch(e.path,((t,s,i)=>{e.callback(t,s,i,this)})))}_unwatchParent(e){e.parentHandle&&(e.parentHandle.remove(),e.parentHandle=void 0)}}

package/utilities/watch.d.ts

@@ -18,7 +18,19 @@ export declare function onEach<T extends Evented>(collection: Collection<T>, eve
  * @param sync Whether to invoke the callback synchronously. The default is
  *   `false`.
  */
-export declare function watchEach<T extends AccessorLike>(collection: Collection<T>, path: string | string[], callback: WatchCallback, sync?: boolean): IHandle;
+export declare function watchEach<T extends AccessorLike, U = unknown>(collection: Collection<T>, path: string | string[], callback: WatchCallback<U, T>, sync?: boolean): IHandle;
+/**
+ * Watches a property on each item in a collection.
+ *
+ * @param collection The collection of items to watch.
+ * @param getValue Function used to get the current value from each item. All
+ *   accessed properties will be tracked.
+ * @param callback The callback to invoke. Note that the item that changed is
+ *   passed as the last parameter of the callback.
+ * @param sync Whether to invoke the callback synchronously. The default is
+ *   `false`.
+ */
+export declare function watchEach<T extends AccessorLike, U = unknown>(collection: Collection<T>, getValue: (item: T) => U, callback: (newValue: U, oldValue: U, item: T) => void, sync?: boolean): IHandle;
 /**
  * Watches a property on each item in a collection property.
  *

package/utilities/watch.js

@@ -1 +1 @@
-import{Collection}from"../support/esri.js";import{checkArg}from"./checkArg.js";export{}from"../support/esri.js";export function onEach(o,e,t){checkArg("collection",o).isNotMissing(),checkArg("eventType",e).isNotMissing().isNotEmpty(),checkArg("callback",t).isNotMissing();const r=new Map;for(const c of o.toArray())r.set(c,c.on(e,t));const c=o.on("change",(o=>{for(const c of o.added)r.set(c,c.on(e,t));for(const e of o.removed){const o=r.get(e);o&&o.remove(),r.delete(e)}}));return{remove:()=>{c.remove(),r.forEach((o=>o.remove()))}}}export function watchEach(o,e,t,r=!1){checkArg("items",o).isNotMissing(),checkArg("path",e).isNotMissing().isNotEmpty(),checkArg("callback",t).isNotMissing();const c=new Map;for(const n of o.toArray())c.set(n,n.watch(e,t,r));const n=o.on("change",(o=>{for(const n of o.added)c.set(n,n.watch(e,t,r));for(const e of o.removed){const o=c.get(e);o&&o.remove(),c.delete(e)}}));return{remove:()=>{n.remove(),c.forEach((o=>o.remove()))}}}export function watchCollectionPropertyEach(o,e,t,r,c=!1){checkArg("obj",o).isNotMissing(),checkArg("collectionProperty",e).isNotMissing().isNotEmpty(),checkArg("path",t).isNotMissing().isNotEmpty(),checkArg("callback",r).isNotMissing();const n=new Map,s=o.get(e);if(s)for(const o of s.toArray())n.set(o,o.watch(t,r,c));const i=onCollectionPropertyChange(o,e,(o=>{for(const e of o.added)n.set(e,e.watch(t,r,c));for(const e of o.removed){const o=n.get(e);o&&o.remove(),n.delete(e)}}),c);return{remove:()=>{i.remove(),n.forEach((o=>o.remove()))}}}export function onCollectionPropertyChange(o,e,t,r=!1){let c;checkArg("obj",o).isNotMissing(),checkArg("property",e).isNotMissing().isNotEmpty(),checkArg("callback",t).isNotMissing();const n=o.get(e);n&&(c=n.on("change",t));const s=o.watch(e,((o,e)=>{c&&(c.remove(),c=void 0),o&&(c=o.on("change",t));const r=o??new Collection,n=e??new Collection,s=r,i=r.filter((o=>n.includes(o))),a=n.filter((o=>r.includes(o))),g={added:r.filter((o=>!n.includes(o))).toArray(),removed:n.filter((o=>!r.includes(o))).toArray(),moved:i.filter(((o,e)=>a.indexOf(o)!==e)).toArray(),target:s};(g.added.length||g.removed.length||g.moved.length)&&t(g)}),r);return{remove:()=>{c&&c.remove(),s.remove()}}}export function onOnce(o,e,t){const r=o.on(e,(o=>{t(o),r.remove()}));return r}
+import*as reactiveUtils from"@arcgis/core/core/reactiveUtils";import{Collection}from"../support/esri.js";import{checkArg}from"./checkArg.js";export{}from"../support/esri.js";export function onEach(e,o,t){checkArg("collection",e).isNotMissing(),checkArg("eventType",o).isNotMissing().isNotEmpty(),checkArg("callback",t).isNotMissing();const c=new Map;for(const r of e.toArray())c.set(r,r.on(o,t));const r=e.on("change",(e=>{for(const r of e.added)c.set(r,r.on(o,t));for(const o of e.removed){const e=c.get(o);e&&e.remove(),c.delete(o)}}));return{remove:()=>{r.remove(),c.forEach((e=>e.remove()))}}}export function watchEach(e,...o){let t;if(checkArg("collection",e).isNotMissing(),"function"==typeof o[0]){const[e,c,r=!1]=o;checkArg("getValue",e).isNotMissing(),checkArg("callback",c).isNotMissing(),t=o=>reactiveUtils.watch((()=>e(o)),((e,t)=>c(e,t,o)),{sync:r})}else{const[e,c,r=!1]=o;checkArg("path",e).isNotMissing().isNotEmpty(),checkArg("callback",c).isNotMissing(),t=o=>o.watch(e,c,r)}const c=new Map;for(const o of e.toArray())c.set(o,t(o));const r=e.on("change",(e=>{for(const o of e.added)c.set(o,t(o));for(const o of e.removed){const e=c.get(o);e&&e.remove(),c.delete(o)}}));return{remove:()=>{r.remove(),c.forEach((e=>e.remove()))}}}export function watchCollectionPropertyEach(e,o,t,c,r=!1){checkArg("obj",e).isNotMissing(),checkArg("collectionProperty",o).isNotMissing().isNotEmpty(),checkArg("path",t).isNotMissing().isNotEmpty(),checkArg("callback",c).isNotMissing();const n=new Map,s=e.get(o);if(s)for(const e of s.toArray())n.set(e,e.watch(t,c,r));const i=onCollectionPropertyChange(e,o,(e=>{for(const o of e.added)n.set(o,o.watch(t,c,r));for(const o of e.removed){const e=n.get(o);e&&e.remove(),n.delete(o)}}),r);return{remove:()=>{i.remove(),n.forEach((e=>e.remove()))}}}export function onCollectionPropertyChange(e,o,t,c=!1){let r;checkArg("obj",e).isNotMissing(),checkArg("property",o).isNotMissing().isNotEmpty(),checkArg("callback",t).isNotMissing();const n=e.get(o);n&&(r=n.on("change",t));const s=e.watch(o,((e,o)=>{r&&(r.remove(),r=void 0),e&&(r=e.on("change",t));const c=e??new Collection,n=o??new Collection,s=c,i=c.filter((e=>n.includes(e))),a=n.filter((e=>c.includes(e))),l={added:c.filter((e=>!n.includes(e))).toArray(),removed:n.filter((e=>!c.includes(e))).toArray(),moved:i.filter(((e,o)=>a.indexOf(e)!==o)).toArray(),target:s};(l.added.length||l.removed.length||l.moved.length)&&t(l)}),c);return{remove:()=>{r&&r.remove(),s.remove()}}}export function onOnce(e,o,t){const c=e.on(o,(e=>{t(e),c.remove()}));return c}

package/version.d.ts

@@ -1,4 +1,4 @@
 /**
  * The current version of the Geocortex ArcGIS Extensions API.
  */
-export declare const version = "37.2.1";
+export declare const version = "37.3.0";

package/version.js

@@ -1 +1 @@
-export const version="37.2.1";
+export const version="37.3.0";