@shortfuse/materialdesignweb 0.7.6 → 0.9.0

package/core/observe.js

@@ -1,57 +1,63 @@
-import { buildMergePatch, hasMergePatch } from '../utils/jsonMergePatch.js';
-
 import { attrNameFromPropName } from './dom.js';
+import { buildMergePatch, hasMergePatch } from './jsonMergePatch.js';
 
-/** @typedef {import('./typings.js').ObserverPropertyType} ObserverPropertyType */
-
-/** @return {null} */
-const DEFAULT_NULL_PARSER = () => null;
-
-/**
- * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean#boolean_coercion
- * @param {any} v
- * @return {boolean}
- */
-const DEFAULT_BOOLEAN_PARSER = (v) => !!v;
+/** @typedef {'string' | 'boolean' | 'map' | 'set' | 'float' | 'integer' | 'object' | 'function' | 'array'} ObserverPropertyType */
 
 /**
- * Doesn't support `BigInt` types
- * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number#number_coercion
- * @param {any} v
- * @return {number}
+ * @template {ObserverPropertyType} T
+ * @typedef {(
+ * T extends 'boolean' ? boolean
+ * : T extends 'string' ? string
+ * : T extends 'float' | 'integer' ? number
+ * : T extends 'array' ? any[]
+ * : T extends 'object' ? any
+ * : T extends 'function' ? (...args:any) => any
+ * : unknown
+ * )} ParsedObserverPropertyType
  */
-const DEFAULT_NUMBER_PARSER = (v) => +v;
 
 /**
- * Doesn't support `Symbol` types
- * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#string_coercion
- * @param {any} v
- * @return {string}
- */
-const DEFAULT_STRING_PARSER = (v) => `${v}`;
-
-/**
- * @template T
- * @param {T} o
- * @return {T}
- */
-const DEFAULT_OBJECT_PARSER = (o) => o;
-
-/**
- * @template T
- * @param {T} a
- * @param {T} b
- * @return {boolean} true if equal
+ * @template {ObserverPropertyType} T1
+ * @template {any} T2
+ * @template {Object} [C=any]
+ * @typedef {Object} ObserverOptions
+ * @prop {T1} [type]
+ * @prop {string} [attr]
+ * @prop {boolean} [readonly]
+ * @prop {boolean} [enumerable]
+ * Defaults to false if type is boolean
+ * @prop {boolean} [nullable]
+ * @prop {T2} [empty]
+ * @prop {T2} [value]
+ * @prop {WeakMap<C,T2>} [values]
+ * @prop {boolean|'write'|'read'} [reflect]
+ * Function used when null passed
+ * @prop {(this:C, value:null|undefined)=>T2} [nullParser]
+ * @prop {(this:C, value:any)=>T2} [parser]
+ * Function used when comparing
+ * @prop {(this:C, a:T2, b:T2)=> any} [diff]
+ * @prop {(this:C, a:T2, b:T2)=>boolean} [is]
+ * @prop {(this:C, data:Partial<C>, fn?: () => T2) => T2} [get]
+ * @prop {(this:C, value: T2, fn?:(value2: T2) => any) => any} [set]
+ * Simple callback
+ * @prop {(this:C, oldValue:T2, newValue:T2, changes:any)=>any} [changedCallback]
+ * Named callback
+ * @prop {(this:C, name:string, oldValue: T2, newValue: T2, changes:any) => any} [propChangedCallback]
+ * Attribute callback
+ * @prop  {(this:C, name:string, oldValue: string, newValue: string) => any} [attributeChangedCallback]
+ * @prop {WeakMap<C, T2>} [computedValues]
+ * @prop {[keyof C, (this:C, ...args:any[]) => any][]} [watchers]
+ * @prop {WeakSet<C>} [needsSelfInvalidation]
+ * @prop {Set<keyof C>} [props]
  */
-export const DEFAULT_OBJECT_COMPARATOR = (a, b) => !hasMergePatch(a, b);
 
 /**
- * @template T
- * @param {T} a
- * @param {T} b
- * @return {boolean} true if equal
+ * @template {ObserverPropertyType} T1
+ * @template {any} [T2=any]
+ * @template {string} [K=string]
+ * @template {Object} [C=any]
+ * @typedef {ObserverOptions<T1, T2, C> & { key: K, values?: WeakMap<C, T2>; attrValues?: WeakMap<C, string> }} ObserverConfiguration
  */
-export const DEFAULT_OBJECT_DIFF = (a, b) => buildMergePatch(a, b, 'object');
 
 /**
  * @param {ObserverPropertyType} type
@@ -78,6 +84,50 @@ function emptyFromType(type) {
   }
 }
 
+/**
+ * @template {Object} T
+ * @param {T} proxyTarget
+ * @param {Set<string>} set
+ * @param {Set<string>} deepSet
+ * @param {string} [prefix]
+ * @return {T}
+ */
+function buildProxy(proxyTarget, set, deepSet, prefix) {
+  // @ts-ignore
+  proxyTarget ??= {};
+  return new Proxy(proxyTarget, {
+    get(target, p) {
+      // @ts-ignore
+      const value = target[p];
+      if (typeof p !== 'symbol') {
+        const arg = prefix ? `${prefix}.${p}` : p;
+        if (prefix) {
+          deepSet.add(arg);
+        } else {
+          set.add(arg);
+        }
+        if (typeof value === 'object' && value != null) {
+          console.debug('tried to arg poke object get', p, value);
+          return buildProxy(value, set, deepSet, arg);
+        }
+      }
+      return value;
+    },
+    has(target, p) {
+      const value = Reflect.has(target, p);
+      if (typeof p !== 'symbol') {
+        const arg = prefix ? `${prefix}.p` : p;
+        if (prefix) {
+          deepSet.add(arg);
+        } else {
+          set.add(arg);
+        }
+      }
+      return value;
+    },
+  });
+}
+
 /**
  * @param {ObserverPropertyType} type
  * @return {any}
@@ -85,127 +135,218 @@ function emptyFromType(type) {
 function defaultParserFromType(type) {
   switch (type) {
     case 'boolean':
-      return DEFAULT_BOOLEAN_PARSER;
+      /**
+       * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean#boolean_coercion
+       * @param {any} v
+       * @return {boolean}
+       */
+      return (v) => !!v;
     case 'integer':
       // Calls ToNumber(x)
       return Math.round;
     case 'float':
-      return DEFAULT_NUMBER_PARSER;
+      /**
+       * Doesn't support `BigInt` types
+       * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number#number_coercion
+       * @param {any} v
+       * @return {number}
+       */
+      return (v) => +v;
     case 'map':
       return Map;
     case 'set':
       return Set;
     case 'object':
-      return DEFAULT_OBJECT_PARSER;
     case 'array':
-      return Array.from;
+      /**
+       * Reflect self
+       * @template T
+       * @param {T} o
+       * @return {T}
+       */
+      return (o) => o;
     default:
     case 'string':
-      return DEFAULT_STRING_PARSER;
+      /**
+       * Doesn't support `Symbol` types
+       * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#string_coercion
+       * @param {any} v
+       * @return {string}
+       */
+      return (v) => `${v}`;
   }
 }
 
+/**
+ * @param {(data: Partial<any>) => any} fn
+ * @param {...any} args
+ * @this {any}
+ * @return {{
+ *  props: {
+ *    this: string[],
+ *    args: string[][],
+ *  },
+ *  deepPropStrings: {
+ *   this: string[],
+ *   args: string[][],
+ *  },
+ *  deepProps: {
+ *   this: string[][],
+ *   args: string[][][],
+ *  },
+ *  defaultValue: any,
+ *  reusable: boolean,
+ * }}
+ */
+export function observeFunction(fn, ...args) {
+  /** @type {Set<string>} */
+  const thisPoked = new Set();
+  /** @type {Set<string>} */
+  const thisPokedDeep = new Set();
+
+  const argWatchers = args.map((arg) => {
+    const poked = new Set();
+    const pokedDeep = new Set();
+    const proxy = buildProxy(arg, poked, pokedDeep);
+    return { poked, pokedDeep, proxy };
+  });
+
+  const thisProxy = buildProxy(this ?? {}, thisPoked, thisPokedDeep);
+  const defaultValue = fn.apply(thisProxy, argWatchers.map((watcher) => watcher.proxy));
+  /* Arrow functions can reused if they don't poke `this` */
+  const reusable = fn.name ? true : !thisPoked.size;
+
+  return {
+    props: {
+      this: [...thisPoked],
+      args: argWatchers.map((watcher) => [...watcher.poked]),
+    },
+    deepPropStrings: {
+      this: [...thisPokedDeep],
+      args: argWatchers.map((watcher) => [...watcher.pokedDeep]),
+    },
+    deepProps: {
+      this: [...thisPokedDeep].map((deepPropString) => deepPropString.split('.')),
+      args: argWatchers.map((watcher) => [...watcher.pokedDeep].map((deepPropString) => deepPropString.split('.'))),
+    },
+    defaultValue,
+    reusable,
+  };
+}
+
 /**
  * @template {string} K
  * @template {ObserverPropertyType} [T1=any]
- * @template {any} [T2=import('./typings.js').ParsedObserverPropertyType<T1>]
+ * @template {any} [T2=ParsedObserverPropertyType<T1>]
  * @param {K} name
- * @param {T1|import('./typings.js').ObserverOptions<T1,T2>} [typeOrOptions='string']
- * @param {any} object
- * @return {import('./typings.js').ObserverConfiguration<T1,T2,K> & import('./typings.js').ObserverOptions<T1,T2>}
+ * @param {T1|ObserverOptions<T1,T2>} [typeOrOptions='string']
+ * @param {any} [object]
+ * @return {ObserverConfiguration<T1,T2,K> & ObserverOptions<T1,T2>}
  */
 export function parseObserverOptions(name, typeOrOptions, object) {
-  /** @type {Partial<import('./typings.js').ObserverOptions<T1,T2>>} */
-  const options = {
-    ...((typeof typeOrOptions === 'string') ? { type: typeOrOptions } : typeOrOptions),
-  };
+  /** @type {Partial<ObserverOptions<T1,T2>>} */
+  const options = (typeof typeOrOptions === 'string')
+    ? { type: typeOrOptions }
+    : typeOrOptions;
+
+  let {
+    watchers, value, readonly,
+    empty, type,
+    enumerable, reflect, attr,
+    nullable, parser, nullParser,
+    get,
+    is, diff,
+    props,
+  } = options;
 
-  let { enumerable, attr, reflect } = options;
-  const { type, empty, changedCallback } = options;
+  watchers ??= [];
+  readonly ??= false;
+
+  if (empty === undefined) {
+    empty = null;
+  }
+
+  value ??= empty;
+
+  if (get && !props) {
+    // Custom `get` uses computed values.
+    // Invalidate computed value when dependent `prop` changes
+    const observeResult = observeFunction(get.bind(object), object, () => value);
+    value ??= observeResult.defaultValue;
+    const uniqueProps = new Set([
+      ...observeResult.props.this,
+      ...observeResult.props.args[0],
+    ]);
+    props = uniqueProps;
+  }
 
   /** @type {ObserverPropertyType} */
-  let parsedType = type;
-  if (parsedType == null) {
-    // Use .value or .get() to parse type
-    const value = options.value ?? empty ?? options.get?.call(object ?? {}, object ?? {});
+  if (!type) {
     if (value == null) {
-      parsedType = 'string';
+      // @ts-ignore
+      type = 'string';
     } else {
       const parsed = typeof value;
-      parsedType = (parsed === 'number')
+      // @ts-ignore
+      type = (parsed === 'number')
         ? (Number.isInteger(value) ? 'integer' : 'number')
         : parsed;
     }
   }
 
   enumerable ??= name[0] !== '_';
-  reflect ??= enumerable ? parsedType !== 'object' : (attr ? 'write' : false);
+  reflect ??= enumerable ? type !== 'object' : (attr ? 'write' : false);
   attr ??= (reflect ? attrNameFromPropName(name) : null);
+  nullable ??= (type === 'boolean') ? false : (empty == null);
+  if (!nullable) {
+    empty ??= emptyFromType(type);
+    value ??= empty;
+  }
 
   // if defined ? value
   // else if boolean ? false
   // else if onNullish ? false
   // else if empty == null
-  const parser = options.parser ?? defaultParserFromType(parsedType);
-  let nullParser = options.nullParser;
-  let parsedEmpty = empty ?? null;
+  parser ??= defaultParserFromType(type);
   if (!nullParser) {
-    const nullable = options.nullable ?? (
-      parsedType === 'boolean'
-        ? false
-        : (empty == null));
     if (nullable) {
-      nullParser = DEFAULT_NULL_PARSER;
+      nullParser = () => null;
     } else {
-      parsedEmpty ??= emptyFromType(parsedType);
-      nullParser = parsedEmpty === null ? () => emptyFromType(parsedType) : () => parsedEmpty;
+      nullParser = (empty === null)
+        ? () => emptyFromType(type)
+        : () => empty;
     }
   }
 
-  let isFn = options.is;
-  if (!isFn) {
-    isFn = parsedType === 'object'
-      ? DEFAULT_OBJECT_COMPARATOR
-      : Object.is;
-  }
+  is ??= (type === 'object')
+    ? (a, b) => !hasMergePatch(a, b)
+    : ((type === 'array') ? () => false : Object.is);
 
-  const diff = 'diff' in options
-    ? options.diff
-    : ((parsedType === 'object') ? DEFAULT_OBJECT_DIFF : null);
+  if (diff === undefined) {
+    // @ts-ignore
+    diff = ((type === 'object') ? (a, b) => buildMergePatch(a, b, 'reference') : null);
+  }
 
   return {
     ...options,
-    type: parsedType,
-    is: isFn,
+    type,
+    is,
     diff,
     attr,
     reflect,
-    readonly: options.readonly ?? false,
+    readonly,
     enumerable,
-    value: options.value ?? parsedEmpty,
+    value,
     parser,
     nullParser,
     key: name,
-    changedCallback,
-    watchers: options.watchers ?? [],
-    values: options.values ?? new WeakMap(),
-    computedValues: options.computedValues ?? new WeakMap(),
-    attributeChangedCallback: options.attributeChangedCallback,
-    needsSelfInvalidation: options.needsSelfInvalidation ?? new WeakSet(),
+    props,
+    watchers,
   };
 }
 
-const INIT_SYMBOL = Symbol('PROP_INIT');
-
-/** @type {Partial<import('./typings.js').ObserverConfiguration<?,?,?>>} */
-const DEFAULT_OBSERVER_CONFIGURATION = {
-  nullParser: DEFAULT_NULL_PARSER,
-  is: Object.is,
-  INIT_SYMBOL,
-};
-
 /**
- * @this {import('./typings.js').ObserverConfiguration<?,?,?>}
+ * @this {ObserverConfiguration<?,?,?>}
  * @param {*} value
  */
 export function parsePropertyValue(value) {
@@ -216,61 +357,58 @@ export function parsePropertyValue(value) {
 }
 
 /**
- * @param {(data: Partial<any>) => any} fn
- * @param {any} arg0
- * @param {any} args[]
- * @param {...any} args
- * @this {any}
- * @return {{props:Set<string>, defaultValue:any, reusable: boolean}}
+ * @param {ObserverConfiguration<?,?,?,?>} config
+ * @param {any} oldValue
+ * @param {any} value
+ * @return {boolean} changed
  */
-export function observeFunction(fn, arg0, ...args) {
-  const argPoked = new Set();
-  const thisPoked = new Set();
+function detectChange(config, oldValue, value) {
+  if (config.get) {
+    // TODO: Custom getter vs parser
+  }
 
-  /**
-   * @template {Object} T
-   * @param {T} proxyTarget
-   * @param {Set<string>} set
-   * @param {string} [prefix]
-   * @return {T}
-   */
-  function buildProxy(proxyTarget, set, prefix) {
-    return new Proxy(proxyTarget, {
-      get(target, p) {
-        const arg = prefix ? `${prefix}.${p}` : p;
-        set.add(arg);
-        const value = Reflect.get(target, p);
-        if (typeof value === 'object' && value != null) {
-          console.debug('tried to arg poke object get', p, value);
-          return buildProxy(value, set, arg);
-        }
-        return value;
-      },
-      has(target, p) {
-        const arg = prefix ? `${prefix}.p` : p;
-        set.add(arg);
-        const value = Reflect.has(target, p);
-        return value;
-      },
-    });
+  // Compute real new value after parsing
+  const newValue = (value == null)
+    ? config.nullParser.call(this, value)
+    : config.parser.call(this, value);
+
+  // Default change is the newValue
+  let changes = newValue;
+
+  // Null check
+  if (oldValue == null) {
+    if (newValue == null) {
+      // Both nullish
+      return false;
+    }
+  } else if (newValue != null) {
+    // Both non-null, compare
+    if (config.diff) {
+      // Custom change diff
+      changes = config.diff.call(this, oldValue, newValue);
+      if (changes == null) {
+        // No difference
+        return false;
+      }
+    } else if (config.is.call(this, oldValue, newValue)) {
+      // Non-equal
+      return false;
+    }
   }
 
-  const argProxy = buildProxy(arg0, argPoked);
-  const thisProxy = buildProxy(this ?? arg0, thisPoked);
-  const defaultValue = fn.call(thisProxy, argProxy, ...args);
-  /* Arrow functions can reused if they don't poke `this` */
-  const reusable = fn.name ? true : !thisPoked.size;
+  // Commit value
+  if (config.values) {
+    config.values.set(this, newValue);
+  } else {
+    config.values = new WeakMap([[this, newValue]]);
+  }
 
-  const props = new Set([
-    ...argPoked,
-    ...thisPoked,
-  ]);
+  // Emit change
 
-  return {
-    props,
-    defaultValue,
-    reusable,
-  };
+  config.propChangedCallback?.call(this, config.key, oldValue, newValue, changes);
+  config.changedCallback?.call(this, oldValue, newValue, changes);
+
+  return true;
 }
 
 /**
@@ -280,56 +418,20 @@ export function observeFunction(fn, arg0, ...args) {
  * @template [C=any]
  * @param {C} object
  * @param {K} key
- * @param {import('./typings.js').ObserverOptions<T1, T2, C>} options
- * @return {import('./typings.js').ObserverConfiguration<T1,T2,K,C>}
+ * @param {ObserverOptions<T1, T2, C>} options
+ * @return {ObserverConfiguration<T1,T2,K,C>}
  */
 export function defineObservableProperty(object, key, options) {
-  /** @type {import('./typings.js').ObserverConfiguration<T1,T2,K,C>} */
-  const config = {
-    ...DEFAULT_OBSERVER_CONFIGURATION,
-    ...parseObserverOptions(key, options, object),
-    changedCallback: options.changedCallback,
-  };
+  /** @type {ObserverConfiguration<T1,T2,K,C>} */
+  // @ts-ignore
+  const config = parseObserverOptions(key, options, object);
 
-  /**
-   * @param {T2} oldValue
-   * @param {T2} value
-   * @return {boolean} changed
-   */
-  function detectChange(oldValue, value) {
-    if (oldValue === value) return false;
-    if (config.get) {
-      // TODO: Custom getter vs parser
-    }
-    let newValue = value;
-    newValue = (value == null)
-      ? config.nullParser.call(this, value)
-      : config.parser.call(this, newValue);
-
-    let changes = newValue;
-    if (oldValue == null) {
-      if (newValue == null) return false; // Both nullish
-    } else if (newValue != null) {
-      if (oldValue === newValue) return false;
-      if (config.diff) {
-        changes = config.diff.call(this, oldValue, newValue);
-        if (changes == null) return false;
-      }
-      if (config.is.call(this, oldValue, newValue)) return false;
-    }
-
-    config.values.set(this, newValue);
-    // console.log(key, 'value.set', newValue);
-    config.propChangedCallback?.call(this, key, oldValue, newValue, changes);
-    config.changedCallback?.call(this, oldValue, newValue, changes);
-    return true;
-  }
   /**
    * @this {C}
    * @return {T2}
    */
   function internalGet() {
-    return config.values.has(this) ? config.values.get(this) : config.value;
+    return config.values?.has(this) ? config.values.get(this) : config.value;
   }
 
   /**
@@ -338,68 +440,65 @@ export function defineObservableProperty(object, key, options) {
    * @return {void}
    */
   function internalSet(value) {
+    // @ts-ignore
     const oldValue = this[key];
-    // console.log(key, 'internalSet', oldValue, '=>', value);
-    detectChange.call(this, oldValue, value);
+    detectChange.call(this, config, oldValue, value);
   }
 
   /** @return {void} */
   function onInvalidate() {
     // Current value is now invalidated. Recompute and check if changed
-    const oldValue = config.computedValues.get(this);
+    // eslint-disable-next-line no-multi-assign
+
+    const oldValue = config.computedValues?.get(this);
     const newValue = this[key];
-    // console.debug('observe: onInvalidate called for', key, oldValue, '=>', newValue, this);
-    config.needsSelfInvalidation.delete(this);
-    detectChange.call(this, oldValue, newValue);
+    config.needsSelfInvalidation?.delete(this);
+    detectChange.call(this, config, oldValue, newValue);
   }
 
-  if (config.get) {
-    // Custom `get` uses computed values.
-    // Invalidate computed value when dependent `prop` changes
-    const { props } = observeFunction(config.get.bind(object), object, internalGet.bind(object));
-    config.watchers.push(
-      ...[...props].map((prop) => [prop, onInvalidate]),
-    );
-    // TODO: May be able to cache value if props are present
+  if (config.props) {
+    for (const prop of config.props) {
+      config.watchers.push([prop, onInvalidate]);
+    }
   }
+
+  /**
+   * @this {C}
+   * @return {T2}
+   */
+  function cachedGet() {
+    const newValue = config.get.call(this, this, internalGet.bind(this));
+    // Store computed value internally. Used by onInvalidate to get previous value
+    const computedValues = (config.computedValues ??= new WeakMap());
+    computedValues.set(this, newValue);
+    return newValue;
+  }
+
+  /**
+   * @this {C}
+   * @param {T2} value
+   * @return {void}
+   */
+  function cachedSet(value) {
+    if (config.needsSelfInvalidation) {
+      config.needsSelfInvalidation.add(this);
+    } else {
+      config.needsSelfInvalidation = new WeakSet([this]);
+    }
+    const oldValue = this[key];
+    config.set.call(this, value, internalSet.bind(this));
+    const newValue = this[key];
+    if (!config.needsSelfInvalidation.has(this)) return;
+    config.needsSelfInvalidation.delete(this);
+    detectChange.call(this, config, oldValue, newValue);
+  }
+
   /** @type {Partial<PropertyDescriptor>} */
   const descriptor = {
     enumerable: config.enumerable,
-    /**
-     * @this {C}
-     * @return {T2}
-     */
-    get() {
-      if (config.get) {
-        const newValue = config.get.call(this, this, internalGet.bind(this));
-        // Store computed value internally. Used by onInvalidate to get previous value
-        config.computedValues.set(this, newValue);
-        return newValue;
-      }
-      return internalGet.call(this);
-    },
-    /**
-     * @this {C}
-     * @param {T2} value
-     * @return {void}
-     */
-    set(value) {
-      if (value === INIT_SYMBOL) {
-        // console.log(key, 'returning due to INIT');
-        return;
-      }
-      if (config.set) {
-        config.needsSelfInvalidation.add(this);
-        const oldValue = this[key];
-        config.set.call(this, value, internalSet.bind(this));
-        const newValue = this[key];
-        if (!config.needsSelfInvalidation.has(this)) return;
-        config.needsSelfInvalidation.delete(this);
-        detectChange.call(this, oldValue, newValue);
-      } else {
-        internalSet.call(this, value);
-      }
-    },
+    configurable: true,
+    get: config.get ? cachedGet : internalGet,
+    set: config.set ? cachedSet : internalSet,
   };
 
   Object.defineProperty(object, key, descriptor);