shablon 0.0.1-rc.7 → 0.0.1-rc.8

package/README.md

@@ -174,8 +174,6 @@ 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

package/package.json

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

package/src/state.js

@@ -234,14 +234,13 @@ function createProxy(obj, pathWatcherIds) {
                 // if not invoked inside a watch function, call the original
                 // getter to ensure that an up-to-date value is computed
                 if (!activeWatcher) {
-                    return descriptors[prop]?.get?.call(obj);
+                    return descriptors[prop].get.call(obj);
                 }
 
                 getterProp = prop;
 
                 // replace with an internal property so that reactive statements can be cached
                 prop = "@@" + prop;
-                Object.defineProperty(obj, prop, { writable: true, enumerable: false });
             }
 
             // detached child?
@@ -364,14 +363,24 @@ function createProxy(obj, pathWatcherIds) {
 
                     let getFunc = descriptors[getterProp].get.bind(obj);
 
-                    let getWatcher = watch(getFunc, (result) => (receiver[prop] = result));
+                    let getWatcher = watch(getFunc, (result) => {
+                        if (!obj.hasOwnProperty(prop)) {
+                            Object.defineProperty(obj, prop, {
+                                writable: true,
+                                enumerable: false,
+                                value: result,
+                            });
+                        } else {
+                            receiver[prop] = result;
+                        }
+                    });
 
                     getWatcher[onRemoveSym] = () => {
                         descriptors[getterProp]?.watchers?.delete(watcherId);
                     };
 
                     // update with the cached get value after the above watch initialization
-                    propVal = obj[prop]
+                    propVal = obj[prop];
                 }
             }
 

package/src/template.js

@@ -117,7 +117,7 @@ function tag(tagName, attrs = {}, ...children) {
                         return;
                     }
 
-                    const result = val(el, attr)
+                    const result = val(el, attr);
 
                     if (useSetAttr) {
                         el.setAttribute(attr, result);