Remove and

Author: tolyo

@types/core/scope/scope.d.ts

@@ -146,8 +146,6 @@ export class Scope {
   ): any;
   propertyMap: {
     $watch: any;
-    $watchGroup: any;
-    $watchCollection: any;
     $new: any;
     $newIsolate: any;
     $destroy: any;
@@ -191,14 +189,13 @@ export class Scope {
     listenerFn?: ListenerFunction,
     lazy?: boolean,
   ): () => void;
-  $watchGroup(watchArray: any, listenerFn: any): void;
-  $watchCollection(watchProp: any, listenerFn: any): () => void;
   $new(childInstance: any): any;
   $newIsolate(instance: any): any;
   $transcluded(parentInstance: any): any;
-  registerKey(key: any, listener: any): void;
-  registerForeignKey(key: any, listener: any): void;
-  deregisterKey(key: any, id: any): boolean;
+  /**
+   * @private
+   */
+  private deregisterKey;
   deregisterForeignKey(key: any, id: any): boolean;
   $eval(expr: any, locals: any): any;
   $evalAsync(expr: any, locals: any): Promise<any>;
@@ -242,18 +239,19 @@ export class Scope {
   $postUpdate(fn: any): void;
   $destroy(): void;
   /**
-   * Invokes the registered listener function with watched property changes.
+   * @private
    *
    * @param {Listener} listener - The property path that was changed.
    */
-  notifyListener(listener: Listener, target: any): void;
+  private notifyListener;
   /**
    * Searches the scope instance
    *
    * @param {string|number}id
    * @returns {Scope|undefined}
    */
   $getById(id: string | number): Scope | undefined;
+  #private;
 }
 export type AsyncQueueTask = {
   handler: Scope;

src/animations/animate-swap.js

@@ -12,25 +12,22 @@ export function ngAnimateSwapDirective($animate) {
     link(scope, $element, attrs, ctrl, $transclude) {
       let previousElement;
       let previousScope;
-      scope.$watchCollection(
-        attrs["ngAnimateSwap"] || attrs["for"],
-        (value) => {
-          if (previousElement) {
-            $animate.leave(previousElement);
-          }
-          if (previousScope) {
-            previousScope.$destroy();
-            previousScope = null;
-          }
-          if (value) {
-            $transclude((clone, childScope) => {
-              previousElement = clone;
-              previousScope = childScope;
-              $animate.enter(clone, null, $element);
-            });
-          }
-        },
-      );
+      scope.$watch(attrs["ngAnimateSwap"] || attrs["for"], (value) => {
+        if (previousElement) {
+          $animate.leave(previousElement);
+        }
+        if (previousScope) {
+          previousScope.$destroy();
+          previousScope = null;
+        }
+        if (value) {
+          $transclude((clone, childScope) => {
+            previousElement = clone;
+            previousScope = childScope;
+            $animate.enter(clone, null, $element);
+          });
+        }
+      });
     },
   };
 }

src/core/scope/scope.js

@@ -478,8 +478,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),
@@ -499,7 +497,7 @@ export class Scope {
       $root: this.$root,
       $children: this.$children,
       $id: this.$id,
-      registerForeignKey: this.registerForeignKey.bind(this),
+      registerForeignKey: this.#registerForeignKey.bind(this),
       notifyListener: this.notifyListener.bind(this),
       $merge: this.$merge.bind(this),
       $getById: this.$getById.bind(this),
@@ -675,7 +673,7 @@ 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) => {
@@ -716,7 +714,7 @@ export class Scope {
           }
         });
         keys.forEach((key) => {
-          this.registerKey(key, listener);
+          this.#registerKey(key, listener);
           this.scheduleListener([listener]);
         });
 
@@ -745,7 +743,7 @@ export class Scope {
             watchProp.split(".").slice(0, -1).join("."),
           )(listener.originalTarget);
           if (potentialProxy && this.foreignProxies.has(potentialProxy)) {
-            potentialProxy.$handler.registerForeignKey(key, listener);
+            potentialProxy.$handler.#registerForeignKey(key, listener);
             potentialProxy.$handler.scheduleListener([listener]);
             return () => {
               return potentialProxy.$handler.deregisterKey(key, listener.id);
@@ -779,7 +777,7 @@ export class Scope {
           })
           .filter((x) => !!x);
         keys.forEach((key) => {
-          this.registerKey(key, listener);
+          this.#registerKey(key, listener);
           this.scheduleListener([listener]);
         });
         return () => {
@@ -846,10 +844,10 @@ 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) {
@@ -871,14 +869,6 @@ export class Scope {
     };
   }
 
-  $watchGroup(watchArray, listenerFn) {
-    watchArray.forEach((x) => this.$watch(x, listenerFn));
-  }
-
-  $watchCollection(watchProp, listenerFn) {
-    return this.$watch(watchProp, listenerFn);
-  }
-
   $new(childInstance) {
     let child;
     if (childInstance) {
@@ -908,7 +898,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;
@@ -921,22 +910,24 @@ export class Scope {
     return proxy;
   }
 
-  registerKey(key, listener) {
+  #registerKey(key, listener) {
     if (this.watchers.has(key)) {
       this.watchers.get(key).push(listener);
     } else {
       this.watchers.set(key, [listener]);
     }
   }
 
-  registerForeignKey(key, listener) {
+  #registerForeignKey(key, listener) {
     if (this.foreignListeners.has(key)) {
       this.foreignListeners.get(key).push(listener);
     } else {
       this.foreignListeners.set(key, [listener]);
     }
   }
-
+  /**
+   * @private
+   */
   deregisterKey(key, id) {
     const listenerList = this.watchers.get(key);
     if (!listenerList) return false;
@@ -1182,7 +1173,7 @@ export class Scope {
   }
 
   /**
-   * Invokes the registered listener function with watched property changes.
+   * @private
    *
    * @param {Listener} listener - The property path that was changed.
    */

src/directive/messages/messages.js

@@ -25,7 +25,7 @@ class NgMessageCtrl {
     this.head = undefined;
     this.default = undefined;
 
-    this.$scope.$watchCollection(
+    this.$scope.$watch(
       this.$attrs["ngMessages"] || this.$attrs["for"],
       this.render.bind(this),
     );