@webqit/observer 2.0.7 → 2.1.1

package/src/actors.js

@@ -1,176 +1,180 @@
-
-/**
- * @imports
- */
-import { _from as _arrFrom } from '@webqit/util/arr/index.js';
-import { _isClass, _isFunction, _isTypeObject, _getType } from '@webqit/util/js/index.js';
-import { set, deleteProperty, has, get, ownKeys, defineProperty, getOwnPropertyDescriptor } from "./main.js";
-import { apply, construct, getPrototypeOf, setPrototypeOf, isExtensible, preventExtensions } from "./main.js";
-import { _ } from './util.js';
-
-/* ---------------ACCESSORIZE METHODS--------------- */
-
-/**
- * Accessorizes props.
- *
- * @param Array|Object	target
- * @param String|Array	props
- * @param Object		params
- *
- * @return Array
- */
-export function accessorize( target, props, params = {} ) {
-    target = resolveTarget( target );
-    const accessorizedProps = _( target, 'accessorizedProps' );
-    // ---------
-    function getDescriptorDeep( prop ) {
-        let descriptor, proto = target;
-        while ( !descriptor && ( proto = Object.getPrototypeOf( proto ) ) ) {
-            descriptor = Object.getOwnPropertyDescriptor( proto, prop );
-        }
-        return descriptor 
-            ? { proto, descriptor } 
-            : { descriptor: { value: undefined } };
-    }
-    // ---------
-    function accessorizeProp( prop ) {
-        if ( accessorizedProps.has( prop ) ) return true;
-        // ------------------
-        // Current Descriptor Record
-        const currentDescriptorRecord = getDescriptorDeep( prop );
-        currentDescriptorRecord.getValue = function() {
-            return 'get' in this.descriptor ? this.descriptor.get() : this.descriptor.value;
-        };
-        currentDescriptorRecord.setValue = function( value ) {
-            return 'set' in this.descriptor ? this.descriptor.set( value ) : ( this.descriptor.value = value )
-        };
-        currentDescriptorRecord.intact = function() {
-            const currentDescriptor = Object.getOwnPropertyDescriptor( target, prop );
-            return currentDescriptor.get === accessorization.get 
-                && currentDescriptor.set === accessorization.set
-                && accessorizedProps.get( prop ) === this;
-        };
-        currentDescriptorRecord.restore = function() {
-            if ( !this.intact() ) return false;
-            if ( this.proto !== target ) { delete target[ prop ]; }
-            else { Object.defineProperty( target, prop, this.descriptor ); }
-            accessorizedProps.delete( prop );
-            return true;
-        };
-        accessorizedProps.set( prop, currentDescriptorRecord );
-        // ------------------
-        // enumerable, configurable
-        const { enumerable = true, configurable = true } = currentDescriptorRecord.descriptor;
-        const accessorization = { enumerable, configurable };
-        // set, get
-        if ( [ 'value', 'set' ].some( x => x in currentDescriptorRecord.descriptor ) ) {
-            accessorization.set = function ( value ) { return set( this, prop, value, params ); };
-        }
-        if ( [ 'value', 'get' ].some( x => x in currentDescriptorRecord.descriptor ) ) {
-            accessorization.get = function () { return get( this, prop, params ); };
-        }
-        try {
-            Object.defineProperty( target, prop, accessorization );
-            return true;
-        } catch( e ) {
-            accessorizedProps.delete( prop );
-            return false;
-        }
-    }
-    const _props = Array.isArray( props ) ? props : (
-        props === undefined ? Object.keys( target ) : [ props ]
-    );
-    const statuses = _props.map( accessorizeProp );
-    return props === undefined || Array.isArray( props ) 
-        ? statuses 
-        : statuses[ 0 ];
-}
-
-/**
- * Unaccessorizes previously accessorized props.
- *
- * @param Array|Object	target
- * @param String|Array	props
- * @param Object		params
- *
- * @return Array
- */
-export function unaccessorize( target, props, params = {} ) {
-    target = resolveTarget( target );
-    const accessorizedProps = _( target, 'accessorizedProps' );
-    function unaccessorizeProp( prop ) {
-        if ( !accessorizedProps.has( prop ) ) return true;
-        return accessorizedProps.get( prop ).restore();
-    }
-    const _props = Array.isArray( props ) ? props : (
-        props === undefined ? Object.keys( target ) : [ props ]
-    );
-    const statuses = _props.map( unaccessorizeProp );
-    return props === undefined || Array.isArray( props ) 
-        ? statuses 
-        : statuses[ 0 ];
-}
-
-/* ---------------PROXY METHODS--------------- */
-
-/**
- * Returns an object as a proxy and binds all instance methods
- * to the proxy instead of the object itself.
- *
- * @param Array|Object		target
- * @param Object		    params
- *
- * @return Proxy
- */
-export function proxy( target, params = {} ) {
-    target = resolveTarget( target );
-    const proxy = new Proxy( target, {
-        apply:  ( target, thisArgument, argumentsList ) => apply( target, thisArgument, argumentsList, params ),
-        construct:  ( target, argumentsList, newTarget = null ) => construct( target, argumentsList, newTarget, params ),
-        defineProperty:  ( target, propertyKey, attributes ) => defineProperty( target, propertyKey, attributes, params ),
-        deleteProperty: ( target, propertyKey ) => deleteProperty( target, propertyKey, params ),
-        get: ( target, propertyKey, receiver = null ) => {
-            const val = get( target, propertyKey, { ...params, receiver } );
-            if ( params.proxyAutoBinding !== false && _isFunction( val ) && !_isClass( val )) {
-                return val.bind( proxy );
-            }
-            return val;
-        },
-        getOwnPropertyDescriptor: ( target, propertyKey ) => getOwnPropertyDescriptor( target, propertyKey, params ),
-        getPrototypeOf: target => getPrototypeOf( target, params ),
-        has: ( target, propertyKey ) => has( target, propertyKey, params ),
-        isExtensible: target => isExtensible( target, params ),
-        ownKeys: target => ownKeys( target, params ),
-        preventExtensions: target => preventExtensions( target, params ),
-        set: ( target, propertyKey, value, receiver = null ) => set( target, propertyKey, value, { ...params, receiver } ),
-        setPrototypeOf: ( target, prototype ) => setPrototypeOf( target, prototype, params ),
-    });
-    _( proxy ).set( proxy, target );
-	return proxy;
-}
-
-/**
- * Returns the original object earlier proxied by proxy().
- *
- * @param Proxy|Any		target
- *
- * @return Any
- */
-export function unproxy( target ) {
-    // Proxy targets are mapped to their own instances internally
-    return _( target ).get( target ) || target;
-}
-
-/* ---------------HELPERS--------------- */
-
-/** 
- * Ensures target object is an object or array.
- *
- * @param Array|Object	target
- *
- * @return Array|Object
- */
-function resolveTarget( target ) {
-	if ( !target || !_isTypeObject( target ) ) throw new Error('Target must be of type object!');
-	return unproxy( target );
-}
+
+/**
+ * @imports
+ */
+import { _from as _arrFrom } from '@webqit/util/arr/index.js';
+import { _isClass, _isFunction, _isTypeObject, _getType } from '@webqit/util/js/index.js';
+import { set, deleteProperty, has, get, ownKeys, defineProperty, getOwnPropertyDescriptor } from "./main.js";
+import { batch, apply, construct, getPrototypeOf, setPrototypeOf, isExtensible, preventExtensions } from "./main.js";
+import { _ } from './util.js';
+
+/* ---------------ACCESSORIZE METHODS--------------- */
+
+/**
+ * Accessorizes props.
+ *
+ * @param Array|Object	target
+ * @param String|Array	props
+ * @param Object		params
+ *
+ * @return Array
+ */
+export function accessorize( target, props, params = {} ) {
+    target = resolveTarget( target );
+    const accessorizedProps = _( target, 'accessorizedProps' );
+    // ---------
+    function getDescriptorDeep( prop ) {
+        let descriptor, proto = target;
+        do {
+            descriptor = Object.getOwnPropertyDescriptor( proto, prop );
+        } while ( !descriptor && ( proto = Object.getPrototypeOf( proto ) ) );
+        return descriptor 
+            ? { proto, descriptor } 
+            : { descriptor: { value: undefined, configurable: true, enumerable: true, writable: true } };
+    }
+    // ---------
+    function accessorizeProp( prop ) {
+        if ( accessorizedProps.has( prop + '' ) ) return true;
+        // ------------------
+        // Current Descriptor Record
+        const currentDescriptorRecord = getDescriptorDeep( prop );
+        currentDescriptorRecord.getValue = function() {
+            return this.descriptor.get ? this.descriptor.get() : this.descriptor.value;
+        };
+        currentDescriptorRecord.setValue = function( value ) {
+            this.dirty = true;
+            return this.descriptor.set ? this.descriptor.set( value ) !== false : ( this.descriptor.value = value, true );
+        };
+        currentDescriptorRecord.intact = function() {
+            const currentDescriptor = Object.getOwnPropertyDescriptor( target, prop );
+            return currentDescriptor?.get === accessorization.get 
+                && currentDescriptor?.set === accessorization.set
+                && accessorizedProps.get( prop + '' ) === this;
+        };
+        currentDescriptorRecord.restore = function() {
+            if ( !this.intact() ) return false;
+            if ( ( this.proto && this.proto !== target ) || ( !this.proto && !this.dirty ) ) { delete target[ prop ]; }
+            else { Object.defineProperty( target, prop, this.descriptor ); }
+            accessorizedProps.delete( prop + '' );
+            return true;
+        };
+        accessorizedProps.set( prop + '', currentDescriptorRecord );
+        // ------------------
+        // enumerable, configurable
+        const { enumerable = true } = currentDescriptorRecord.descriptor;
+        const accessorization = { enumerable, configurable: true };
+        // set, get
+        if ( ( 'value' in currentDescriptorRecord.descriptor ) || currentDescriptorRecord.descriptor.set ) {
+            accessorization.set = function ( value ) { return set( this, prop, value, params ); };
+        }
+        if ( ( 'value' in currentDescriptorRecord.descriptor ) || currentDescriptorRecord.descriptor.get ) {
+            accessorization.get = function () { return get( this, prop, params ); };
+        }
+        try {
+            Object.defineProperty( target, prop, accessorization );
+            return true;
+        } catch( e ) {
+            accessorizedProps.delete( prop + '' );
+            return false;
+        }
+    }
+    const _props = Array.isArray( props ) ? props : (
+        props === undefined ? Object.keys( target ) : [ props ]
+    );
+    const statuses = _props.map( accessorizeProp );
+    return props === undefined || Array.isArray( props ) 
+        ? statuses 
+        : statuses[ 0 ];
+}
+
+/**
+ * Unaccessorizes previously accessorized props.
+ *
+ * @param Array|Object	target
+ * @param String|Array	props
+ * @param Object		params
+ *
+ * @return Array
+ */
+export function unaccessorize( target, props, params = {} ) {
+    target = resolveTarget( target );
+    const accessorizedProps = _( target, 'accessorizedProps' );
+    function unaccessorizeProp( prop ) {
+        if ( !accessorizedProps.has( prop + '' ) ) return true;
+        return accessorizedProps.get( prop + '' ).restore();
+    }
+    const _props = Array.isArray( props ) ? props : (
+        props === undefined ? Object.keys( target ) : [ props ]
+    );
+    const statuses = _props.map( unaccessorizeProp );
+    return props === undefined || Array.isArray( props ) 
+        ? statuses 
+        : statuses[ 0 ];
+}
+
+/* ---------------PROXY METHODS--------------- */
+
+/**
+ * Returns an object as a proxy and binds all instance methods
+ * to the proxy instead of the object itself.
+ *
+ * @param Array|Object		target
+ * @param Object		    params
+ *
+ * @return Proxy
+ */
+export function proxy( target, params = {} ) {
+    target = resolveTarget( target );
+    const proxy = new Proxy( target, {
+        apply:  ( target, thisArgument, argumentsList ) => apply( target, thisArgument, argumentsList, params ),
+        construct:  ( target, argumentsList, newTarget = null ) => construct( target, argumentsList, newTarget, params ),
+        defineProperty:  ( target, propertyKey, attributes ) => defineProperty( target, propertyKey, attributes, params ),
+        deleteProperty: ( target, propertyKey ) => deleteProperty( target, propertyKey, params ),
+        get: ( target, propertyKey, receiver = null ) => {
+            const val = get( target, propertyKey, { ...params, receiver } );
+            if ( params.proxyAutoBinding !== false && _isFunction( val ) && !_isClass( val )) {
+                return function( ...args ) {
+                    const _this = this || proxy;
+                    return batch( _this, () => val.call( _this, ...args ) );
+                }
+            }
+            return val;
+        },
+        getOwnPropertyDescriptor: ( target, propertyKey ) => getOwnPropertyDescriptor( target, propertyKey, params ),
+        getPrototypeOf: target => getPrototypeOf( target, params ),
+        has: ( target, propertyKey ) => has( target, propertyKey, params ),
+        isExtensible: target => isExtensible( target, params ),
+        ownKeys: target => ownKeys( target, params ),
+        preventExtensions: target => preventExtensions( target, params ),
+        set: ( target, propertyKey, value, receiver = null ) => set( target, propertyKey, value, { ...params, receiver } ),
+        setPrototypeOf: ( target, prototype ) => setPrototypeOf( target, prototype, params ),
+    });
+    _( proxy ).set( proxy, target );
+	return proxy;
+}
+
+/**
+ * Returns the original object earlier proxied by proxy().
+ *
+ * @param Proxy|Any		target
+ *
+ * @return Any
+ */
+export function unproxy( target ) {
+    // Proxy targets are mapped to their own instances internally
+    return _( target ).get( target ) || target;
+}
+
+/* ---------------HELPERS--------------- */
+
+/** 
+ * Ensures target object is an object or array.
+ *
+ * @param Array|Object	target
+ *
+ * @return Array|Object
+ */
+function resolveTarget( target ) {
+	if ( !target || !_isTypeObject( target ) ) throw new Error('Target must be of type object!');
+	return unproxy( target );
+}

package/src/core/Descriptor.js

@@ -1,23 +1,23 @@
-
-/**
- * ---------------------------
- * The Descriptor class
- * ---------------------------
- */
-
-export default class Descriptor {
-	
-	/**
-	 * Initializes the instance.
-	 *
-	 * @param array|object	target
-	 * @param object		dfn
-	 *
-	 * @return void
-	 */
-	constructor( target, dfn ) {
-		this.target = target;
-		if ( !( dfn.type ) ) throw new Error( 'Descriptor type must be given in definition!' );
-		Object.assign( this, dfn );
-	}
+
+/**
+ * ---------------------------
+ * The Descriptor class
+ * ---------------------------
+ */
+
+export default class Descriptor {
+	
+	/**
+	 * Initializes the instance.
+	 *
+	 * @param array|object	target
+	 * @param object		dfn
+	 *
+	 * @return void
+	 */
+	constructor( target, dfn ) {
+		this.target = target;
+		if ( !( dfn.type ) ) throw new Error( 'Descriptor type must be given in definition!' );
+		Object.assign( this, dfn );
+	}
 }

package/src/core/ListenerRegistration.js

@@ -1,57 +1,61 @@
-
-/**
- * @imports
- */
-import { _from as _arrFrom } from '@webqit/util/arr/index.js';
-import Registration from './Registration.js';
-
-/**
- * ---------------------------
- * The ListenerRegistration class
- * ---------------------------
- */
-
-export default class ListenerRegistration extends Registration {
-	
-	/**
-	 * @constructor
-	 */
-	constructor() {
-		super( ...arguments );
-		Object.defineProperty( this, 'abortController', { value: new AbortController } );
-		Object.defineProperty( this, 'signal', { value: this.abortController.signal } );
-	}
-
-	/**
-	 * De-registers the instance.
-	 * 
-	 * @return Void
-	 */
-	remove() {
-		this.abortController.abort();
-		super.remove();
-	}
-
-	/**
-	 * Calls the observer's handler function
-	 * on matching with the event's fields.
-	 *
-	 * @param Array			 		events
-	 *
-	 * @return Any
-	 */
-	fire( events ) {
-		let matches = events, filter = this.filter;
-		if ( filter !== Infinity && ( filter = _arrFrom( filter ) ) ) {
-			matches = events.filter( event => filter.includes( event.key ) );
-		}
-		if ( this.params.diff ) {
-			matches = matches.filter( event => event.type !== 'set' || event.value !== event.oldValue );
-		}
-		if ( matches.length ) {
-			return this.filter === Infinity || Array.isArray( this.filter )
-				? this.handler( matches, this )
-				: this.handler( matches[ 0 ], this );
-		}
-	}
-}
+
+/**
+ * @imports
+ */
+import { _from as _arrFrom } from '@webqit/util/arr/index.js';
+import Registration from './Registration.js';
+
+/**
+ * ---------------------------
+ * The ListenerRegistration class
+ * ---------------------------
+ */
+
+export default class ListenerRegistration extends Registration {
+	
+	/**
+	 * @constructor
+	 */
+	constructor() {
+		super( ...arguments );
+		Object.defineProperty( this, 'abortController', { value: new AbortController } );
+		Object.defineProperty( this, 'signal', { value: this.abortController.signal } );
+	}
+
+	/**
+	 * De-registers the instance.
+	 * 
+	 * @return Void
+	 */
+	remove() {
+		this.abortController.abort();
+		super.remove();
+	}
+
+	/**
+	 * Calls the observer's handler function
+	 * on matching with the event's fields.
+	 *
+	 * @param Array			 		events
+	 *
+	 * @return Any
+	 */
+	fire( events ) {
+		if ( this.handler.firing ) return;
+		let matches = events, filter = this.filter;
+		if ( filter !== Infinity && ( filter = _arrFrom( filter ) ) ) {
+			matches = events.filter( event => filter.includes( event.key ) );
+		}
+		if ( this.params.diff ) {
+			matches = matches.filter( event => event.type !== 'set' || event.value !== event.oldValue );
+		}
+		if ( matches.length ) {
+			this.handler.firing = true;
+			const ret = this.filter === Infinity || Array.isArray( this.filter )
+				? this.handler( matches, this )
+				: this.handler( matches[ 0 ], this );
+			this.handler.firing = false;
+			return ret;
+		}
+	}
+}