@expressive/mvc 0.29.1 → 0.29.2

package/lib/index.esm.js

@@ -254,11 +254,13 @@ 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);
+            unSet = void unSet(value);
+        if (value === null && ignoreNull)
+            return;
         const out = callback.call(this, value);
         if (typeof out == "boolean")
             return out;
@@ -775,33 +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")
-            for (const key in control(arg, true).state) {
-                defineProperty(value, key, typeof mapper == "function" ? {
+            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 && mapper !== false
-                ? (x) => x !== null ? arg(x) : undefined
-                : arg);
+            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,11 +258,13 @@ 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);
+            unSet = void unSet(value);
+        if (value === null && ignoreNull)
+            return;
         const out = callback.call(this, value);
         if (typeof out == "boolean")
             return out;
@@ -779,33 +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")
-            for (const key in control(arg, true).state) {
-                defineProperty(value, key, typeof mapper == "function" ? {
+            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 && mapper !== false
-                ? (x) => x !== null ? arg(x) : undefined
-                : arg);
+            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.1",
-  "gitHead": "bc5ef985433d6f7d198eda375cda9e8a055ca0d0"
+  "version": "0.29.2",
+  "gitHead": "a10efcc0deba6e634d9b194ceda506573e981719"
 }