@expressive/mvc 0.29.0 → 0.29.2

package/lib/index.d.ts

@@ -176,9 +176,9 @@ declare function get<R, T>(compute: (property: string, on: T) => (this: T, state
 declare function get<R, T>(compute: (property: string, on: T) => (this: T, state: T) => R): R;
 
 declare namespace ref {
-    type Callback<T> = (argument: T) => ((next: T) => void) | Promise<void> | void | boolean;
+    type Callback<T> = (argument: T) => ((next: T | null) => void) | Promise<void> | void | boolean;
     interface Object<T = any> {
-        (next: T): void;
+        (next: T | null): void;
         current: T | null;
     }
     /** Object with references to all managed values of `T`. */
@@ -216,6 +216,16 @@ declare function ref<O extends Model, R>(target: O, mapper: (key: Model.Key<O>)
  * @param callback - Optional callback to synchronously fire when reference is first set or does update.
  */
 declare function ref<T = HTMLElement>(callback?: ref.Callback<T>): ref.Object<T>;
+/**
+ * Creates a ref-compatible property.
+ * Will persist value, and updates to this are made part of controller event-stream.
+ *
+ * *Output is simultaneously a ref-function and ref-object, use as needed.*
+ *
+ * @param callback - Optional callback to synchronously fire when reference is first set or does update.
+ * @param ignoreNull - Default `true`. If `false`, will still callback with `null`.
+ */
+declare function ref<T = HTMLElement>(callback: ref.Callback<T | null>, ignoreNull: boolean): ref.Object<T>;
 
 declare namespace set {
     type Callback<T, S = any> = (this: S, argument: T) => ((next: T) => void) | Promise<any> | void | boolean;

package/lib/index.esm.js

@@ -254,12 +254,14 @@ function createEffect(source, callback) {
         return () => refresh = null;
     });
 }
-function createValueEffect(callback) {
+function createValueEffect(callback, ignoreNull) {
     let unSet;
     return function (value) {
         if (typeof unSet == "function")
-            unSet(value);
-        const out = callback.call(this, value, this);
+            unSet = void unSet(value);
+        if (value === null && ignoreNull)
+            return;
+        const out = callback.call(this, value);
         if (typeof out == "boolean")
             return out;
         if (!out || out instanceof Promise)
@@ -775,31 +777,30 @@ function flushComputed() {
 }
 Control.before.add(flushComputed);
 
-function ref(arg, mapper) {
+function ref(arg, arg2) {
     return apply((key, source) => {
         let value = {};
-        if (typeof arg != "object")
-            value = createRef(source, key, arg);
-        else
-            for (const key in control(arg, true).state) {
-                defineProperty(value, key, mapper ? {
+        if (typeof arg == "object")
+            for (const key in control(arg, true).state)
+                defineProperty(value, key, typeof arg2 == "function" ? {
                     configurable: true,
                     get() {
-                        const out = mapper(key);
+                        const out = arg2(key);
                         defineProperty(value, key, { value: out });
                         return out;
                     }
                 } : {
                     value: createRef(source, key)
                 });
-            }
+        else
+            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
         source.state[key] = undefined;
         source.observers.set(key, new Set());
         defineProperty(source.subject, key, { value });
     });
 }
 function createRef(src, key, cb) {
-    const refObjectFunction = src.ref(key, cb && createValueEffect(cb));
+    const refObjectFunction = src.ref(key, cb);
     defineProperty(refObjectFunction, "current", {
         set: refObjectFunction,
         get: () => src.state[key]

package/lib/index.js

@@ -258,12 +258,14 @@ function createEffect(source, callback) {
         return () => refresh = null;
     });
 }
-function createValueEffect(callback) {
+function createValueEffect(callback, ignoreNull) {
     let unSet;
     return function (value) {
         if (typeof unSet == "function")
-            unSet(value);
-        const out = callback.call(this, value, this);
+            unSet = void unSet(value);
+        if (value === null && ignoreNull)
+            return;
+        const out = callback.call(this, value);
         if (typeof out == "boolean")
             return out;
         if (!out || out instanceof Promise)
@@ -779,31 +781,30 @@ function flushComputed() {
 }
 Control.before.add(flushComputed);
 
-function ref(arg, mapper) {
+function ref(arg, arg2) {
     return apply((key, source) => {
         let value = {};
-        if (typeof arg != "object")
-            value = createRef(source, key, arg);
-        else
-            for (const key in control(arg, true).state) {
-                defineProperty(value, key, mapper ? {
+        if (typeof arg == "object")
+            for (const key in control(arg, true).state)
+                defineProperty(value, key, typeof arg2 == "function" ? {
                     configurable: true,
                     get() {
-                        const out = mapper(key);
+                        const out = arg2(key);
                         defineProperty(value, key, { value: out });
                         return out;
                     }
                 } : {
                     value: createRef(source, key)
                 });
-            }
+        else
+            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
         source.state[key] = undefined;
         source.observers.set(key, new Set());
         defineProperty(source.subject, key, { value });
     });
 }
 function createRef(src, key, cb) {
-    const refObjectFunction = src.ref(key, cb && createValueEffect(cb));
+    const refObjectFunction = src.ref(key, cb);
     defineProperty(refObjectFunction, "current", {
         set: refObjectFunction,
         get: () => src.state[key]

package/package.json

@@ -26,6 +26,6 @@
     "prebuild": "rm -rf lib/",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.29.0",
-  "gitHead": "3040fe38026dbff2d9c9e94aed2a46e8c057a137"
+  "version": "0.29.2",
+  "gitHead": "a10efcc0deba6e634d9b194ceda506573e981719"
 }