shablon 0.0.1-rc.3 → 0.0.1-rc.4

package/README.md

@@ -142,7 +142,7 @@ importing it from [npm](https://www.npmjs.com/package/shablon).
 
 The keys of an `obj` must be "stringifiable" because they are used internally to construct a path to the reactive value.
 
-The values can be any valid JS value, including nested arrays and objects (aka. it is recursively reactive).
+The values can be any valid JS primitive value, including nested plain arrays and objects (aka. it is recursively reactive).
 
 Getters are also supported and can be used as reactive computed properties.
 The value of a reactive getter is "cached", meaning that even if one of the getter dependency changes, as long as the resulting value is the same there will be no unnecessary watch events fired.
@@ -162,6 +162,9 @@ data.age++
 data.activity = "rest"
 ```
 
+> Note that Object values like `Date`, `Set`, `Map`, `WeakRef`, `WeakSet` and `WeakMap` values are not wrapped in a nested `Proxy` and they will be resolved as they are to avoid access errors.
+> For other custom object types thay you may want to access without a `Proxy` you can use the special `__raw` key, e.g. `data.myCustomType.__raw.someKey`.
+
 </details>
 
 
@@ -171,6 +174,8 @@ data.activity = "rest"
 Watch registers a callback function that fires on initialization and
 every time any of its evaluated `store` reactive properties change.
 
+Note that for reactive getters, initially the watch `trackedFunc` will be invoked twice because we register a second internal watcher to cache the getter value.
+
 It returns a "watcher" object that could be used to `unwatch()` the registered listener.
 
 _Optionally also accepts a second callback function that is excluded from the evaluated
@@ -215,8 +220,6 @@ data.b++ // trigger watch update
 data.c++ // doesn't trigger watch update
 ```
 
-Note that for reactive getters, initially the watch trackCallback will be invoked twice because we register a second internal watcher to cache the getter value.
-
 </details>
 
 

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-rc.3",
+    "version": "0.0.1-rc.4",
     "name": "shablon",
     "description": "No-build JavaScript framework for Single-page applications",
     "author": "Gani Georgiev",

package/src/state.js

@@ -207,19 +207,21 @@ function createProxy(obj, pathWatcherIds) {
                 prop = "@" + prop;
             }
 
+            const propVal = obj[prop]
+
             // directly return symbols and functions (pop, push, etc.)
-            if (typeof prop == "symbol" || typeof obj[prop] == "function") {
-                return obj[prop];
+            if (typeof prop == "symbol" || typeof propVal == "function") {
+                return propVal;
             }
 
             // wrap child object or array as sub store
             if (
-                typeof obj[prop] == "object" &&
-                obj[prop] !== null &&
-                !obj[prop][parentSym]
+                propVal !== null && typeof propVal == "object" &&
+                !propVal[parentSym] &&
+                !isExcludedInstance(propVal)
             ) {
-                obj[prop][parentSym] = [obj, prop];
-                obj[prop] = createProxy(obj[prop], pathWatcherIds);
+                propVal[parentSym] = [obj, prop];
+                obj[prop] = createProxy(propVal, pathWatcherIds);
             }
 
             // register watch subscriber (if any)
@@ -342,6 +344,17 @@ function getPath(obj, prop) {
     return currentPath;
 }
 
+function isExcludedInstance(val) {
+    return (
+        (val instanceof Date) ||
+        (val instanceof Set) ||
+        (val instanceof Map) ||
+        (val instanceof WeakRef) ||
+        (val instanceof WeakMap) ||
+        (val instanceof WeakSet)
+    )
+}
+
 function callWatchers(obj, prop, pathWatcherIds) {
     let currentPath = getPath(obj, prop);