as-model 0.2.5 → 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";
@@ -802,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() {
@@ -846,6 +854,7 @@ function wrapToField(cache, propertyName, value, onGot) {
     value: field2.value,
     deps: field2.deps
   };
+  collect(propertyName, getter);
   return getter;
 }
 function wrapToActionMethod(cache, methodName) {
@@ -987,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)) {

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/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

@@ -19,6 +19,7 @@ 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() {
@@ -102,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)) {

package/package.json

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