@lumjs/core 1.20.0 → 1.21.0

package/lib/observable.js

@@ -4,11 +4,11 @@ const {duplicateAll: clone} = require('./obj/copyall');
 const lock = Object.freeze;
 
 /**
- * Make an object support the *Observable* API.
+ * Make a target object (or function) support the *Observable* API.
  *
  * Adds `on()`, `off()`, `one()`, and `trigger()` methods.
  * 
- * @param {object} el - The object we are making observable.
+ * @param {(object|function)} el - The target we are making observable.
  * @param {object} [opts] Options that define behaviours.
  * @param {string} [opts.wildcard='*'] The event name used as a wildcard. 
  * 
@@ -78,13 +78,29 @@ const lock = Object.freeze;
  * 
  * @param {string} [opts.addre] If set, add a method with this name
  * to the `el` object, which is a function that can re-build the
- * observable API methods with new `opts` replacing the old ones. 
+ * observable API methods with new `opts` replacing the old ones.
+ * 
+ * The method added takes two arguments, the first being an `object`
+ * representing the new options to set on the target. 
+ * 
+ * The second is an optional `boolean` value that determines if the
+ * existing `opts` should be used as defaults for any options not
+ * specified in the first argument.
+ * 
+ * @param {boolean} [opts.reinherit=false] Used as the default value of
+ * the second argument of the method added by `opts.addre`.
+ * 
+ * @param {boolean} [redefine=false] If `true` allow targets already
+ * implementing the `on()` and `trigger()` methods to be re-initialized.
+ * 
+ * Generally only needed if you need to change the `opts` for some reason.
+ * This is forced to `true` by the method added by `opts.addre`.
  *
  * @returns {object} el
  * 
  * @exports module:@lumjs/core/observable
  */
-function observable (el={}, opts={}) 
+function observable (el={}, opts={}, redefine=false) 
 {
   //console.debug("observable", el, opts);
 
@@ -93,7 +109,7 @@ function observable (el={}, opts={})
     throw new Error("non-object sent to observable()");
   }
 
-  if (observable.is(el))
+  if (isObservable(el) && !redefine)
   { // It's already observable.
     return el;
   }
@@ -338,9 +354,15 @@ function observable (el={}, opts={})
 
   if (addre)
   { // Add a method to change the observable options.
-    add(addre, function(opts={})
+    const reinherit = opts.reinherit ?? false;
+
+    add(addre, function(replacementOpts={}, inherit=reinherit)
     {
-      return observable(el, opts);
+      const newOpts 
+        = inherit 
+        ? Object.assign({}, opts, replacementOpts)
+        : replacementOpts;
+      return observable(el, replacementOpts, true);
     });
   }
 
@@ -362,7 +384,7 @@ module.exports = observable;
  */
 function isObservable(obj)
 {
-  return (isObj(obj)
+  return (isComplex(obj)
     && typeof obj.trigger === F
     && typeof obj.on === F);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumjs/core",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "main": "lib/index.js",
   "exports":
   {