as-model 0.2.4 → 0.2.6

package/dist/index.js

@@ -176,6 +176,9 @@ function modelStoreIdentifier() {
 function tokenIdentifier() {
   return true;
 }
+function modelFieldIdentifier() {
+  return true;
+}
 
 // src/validation/index.ts
 var noStateAModelKey = "no-state-a-model-key";
@@ -779,6 +782,11 @@ function createUpdater(model2, middleWare) {
   return updater;
 }
 
+// src/defaults.ts
+function defaultSelector(i) {
+  return i();
+}
+
 // src/store/cache.ts
 var cacheIdentify = {
   field: function field(d) {
@@ -797,17 +805,22 @@ var cacheIdentify = {
   }
 };
 function wrapToField(cache, propertyName, value, onGot) {
-  var cacheFields = cache.cacheFields;
-  if (!cacheIdentify.field(value)) {
+  function collect(pName, v) {
     if (onGot) {
-      onGot(propertyName, value);
+      onGot(pName, v);
     }
+  }
+  var cacheFields = cache.cacheFields;
+  if (!cacheIdentify.field(value)) {
+    collect(propertyName, value);
     return value;
   }
   var field2 = value;
   var cachedField = cacheFields[propertyName];
-  if (cachedField) {
-    return cachedField.getter;
+  if (cachedField && (field2.deps && shallowEqual(cachedField.deps, field2.deps) || !field2.deps && cachedField.value === field2.value)) {
+    var cacheFieldGetter = cachedField.getter;
+    collect(propertyName, cacheFieldGetter);
+    return cacheFieldGetter;
   }
   var getter = {
     get: function get() {
@@ -841,6 +854,7 @@ function wrapToField(cache, propertyName, value, onGot) {
     value: field2.value,
     deps: field2.deps
   };
+  collect(propertyName, getter);
   return getter;
 }
 function wrapToActionMethod(cache, methodName) {
@@ -982,6 +996,7 @@ function wrapToField2(updater, propertyName, value, onGot) {
     return cacheFieldGetter;
   }
   var getter = {
+    identifier: modelFieldIdentifier,
     get: function get() {
       var currentField = updater.instance[propertyName];
       if (!cacheIdentify.field(currentField)) {
@@ -1024,31 +1039,36 @@ function extractInstance(updater, wrapper, cache, opts) {
     }
     onGet(key, value);
   };
-  var instance = updater.instance;
-  if ((typeof instance === "undefined" ? "undefined" : _type_of(instance)) !== "object" || !instance) {
-    throw new Error("The instance should be an object or array.");
-  }
-  var properties = Object.getOwnPropertyNames(instance);
-  var proxiedInstance = createProxy(instance, {
-    get: function get(target, p) {
-      var value = target[p];
-      if (typeof value === "function" && properties.indexOf(p) >= 0) {
-        var actionMethod = wrapToActionMethod2(updater, p);
-        Object.assign(actionMethod, value);
-        return actionMethod;
-      }
-      return wrapToField2(updater, p, value);
-    },
-    set: function set() {
-      return false;
-    }
-  });
   function generateInstance() {
-    return proxiedInstance;
+    var instance = updater.instance;
+    if ((typeof instance === "undefined" ? "undefined" : _type_of(instance)) !== "object" || !instance) {
+      throw new Error("The instance should be an object or array.");
+    }
+    var properties = Object.getOwnPropertyNames(instance);
+    return createProxy(instance, {
+      get: function get(target, p) {
+        var value = target[p];
+        if (typeof value === "function" && properties.indexOf(p) >= 0) {
+          var actionMethod = wrapToActionMethod2(updater, p);
+          Object.assign(actionMethod, value);
+          return actionMethod;
+        }
+        return wrapToField2(updater, p, value);
+      },
+      set: function set() {
+        return false;
+      }
+    });
   }
-  if (wrapper == null) {
+  var proxiedInstance = generateInstance();
+  if (wrapper == null || wrapper === defaultSelector) {
     return proxiedInstance;
   }
+  if (wrapper === defaultSelector) {
+    return cacheProperties(_object_spread_props(_object_spread({}, cache), {
+      target: proxiedInstance
+    }), handleGetter)();
+  }
   var wrapped = wrapper(generateInstance);
   if ((typeof wrapped === "undefined" ? "undefined" : _type_of(wrapped)) === "object" && wrapped != null) {
     return cacheProperties(_object_spread_props(_object_spread({}, cache), {
@@ -1206,7 +1226,7 @@ function createPrimaryKey(modelFn) {
   var ifModelUsage = isModelUsage(modelFn);
   var model2 = ifModelKey ? modelFn.source : modelFn;
   var _config_wrapper;
-  var wrapper = (_config_wrapper = config2.wrapper) !== null && _config_wrapper !== void 0 ? _config_wrapper : ifModelKey || ifModelUsage ? modelFn.wrapper : function defaultSelector(i) {
+  var wrapper = (_config_wrapper = config2.wrapper) !== null && _config_wrapper !== void 0 ? _config_wrapper : ifModelKey || ifModelUsage ? modelFn.wrapper : function defaultSelector2(i) {
     return i();
   };
   var wrapModel = function wrapModel2(state) {
@@ -1399,9 +1419,7 @@ function createStores(modelKeys) {
 // src/model/index.ts
 function configModel(config2) {
   var model2 = function model3(modelFn, wrapper) {
-    var currentSelector = wrapper !== null && wrapper !== void 0 ? wrapper : function defaultSelector(i) {
-      return i();
-    };
+    var currentSelector = wrapper !== null && wrapper !== void 0 ? wrapper : defaultSelector;
     var modelWrapper = function modelWrapper2(state) {
       return modelFn(state);
     };

package/esm/defaults.js

@@ -0,0 +1,6 @@
+function defaultSelector(i) {
+  return i();
+}
+export {
+  defaultSelector
+};

package/esm/identifiers/index.js

@@ -10,7 +10,11 @@ function modelStoreIdentifier() {
 function tokenIdentifier() {
   return true;
 }
+function modelFieldIdentifier() {
+  return true;
+}
 export {
+  modelFieldIdentifier,
   modelKeyIdentifier,
   modelStoreIdentifier,
   modelUsageIdentifier,

package/esm/model/index.js

@@ -20,11 +20,10 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createStore, createField, createMethod } from "../store";
 import { createKey } from "../key";
 import { modelUsageIdentifier } from "../identifiers";
+import { defaultSelector } from "../defaults";
 function configModel(config) {
   const model = function model2(modelFn, wrapper) {
-    const currentSelector = wrapper != null ? wrapper : function defaultSelector(i) {
-      return i();
-    };
+    const currentSelector = wrapper != null ? wrapper : defaultSelector;
     const modelWrapper = function modelWrapper2(state) {
       return modelFn(state);
     };

package/esm/store/cache.js

@@ -16,17 +16,22 @@ const cacheIdentify = {
   }
 };
 function wrapToField(cache, propertyName, value, onGot) {
-  const { cacheFields } = cache;
-  if (!cacheIdentify.field(value)) {
+  function collect(pName, v) {
     if (onGot) {
-      onGot(propertyName, value);
+      onGot(pName, v);
     }
+  }
+  const { cacheFields } = cache;
+  if (!cacheIdentify.field(value)) {
+    collect(propertyName, value);
     return value;
   }
   const field = value;
   const cachedField = cacheFields[propertyName];
-  if (cachedField) {
-    return cachedField.getter;
+  if (cachedField && (field.deps && shallowEqual(cachedField.deps, field.deps) || !field.deps && cachedField.value === field.value)) {
+    const cacheFieldGetter = cachedField.getter;
+    collect(propertyName, cacheFieldGetter);
+    return cacheFieldGetter;
   }
   const getter = {
     get() {
@@ -56,6 +61,7 @@ function wrapToField(cache, propertyName, value, onGot) {
     }
   };
   cacheFields[propertyName] = { getter, value: field.value, deps: field.deps };
+  collect(propertyName, getter);
   return getter;
 }
 function wrapToActionMethod(cache, methodName) {

package/esm/store/instance.js

@@ -18,6 +18,8 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createProxy, shallowEqual } from "../tools";
+import { defaultSelector } from "../defaults";
+import { modelFieldIdentifier } from "../identifiers";
 import { cacheIdentify, cacheProperties } from "./cache";
 function createField(callback, deps) {
   const currentDeps = function computeDeps() {
@@ -101,6 +103,7 @@ function wrapToField(updater, propertyName, value, onGot) {
     return cacheFieldGetter;
   }
   const getter = {
+    identifier: modelFieldIdentifier,
     get() {
       const currentField = updater.instance[propertyName];
       if (!cacheIdentify.field(currentField)) {
@@ -139,31 +142,37 @@ function extractInstance(updater, wrapper, cache, opts) {
     }
     onGet(key, value);
   };
-  const { instance } = updater;
-  if (typeof instance !== "object" || !instance) {
-    throw new Error("The instance should be an object or array.");
-  }
-  const properties = Object.getOwnPropertyNames(instance);
-  const proxiedInstance = createProxy(instance, {
-    get(target, p) {
-      const value = target[p];
-      if (typeof value === "function" && properties.indexOf(p) >= 0) {
-        const actionMethod = wrapToActionMethod(updater, p);
-        Object.assign(actionMethod, value);
-        return actionMethod;
-      }
-      return wrapToField(updater, p, value);
-    },
-    set() {
-      return false;
-    }
-  });
   function generateInstance() {
-    return proxiedInstance;
+    const { instance } = updater;
+    if (typeof instance !== "object" || !instance) {
+      throw new Error("The instance should be an object or array.");
+    }
+    const properties = Object.getOwnPropertyNames(instance);
+    return createProxy(instance, {
+      get(target, p) {
+        const value = target[p];
+        if (typeof value === "function" && properties.indexOf(p) >= 0) {
+          const actionMethod = wrapToActionMethod(updater, p);
+          Object.assign(actionMethod, value);
+          return actionMethod;
+        }
+        return wrapToField(updater, p, value);
+      },
+      set() {
+        return false;
+      }
+    });
   }
-  if (wrapper == null) {
+  const proxiedInstance = generateInstance();
+  if (wrapper == null || wrapper === defaultSelector) {
     return proxiedInstance;
   }
+  if (wrapper === defaultSelector) {
+    return cacheProperties(
+      __spreadProps(__spreadValues({}, cache), { target: proxiedInstance }),
+      handleGetter
+    )();
+  }
   const wrapped = wrapper(generateInstance);
   if (typeof wrapped === "object" && wrapped != null) {
     return cacheProperties(__spreadProps(__spreadValues({}, cache), { target: wrapped }), handleGetter)();

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "as-model",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "This is a model state management tool",
   "license": "MIT",
   "author": "Jimmy.Harding",