@angular-wave/angular.ts 0.6.5 → 0.6.6

package/package.json

@@ -2,9 +2,10 @@
   "name": "@angular-wave/angular.ts",
   "description": "A modern, optimized and typesafe version of AngularJS",
   "license": "MIT",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
+  "types": "types/index.d.ts",
   "browser": "dist/angular-ts.umd.js",
   "repository": {
     "type": "git",

package/src/core/compile/compile.spec.js

@@ -3664,7 +3664,6 @@ describe("$compile", () => {
           return {
             transclude: "element",
             link: function (scope, el, attrs, ctrl, transclude) {
-              debugger;
               const res = transclude();
               el.after(res);
             },
@@ -13061,7 +13060,7 @@ describe("$compile", () => {
       describe("content transclusion", () => {
         it("should support transclude directive", () => {
           module.directive("trans", () => ({
-            transclude: "content",
+            transclude: true,
             replace: true,
             scope: {},
             link(scope) {
@@ -13087,7 +13086,7 @@ describe("$compile", () => {
             .directive(
               "book",
               valueFn({
-                transclude: "content",
+                transclude: true,
                 template:
                   "<div>book-<div chapter>(<div ng-transclude></div>)</div></div>",
               }),
@@ -13095,14 +13094,14 @@ describe("$compile", () => {
             .directive(
               "chapter",
               valueFn({
-                transclude: "content",
+                transclude: true,
                 templateUrl: "chapter.html",
               }),
             )
             .directive(
               "section",
               valueFn({
-                transclude: "content",
+                transclude: true,
                 template:
                   "<div>section-!<div ng-transclude></div>!</div></div>",
               }),
@@ -13165,7 +13164,7 @@ describe("$compile", () => {
           module.directive(
             "foo",
             valueFn({
-              transclude: "content",
+              transclude: true,
               template: "<div>This is before {{before}}. </div>",
               link(scope, element, attr, ctrls, $transclude) {
                 const futureParent = element.children().eq(0);
@@ -13234,7 +13233,7 @@ describe("$compile", () => {
             .directive(
               "trans",
               valueFn({
-                transclude: "content",
+                transclude: true,
                 link(scope, element, attr, ctrl, $transclude) {
                   $transclude((clone) => {
                     element.append(clone);
@@ -13266,7 +13265,7 @@ describe("$compile", () => {
             .directive(
               "trans",
               valueFn({
-                transclude: "content",
+                transclude: true,
                 link(scope, element, attr, ctrl, $transclude) {
                   $transclude((clone) => {
                     element.append(clone);
@@ -13862,7 +13861,7 @@ describe("$compile", () => {
           module.directive(
             "transclude",
             valueFn({
-              transclude: "content",
+              transclude: true,
               controller($transclude) {
                 transcludeCtrl = this;
               },
@@ -13899,7 +13898,7 @@ describe("$compile", () => {
           module.directive(
             "transclude",
             valueFn({
-              transclude: "content",
+              transclude: true,
               controller($transclude) {
                 ctrlTransclude = $transclude;
               },
@@ -13927,7 +13926,7 @@ describe("$compile", () => {
           module.directive(
             "transclude",
             valueFn({
-              transclude: "content",
+              transclude: true,
               link(scope, element, attr, ctrl, $transclude) {
                 $transclude(scope, (clone) => {
                   element.append(clone);
@@ -13947,7 +13946,7 @@ describe("$compile", () => {
             .directive(
               "transclude",
               valueFn({
-                transclude: "content",
+                transclude: true,
                 controller() {},
                 link(scope, element, attr, ctrl, $transclude) {
                   $transclude((clone) => {
@@ -14766,7 +14765,7 @@ describe("$compile", () => {
           .directive(
             "transclude",
             valueFn({
-              transclude: "content",
+              transclude: true,
               controller($transclude) {
                 transclude = $transclude;
               },

package/src/core/exception-handler.js

@@ -48,16 +48,18 @@ export const errorHandler = (exception, cause) => {
  * @constructor
  * @this {import('../types').ServiceProvider}
  */
-export function ExceptionHandlerProvider() {
-  this.$get = [
-    "$log",
-    /**
-     * @param {import('../services/log').LogService} $log
-     * @returns {ErrorHandler}
-     */
-    function ($log) {
-      log = $log;
-      return errorHandler;
-    },
-  ];
+export class ExceptionHandlerProvider {
+  constructor() {
+    this.$get = [
+      "$log",
+      /**
+       * @param {import('../services/log').LogService} $log
+       * @returns {ErrorHandler}
+       */
+      function ($log) {
+        log = $log;
+        return errorHandler;
+      },
+    ];
+  }
 }

package/src/directive/bind/{bing-html.spec.js → bind-html.spec.js}

@@ -1,5 +1,4 @@
 import { createInjector } from "../../core/di/injector";
-import { forEach } from "../../shared/utils.js";
 import { Angular } from "../../loader";
 
 describe("ngBindHtml", () => {

package/src/directive/bind/bind.html

@@ -11,6 +11,7 @@
     <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/directive/bind/bind.spec.js"></script>
+    <script type="module" src="/src/directive/bind/bind-html.spec.js"></script>
   </head>
   <body>
     <div id="dummy"></div>

package/src/directive/options/options.spec.js

@@ -159,65 +159,71 @@ describe("ngOptions", () => {
   beforeEach(() => {
     window.angular = new Angular();
     window.angular
-      .module("myModule", ["ng"])
-      .decorator("$exceptionHandler", function () {
-        return (exception, cause) => {
-          throw new Error(exception.message);
-        };
-      });
-    injector = createInjector([
-      "myModule",
-      ($compileProvider, $provide) => {
-        linkLog = [];
-
-        $compileProvider
-          .directive("customSelect", () => ({
-            restrict: "E",
-            replace: true,
-            scope: {
-              ngModel: "=",
-              options: "=",
-            },
-            templateUrl: "select_template.html",
-            link(scope, $element, attributes) {
-              scope.selectable_options = scope.options;
-            },
-          }))
+      .module("myModule", [
+        "ng",
+        ($compileProvider, $provide) => {
+          linkLog = [];
+
+          $compileProvider
+            .directive("customSelect", () => ({
+              restrict: "E",
+              replace: true,
+              scope: {
+                ngModel: "=",
+                options: "=",
+              },
+              templateUrl: "select_template.html",
+              link(scope, $element, attributes) {
+                scope.selectable_options = scope.options;
+              },
+            }))
 
-          .directive("oCompileContents", () => ({
-            link(scope, element) {
-              linkLog.push("linkCompileContents");
-              $compile(JQLite(element[0].childNodes))(scope);
-            },
-          }))
+            .directive("oCompileContents", () => ({
+              link(scope, element) {
+                linkLog.push("linkCompileContents");
+                $compile(JQLite(element[0].childNodes))(scope);
+              },
+            }))
 
-          .directive("observeChildList", () => ({
-            link(scope, element) {
-              const config = { childList: true };
+            .directive("observeChildList", () => ({
+              link(scope, element) {
+                const config = { childList: true };
 
-              childListMutationObserver = new window.MutationObserver(() => {});
-              childListMutationObserver.observe(element[0], config);
-            },
-          }));
-
-        $provide.decorator("ngOptionsDirective", ($delegate) => {
-          const origPreLink = $delegate[0].link.pre;
-          const origPostLink = $delegate[0].link.post;
-
-          $delegate[0].compile = function () {
-            return {
-              pre: origPreLink,
-              post() {
-                linkLog.push("linkNgOptions");
-                origPostLink.apply(this, arguments);
+                childListMutationObserver = new window.MutationObserver(
+                  () => {},
+                );
+                childListMutationObserver.observe(element[0], config);
               },
+            }));
+
+          $provide.decorator("ngOptionsDirective", ($delegate) => {
+            const origPreLink = $delegate[0].link.pre;
+            const origPostLink = $delegate[0].link.post;
+
+            $delegate[0].compile = function () {
+              return {
+                pre: origPreLink,
+                post() {
+                  linkLog.push("linkNgOptions");
+                  origPostLink.apply(this, arguments);
+                },
+              };
             };
-          };
 
-          return $delegate;
-        });
-      },
+            return $delegate;
+          });
+        },
+      ])
+      .decorator("$exceptionHandler", function () {
+        return (exception, cause) => {
+          throw new Error(exception.message);
+        };
+      });
+
+    injector = window.angular.bootstrap(document.getElementById("dummy"), [
+      "myModule",
     ]);
+
     $compile = injector.get("$compile");
     scope = injector.get("$rootScope").$new(); // create a child scope because the root scope can't be $destroy-ed
     formElement = element = null;
@@ -2992,7 +2998,7 @@ describe("ngOptions", () => {
         const addSpiesOnProto =
           originalSelectedDescriptor && originalSelectedDescriptor.configurable;
 
-        Object.entries(options).forEach(([i, option]) => {
+        options.elements().forEach((option, i) => {
           const setSelected = function (value) {
             _selected[i] = value;
           };
@@ -3003,7 +3009,7 @@ describe("ngOptions", () => {
         });
 
         if (!addSpiesOnProto) {
-          Object.entries(options).forEach(([i, option]) => {
+          options.elements().forEach((option, i) => {
             Object.defineProperty(option, "selected", {
               get() {
                 return _selected[i];

package/src/directive/setter/setter.js

@@ -21,8 +21,11 @@ export function ngSetterDirective($parse) {
       }
 
       const updateModel = (value) => {
-        assignModel(scope, value);
-        scope.$digest();
+        if (value !== "") {
+          const maybeNumber = convertToNumberOrString(value);
+          assignModel(scope, maybeNumber);
+          scope.$digest();
+        }
       };
 
       const observer = new MutationObserver((mutationsList) => {
@@ -54,7 +57,19 @@ export function ngSetterDirective($parse) {
       }
 
       scope.$on("$destroy", () => observer.disconnect());
-      updateModel(element.html());
+      const content = element.html();
+      updateModel(content);
     },
   };
 }
+
+/**
+ * Converts the input to a number if possible, otherwise returns the input as a string.
+ *
+ * @param {string} input - The input to be converted or returned.
+ * @returns {number|string} The converted number if valid, or the original string if not convertible.
+ */
+function convertToNumberOrString(input) {
+  const converted = Number(input);
+  return isNaN(converted) ? input : converted;
+}

package/src/directive/setter/setter.spec.js

@@ -21,7 +21,6 @@ describe("setter", () => {
   });
 
   it("should update the scope model when the element content changes", async () => {
-    $rootScope.testModel = "";
     const element = $compile('<div ng-setter="testModel"></div>')($rootScope);
     $rootScope.$digest();
 
@@ -32,16 +31,40 @@ describe("setter", () => {
     expect($rootScope.testModel).toBe("New content");
   });
 
+  it("should update the scope model for objects when the element content changes", async () => {
+    const element = $compile('<div ng-setter="testModel.a">1</div>')(
+      $rootScope,
+    );
+    $rootScope.$digest();
+
+    element.html("New content");
+    await wait();
+    $rootScope.$digest();
+
+    expect($rootScope.testModel.a).toBe("New content");
+  });
+
   it("should handle initial content in the element", () => {
-    $rootScope.testModel = "";
-    const element = $compile(
-      '<div ng-setter="testModel">Initial content</div>',
-    )($rootScope);
+    $compile('<div ng-setter="testModel">Initial content</div>')($rootScope);
     $rootScope.$digest();
 
     expect($rootScope.testModel).toBe("Initial content");
   });
 
+  it("should handle initial content in the element for objects", () => {
+    $compile('<div ng-setter="testModel.a">Initial content</div>')($rootScope);
+    $rootScope.$digest();
+
+    expect($rootScope.testModel.a).toBe("Initial content");
+  });
+
+  it("should convert initial content in the element to numbers if possible", () => {
+    $compile('<div ng-setter="testModel.a">1</div>')($rootScope);
+    $rootScope.$digest();
+
+    expect($rootScope.testModel.a).toBe(1);
+  });
+
   it("should warn if no model expression is provided", () => {
     spyOn(console, "warn");
 
@@ -55,9 +78,7 @@ describe("setter", () => {
 
   it("should clean up the MutationObserver on scope destruction", async () => {
     spyOn(window, "MutationObserver").and.returnValue(observerSpy);
-    const element = $compile('<div ng-setter="testModel"></div>')($rootScope);
-    const isolateScope = element.isolateScope();
-
+    $compile('<div ng-setter="testModel"></div>')($rootScope);
     $rootScope.$destroy();
     await wait();
     expect(observerSpy.disconnect).toHaveBeenCalled();