@angular-wave/angular.ts 0.0.70 → 0.0.72

package/package.json

@@ -2,7 +2,7 @@
   "name": "@angular-wave/angular.ts",
   "description": "A modern, optimized and typesafe version of AngularJS",
   "license": "MIT",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/animations/animate-children-directive.md

@@ -70,7 +70,7 @@
 
      </file>
      <file name="script.js">
-       angular.module('ngAnimateChildren', ['ngAnimate'])
+       angular.module('ngAnimateChildren', [])
          .controller('MainController', function MainController() {
            this.animateChildren = false;
            this.enterElement = false;

package/src/animations/animate-css-driver.js

@@ -26,7 +26,7 @@ export function $$AnimateCssDriverProvider($$animationProvider) {
     /**
      *
      * @param {*} $animateCss
-     * @param {typeof import('../core/animate/animate-runner').AnimateRunner} $$AnimateRunner
+     * @param {typeof import('./animate-runner').AnimateRunner} $$AnimateRunner
      * @param {JQLite} $rootElement
      * @returns
      */

package/src/animations/animate-css.html

@@ -9,12 +9,12 @@
     <!--     
     <script src="https://cdn.jsdelivr.net/npm/angular@1.8.3/angular.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/angular-animate@1.8.3/angular-animate.js"></script>
-    <script>window.angular.module("test", ["ngAnimate"])</script> -->
+    <script>window.angular.module("test", [])</script> -->
 
     <script type="module" src="/src/index.js"></script>
     <script>
       document.addEventListener("DOMContentLoaded", () => {
-        window.angular.module("test", ["ngAnimate"]);
+        window.angular.module("test", []);
       });
     </script>
 

package/src/animations/animate-js.html

@@ -9,7 +9,7 @@
     <script src="https://cdn.jsdelivr.net/npm/animejs@3.2.2/lib/anime.min.js"></script>
     <script>
       document.addEventListener("DOMContentLoaded", () => {
-        window.angular.module("test", ["ngAnimate"]).animation(".colorful", [
+        window.angular.module("test", []).animation(".colorful", [
           function () {
             return {
               addClass: function (element, className, doneFn) {

package/src/animations/animate-queue.js

@@ -145,14 +145,14 @@ export function $$AnimateQueueProvider($animateProvider) {
 
   this.$get = [
     "$rootScope",
-    "$rootElement",
+    "$injector",
     "$$animation",
     "$$AnimateRunner",
     "$templateRequest",
     /**
      *
      * @param {*} $rootScope
-     * @param {JQLite} $rootElement
+     * @param {*} $injector
      * @param {*} $$animation
      * @param {*} $$AnimateRunner
      * @param {*} $templateRequest
@@ -160,7 +160,7 @@ export function $$AnimateQueueProvider($animateProvider) {
      */
     function (
       $rootScope,
-      $rootElement,
+      $injector,
       $$animation,
       $$AnimateRunner,
       $templateRequest,
@@ -747,7 +747,7 @@ export function $$AnimateQueueProvider($animateProvider) {
        */
       function areAnimationsAllowed(node, parentNode) {
         const bodyNode = document.body;
-        const rootNode = getDomNode($rootElement);
+        const rootNode = getDomNode($injector.get("$rootElement"));
 
         let bodyNodeDetected = node === bodyNode || node.nodeName === "HTML";
         let rootNodeDetected = node === rootNode;

package/src/animations/animate-swap.md

@@ -32,7 +32,7 @@
 -     </div>
 - </file>
 - <file name="script.js">
--     angular.module('ngAnimateSwapExample', ['ngAnimate'])
+-     angular.module('ngAnimateSwapExample', [])
 -       .controller('AppCtrl', ['$scope', '$interval', function($scope, $interval) {
 -         $scope.number = 0;
 -         $interval(function() {

package/src/{core/animate → animations}/animate.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/animate/animate.spec.js"></script>
+    <script type="module" src="/src/animations/animate.spec.js"></script>
   </head>
   <body>
     <div id="dummy"></div>

package/src/{core/animate → animations}/animate.js

@@ -5,10 +5,9 @@ import {
   isString,
   minErr,
   extend,
-} from "../../shared/utils";
-import { JQLite } from "../../shared/jqlite/jqlite";
-import { NG_ANIMATE_CLASSNAME } from "../../animations/shared";
-import { addInlineStyles } from "./helpers";
+} from "../shared/utils";
+import { JQLite } from "../shared/jqlite/jqlite";
+import { NG_ANIMATE_CLASSNAME } from "./shared";
 
 /** @typedef {"enter"|"leave"|"move"|"addClass"|"setClass"|"removeClass"} AnimationMethod */
 
@@ -70,121 +69,6 @@ function prepareAnimateOptions(options) {
   return isObject(options) ? options : {};
 }
 
-// this is prefixed with Core since it conflicts with
-// the animateQueueProvider defined in ngAnimate/animateQueue.js
-export function CoreAnimateQueueProvider() {
-  const postDigestQueue = new Map();
-  const postDigestElements = [];
-
-  this.$get = [
-    "$$AnimateRunner",
-    "$rootScope",
-    function ($$AnimateRunner, $rootScope) {
-      return {
-        enabled: () => {},
-        on: () => {},
-        off: () => {},
-        pin: () => {},
-
-        push(element, event, options, domOperation) {
-          if (domOperation) {
-            domOperation();
-          }
-
-          options = options || {};
-          if (options.from) {
-            addInlineStyles(element[0], options.from);
-          }
-          if (options.to) {
-            addInlineStyles(element[0], options.to);
-          }
-
-          if (options.addClass || options.removeClass) {
-            addRemoveClassesPostDigest(
-              element,
-              options.addClass,
-              options.removeClass,
-            );
-          }
-
-          const runner = new $$AnimateRunner();
-
-          // since there are no animations to run the runner needs to be
-          // notified that the animation call is complete.
-          runner.complete();
-          return runner;
-        },
-      };
-
-      function updateData(data, classes, value) {
-        let changed = false;
-        if (classes) {
-          classes = isString(classes)
-            ? classes.split(" ")
-            : Array.isArray(classes)
-              ? classes
-              : [];
-          forEach(classes, (className) => {
-            if (className) {
-              changed = true;
-              data[className] = value;
-            }
-          });
-        }
-        return changed;
-      }
-
-      function handleCSSClassChanges() {
-        forEach(postDigestElements, function (element) {
-          const data = postDigestQueue.get(element);
-          if (data) {
-            const existing = splitClasses(element.attr("class"));
-            let toAdd = "";
-            let toRemove = "";
-            forEach(data, function (status, className) {
-              const hasClass = !!existing[className];
-              if (status !== hasClass) {
-                if (status) {
-                  toAdd += (toAdd.length ? " " : "") + className;
-                } else {
-                  toRemove += (toRemove.length ? " " : "") + className;
-                }
-              }
-            });
-
-            forEach(element, function (elm) {
-              if (toRemove) {
-                toRemove.split(" ").forEach((css) => elm.classList.remove(css));
-              }
-              if (toAdd) {
-                toAdd.split(" ").forEach((css) => elm.classList.add(css));
-              }
-            });
-            postDigestQueue.delete(element);
-          }
-        });
-        postDigestElements.length = 0;
-      }
-
-      function addRemoveClassesPostDigest(element, add, remove) {
-        const data = postDigestQueue.get(element) || {};
-
-        const classesAdded = updateData(data, add, true);
-        const classesRemoved = updateData(data, remove, false);
-
-        if (classesAdded || classesRemoved) {
-          postDigestQueue.set(element, data);
-          postDigestElements.push(element);
-
-          if (postDigestElements.length === 1) {
-            $rootScope.$$postDigest(handleCSSClassChanges);
-          }
-        }
-      }
-    },
-  ];
-}
-
 export function domInsert(element, parentElement, afterElement) {
   // if for some reason the previous element was removed
   // from the dom sometime before this code runs then let's
@@ -502,7 +386,7 @@ export function AnimateProvider($provide) {
        * @example
         <example module="animationExample" deps="angular-animate.js" animations="true" name="animate-cancel">
           <file name="app.js">
-            angular.module('animationExample', ['ngAnimate']).component('cancelExample', {
+            angular.module('animationExample', []).component('cancelExample', {
               templateUrl: 'template.html',
               controller: function($element, $animate) {
                 this.runner = null;

package/src/animations/raf-scheduler.js

@@ -7,9 +7,8 @@
 
 /**
  * Creates a requestAnimationFrame scheduler.
- * @returns {RafScheduler} The scheduler object.
  */
-export function $$rAFSchedulerFactory() {
+export function RafSchedulerProvider() {
   /**
    * @type {Array<Array<Function>>}
    */
@@ -68,5 +67,10 @@ export function $$rAFSchedulerFactory() {
     });
   };
 
-  return scheduler;
+  /**
+   * @returns {RafScheduler} The scheduler object.
+   */
+  this.$get = function () {
+    return scheduler;
+  };
 }

package/src/animations/raf-scheduler.spec.js

@@ -1,6 +1,6 @@
-import { $$rAFSchedulerFactory } from "./raf-scheduler";
+import { RafSchedulerProvider } from "./raf-scheduler";
 
-describe("$$rAFSchedulerFactory", function () {
+describe("RafSchedulerProvider", function () {
   let scheduler;
   let rAFCallbacks;
   let originalRequestAnimationFrame;
@@ -8,7 +8,7 @@ describe("$$rAFSchedulerFactory", function () {
 
   beforeEach(function () {
     rAFCallbacks = [];
-    scheduler = $$rAFSchedulerFactory();
+    scheduler = new RafSchedulerProvider().$get();
 
     originalRequestAnimationFrame = window.requestAnimationFrame;
     originalCancelAnimationFrame = window.cancelAnimationFrame;

package/src/animations/shared.js

@@ -119,18 +119,23 @@ export function removeFromArray(arr, val) {
   }
 }
 
+/**
+ *
+ * @param {JQLite|Node} element
+ * @returns {JQLite}
+ */
 export function stripCommentsFromElement(element) {
   if (element instanceof JQLite) {
     switch (element.length) {
       case 0:
-        return element;
+        return /** @type {JQLite} */ (element);
 
       case 1:
         // there is no point of stripping anything if the element
         // is the only element within the JQLite wrapper.
         // (it's important that we retain the element instance.)
         if (element[0].nodeType === Node.ELEMENT_NODE) {
-          return element;
+          return /** @type {JQLite} */ (element);
         }
         break;
 
@@ -139,14 +144,18 @@ export function stripCommentsFromElement(element) {
     }
   }
 
-  if (element.nodeType === Node.ELEMENT_NODE) {
+  if (/** @type {Node} */ (element).nodeType === Node.ELEMENT_NODE) {
     return JQLite(element);
   }
 }
 
+/**
+ * @param {JQLite|Node} element
+ * @returns {Node}
+ */
 export function extractElementNode(element) {
-  if (!element[0]) return element;
-  for (let i = 0; i < element.length; i++) {
+  if (!element[0]) return /** @type {Node} */ (element);
+  for (let i = 0; i < /** @type {JQLite} */ (element).length; i++) {
     const elm = element[i];
     if (elm.nodeType === Node.ELEMENT_NODE) {
       return elm;
@@ -157,11 +166,11 @@ export function extractElementNode(element) {
 export function applyAnimationClassesFactory() {
   return function (element, options) {
     if (options.addClass) {
-      element[0].classList.add(options.addClass);
+      element[0].classList.add(...options.addClass.trim().split(" "));
       options.addClass = null;
     }
     if (options.removeClass) {
-      element[0].classList.remove(options.removeClass);
+      element[0].classList.remove(...options.removeClass.trim().split(" "));
       options.removeClass = null;
     }
   };

package/src/binding.spec.js

@@ -1,6 +1,5 @@
 import { JQLite, dealoc } from "./shared/jqlite/jqlite";
 import { Angular } from "./loader";
-import { createInjector } from "./core/di/injector";
 import { browserTrigger } from "./shared/test-utils";
 
 describe("binding", () => {
@@ -21,11 +20,13 @@ describe("binding", () => {
     window.angular = new Angular();
     myModule = window.angular.module("myModule", ["ng"]);
     myModule.decorator("$exceptionHandler", function () {
-      return (exception, cause) => {
+      return (exception) => {
         errors.push(exception.message);
       };
     });
-    $injector = createInjector(["myModule"]);
+    $injector = window.angular.bootstrap(document.getElementById("dummy"), [
+      "myModule",
+    ]);
     $rootScope = $injector.get("$rootScope");
     $compile = $injector.get("$compile");
     $exceptionHandler = $injector.get("$exceptionHandler");