@angular-wave/angular.ts 0.7.0-beta.0 → 0.7.1

package/src/core/scope/scope.js

@@ -10,6 +10,7 @@ import {
   isNull,
   isProxy,
   isProxySymbol,
+  hasOwn,
 } from "../../shared/utils.js";
 import { ASTType } from "../parse/ast-type.js";
 
@@ -24,7 +25,7 @@ export function nextId() {
 }
 
 /**
- * @type {import('../parse/parse.js').ParseService}
+ * @type {import('../parse/interface.ts').ParseService}
  */
 let $parse;
 
@@ -55,7 +56,7 @@ export class RootScopeProvider {
     "$parse",
     /**
      * @param {import('../exception-handler.js').ErrorHandler} exceptionHandler
-     * @param {import('../parse/parse.js').ParseService} parse
+     * @param {import('../parse/interface.ts').ParseService} parse
      */
     (exceptionHandler, parse) => {
       $exceptionHandler = exceptionHandler;
@@ -86,7 +87,7 @@ export function createScope(target = {}, context) {
   if (typeof target === "object") {
     const proxy = new Proxy(target, context || new Scope());
     for (const key in target) {
-      if (Object.prototype.hasOwnProperty.call(target, key)) {
+      if (hasOwn(target, key)) {
         try {
           if (
             (target.constructor.$nonscope &&
@@ -117,7 +118,7 @@ export function createScope(target = {}, context) {
  * @typedef {Object} Listener
  * @property {Object} originalTarget - The original target object.
  * @property {ListenerFunction} listenerFn - The function invoked when changes are detected.
- * @property {import("../parse/parse.js").CompiledExpression} watchFn
+ * @property {import("../parse/interface.ts").CompiledExpression} watchFn
  * @property {number} id - Deregistration id
  * @property {number} scopeId - The scope that created the Listener
  * @property {string[]} property
@@ -226,6 +227,7 @@ export class Scope {
    * @param {Object} target - The target object.
    * @param {string} property - The name of the property being set.
    * @param {*} value - The new value being assigned to the property.
+   * @param {Proxy} proxy - The proxy intercepting property access
    * @returns {boolean} - Returns true to indicate success of the operation.
    */
   set(target, property, value, proxy) {
@@ -262,13 +264,13 @@ export class Scope {
           const listeners = this.watchers.get(property);
 
           if (listeners) {
-            this.scheduleListener(listeners);
+            this.#scheduleListener(listeners);
           }
 
           const foreignListeners = this.foreignListeners.get(property);
 
           if (foreignListeners) {
-            this.scheduleListener(foreignListeners);
+            this.#scheduleListener(foreignListeners);
           }
         }
 
@@ -281,7 +283,7 @@ export class Scope {
       }
 
       if (isObject(value)) {
-        if (Object.prototype.hasOwnProperty.call(target, property)) {
+        if (hasOwn(target, property)) {
           Object.keys(oldValue)
             .filter((x) => !value[x])
             .forEach((k) => {
@@ -293,16 +295,16 @@ export class Scope {
           const listeners = this.watchers.get(property);
 
           if (listeners) {
-            this.scheduleListener(listeners);
+            this.#scheduleListener(listeners);
           }
 
           const foreignListeners = this.foreignListeners.get(property);
 
           if (foreignListeners) {
-            this.scheduleListener(foreignListeners);
+            this.#scheduleListener(foreignListeners);
           }
 
-          this.checkeListenersForAllKeys(value);
+          this.#checkeListenersForAllKeys(value);
         }
         target[property] = createScope(value, this);
         //setDeepValue(target[property], value);
@@ -323,7 +325,7 @@ export class Scope {
           let listeners = this.watchers.get(property);
 
           if (listeners) {
-            this.scheduleListener(listeners);
+            this.#scheduleListener(listeners);
           }
         }
 
@@ -335,7 +337,7 @@ export class Scope {
         let listeners = this.watchers.get(property);
 
         if (listeners) {
-          this.scheduleListener(listeners);
+          this.#scheduleListener(listeners);
         }
 
         if (Array.isArray(target)) {
@@ -344,7 +346,7 @@ export class Scope {
             keys.forEach((key) => {
               const listeners = this.watchers.get(key);
               if (listeners) {
-                this.scheduleListener(listeners);
+                this.#scheduleListener(listeners);
               }
             });
             decodeURI;
@@ -358,9 +360,10 @@ export class Scope {
       if (isUndefined(target[property]) && isProxy(value)) {
         this.foreignProxies.add(value);
         target[property] = value;
-        return true;
+        if (!this.watchers.has(property)) {
+          return true;
+        }
       }
-
       if (isUndefined(value)) {
         target[property] = value;
       } else {
@@ -389,7 +392,7 @@ export class Scope {
         this.watchers.get(property)?.forEach((l) => listeners.push(l));
         if (listeners.length > 0) {
           // check if the listener actually appllies to this target
-          this.scheduleListener(listeners, (x) => {
+          this.#scheduleListener(listeners, (x) => {
             return x.filter((x) => {
               if (!x.watchProp) return true;
               // Compute the expected target based on `watchProp`
@@ -417,7 +420,7 @@ export class Scope {
             );
           }
 
-          this.scheduleListener(foreignListeners);
+          this.#scheduleListener(foreignListeners);
         }
       }
 
@@ -427,7 +430,7 @@ export class Scope {
           const listeners = this.watchers.get(key);
           if (listeners) {
             if (this.scheduled !== listeners) {
-              this.scheduleListener(listeners);
+              this.#scheduleListener(listeners);
             }
           }
         });
@@ -437,22 +440,6 @@ export class Scope {
     }
   }
 
-  checkeListenersForAllKeys(value) {
-    if (isUndefined(value)) {
-      return;
-    }
-    Object.keys(value).forEach((k) => {
-      const listeners = this.watchers.get(k);
-
-      if (listeners) {
-        this.scheduleListener(listeners);
-      }
-      if (isObject(value[k])) {
-        this.checkeListenersForAllKeys(value[k]);
-      }
-    });
-  }
-
   /**
    * Intercepts property access on the target object. It checks for specific
    * properties (`watch` and `sync`) and binds their methods. For other properties,
@@ -475,8 +462,6 @@ export class Scope {
 
     this.propertyMap = {
       $watch: this.$watch.bind(this),
-      $watchGroup: this.$watchGroup.bind(this),
-      $watchCollection: this.$watchCollection.bind(this),
       $new: this.$new.bind(this),
       $newIsolate: this.$newIsolate.bind(this),
       $destroy: this.$destroy.bind(this),
@@ -484,7 +469,7 @@ export class Scope {
       $apply: this.$apply.bind(this),
       $evalAsync: this.$evalAsync.bind(this),
       $postUpdate: this.$postUpdate.bind(this),
-      $isRoot: this.isRoot.bind(this),
+      $isRoot: this.#isRoot.bind(this),
       $target: target,
       $proxy: this.$proxy,
       $on: this.$on.bind(this),
@@ -496,8 +481,6 @@ export class Scope {
       $root: this.$root,
       $children: this.$children,
       $id: this.$id,
-      registerForeignKey: this.registerForeignKey.bind(this),
-      notifyListener: this.notifyListener.bind(this),
       $merge: this.$merge.bind(this),
       $getById: this.$getById.bind(this),
     };
@@ -518,11 +501,11 @@ export class Scope {
 
       // TODO aditional testing
       if (property === "unshift") {
-        this.scheduleListener(this.scheduled);
+        this.#scheduleListener(this.scheduled);
       }
     }
 
-    if (Object.prototype.hasOwnProperty.call(this.propertyMap, property)) {
+    if (hasOwn(this.propertyMap, property)) {
       this.$target = target;
       return this.propertyMap[property];
     } else {
@@ -531,26 +514,6 @@ export class Scope {
     }
   }
 
-  /**
-   * @private
-   * @param {Listener[]} listeners
-   */
-  scheduleListener(listeners, filter = (val) => val) {
-    Promise.resolve().then(() => {
-      let index = 0;
-      let filteredListeners = filter(listeners);
-      while (index < filteredListeners.length) {
-        const listener = filteredListeners[index];
-        if (listener.foreignListener) {
-          listener.foreignListener.notifyListener(listener, this.$target);
-        } else {
-          this.notifyListener(listener, this.$target);
-        }
-        index++;
-      }
-    });
-  }
-
   deleteProperty(target, property) {
     // Currently deletes $model
     if (target[property] && target[property][isProxySymbol]) {
@@ -558,20 +521,20 @@ export class Scope {
 
       let listeners = this.watchers.get(property);
       if (listeners) {
-        this.scheduleListener(listeners);
+        this.#scheduleListener(listeners);
       }
       if (this.objectListeners.has(this.$proxy)) {
         let keys = this.objectListeners.get(this.$proxy);
         keys.forEach((key) => {
           listeners = this.watchers.get(key);
           if (listeners) {
-            this.scheduleListener(listeners);
+            this.#scheduleListener(listeners);
           }
         });
       }
 
       if (this.scheduled) {
-        this.scheduleListener(this.scheduled);
+        this.#scheduleListener(this.scheduled);
         this.scheduled = [];
       }
       return true;
@@ -584,19 +547,54 @@ export class Scope {
       keys.forEach((key) => {
         const listeners = this.watchers.get(key);
         if (listeners) {
-          this.scheduleListener(listeners);
+          this.#scheduleListener(listeners);
         }
       });
     } else {
       const listeners = this.watchers.get(property);
       if (listeners) {
-        this.scheduleListener(listeners, target[property]);
+        this.#scheduleListener(listeners, target[property]);
       }
     }
 
     return true;
   }
 
+  #checkeListenersForAllKeys(value) {
+    if (isUndefined(value)) {
+      return;
+    }
+    Object.keys(value).forEach((k) => {
+      const listeners = this.watchers.get(k);
+
+      if (listeners) {
+        this.#scheduleListener(listeners);
+      }
+      if (isObject(value[k])) {
+        this.#checkeListenersForAllKeys(value[k]);
+      }
+    });
+  }
+
+  /**
+   * @param {Listener[]} listeners
+   */
+  #scheduleListener(listeners, filter = (val) => val) {
+    Promise.resolve().then(() => {
+      let index = 0;
+      let filteredListeners = filter(listeners);
+      while (index < filteredListeners.length) {
+        const listener = filteredListeners[index];
+        if (listener.foreignListener) {
+          listener.foreignListener.#notifyListener(listener, this.$target);
+        } else {
+          this.#notifyListener(listener, this.$target);
+        }
+        index++;
+      }
+    });
+  }
+
   /**
    * Registers a watcher for a property along with a listener function. The listener
    * function is invoked when changes to that property are detected.
@@ -672,11 +670,11 @@ export class Scope {
         keys.push(get.decoratedNode.body[0].expression.left.toWatch[0]?.name);
         keys.push(get.decoratedNode.body[0].expression.right.toWatch[0]?.name);
         keys.forEach((key) => {
-          this.registerKey(key, listener);
+          this.#registerKey(key, listener);
         });
         return () => {
           keys.forEach((key) => {
-            this.deregisterKey(key, listener.id);
+            this.#deregisterKey(key, listener.id);
           });
         };
       }
@@ -713,13 +711,13 @@ export class Scope {
           }
         });
         keys.forEach((key) => {
-          this.registerKey(key, listener);
-          this.scheduleListener([listener]);
+          this.#registerKey(key, listener);
+          this.#scheduleListener([listener]);
         });
 
         return () => {
           keys.forEach((key) => {
-            this.deregisterKey(key, listener.id);
+            this.#deregisterKey(key, listener.id);
           });
         };
       }
@@ -742,10 +740,10 @@ export class Scope {
             watchProp.split(".").slice(0, -1).join("."),
           )(listener.originalTarget);
           if (potentialProxy && this.foreignProxies.has(potentialProxy)) {
-            potentialProxy.$handler.registerForeignKey(key, listener);
-            potentialProxy.$handler.scheduleListener([listener]);
+            potentialProxy.$handler.#registerForeignKey(key, listener);
+            potentialProxy.$handler.#scheduleListener([listener]);
             return () => {
-              return potentialProxy.$handler.deregisterKey(key, listener.id);
+              return potentialProxy.$handler.#deregisterKey(key, listener.id);
             };
           }
         }
@@ -776,12 +774,12 @@ export class Scope {
           })
           .filter((x) => !!x);
         keys.forEach((key) => {
-          this.registerKey(key, listener);
-          this.scheduleListener([listener]);
+          this.#registerKey(key, listener);
+          this.#scheduleListener([listener]);
         });
         return () => {
           keys.forEach((key) => {
-            this.deregisterKey(key, listener.id);
+            this.#deregisterKey(key, listener.id);
           });
         };
       }
@@ -843,39 +841,31 @@ export class Scope {
 
     if (keySet.length > 0) {
       keySet.forEach((key) => {
-        this.registerKey(key, listener);
+        this.#registerKey(key, listener);
       });
     } else {
-      this.registerKey(key, listener);
+      this.#registerKey(key, listener);
     }
 
     if (!lazy) {
-      this.scheduleListener([listener]);
+      this.#scheduleListener([listener]);
     }
     return () => {
       if (keySet.length > 0) {
         let res = true;
         keySet.forEach((key) => {
-          let success = this.deregisterKey(key, listener.id);
+          let success = this.#deregisterKey(key, listener.id);
           if (!success) {
             res = false;
           }
         });
         return res;
       } else {
-        return this.deregisterKey(key, listener.id);
+        return this.#deregisterKey(key, listener.id);
       }
     };
   }
 
-  $watchGroup(watchArray, listenerFn) {
-    watchArray.forEach((x) => this.$watch(x, listenerFn));
-  }
-
-  $watchCollection(watchProp, listenerFn) {
-    return this.$watch(watchProp, listenerFn);
-  }
-
   $new(childInstance) {
     let child;
     if (childInstance) {
@@ -905,7 +895,6 @@ export class Scope {
 
   $newIsolate(instance) {
     let child = instance ? Object.create(instance) : Object.create(null);
-    // child.$root = this.$root;
     const proxy = new Proxy(child, new Scope(this, this.$root));
     this.$children.push(proxy);
     return proxy;
@@ -918,7 +907,7 @@ export class Scope {
     return proxy;
   }
 
-  registerKey(key, listener) {
+  #registerKey(key, listener) {
     if (this.watchers.has(key)) {
       this.watchers.get(key).push(listener);
     } else {
@@ -926,7 +915,7 @@ export class Scope {
     }
   }
 
-  registerForeignKey(key, listener) {
+  #registerForeignKey(key, listener) {
     if (this.foreignListeners.has(key)) {
       this.foreignListeners.get(key).push(listener);
     } else {
@@ -934,7 +923,7 @@ export class Scope {
     }
   }
 
-  deregisterKey(key, id) {
+  #deregisterKey(key, id) {
     const listenerList = this.watchers.get(key);
     if (!listenerList) return false;
 
@@ -950,21 +939,21 @@ export class Scope {
     return true;
   }
 
-  deregisterForeignKey(key, id) {
-    const listenerList = this.foreignListeners.get(key);
-    if (!listenerList) return false;
+  // deregisterForeignKey(key, id) {
+  //   const listenerList = this.foreignListeners.get(key);
+  //   if (!listenerList) return false;
 
-    const index = listenerList.findIndex((x) => x.id === id);
-    if (index === -1) return false;
+  //   const index = listenerList.findIndex((x) => x.id === id);
+  //   if (index === -1) return false;
 
-    listenerList.splice(index, 1);
-    if (listenerList.length) {
-      this.foreignListeners.set(key, listenerList);
-    } else {
-      this.foreignListeners.delete(key);
-    }
-    return true;
-  }
+  //   listenerList.splice(index, 1);
+  //   if (listenerList.length) {
+  //     this.foreignListeners.set(key, listenerList);
+  //   } else {
+  //     this.foreignListeners.delete(key);
+  //   }
+  //   return true;
+  // }
 
   $eval(expr, locals) {
     const fn = $parse(expr);
@@ -992,12 +981,19 @@ export class Scope {
     return await this.$eval(expr, locals);
   }
 
+  /**
+   * @param {Object} newTarget
+   */
   $merge(newTarget) {
     Object.entries(newTarget).forEach(([key, value]) => {
-      this.set(this.$target, key, value);
+      this.set(this.$target, key, value, this.$proxy);
     });
   }
 
+  /**
+   * @param {import('../../interface.js').Expression} expr
+   * @returns {any}
+   */
   $apply(expr) {
     try {
       return $parse(expr)(this.$proxy);
@@ -1006,6 +1002,11 @@ export class Scope {
     }
   }
 
+  /**
+   * @param {string} name
+   * @param {Function} listener
+   * @returns {(function(): void)|*}
+   */
   $on(name, listener) {
     let namedListeners = this.$$listeners.get(name);
     if (!namedListeners) {
@@ -1028,10 +1029,10 @@ export class Scope {
   /**
    * @param {string} name
    * @param  {...any} args
-   * @returns
+   * @returns {void}
    */
   $emit(name, ...args) {
-    return this.eventHelper(
+    return this.#eventHelper(
       { name: name, event: undefined, broadcast: false },
       ...args,
     );
@@ -1043,21 +1044,20 @@ export class Scope {
    * @returns {any}
    */
   $broadcast(name, ...args) {
-    return this.eventHelper(
+    return this.#eventHelper(
       { name: name, event: undefined, broadcast: true },
       ...args,
     );
   }
 
   /**
-   * @private
    * @returns {void}
    */
-  eventHelper({ name, event, broadcast }, ...args) {
+  #eventHelper({ name, event, broadcast }, ...args) {
     if (!broadcast) {
       if (!this.$$listeners.has(name)) {
         if (this.$parent) {
-          return this.$parent.$handler.eventHelper(
+          return this.$parent.$handler.#eventHelper(
             { name: name, event: event, broadcast: broadcast },
             ...args,
           );
@@ -1112,7 +1112,7 @@ export class Scope {
     if (broadcast) {
       if (this.$children.length > 0) {
         this.$children.forEach((child) => {
-          event = child["$handler"].eventHelper(
+          event = child["$handler"].#eventHelper(
             { name: name, event: event, broadcast: broadcast },
             ...args,
           );
@@ -1121,7 +1121,7 @@ export class Scope {
       return event;
     } else {
       if (this.$parent) {
-        return this.$parent?.eventHelper(
+        return this.$parent.#eventHelper(
           { name: name, event: event, broadcast: broadcast },
           ...args,
         );
@@ -1132,10 +1132,9 @@ export class Scope {
   }
 
   /**
-   * @private
    * @returns {boolean}
    */
-  isRoot() {
+  #isRoot() {
     return this.$root == /** @type {Scope} */ (this);
   }
 
@@ -1154,7 +1153,7 @@ export class Scope {
       );
     });
 
-    if (this.isRoot()) {
+    if (this.#isRoot()) {
       this.watchers.clear();
     } else {
       let i = this.$parent.$children.filter((x) => x.$id == this.$id)[0];
@@ -1167,11 +1166,9 @@ export class Scope {
   }
 
   /**
-   * Invokes the registered listener function with watched property changes.
-   *
    * @param {Listener} listener - The property path that was changed.
    */
-  notifyListener(listener, target) {
+  #notifyListener(listener, target) {
     const { originalTarget, listenerFn, watchFn } = listener;
     try {
       let newVal = watchFn(originalTarget);
@@ -1230,6 +1227,8 @@ export class Scope {
   }
 }
 
+/*------------- Private helpers -------------*/
+
 /**
  * @param {Scope} model
  * @returns {number}