@angular-wave/angular.ts 0.4.2 → 0.4.4

package/src/core/compile/compile.test.js

@@ -5,7 +5,7 @@ const TEST_URL = "src/core/compile/compile.html?random=false";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
-  await page.waitForTimeout(5000);
+  await page.waitForTimeout(4000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/core/controller/controller.js

@@ -112,6 +112,7 @@ export class ControllerProvider {
           instance = Object.create(controllerPrototype || null);
 
           if (identifier) {
+            instance["$controllerIdentifier"] = identifier;
             this.addIdentifier(
               locals,
               identifier,
@@ -134,6 +135,7 @@ export class ControllerProvider {
             ) {
               instance = result;
               if (identifier) {
+                instance["$controllerIdentifier"] = identifier;
                 this.addIdentifier(
                   locals,
                   identifier,

package/src/core/di/injector.md

@@ -28,7 +28,7 @@
 - // use the type inference to auto inject arguments, or use implicit injection
 - $injector.invoke(function($rootScope, $compile, $document) {
 -     $compile($document)($rootScope);
--     $rootScope.$digest();
+-     ;
 - });
 - ```
 

package/src/core/di/injector.spec.js

@@ -1410,7 +1410,6 @@ describe("directive", () => {
     injector.loadNewModules(["a"]);
     injector.invoke(($compile, $rootScope) => {
       const elem = $compile("<div a-directive></div>")($rootScope); // compile and link
-      $rootScope.$digest();
       expect(elem.text()).toEqual("test directive");
       elem.remove();
     });
@@ -1424,7 +1423,6 @@ describe("directive", () => {
     injector.loadNewModules(["a"]);
     injector.invoke(($compile, $rootScope) => {
       const elem = $compile("<div a-directive></div>")($rootScope); // compile and link
-      $rootScope.$digest();
       expect(elem.text()).toEqual("test directive");
       elem.remove();
     });

package/src/core/di/internal-injector.js

@@ -114,7 +114,8 @@ class AbstractInjector {
 
     if (isClass(/** @type {string} */ (fn))) {
       args.unshift(null);
-      return new (Function.prototype.bind.apply(fn, args))();
+      const res = new (Function.prototype.bind.apply(fn, args))();
+      return res;
     } else {
       return /** @type {Function} */ (fn).apply(self, args);
     }

package/src/core/interpolate/interpolate.js

@@ -332,13 +332,25 @@ export class InterpolateProvider {
           };
 
           return extend(
-            (context) => {
+            (context, cb) => {
               let i = 0;
               const ii = expressions.length;
               const values = new Array(ii);
-
               try {
                 for (; i < ii; i++) {
+                  if (cb) {
+                    const watchProp = expressions[i].trim();
+                    console.log(watchProp);
+                    context.$watch(watchProp, () => {
+                      let vals = new Array(ii);
+                      let j = 0;
+                      for (; j < ii; j++) {
+                        vals[j] = parseFns[j](context);
+                      }
+                      cb(compute(vals));
+                    });
+                  }
+
                   values[i] = parseFns[i](context);
                 }
 
@@ -348,12 +360,13 @@ export class InterpolateProvider {
               }
             },
             {
+              // Most likely we would need to register watches during interpolation
               // all of these properties are undocumented for now
               exp: text, // just for compatibility with regular watchers created via $watch
               expressions,
               $$watchDelegate(scope, listener) {
                 let lastValue;
-                return scope.$watchGroup(
+                return scope.$watch(
                   parseFns,
                   function interpolateFnWatcher(values, oldValues) {
                     const currValue = compute(values);

package/src/core/interpolate/interpolate.spec.js

@@ -1,5 +1,6 @@
 import { createInjector } from "../di/injector";
 import { Angular } from "../../loader";
+import { wait } from "../../shared/test-utils";
 
 describe("$interpolate", () => {
   let $interpolate, $injector, $rootScope, $sce;
@@ -234,18 +235,22 @@ describe("$interpolate", () => {
       expect(calls.pop()).toBeUndefined();
     });
 
-    it("should stop watching strings with no expressions after first execution", () => {
+    // TODO these tests shoudl be revereds
+    // Calling interpolation with scope should CREATE watches on scope
+    it("should stop watching strings with no expressions after first execution", async () => {
       const spy = jasmine.createSpy();
-      $rootScope.$watch($interpolate("foo"), spy);
-      $rootScope.$digest();
-      expect(spy).toHaveBeenCalledWith("foo", "foo", $rootScope);
+      $rootScope.$watch($interpolate("foo")(), spy);
+      $rootScope.foo = "foo";
+      await wait();
+      expect(spy).toHaveBeenCalledWith("foo", undefined, $rootScope);
       expect(spy).toHaveBeenCalledTimes(1);
     });
 
     it("should stop watching strings with only constant expressions after first execution", () => {
       const spy = jasmine.createSpy();
-      $rootScope.$watch($interpolate("foo {{42}}"), spy);
-      $rootScope.$digest();
+      let res = $interpolate("foo {{42}}")($rootScope);
+      $rootScope.$watch(res, spy);
+
       expect(spy).toHaveBeenCalledWith("foo 42", "foo 42", $rootScope);
       expect(spy).toHaveBeenCalledTimes(1);
     });
@@ -264,18 +269,12 @@ describe("$interpolate", () => {
       expect(interp.$$watchDelegate).toBeDefined();
     });
 
-    it("correctly returns new and old value when watched", function () {
+    it("correctly returns new value", async () => {
       const interp = $interpolate("{{expr}}");
-      const listenerSpy = jasmine.createSpy();
-      $rootScope.$watch(interp, listenerSpy);
+      $rootScope.$watch("expr", () => {});
       $rootScope.expr = 42;
-      $rootScope.$apply();
-      expect(listenerSpy.calls.mostRecent().args[0]).toEqual("42");
-      expect(listenerSpy.calls.mostRecent().args[1]).toEqual("42");
-      $rootScope.expr++;
-      $rootScope.$apply();
-      expect(listenerSpy.calls.mostRecent().args[0]).toEqual("43");
-      expect(listenerSpy.calls.mostRecent().args[1]).toEqual("42");
+      await wait();
+      expect(interp($rootScope)).toEqual("42");
     });
 
     it("should support escaping interpolation signs", () => {
@@ -399,6 +398,61 @@ describe("$interpolate", () => {
     });
   });
 
+  describe("interpolation callbacks", () => {
+    it("does not require a callback", async () => {
+      let text;
+      $rootScope.expr = 42;
+      const interp = $interpolate("{{expr}}");
+
+      text = interp($rootScope);
+
+      expect(text).toEqual("42");
+    });
+
+    it("correctly invokes callback when interpolated value changes", async () => {
+      let counter = 0;
+
+      const interp = $interpolate("{{expr}}");
+
+      interp($rootScope, (val) => {
+        counter++;
+      });
+
+      $rootScope.expr = 42;
+      await wait();
+      expect(counter).toEqual(1);
+
+      $rootScope.expr++;
+      await wait();
+      expect(counter).toEqual(2);
+    });
+
+    it("returns currently interpolated text", async () => {
+      let text;
+      $rootScope.expr = 42;
+      const interp = $interpolate("{{expr}}");
+
+      text = interp($rootScope, (val) => {
+        text = val;
+      });
+
+      expect(text).toEqual("42");
+    });
+
+    it("invokes callback with newly interpolated text", async () => {
+      let text;
+      const interp = $interpolate("{{expr}}");
+
+      interp($rootScope, (val) => {
+        text = val;
+      });
+
+      $rootScope.expr = 42;
+      await wait();
+      expect(text).toEqual("42");
+    });
+  });
+
   describe("interpolating in a trusted context", () => {
     let sce;
 

package/src/core/location/location.js

@@ -13,7 +13,6 @@ import {
   toInt,
   toKeyValue,
 } from "../../shared/utils";
-import { ScopePhase } from "../scope/scope";
 
 /**
  * @typedef {Object} DefaultPorts
@@ -768,7 +767,6 @@ export function LocationProvider() {
             afterLocationChange(oldUrl, oldState);
           }
         });
-        if ($rootScope.$$phase === ScopePhase.NONE) $rootScope.$digest();
       });
 
       // update browser

package/src/core/location/location.spec.js

@@ -785,7 +785,7 @@ describe("$location", () => {
   //         $browser,
   //         "url",
   //       ).and.callThrough();
-  //       $rootScope.$digest();
+  //       ;
   //       expect($browserUrl).not.toHaveBeenCalled();
   //     });
   //   });
@@ -815,7 +815,7 @@ describe("$location", () => {
   //         }
   //       });
   //       expect($browser.url()).toEqual("http://server/base/#!/home");
-  //       $rootScope.$digest();
+  //       ;
   //       expect(handlerCalled).toEqual(true);
   //       expect($browser.url()).toEqual("http://server/base/#!/");
   //     });
@@ -829,7 +829,7 @@ describe("$location", () => {
   //     });
   //     inject(($location, $browser, $rootScope) => {
   //       expect(() => {
-  //         $rootScope.$digest();
+  //         ;
   //       }).not.toThrow();
   //     });
   //   });
@@ -843,7 +843,7 @@ describe("$location", () => {
   //     });
   //     inject(($location, $browser, $rootScope) => {
   //       expect(() => {
-  //         $rootScope.$digest();
+  //         ;
   //       }).not.toThrow();
   //     });
   //   });
@@ -857,7 +857,7 @@ describe("$location", () => {
   //     });
   //     inject(($location, $browser, $rootScope) => {
   //       expect(() => {
-  //         $rootScope.$digest();
+  //         ;
   //       }).not.toThrow();
   //     });
   //   });
@@ -867,10 +867,10 @@ describe("$location", () => {
   //     initService({ html5Mode: true, supportHistory: true });
   //     mockUpBrowser({ initialUrl: "http://localhost:9876/", baseHref: "/" });
   //     inject(($location, $browser, $rootScope) => {
-  //       $rootScope.$digest();
+  //       ;
   //       $browser.url("http://localhost:9876/?q='");
   //       expect(() => {
-  //         $rootScope.$digest();
+  //         ;
   //       }).not.toThrow();
   //     });
   //   });
@@ -880,7 +880,7 @@ describe("$location", () => {
   //     initService({ html5Mode: true, supportHistory: true });
   //     mockUpBrowser({ initialUrl: "http://localhost:9876/", baseHref: "/" });
   //     inject(($window, $location, $browser, $rootScope) => {
-  //       $rootScope.$digest();
+  //       ;
   //       $window.location.href = "http://localhost:9876/?q='";
   //       expect(() => {
   //         JQLite($window).triggerHandler("popstate");
@@ -901,7 +901,7 @@ describe("$location", () => {
   //       $window,
   //     ) => {
   //       $location.url("baz");
-  //       $rootScope.$digest();
+  //       ;
 
   //       const originalUrl = $window.location.href;
 
@@ -931,7 +931,7 @@ describe("$location", () => {
   //       $window,
   //     ) => {
   //       $location.url("baz");
-  //       $rootScope.$digest();
+  //       ;
 
   //       $rootScope.$apply(() => {
   //         $rootScope.$evalAsync(() => {
@@ -969,7 +969,7 @@ describe("$location", () => {
 
   //         updatePathOnLocationChangeSuccessTo("/Home");
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/#!/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -991,7 +991,7 @@ describe("$location", () => {
 
   //         updatePathOnLocationChangeSuccessTo("/");
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/#!/");
   //         expect($location.path()).toEqual("/");
@@ -1014,7 +1014,7 @@ describe("$location", () => {
   //         ).and.callThrough();
 
   //         updatePathOnLocationChangeSuccessTo("/Home");
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/#!/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -1037,7 +1037,7 @@ describe("$location", () => {
   //         ).and.callThrough();
 
   //         updatePathOnLocationChangeSuccessTo("/");
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/#!/");
   //         expect($location.path()).toEqual("/");
@@ -1059,7 +1059,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/Home");
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -1079,7 +1079,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/");
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/");
   //         expect($location.path()).toEqual("/");
@@ -1099,7 +1099,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/Home");
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -1119,7 +1119,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/");
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($browser.url()).toEqual("http://server/app/");
   //         expect($location.path()).toEqual("/");
@@ -1140,7 +1140,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/", { q: "'" });
 
-  //         $rootScope.$digest();
+  //         ;
 
   //         expect($location.path()).toEqual("/");
   //         expect($location.search()).toEqual({ q: "'" });
@@ -1200,7 +1200,7 @@ describe("$location", () => {
   //         }
   //       });
 
-  //       $rootScope.$digest();
+  //       ;
   //       expect($location.absUrl()).toBe(NEW_URL);
   //     });
   //   });
@@ -1299,7 +1299,7 @@ describe("$location", () => {
   //         },
   //       );
 
-  //       $rootScope.$digest();
+  //       ;
   //       expect($browser.url()).toBe("http://new.com/a/b#!/changed");
   //     });
   //   });
@@ -1310,7 +1310,7 @@ describe("$location", () => {
   //     inject(($rootScope, $browser, $location) => {
   //       $location.hash("test");
 
-  //       $rootScope.$digest();
+  //       ;
   //       expect($browser.url()).toBe("http://new.com/a/b##test");
   //     });
   //   });
@@ -1334,7 +1334,7 @@ describe("$location", () => {
   //     mockUpBrowser({ initialUrl: "http://new.com/a/b/", baseHref: "/a/b/" });
   //     inject(($location, $rootScope, $window) => {
   //       $window.history.pushState({ b: 3 });
-  //       $rootScope.$digest();
+  //       ;
 
   //       expect($location.state()).toEqual({ b: 3 });
 
@@ -1343,7 +1343,7 @@ describe("$location", () => {
   //         null,
   //         `${$window.location.href}c?d=e#f`,
   //       );
-  //       $rootScope.$digest();
+  //       ;
 
   //       expect($location.path()).toBe("/c");
   //       expect($location.search()).toEqual({ d: "e" });
@@ -1358,10 +1358,10 @@ describe("$location", () => {
   //     mockUpBrowser({ initialUrl: "http://server/app/", baseHref: "/app/" });
   //     inject(($rootScope, $injector, $window) => {
   //       const $location = $injector.get("$location");
-  //       $rootScope.$digest(); // allow $location initialization to finish
+  //       ; // allow $location initialization to finish
 
   //       $window.history.pushState({}, null, "http://server/app/Home?q='");
-  //       $rootScope.$digest();
+  //       ;
 
   //       expect($location.absUrl()).toEqual("http://server/app/Home?q='");
   //       expect($location.path()).toEqual("/Home");
@@ -1375,7 +1375,7 @@ describe("$location", () => {
   //     mockUpBrowser({ initialUrl: "http://server/app/", baseHref: "/app/" });
   //     inject(($rootScope, $injector, $window) => {
   //       const $location = $injector.get("$location");
-  //       $rootScope.$digest(); // allow $location initialization to finish
+  //       ; // allow $location initialization to finish
 
   //       $window.location.href = "http://server/app/Home?q='";
   //       JQLite($window).triggerHandler("popstate");

package/src/core/{scope/scope.html → model/model.html}

@@ -10,7 +10,7 @@
     <script src="/jasmine/jasmine-5.1.2/jasmine-html.js"></script>
     <script src="/jasmine/jasmine-5.1.2/boot0.js"></script>
     <script src="/jasmine/jasmine-5.1.2/boot1.js"></script>
-    <script type="module" src="/src/core/scope/scope.spec.js"></script>
+    <script type="module" src="/src/core/model/model.spec.js"></script>
   </head>
   <body>
     <div id="dummy"></div>