@vertigis/arcgis-extensions 49.9.0 → 50.0.0

package/support/InitializableBase.d.ts

@@ -2,12 +2,13 @@ import type Collection from "@arcgis/core/core/Collection";
 import type { FailureMode } from "../FailureMode.js";
 import type { EventCallback } from "../support/esri.js";
 import { InitializeError } from "./InitializeError.js";
-import type { PropertyDefs } from "./Serializable.js";
+import type { PropertyDefs, SerializeMode } from "./Serializable.js";
 import { SerializableBase } from "./Serializable.js";
+import type { ObservableMixin } from "./observableUtils.js";
 /**
  * Represents an item that can be initialized.
  */
-export interface Initializable {
+export interface Initializable extends ObservableMixin {
     /**
      * Indicates if the item has been initialized.
      */
@@ -57,10 +58,11 @@ export interface InitializableBaseProperties {
      */
     failureMode?: FailureMode;
 }
+declare const InitializableBase_base: (abstract new (_properties?: InitializableBaseProperties) => SerializableBase<InitializableBaseProperties>) & (abstract new (...args: any[]) => ObservableMixin);
 /**
  * A base class that contains logic for initializing items.
  */
-export declare abstract class InitializableBase<TProperties extends InitializableBaseProperties = InitializableBaseProperties> extends SerializableBase<TProperties> implements Initializable {
+export declare abstract class InitializableBase<TProperties extends InitializableBaseProperties = InitializableBaseProperties> extends InitializableBase_base implements Initializable {
     /**
      * See {@link support/InitializableBase!Initializable.isInitialized}.
      */
@@ -96,6 +98,12 @@ export declare abstract class InitializableBase<TProperties extends Initializabl
     destroy(): Promise<void>;
     on(name: string | string[], callback: EventCallback<any>): IHandle;
     emit(name: string, event: unknown): boolean;
+    toJSON(serializeMode?: SerializeMode): TProperties;
+    assignProperties(properties: Partial<TProperties>): void;
+    assignPropertiesAsync(properties: Partial<TProperties>): Promise<void>;
+    getDefaults(): TProperties;
+    getDefault<K extends keyof TProperties>(key: K): TProperties[K];
+    getSerializableProperties(serializeMode?: SerializeMode): PropertyDefs<TProperties>;
     protected _getSerializableProperties(): PropertyDefs<TProperties>;
     /**
      * Called to perform initialization of the
@@ -146,3 +154,4 @@ export interface InitializeCollectionOptions {
  *   thrown by collection items with failureMode "warn".
  */
 export declare function initializeCollection<T extends InitializableBase = InitializableBase>(collection: Collection<T>, options?: InitializeCollectionOptions): Promise<void>;
+export {};

package/support/InitializableBase.js

@@ -1 +1 @@
-import{getLogger as i}from"../utilities/log.js";import{parallelEach as e}from"../utilities/promise.js";import{InitializeError as t}from"./InitializeError.js";import{SerializableBase as r}from"./Serializable.js";export class InitializableBase extends r{get isInitialized(){return this._isInitialized}get isDestroyed(){return this._isDestroyed}get failureMode(){return this._failureMode}set failureMode(i){this._failureMode=i}_isInitialized=!1;_isDestroyed=!1;_initializePromise;_destroyPromise;_failureMode="warn";async initialize(){return void 0===this._initializePromise&&(this._initializePromise=(async()=>{try{await this.finishAssignProperties(),await this._onInitialize(),await this._initializeChildren(),await this._postInitialize()}catch(i){throw i instanceof Error?(this._initializePromise=void 0,new t(this.failureMode,i,this)):i}this._isInitialized=!0,this.notifyChange("isInitialized")})()),this._initializePromise}async destroy(){return void 0===this._destroyPromise&&(this._destroyPromise=(async()=>{try{await this._onDestroy()}catch(i){throw this._destroyPromise=void 0,i}this._isDestroyed=!0,this.notifyChange("isDestroyed")})()),this._destroyPromise}on(i,e){return super.on(i,e)}emit(i,e){return super.emit(i,e)}_getSerializableProperties(){return{...super._getSerializableProperties(),failureMode:{serializeModes:["initial"],default:"warn"}}}async _onInitialize(){}async _postInitialize(){}async _onDestroy(){}async _initializeChildren(){await e(this._initializableChildCollections(),(i=>initializeCollection(i,{target:this,onInitializeWarning:i=>this.emit("initializeWarning",i)})))}*_initializableChildCollections(){}}const s={onInitializeWarning:()=>{}};export async function initializeCollection(r,a=s){const{onInitializeWarning:n,target:o}=a;await e(r.toArray(),(async e=>{const r=e.on("initializeWarning",n);try{await e.initialize()}catch(r){const s=r instanceof t?r:new t(e.failureMode,r,e);if("error"===s.failureMode)throw s;"warn"===s.failureMode&&i("geocortex.api.support.InitializeBase").warn({message:"Error attempting to initialize child item: {0}.",error:s},s.error.message);n({error:s,target:o})}finally{r.remove()}}))}
+import{getLogger as i}from"../utilities/log.js";import{parallelEach as e}from"../utilities/promise.js";import{InitializeError as t}from"./InitializeError.js";import{SerializableBase as r}from"./Serializable.js";import{notifyChange as s,observable as a}from"./observableUtils.js";export class InitializableBase extends(a(r)){get isInitialized(){return this._isInitialized}get isDestroyed(){return this._isDestroyed}get failureMode(){return this._failureMode}set failureMode(i){this._failureMode=i}_isInitialized=!1;_isDestroyed=!1;_initializePromise;_destroyPromise;_failureMode="warn";async initialize(){return void 0===this._initializePromise&&(this._initializePromise=(async()=>{try{await this.finishAssignProperties(),await this._onInitialize(),await this._initializeChildren(),await this._postInitialize()}catch(i){throw i instanceof Error?(this._initializePromise=void 0,new t(this.failureMode,i,this)):i}this._isInitialized=!0,s(this,"isInitialized")})()),this._initializePromise}async destroy(){return void 0===this._destroyPromise&&(this._destroyPromise=(async()=>{try{await this._onDestroy()}catch(i){throw this._destroyPromise=void 0,i}this._isDestroyed=!0,s(this,"isDestroyed")})()),this._destroyPromise}on(i,e){return super.on(i,e)}emit(i,e){return super.emit(i,e)}toJSON(i="all"){return super.toJSON(i)}assignProperties(i){super.assignProperties(i)}assignPropertiesAsync(i){return super.assignPropertiesAsync(i)}getDefaults(){return super.getDefaults()}getDefault(i){return super.getDefault(i)}getSerializableProperties(i){return super.getSerializableProperties(i)}_getSerializableProperties(){return{...super._getSerializableProperties(),failureMode:{serializeModes:["initial"],default:"warn"}}}async _onInitialize(){}async _postInitialize(){}async _onDestroy(){}async _initializeChildren(){await e(this._initializableChildCollections(),(i=>initializeCollection(i,{target:this,onInitializeWarning:i=>this.emit("initializeWarning",i)})))}*_initializableChildCollections(){}}const n={onInitializeWarning:()=>{}};export async function initializeCollection(r,s=n){const{onInitializeWarning:a,target:o}=s;await e(r.toArray(),(async e=>{const r=e.on("initializeWarning",a);try{await e.initialize()}catch(r){const s=r instanceof t?r:new t(e.failureMode,r,e);if("error"===s.failureMode)throw s;"warn"===s.failureMode&&i("geocortex.api.support.InitializeBase").warn({message:"Error attempting to initialize child item: {0}.",error:s},s.error.message);a({error:s,target:o})}finally{r.remove()}}))}

package/support/InitializeError.js

@@ -1 +1 @@
-import{format as r}from"../utilities/format/string.js";export class InitializeError extends Error{failureMode;error;target;constructor(i,t,e,o,...s){super(r(o||"Failed to initialize item: {0}.",...o?s:[t])),this.name="InitializeError",this.failureMode=i,this.error=t,this.target=e}}
+import{format as r}from"../utilities/format/string.js";export class InitializeError extends Error{failureMode;error;target;constructor(i,t,e,o,...s){super(r(o||"Failed to initialize item: {0}.",...o?s:[t])),this.name="InitializeError",this.failureMode=i,this.error=t,this.cause=t,this.target=e}}

package/support/Observable.d.ts

@@ -1,13 +1,19 @@
 import Evented from "@arcgis/core/core/Evented";
-import type { AccessorLike, WatchCallback } from "./esri.js";
+import type { WatchCallback } from "../utilities/watch.js";
+import { type ObservableMixin } from "./observableUtils.js";
+declare const Observable_base: typeof Evented & (abstract new (...args: any[]) => ObservableMixin);
 /**
  * An object whose properties can be observed for changes.
+ *
+ * @deprecated See {@link support/observableUtils!observable} instead.
  */
-export declare class Observable extends Evented implements AccessorLike {
+export declare class Observable extends Observable_base {
     constructor();
     /**
      * Watches for property changes.
      *
+     * @deprecated See {@link support/observableUtils!observable} and
+     *   {@link support/observableUtils!watch} instead.
      * @param path The property (or list of properties) to watch for changes.
      * @param callback The callback to invoke when the property has changed.
      *   This callback will always be invoked _asynchronously_.
@@ -18,6 +24,7 @@ export declare class Observable extends Evented implements AccessorLike {
     /**
      * Gets the value of a property.
      *
+     * @deprecated This function is deprecated. Access the property directly.
      * @param propertyPath The name of the property to get. It can also be a
      *   path to a property deeper in the instance, for example "foo.bar.baz".
      *   If a property in the path doesn't exist, then the result will be
@@ -28,6 +35,7 @@ export declare class Observable extends Evented implements AccessorLike {
     /**
      * Sets the value of a property.
      *
+     * @deprecated This function is deprecated. Access the property directly.
      * @param propertyPath The name of the property to set. It can also be a
      *   path to a property deeper in the instance, for example "foo.bar.baz".
      *   If a property along the way doesn't exist, then nothing will be set.
@@ -37,6 +45,7 @@ export declare class Observable extends Evented implements AccessorLike {
     /**
      * Sets the values of one or more properties.
      *
+     * @deprecated This function is deprecated. Access the property directly.
      * @param properties An object containing key/value pairs of properties to
      *   set.
      */
@@ -45,6 +54,8 @@ export declare class Observable extends Evented implements AccessorLike {
      * Indicates that the given property might have changed, causing observers
      * to be notified if it did.
      *
+     * @deprecated See {@link support/observableUtils!observable} and
+     *   {@link support/observableUtils!notifyChange} instead.
      * @param propertyKey The property that changed (or might have changed).
      */
     notifyChange(propertyKey: keyof this): void;
@@ -54,6 +65,8 @@ export declare class Observable extends Evented implements AccessorLike {
      * instead of watch(), which will automatically take care of handling
      * multiple properties and nesting.
      *
+     * @deprecated See {@link support/observableUtils!observable} and
+     *   {@link support/observableUtils!watch} instead.
      * @param propertyKey The root of the property path, e.g. "foo" in
      *   "foo.bar.baz" or "foo".
      * @param subpath The remainder of the property path, e.g. "bar.baz" in
@@ -65,18 +78,6 @@ export declare class Observable extends Evented implements AccessorLike {
      *   future tick.
      */
     protected _watchProperty(propertyKey: keyof this, subpath: string, callback: WatchCallback, sync: boolean): IHandle;
-    /**
-     * 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. NO LONGER SUPPORTED. This will always effectively be
-     *   `false`.
-     */
-    protected _notifyChange(property: keyof this, force?: boolean): void;
 }
 /**
  * Gets the value of a property by specifying a path.
@@ -84,9 +85,158 @@ export declare class Observable extends Evented implements AccessorLike {
  * This is equivalent to the `get()` method on an Accessor-like object, only it
  * can be used on any object.
  *
+ * @deprecated This function is deprecated. Access the property directly.
  * @param object The object to read.
  * @param path The name of the property to get. It can also be a path to a
  *   property deeper in the instance, for example "foo.bar.baz". If a property
  *   in the path doesn't exist, then the result will be undefined.
  */
 export declare function getPropertyByPath<T = unknown>(object: object, path: string): T;
+/**
+ * @deprecated See {@link support/observableUtils!observable} instead.
+ */
+export interface IDeprecatedObservable {
+    /**
+     * Watches for property changes.
+     *
+     * @deprecated See {@link support/observableUtils!observable} and
+     *   {@link support/observableUtils!watch} instead.
+     * @param path The property (or list of properties) to watch for changes.
+     * @param callback The callback to invoke when the property has changed.
+     *   This callback will always be invoked _asynchronously_.
+     * @param sync Whether to invoke the callback synchronously. The default is
+     *   false.
+     */
+    watch(path: string | string[], callback: WatchCallback, sync?: boolean): IHandle;
+    /**
+     * Gets the value of a property.
+     *
+     * @deprecated This function is deprecated. Access the property directly.
+     * @param propertyPath The name of the property to get. It can also be a
+     *   path to a property deeper in the instance, for example "foo.bar.baz".
+     *   If a property in the path doesn't exist, then the result will be
+     *   undefined.
+     */
+    get<T>(propertyPath: string): T;
+    /**
+     * Gets the value of a property.
+     *
+     * @deprecated This function is deprecated. Access the property directly.
+     * @param propertyPath The name of the property to get. It can also be a
+     *   path to a property deeper in the instance, for example "foo.bar.baz".
+     *   If a property in the path doesn't exist, then the result will be
+     *   undefined.
+     */
+    get(propertyPath: string): any;
+    /**
+     * Sets the value of a property.
+     *
+     * @deprecated This function is deprecated. Access the property directly.
+     * @param propertyPath The name of the property to set. It can also be a
+     *   path to a property deeper in the instance, for example "foo.bar.baz".
+     *   If a property along the way doesn't exist, then nothing will be set.
+     * @param value The new value to set on the property.
+     */
+    set<T>(propertyPath: string, value: T): this;
+    /**
+     * Sets the values of one or more properties.
+     *
+     * @deprecated This function is deprecated. Access the property directly.
+     * @param properties An object containing key/value pairs of properties to
+     *   set.
+     */
+    set(properties: HashMap<any>): this;
+    /**
+     * Indicates that the given property might have changed, causing observers
+     * to be notified if it did.
+     *
+     * @deprecated See {@link support/observableUtils!observable} and
+     *   {@link support/observableUtils!notifyChange} instead.
+     * @param propertyKey The property that changed (or might have changed).
+     */
+    notifyChange(propertyKey: keyof this): void;
+    /**
+     * Implements the watch() behavior for a single property. Subclasses that
+     * need specialized watch handling should generally override this function
+     * instead of watch(), which will automatically take care of handling
+     * multiple properties and nesting.
+     *
+     * @deprecated See {@link support/observableUtils!observable} and
+     *   {@link support/observableUtils!watch} instead.
+     * @param propertyKey The root of the property path, e.g. "foo" in
+     *   "foo.bar.baz" or "foo".
+     * @param subpath The remainder of the property path, e.g. "bar.baz" in
+     *   "foo.bar.baz" or "" in "foo". The implementation of watch() takes care
+     *   of monitoring the subpath for changes.
+     * @param callback The callback to invoke.
+     * @param sync If true, the callback will be invoked synchronously on the
+     *   same tick that the property changed. Otherwise, it will be invoked in a
+     *   future tick.
+     */
+    _watchProperty(propertyKey: keyof this, subpath: string, callback: WatchCallback, sync: boolean): IHandle;
+}
+/**
+ * Helper function to use with {@link support/Observable!IDeprecatedObservable}
+ * to implement watch on classes that no longer inherit from Observable.
+ *
+ * @deprecated
+ * @param obj The object to watch.
+ * @param path The property (or list of properties) to watch for changes.
+ * @param callback The callback to invoke when the property has changed. This
+ *   callback will always be invoked _asynchronously_.
+ * @param sync Whether to invoke the callback synchronously. The default is
+ *   false.
+ */
+export declare function deprecatedWatch(obj: ObservableMixin, path: string | string[], callback: WatchCallback, sync?: boolean): IHandle;
+/**
+ * Helper function to use with {@link support/Observable!IDeprecatedObservable}
+ * to implement notifyChange on classes that no longer inherit from Observable.
+ *
+ * @deprecated
+ * @param obj The object with the property to notify on.
+ * @param propertyKey The property that changed (or might have changed).
+ */
+export declare function deprecatedNotifyChange<T extends ObservableMixin>(obj: T, propertyKey: keyof T): void;
+/**
+ * Helper function to use with {@link support/Observable!IDeprecatedObservable}
+ * to implement set on classes that no longer inherit from Observable.
+ *
+ * @deprecated
+ * @param obj The object to set the property on.
+ * @param pathOrProperties An object containing key/value pairs of properties to
+ *   set or the name of the property to set. It can also be a path to a property
+ *   deeper in the instance, for example "foo.bar.baz". If a property along the
+ *   way doesn't exist, then nothing will be set.
+ * @param value The new value to set on the property.
+ */
+export declare function deprecatedSet<T>(obj: T, pathOrProperties: string | HashMap<unknown>, value?: unknown): T;
+/**
+ * Helper function to use with {@link support/Observable!IDeprecatedObservable}
+ * to implement get on classes that no longer inherit from Observable.
+ *
+ * @deprecated
+ * @param obj The object to read.
+ * @param propertyPath The name of the property to get. It can also be a path to
+ *   a property deeper in the instance, for example "foo.bar.baz". If a property
+ *   in the path doesn't exist, then the result will be undefined.
+ */
+export declare function deprecatedGetPropertyPath<T>(obj: object, propertyPath: string): T;
+/**
+ * Helper function to use with {@link support/Observable!IDeprecatedObservable}
+ * to implement _watchProperty on classes that no longer inherit from
+ * Observable.
+ *
+ * @deprecated
+ * @param obj The object to watch.
+ * @param propertyKey The root of the property path, e.g. "foo" in "foo.bar.baz"
+ *   or "foo".
+ * @param subpath The remainder of the property path, e.g. "bar.baz" in
+ *   "foo.bar.baz" or "" in "foo". The implementation of watch() takes care of
+ *   monitoring the subpath for changes.
+ * @param callback The callback to invoke.
+ * @param sync If true, the callback will be invoked synchronously on the same
+ *   tick that the property changed. Otherwise, it will be invoked in a future
+ *   tick.
+ */
+export declare function deprecatedWatchProperty<T extends ObservableMixin>(obj: T, propertyKey: keyof T, subpath: string, callback: WatchCallback, sync?: boolean): IHandle;
+export {};

package/support/Observable.js

@@ -1 +1 @@
-import t from"@arcgis/core/core/Evented";import{Property as e}from"@arcgis/core/core/accessorSupport/Property";import{trackAccess as o}from"@arcgis/core/core/accessorSupport/tracking";const r=new WeakMap;class s extends e{invalidated=!0;_oldValue;get oldValue(){return this._oldValue}set oldValue(t){this._oldValue=t,this.invalidated=!1}constructor(t){super(t,{})}onInvalidated(){this.invalidated=!0,super.onInvalidated()}}export class Observable extends t{constructor(){super();const t=new Map,e=new Proxy(this,{get(e,r,i){let n=t.get(r);return n||(n=new s(String(r)),t.set(r,n)),o(n),Reflect.get(e,r,i)},set(e,o,r,s){Reflect.set(e,o,r,s);const i=t.get(o);if(i){if(!i.invalidated&&r===i.oldValue)return!0;i.invalidate(),i.oldValue=r,i.commit()}return!0}});return r.set(e,t),e}watch(t,e,o=!1){const r=[].concat(t),s=[];for(const t of r){const[r,i]=t.split(/\.(.*)/);if(i?.length){let n;const a=this[r];a&&"function"==typeof a.watch&&(n=a.watch(i,((o,r)=>{e(o,r,t,this)}),o));const l=this._watchProperty(r,i,((r,s)=>{n&&n.remove(),r&&"function"==typeof r.watch&&(n=r.watch(i,((o,r)=>{e(o,r,t,this)}),o));const a="object"==typeof s?getPropertyByPath(s,i):void 0,l=this.get(t);e(l,a,t,this)}),o);s.push({remove:()=>{l.remove(),n&&n.remove()}})}else s.push(this._watchProperty(r,"",e,o))}return{remove:()=>{for(const t of s)t.remove()}}}get(t){return getPropertyByPath(this,t)}set(t,e){if(!t)return this;if("string"==typeof t){const o=t.split(".");let r=this;for(;r&&"object"==typeof r&&o.length>1;)r=r[o.shift()];r&&"object"==typeof r&&(r[o[0]]=e)}else for(const e of Object.keys(t))this.set(e,t[e]);return this}notifyChange(t){const e=r.get(this).get(t);e&&(e.invalidate(),e.commit())}_watchProperty(t,e,o,a){const l=a?new i:new n;l.callback=o,l.oldValue=this[t];const c=r.get(this);let h=c.get(t);h||(h=new s(String(t)),c.set(t,h)),l.property=h,l.target=this;const d=h.observe(l);return{remove:()=>{l.removed=!0,d.remove()}}}_notifyChange(t,e=!1){console.warn("Observable._notifyChange() is deprecated and will be removed in a future update. Use notifyChange() instead."),this.notifyChange(t)}}export function getPropertyByPath(t,e){if(!e)return;const o=e.split(".");let r=t;for(;r&&"object"==typeof r&&o.length;)r=r[o.shift()];return o.length?void 0:r}class i{oldValue;callback;property;target;removed=!1;onInvalidated(){}onCommitted(){const{target:t}=this,{propertyName:e}=this.property,o=t[e];this.oldValue===o||this.removed||(this.callback(o,this.oldValue,e,t),this.oldValue=o)}}class n{oldValue;callback;property;target;removed=!1;_notifyPending=!1;onInvalidated(){}onCommitted(){this._notifyPending||(this._notifyPending=!0,queueMicrotask((()=>{this._notifyPending=!1;const{target:t}=this,{propertyName:e}=this.property,o=t[e];this.oldValue===o||this.removed||(this.callback(o,this.oldValue,e,t),this.oldValue=o)})))}}
+import e from"@arcgis/core/core/Evented";import{notifyChange as t,observable as r,watch as o,createIHandle as s}from"./observableUtils.js";export class Observable extends(r(e)){constructor(){super(),console.warn("[Observable]: The Observable class is deprecated and will be removed in a future release. For watch functionality use the observable mixin from @vertigis/arcgis-extensions/support/observableUtils instead. For events, use @arcgis/core/core/Evented instead. You can combine both by using the observable mixin with @arcgis/core/core/Evented `extends observable(Evented)`.")}watch(e,t,r=!1){return deprecatedWatch(this,e,t,r)}get(e){return getPropertyByPath(this,e)}set(e,t){if(!e)return this;if("string"==typeof e){const r=e.split(".");let o=this;for(;o&&"object"==typeof o&&r.length>1;)o=o[r.shift()];o&&"object"==typeof o&&(o[r[0]]=t)}else for(const t of Object.keys(e))this.set(t,e[t]);return this}notifyChange(e){t(this,e)}_watchProperty(e,t,r,o){return deprecatedWatchProperty(this,e,t,r,o)}}export function getPropertyByPath(e,t){if(!t)return;const r=t.split(".");let o=e;for(;o&&"object"==typeof o&&r.length;)o=o[r.shift()];return r.length?void 0:o}export function deprecatedWatch(e,t,n,i){if(console.warn("[Observable]: The watch method is deprecated and will be removed in a future release. See @vertigis/arcgis-extensions/support/observableUtils instead."),!("__isObservable"in e)){let t=Object.getPrototypeOf(e);const o=Object.getPrototypeOf(r().prototype);for(;t;){const e=Object.getPrototypeOf(t);if(e===Object.prototype)break;if(t=e,e===o)break}t!==o&&Object.setPrototypeOf(t,r().prototype);const s=new(r());Object.assign(e,s)}const a=[],c=Array.isArray(t)?t:[t];for(const t of c)a.push(o(e,t,((e,r,o)=>{n(e,r,t,o)}),{sync:i}));return s(a)}export function deprecatedNotifyChange(e,r){console.warn("[Observable]: The notifyChange method is deprecated and will be removed in a future release. See @vertigis/arcgis-extensions/support/observableUtils instead."),"__isObservable"in e&&!e.__isObservable||t(e,r)}export function deprecatedSet(e,t,r){if(!t)return e;if("string"==typeof t){const o=t.split(".");let s=e;for(;s&&"object"==typeof s&&o.length>1;)s=s[o.shift()];s&&"object"==typeof s&&(s[o[0]]=r)}else for(const r of Object.keys(t))deprecatedSet(e,r,t[r]);return e}export function deprecatedGetPropertyPath(e,t){return getPropertyByPath(e,t)}export function deprecatedWatchProperty(e,t,r,o,s){console.warn("[Observable]: The _watchProperty method is deprecated and will be removed in a future release. See @vertigis/arcgis-extensions/support/observableUtils instead.");return deprecatedWatch(e,`${t.toString()}.${r}`,o,s)}

package/support/Serializable.d.ts

@@ -1,4 +1,6 @@
-import { Observable } from "./Observable.js";
+import Evented from "@arcgis/core/core/Evented.js";
+import type { WatchCallback } from "../utilities/watch.js";
+import { type IDeprecatedObservable } from "./Observable.js";
 /**
  * A class that can take in initial property values in its constructor.
  */
@@ -6,7 +8,7 @@ export type SerializableClass<P, T extends SerializableBase<P>> = new (propertie
 /**
  * An object that can be serialized to/from plain JSON.
  */
-export interface Serializable<TProperties> {
+export interface Serializable<TProperties> extends IDeprecatedObservable {
     /**
      * Returns a serializable representation of the item.
      *
@@ -60,7 +62,7 @@ export interface Serializable<TProperties> {
  * Default implementation of a {@link Serializable} that supports observability
  * and serialization.
  */
-export declare abstract class SerializableBase<TProperties> extends Observable implements Serializable<TProperties> {
+export declare abstract class SerializableBase<TProperties> extends Evented implements Serializable<TProperties>, IDeprecatedObservable {
     private readonly _assignPropertiesPromises;
     constructor(_properties?: TProperties);
     /**
@@ -94,6 +96,41 @@ export declare abstract class SerializableBase<TProperties> extends Observable i
      * @inheritDoc
      */
     getDefault<K extends keyof TProperties>(key: K): TProperties[K];
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    set<T>(propertyPath: string, value: T): this;
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    set(properties: HashMap<any>): this;
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    get<T>(propertyPath: string): T;
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    get(propertyPath: string): any;
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    watch(path: string | string[], callback: WatchCallback, sync?: boolean): IHandle;
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    notifyChange(propertyKey: keyof this): void;
+    /**
+     * @deprecated
+     * @inheritdoc
+     */
+    _watchProperty(propertyKey: keyof this, subpath: string, callback: WatchCallback, sync: boolean): IHandle;
     /**
      * The property keys and their metadata that are used to implement
      * serializing and deserializing the class instance.

package/support/Serializable.js

@@ -1 +1 @@
-import e from"safe-stable-stringify";import{filter as t,isPlainObject as r,map as i,objectKeys as s}from"../utilities/object.js";import{Observable as o}from"./Observable.js";const n=new WeakSet;export class SerializableBase extends o{_assignPropertiesPromises=[];constructor(e){if(super(),!n.has(this.constructor))throw new Error(`Class "${this.constructor.name}" must be marked as "@serializable" since it extends ${SerializableBase.name} (make sure it is the _last_ decorator on the class).`)}toJSON(e="all"){return filterJSONProperties(this._getSerializableProperties(),this,e)}assignProperties(e){const t=a(this._getSerializableProperties(),this,e,!0);this._assignPropertiesPromises.push(t),(async()=>{try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}})()}async assignPropertiesAsync(e){await this.finishAssignProperties();const t=assignPropertiesAsync(this._getSerializableProperties(),this,e);this._assignPropertiesPromises.push(t);try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}}async finishAssignProperties(){await Promise.all(this._assignPropertiesPromises)}getSerializableProperties(e="all"){return getSerializableProperties(this._getSerializableProperties(),e)}getDefaults(){return getDefaults(this._getSerializableProperties())}getDefault(e){return this.getDefaults()[e]}_getSerializableProperties(){return{}}_toPropertyDef(e){return toPropertyDef(e)}}export function serializable(e){if(!isSerializable(e.prototype))throw new Error(`Class "${e.name}" is marked as @serializable but does not implement 'Serializable'.`);class t extends e{constructor(e,...r){super(e,...r),this.constructor===t&&this.assignProperties({...this.getDefaults(),...e})}}return n.add(t),t}export function shouldExcludeDefaults(e){return"initial"===e||"project"===e}export function filterJSONProperties(t,r,i){let o=i;"initial"!==o&&"initial-with-defaults"!==o&&"preferences"!==o&&"project"!==o&&(o="all");const n={},a=getSerializableProperties(t,o);for(const t of s(a)){const i=a[t],s=l(t,i,r,o);if(shouldExcludeDefaults(o)){let r=!1;r=i.hasOwnProperty("default")?e(s)===e(i.default):i.isDefault?i.isDefault(s,o):isDefault(s),r||(n[t]=s)}else n[t]=s}if(!shouldExcludeDefaults(o)&&"preferences"!==o||!isDefault(n))return n}export function assignProperties(e,t,r){r&&a(e,t,r,!0)}export function assignPropertiesAsync(e,t,r){return a(e,t,r)}function a(e,t,i,s=!1){if(!i)return Promise.resolve();const o=[];return Object.keys(e).forEach((n=>{const a=e[n];if(i.hasOwnProperty(n)&&(Array.isArray(e[n])||!1!==a.deserialize))try{const e=i[n]??void 0;if(a?.deserialize){const t=a.deserialize(e);t&&o.push(t)}else"object"!=typeof t[n]||!t[n]||!r(e)&&void 0!==e||s||"function"!=typeof t[n].assignPropertiesAsync?"object"==typeof t[n]&&t[n]&&(r(e)||void 0===e)&&"function"==typeof t[n].assignProperties?t[n].assignProperties(e):t[n]=e:o.push(t[n].assignPropertiesAsync(e))}catch(e){if(s)throw e;o.push(Promise.reject(e))}})),Promise.all(o).then()}export function getDefaults(e){const t={},r=s(e).filter((t=>"object"==typeof e[t]));for(const i of r){const r=e[i];r.hasOwnProperty("default")&&(t[i]=r.default)}return t}export function getDefault(e,t){return getDefaults(e)[t]}export function isDefault(e){if(null==e)return!0;if(e.constructor===Object){if(!Object.keys(e).length)return!0}return!(!Array.isArray(e)||e.length)}function l(e,t,r,i){const s=t?.serialize?t.serialize(i):r[e];if(s&&"function"==typeof s.toItemUri)return s.toItemUri();if(s&&"function"==typeof s.toJSON)return s.toJSON(i);if(Array.isArray(s))return s.map(((e,t)=>l(t,void 0,s,i)));if(s&&"function"==typeof s.toArray){const e=s.toArray();return e.map(((t,r)=>l(r,void 0,e,i)))}if(s&&"object"==typeof s){const e={};for(const t of Object.keys(s))e[t]=l(t,void 0,s,i);return e}return t?.serialize?s:r[e]}export function toPropertyDef(e){const t={serializeModes:[]};return"string"==typeof e?{...t,serializeModes:[e]}:Array.isArray(e)?{...t,serializeModes:e}:{...t,...e}}export function isSerializable(e){return["assignProperties","getDefaults","getSerializableProperties","toJSON"].every((t=>"function"==typeof e[t]))}export function getSerializableProperties(e,r="all"){const s=i(e,(e=>toPropertyDef(e))),o=t(s,(e=>function(e,t){if(!1===t.serialize)return!1;const r="initial-with-defaults"===e?"initial":e;return"all"===e||t.serializeModes?.includes(r)}(r,e)));return o}
+import e from"@arcgis/core/core/Evented.js";import t from"safe-stable-stringify";import{filter as r,isPlainObject as i,map as s,objectKeys as o}from"../utilities/object.js";import{deprecatedGetPropertyPath as n,deprecatedNotifyChange as a,deprecatedSet as l,deprecatedWatch as f,deprecatedWatchProperty as u}from"./Observable.js";const c=new WeakSet;export class SerializableBase extends e{_assignPropertiesPromises=[];constructor(e){if(super(),!c.has(this.constructor))throw new Error(`Class "${this.constructor.name}" must be marked as "@serializable" since it extends ${SerializableBase.name} (make sure it is the _last_ decorator on the class).`)}toJSON(e="all"){return filterJSONProperties(this._getSerializableProperties(),this,e)}assignProperties(e){const t=p(this._getSerializableProperties(),this,e,!0);this._assignPropertiesPromises.push(t),(async()=>{try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}})()}async assignPropertiesAsync(e){await this.finishAssignProperties();const t=assignPropertiesAsync(this._getSerializableProperties(),this,e);this._assignPropertiesPromises.push(t);try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}}async finishAssignProperties(){await Promise.all(this._assignPropertiesPromises)}getSerializableProperties(e="all"){return getSerializableProperties(this._getSerializableProperties(),e)}getDefaults(){return getDefaults(this._getSerializableProperties())}getDefault(e){return this.getDefaults()[e]}set(e,t){return l(this,e,t)}get(e){return n(this,e)}watch(e,t,r){return f(this,e,t,r)}notifyChange(e){a(this,e)}_watchProperty(e,t,r,i){return u(this,e,t,r,i)}_getSerializableProperties(){return{}}_toPropertyDef(e){return toPropertyDef(e)}}export function serializable(e){if(!isSerializable(e.prototype))throw new Error(`Class "${e.name}" is marked as @serializable but does not implement 'Serializable'.`);class t extends e{constructor(e,...r){super(e,...r),this.constructor===t&&this.assignProperties({...this.getDefaults(),...e})}}return c.add(t),t}export function shouldExcludeDefaults(e){return"initial"===e||"project"===e}export function filterJSONProperties(e,r,i){let s=i;"initial"!==s&&"initial-with-defaults"!==s&&"preferences"!==s&&"project"!==s&&(s="all");const n={},a=getSerializableProperties(e,s);for(const e of o(a)){const i=a[e],o=h(e,i,r,s);if(shouldExcludeDefaults(s)){let r=!1;r=i.hasOwnProperty("default")?t(o)===t(i.default):i.isDefault?i.isDefault(o,s):isDefault(o),r||(n[e]=o)}else n[e]=o}if(!shouldExcludeDefaults(s)&&"preferences"!==s||!isDefault(n))return n}export function assignProperties(e,t,r){r&&p(e,t,r,!0)}export function assignPropertiesAsync(e,t,r){return p(e,t,r)}function p(e,t,r,s=!1){if(!r)return Promise.resolve();const o=[];return Object.keys(e).forEach((n=>{const a=e[n];if(r.hasOwnProperty(n)&&(Array.isArray(e[n])||!1!==a.deserialize))try{const e=r[n]??void 0;if(a?.deserialize){const t=a.deserialize(e);t&&o.push(t)}else"object"!=typeof t[n]||!t[n]||!i(e)&&void 0!==e||s||"function"!=typeof t[n].assignPropertiesAsync?"object"==typeof t[n]&&t[n]&&(i(e)||void 0===e)&&"function"==typeof t[n].assignProperties?t[n].assignProperties(e):t[n]=e:o.push(t[n].assignPropertiesAsync(e))}catch(e){if(s)throw e;o.push(Promise.reject(e))}})),Promise.all(o).then()}export function getDefaults(e){const t={},r=o(e).filter((t=>"object"==typeof e[t]));for(const i of r){const r=e[i];r.hasOwnProperty("default")&&(t[i]=r.default)}return t}export function getDefault(e,t){return getDefaults(e)[t]}export function isDefault(e){if(null==e)return!0;if(e.constructor===Object){if(!Object.keys(e).length)return!0}return!(!Array.isArray(e)||e.length)}function h(e,t,r,i){const s=t?.serialize?t.serialize(i):r[e];if(s&&"function"==typeof s.toItemUri)return s.toItemUri();if(s&&"function"==typeof s.toJSON)return s.toJSON(i);if(Array.isArray(s))return s.map(((e,t)=>h(t,void 0,s,i)));if(s&&"function"==typeof s.toArray){const e=s.toArray();return e.map(((t,r)=>h(r,void 0,e,i)))}if(s&&"object"==typeof s){const e={};for(const t of Object.keys(s))e[t]=h(t,void 0,s,i);return e}return t?.serialize?s:r[e]}export function toPropertyDef(e){const t={serializeModes:[]};return"string"==typeof e?{...t,serializeModes:[e]}:Array.isArray(e)?{...t,serializeModes:e}:{...t,...e}}export function isSerializable(e){return["assignProperties","getDefaults","getSerializableProperties","toJSON"].every((t=>"function"==typeof e[t]))}export function getSerializableProperties(e,t="all"){const i=s(e,(e=>toPropertyDef(e))),o=r(i,(e=>function(e,t){if(!1===t.serialize)return!1;const r="initial-with-defaults"===e?"initial":e;return"all"===e||t.serializeModes?.includes(r)}(t,e)));return o}

package/support/Settings.d.ts

@@ -1,19 +1,19 @@
 import Collection from "@arcgis/core/core/Collection";
 import type { SerializeMode } from "./Serializable.js";
 import { SerializableBase } from "./Serializable.js";
-import type { WatchCallback } from "./esri.js";
+declare const Settings_base: (abstract new (_properties?: unknown) => SerializableBase<unknown>) & (abstract new (...args: any[]) => import("./observableUtils.js").ObservableMixin);
 /**
  * Helper class for implementing a collection of settings that can be inherited
  * at runtime from a parent collection of settings. Setting a value locally will
  * override the inherited setting.
  */
-export declare abstract class Settings<TProperties> extends SerializableBase<TProperties> {
+export declare abstract class Settings<TProperties> extends Settings_base {
     private _parent;
+    private _parentHandle;
     /**
      * Locally overridden setting values, keyed by setting name.
      */
     private _overrides;
-    private _settingObservers;
     /**
      * The parent settings that these settings will inherit from.
      */
@@ -44,7 +44,6 @@ export declare abstract class Settings<TProperties> extends SerializableBase<TPr
     isModified(setting: keyof this): boolean;
     toJSON(serializeMode?: SerializeMode): TProperties;
     getDefaults(): TProperties;
-    protected _watchProperty(property: keyof this, subpath: string, callback: WatchCallback, sync: boolean): IHandle;
     /**
      * Gets the value for a setting.
      *
@@ -79,7 +78,7 @@ export declare abstract class Settings<TProperties> extends SerializableBase<TPr
      *
      * @param parent The parent settings to inherit from.
      */
-    protected _setParent(parent: this): void;
-    private _watchParent;
-    private _unwatchParent;
+    protected _setParent(parent: this | undefined): void;
+    private _notifySettingChange;
 }
+export {};

package/support/Settings.js

@@ -1 +1 @@
-import e from"@arcgis/core/core/Collection";import{CopyOnWriteCollection as t}from"../utilities/CopyOnWriteCollection.js";import{every as i}from"../utilities/iterable.js";import{objectKeys as s}from"../utilities/object.js";import{isDefault as r,SerializableBase as n,shouldExcludeDefaults as o}from"./Serializable.js";export class Settings extends n{_parent;_overrides;_settingObservers;get parent(){return this._parent}set parent(e){this._setParent(e)}reset(e){if(this._overrides)if(e){if(this.parent&&this._settingObservers)for(const e of this._settingObservers)this._watchParent(e);this._overrides.delete(e),this.notifyChange(e)}else{const e=[...this._overrides.keys()];this._overrides.clear();for(const t of e){if(this.parent&&this._settingObservers)for(const e of this._settingObservers)this._watchParent(e);this.notifyChange(t)}}}isModified(e){if(!this._overrides)return!1;if(e){if(!this._overrides.has(e))return!1;const i=this._overrides.get(e);return i instanceof t?i.isModified:!(i instanceof Settings)||i.isModified()}return!i(this._overrides.values(),(e=>e instanceof t&&!e.isModified||e instanceof Settings&&!e.isModified()))}toJSON(e="all"){if(!this._overrides?.size&&"initial-with-defaults"!==e)return o(e)?void 0:{};const t=super.toJSON(e);if(t&&"initial-with-defaults"!==e)for(const e of s(t))this.isModified(e)||delete t[e];return o(e)&&r(t)?void 0:t}getDefaults(){return{}}_watchProperty(e,t,i,s){const r={path:`${String(e)}${t?`.${t}`:""}`,handle:super._watchProperty(e,t,i,s),callback:i,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(i){if(!this._overrides?.has(i)){const s=this.parent?this.parent[i]:new e;this._overrides=this._overrides??new Map,this._overrides.set(i,new t(s))}return this._overrides.get(i)}_getNestedSettings(e,t){if(!this._overrides?.has(e)){const i=t();this.parent&&(i.parent=this.parent[e]),this._overrides=this._overrides||new Map,this._overrides.set(e,i)}return this._overrides.get(e)}_setSetting(e,t){if(!this.isModified(e)&&this.parent&&this._settingObservers)for(const t of this._settingObservers)t.path===e&&this._unwatchParent(t);this._overrides=this._overrides??new Map,this._overrides.set(e,t)}_setParent(i){if(this._parent===i||null==this._parent&&null==i)return;const s=this._parent;if(this._parent=i,null!=this._settingObservers)for(const e of this._settingObservers)null!=s&&(e.parentHandle?.remove(),e.parentHandle=void 0),null!=i&&(this.isModified(e.path)||(e.parentHandle=i.watch(e.path,((t,i,s)=>{e.callback(t,i,s,this)})))),this.notifyChange(e.path);if(this._overrides)for(const[s,r]of this._overrides)r instanceof t?r.originalCollection=i?i.get(s):new e:r instanceof Settings&&(r.parent=i?i.get(s):void 0)}_watchParent(e){e.parentHandle||(e.parentHandle=this.parent.watch(e.path,((t,i,s)=>{e.callback(t,i,s,this)})))}_unwatchParent(e){e.parentHandle&&(e.parentHandle.remove(),e.parentHandle=void 0)}}
+import e from"@arcgis/core/core/Collection";import{CopyOnWriteCollection as t}from"../utilities/CopyOnWriteCollection.js";import{every as i}from"../utilities/iterable.js";import{objectKeys as s}from"../utilities/object.js";import{isDefault as r,SerializableBase as n,shouldExcludeDefaults as o}from"./Serializable.js";import{notifyChange as a,observable as h}from"./observableUtils.js";export class Settings extends(h(n)){_parent;_parentHandle;_overrides;get parent(){return this._parent}set parent(e){this._setParent(e)}reset(e){if(this._overrides)if(e)this._overrides.delete(e),this._notifySettingChange(e);else{const e=[...this._overrides.keys()];this._overrides.clear();for(const t of e)this._notifySettingChange(t)}}isModified(e){if(!this._overrides)return!1;if(e){if(!this._overrides.has(e))return!1;const i=this._overrides.get(e);return i instanceof t?i.isModified:!(i instanceof Settings)||i.isModified()}return!i(this._overrides.values(),(e=>e instanceof t&&!e.isModified||e instanceof Settings&&!e.isModified()))}toJSON(e="all"){if(!this._overrides?.size&&"initial-with-defaults"!==e)return o(e)?void 0:{};const t=super.toJSON(e);if(t&&"initial-with-defaults"!==e)for(const e of s(t))this.isModified(e)||delete t[e];return o(e)&&r(t)?void 0:t}getDefaults(){return{}}_getSetting(e,t){return this._overrides?.has(e)?this._overrides.get(e):this.parent?this.parent[e]:t}_getCollectionSetting(i){if(!this._overrides?.has(i)){const s=this.parent?this.parent[i]:new e;null==this._overrides&&(this._overrides=new Map),this._overrides.set(i,new t(s))}return this._overrides.get(i)}_getNestedSettings(e,t){if(!this._overrides?.has(e)){const i=t();this.parent&&(i.parent=this.parent[e]),null==this._overrides&&(this._overrides=new Map),this._overrides.set(e,i)}return this._overrides.get(e)}_setSetting(e,t){null==this._overrides&&(this._overrides=new Map),this._overrides.set(e,t),this._notifySettingChange(e)}_setParent(i){if(this._parent!==i&&(null!=this._parent||null!=i)){if(null!=this._parentHandle&&(this._parentHandle.remove(),this._parentHandle=void 0),this._parent=i,null!=this._parent){const e=new WeakRef(this),t=this._parent.on("property-change",(i=>{const s=e.deref();null!=s?s._notifySettingChange(i.property):t.remove()}));this._parentHandle=t}if(this._overrides)for(const[s,r]of this._overrides)r instanceof t?r.originalCollection=i?i[s]:new e:r instanceof Settings&&(r.parent=i?i[s]:void 0);a(this)}}_notifySettingChange(e){this.emit("property-change",{property:e}),a(this,e)}}

package/support/esri.d.ts

@@ -1,3 +1,4 @@
+import type Accessor from "@arcgis/core/core/Accessor";
 import Collection from "@arcgis/core/core/Collection";
 import Evented from "@arcgis/core/core/Evented";
 import type Layer from "@arcgis/core/layers/Layer";
@@ -22,11 +23,14 @@ export type CIMPolygonSymbol = __esri.CIMPolygonSymbol;
 export type CIMSymbolReference = __esri.CIMSymbolReference;
 export type CollectionAfterAddEventHandler<T> = __esri.CollectionAfterAddEventHandler<T>;
 export type CollectionAfterChangesEventHandler = __esri.CollectionAfterChangesEventHandler;
-export type CollectionAfterItemEvent = __esri.CollectionAfterItemEvent;
 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>;
+export type CollectionAfterItemEvent<T> = __esri.CollectionAfterItemEvent<T>;
+export type CollectionAfterEvent = __esri.CollectionAfterEvent;
 export type CollectionChangeEvent<T> = __esri.CollectionChangeEvent<T>;
 export type CollectionChangeEventHandler<T> = __esri.CollectionChangeEventHandler<T>;
 export type CSVLayerCapabilities = __esri.CSVLayerCapabilities;
@@ -147,56 +151,6 @@ export type VisibilityMode = __esri.GroupLayer["visibilityMode"];
 export type ListMode = __esri.Layer["listMode"];
 export type DrawingTool = __esri.FeatureTemplate["drawingTool"];
 export type PortalItemType = "Web Map" | "Web Scene" | "Feature Service" | "Map Service" | "Image Service" | "KML" | "Feature Collection" | "Vector Tile Service" | "Scene Service" | "Stream Service" | "WMTS" | "WMS";
-/**
- * A callback that gets invoked by {@link AccessorLike.watch} to notify observers
- * about property changes.
- */
-export type WatchCallback<T = any, U = any> = (newValue: T, oldValue: T, propertyName: string, target: U) => void;
-/**
- * An object that supports Accessor-style observability.
- */
-export interface AccessorLike {
-    /**
-     * Gets the value of a property denoted by the given path.
-     *
-     * @param propertyPath The name of the property to get. It can also be a
-     *   path to a property deeper in the instance, for example "foo.bar.baz".
-     *   If a property in the path doesn't exist, then the result will be
-     *   undefined.
-     */
-    get<T = unknown>(propertyPath: string): T;
-    /**
-     * Sets the value of a property denoted by the given path.
-     *
-     * @param propertyPath The name of the property to set. It can also be a
-     *   path to a property deeper in the instance, for example "foo.bar.baz".
-     *   If a property along the way doesn't exist, then nothing will be set.
-     * @param value The value to set.
-     */
-    set<T>(propertyPath: string, value: T): this;
-    /**
-     * Sets the values of several properties.
-     *
-     * @param props On object with key/value pairs denoting the paths and values
-     *   to set.
-     */
-    set(props: HashMap<unknown>): this;
-    /**
-     * Watches a property for changes.
-     *
-     * @param path The property path to watch, which can be the name of a
-     *   property, or a path like "a.b.c" that will be traversed. In the latter
-     *   case the watch handler will be invoked any time that any of the
-     *   intermediate properties change.
-     * @param callback The callback to invoke when the property changes.
-     * @param sync Whether to invoke the callback synchronously. The default is
-     *   `false` (will be invoked on a future tick from the one that changed the
-     *   value). Async generally performs better as the callback is only invoked
-     *   once for the final value if the property is changed multiple times in a
-     *   tick.
-     */
-    watch(path: string | string[], callback: WatchCallback, sync?: boolean): IHandle;
-}
 /**
  * Raised when items are added, removed, or moved from a Collection.
  */
@@ -245,7 +199,7 @@ export type ItemCompareCallback<T> = (firstItem: T, secondItem: T) => number;
 /**
  * Base interface for Esri sublayer classes.
  */
-export interface SublayerLike extends AccessorLike {
+export interface SublayerLike extends Accessor {
     /**
      * The unique ID for the sublayer.
      */