@angular-wave/angular.ts 0.0.31 → 0.0.33

package/index.html

@@ -26,13 +26,13 @@
       <script type="module" src="test/directive/click.spec.js"></script>
       <script type="module" src="test/directive/cloak.spec.js"></script>
       <script type="module" src="test/directive/controller.spec.js"></script>
-      <!--   <script type="module" src="test/directive/event.spec.js"></script>
+      <script type="module" src="test/directive/event.spec.js"></script>
       <script type="module" src="test/directive/href.spec.js"></script>
       <script type="module" src="test/directive/if.spec.js"></script>
       <script type="module" src="test/directive/include.spec.js"></script>
       <script type="module" src="test/directive/init.spec.js"></script>
      
-      <script type="module" src="test/directive/list.spec.js"></script>
+      <!--   <script type="module" src="test/directive/list.spec.js"></script>
       <script type="module" src="test/directive/model-options.spec.js"></script>
       <script type="module" src="test/directive/model.spec.js"></script>
       <script type="module" src="test/directive/non-bindable.spec.js"></script>
@@ -69,7 +69,7 @@
       <script type="module" src="test/core/location.spec.js"></script> 
       <script type="module" src="test/core/on.spec.js"></script>
       <script type="module" src="test/core/prop.spec.js"></script>
-      <script type="module" src="test/core/parse.spec.js"></script>
+     
       <script type="module" src="test/core/q.spec.js"></script>
       <script type="module" src="test/core/root-element.spec.js"></script>
 
@@ -97,17 +97,8 @@
       <script type="module" src="test/shared/strings.spec.js"></script>
       <script type="module" src="test/shared/utils.spec.js"></script>-->
       <!-- <script type="module" src="test/core/pubsub.spec.js"></script>-->
-      <script type="module" src="test/router/glob.spec.js"></script>
-      <script type="module" src="test/router/services.spec.js"></script>
-      <script type="module" src="test/router/state-directives.spec.js"></script>
-      <script type="module" src="test/router/state-filter.spec.js"></script>
-      <script type="module" src="test/router/state.spec.js"></script>
-      <script type="module" src="test/router/template-factory.spec.js"></script>
-      <script type="module" src="test/router/url-matcher-factory.spec.js"></script>
-      <script type="module" src="test/router/view-directive.spec.js"></script>
-      <script type="module" src="test/router/view-hook.spec.js"></script>
-      <script type="module" src="test/router/view-scroll.spec.js"></script>
-      <script type="module" src="test/router/view.spec.js"></script> 
+      <script type="module" src="test/core/scope.spec.js"></script>
+      <script type="module" src="test/core/parse.spec.js"></script>
 
   
       <!-- <script type="module" src="test/core/interval.spec.js"></script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular-wave/angular.ts",
   "license": "MIT",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/core/compile.js

@@ -1,5 +1,6 @@
 import { jqLite, getBooleanAttrName, isTextNode, startingTag } from "../jqLite";
 import { identifierForController } from "./controller";
+import { TTL } from "./root-scope";
 import {
   minErr,
   assertArg,
@@ -44,7 +45,6 @@ const $compileMinErr = minErr("$compile");
 
 const _UNINITIALIZED_VALUE = new Object();
 const EXCLUDED_DIRECTIVES = ["ngIf", "ngRepeat"];
-let TTL = 10;
 
 /**
  * @ngdoc provider
@@ -659,14 +659,15 @@ export function $CompileProvider($provide, $$sanitizeUriProvider) {
 
       // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest
       function flushOnChangesQueue() {
+        let ttl = TTL;
         try {
-          if (!--TTL) {
+          if (!--ttl) {
             // We have hit the TTL limit so reset everything
             onChangesQueue = undefined;
             throw $compileMinErr(
               "infchng",
               "{0} $onChanges() iterations reached. Aborting!\n",
-              TTL,
+              ttl,
             );
           }
           // We must run this hook in an apply since the $$postDigest runs outside apply
@@ -682,7 +683,7 @@ export function $CompileProvider($provide, $$sanitizeUriProvider) {
             onChangesQueue = undefined;
           });
         } finally {
-          TTL++;
+          ttl++;
         }
       }
 

package/src/core/location.js

@@ -1013,7 +1013,7 @@ export function $LocationProvider() {
             afterLocationChange(oldUrl, oldState);
           }
         });
-        if (!$rootScope.$$phase) $rootScope.$digest();
+        if ($rootScope.$$phase !== ScopePhase.NONE) $rootScope.$digest();
       });
 
       // update browser

package/src/core/parser/parse.js

@@ -6,7 +6,6 @@ import {
   isFunction,
   minErr,
   isString,
-  lowercase,
   isNumber,
 } from "../../shared/utils";
 
@@ -191,7 +190,7 @@ Lexer.prototype = {
     let number = "";
     const start = this.index;
     while (this.index < this.text.length) {
-      const ch = lowercase(this.text.charAt(this.index));
+      const ch = this.text.charAt(this.index).toLowerCase();
       if (ch === "." || this.isNumber(ch)) {
         number += ch;
       } else {

package/src/core/root-scope.js

@@ -13,39 +13,25 @@ import {
 } from "../shared/utils";
 
 /**
- * @typedef {"$apply" | "$digest"} ScopePhase
+ * @enum {number}
  */
+export const ScopePhase = {
+  NONE: 0,
+  APPLY: 1,
+  DIGEST: 2,
+};
 
 /**
- * @ngdoc provider
- * @name $rootScopeProvider
- * @description
- *
- * Provider for the $rootScope service.
- */
-
-/**
- * @ngdoc method
- * @name $rootScopeProvider#digestTtl
- * @description
- *
- * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
- * assuming that the model is unstable.
- *
- * The current default is 10 iterations.
  *
- * In complex applications it's possible that the dependencies between `$watch`s will result in
- * several digest iterations. However if an application needs more than the default 10 digest
- * iterations for its model to stabilize then you should investigate what is causing the model to
- * continuously change during the digest.
+ * The default number of `$digest` iterations the scope should attempt to execute before giving up and
+ * assuming that the model is unstable. In complex applications it's possible that the dependencies between `$watch`s will result in
+ * several digest iterations.
  *
- * Increasing the TTL could have performance implications, so you should not change it without
- * proper justification.
+ * @typedef {number} TTL The number of digest iterations
  *
- * @param {number} limit The number of digest iterations.
+ * @type {TTL}
  */
-
-let TTL = 10;
+export const TTL = 10;
 
 const $rootScopeMinErr = minErr("$rootScope");
 const $$asyncQueue = [];
@@ -54,78 +40,51 @@ const $$applyAsyncQueue = [];
 let postDigestQueuePosition = 0;
 let lastDirtyWatch = null;
 let applyAsyncId = null;
+
+/** Services required by each scope instance */
+/** @type {angular.IParseService} */
 let $parse;
+/** @type {import('../services/browser').Browser} */
 let $browser;
+/** @type {angular.IExceptionHandlerService} */
 let $exceptionHandler;
 
 /**
- * @ngdoc service
- * @name $rootScope
- *
- * @description
- *
+ * @type {Scope}
+ */
+let rootScope;
+
+/**
+ * Provider responsible for instantiating the initial scope, aka - root scope.
  * Every application has a single root {@link ng.$rootScope.Scope scope}.
  * All other scopes are descendant scopes of the root scope. Scopes provide separation
  * between the model and the view, via a mechanism for watching the model for changes.
  * They also provide event emission/broadcast and subscription facility. See the
  * {@link guide/scope developer guide on scopes}.
+ *
+ * The provider also injects runtime services to make them available to all scopes.
+ *
  */
-export function $RootScopeProvider() {
-  this.digestTtl = function (value) {
-    if (arguments.length) {
-      TTL = value;
-    }
-    return TTL;
-  };
+export class $RootScopeProvider {
+  constructor() {
+    rootScope = new Scope();
+  }
 
-  this.$get = [
+  $get = [
     "$exceptionHandler",
     "$parse",
     "$browser",
+    /**
+     * @param {angular.IParseService} parse
+     * @param {import('../services/browser').Browser} browser
+     * @param {angular.IExceptionHandlerService} exceptionHandler
+     * @returns {Scope} root scope
+     */
     function (exceptionHandler, parse, browser) {
       $exceptionHandler = exceptionHandler;
       $parse = parse;
       $browser = browser;
-      /**
-     * @ngdoc type
-     * @name $rootScope.Scope
-     *
-     * @description
-     * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
-     * {@link auto.$injector $injector}. Child scopes are created using the
-     * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
-     * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
-     * an in-depth introduction and usage examples.
-     *
-     *
-     * ## Inheritance
-     * A scope can inherit from a parent scope, as in this example:
-     * ```js
-         let parent = $rootScope;
-         let child = parent.$new();
-
-         parent.salutation = "Hello";
-         expect(child.salutation).toEqual('Hello');
-
-         child.salutation = "Welcome";
-         expect(child.salutation).toEqual('Welcome');
-         expect(parent.salutation).toEqual('Hello');
-     * ```
-     *
-     *
-     *
-     * @param {Object.<string, function()>=} providers Map of service factory which need to be
-     *                                       provided for the current scope. Defaults to {@link ng}.
-     * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
-     *                              append/override services provided by `providers`. This is handy
-     *                              when unit-testing and having the need to override a default
-     *                              service.
-     * @returns {Object} Newly created scope.
-     *
-     */
-
-      const $rootScope = new Scope();
-      return $rootScope;
+      return rootScope;
     },
   ];
 }
@@ -163,17 +122,6 @@ export function getQueues() {
   };
 }
 
-/**
- * @param { * } parse
- * @param {import('../services/browser').Browser} browser
- * @param {Function} exceptionHandler
- */
-export function initialize(parse, browser, exceptionHandler) {
-  $parse = parse;
-  $browser = browser;
-  $exceptionHandler = exceptionHandler;
-}
-
 /**
  * @type {angular.IScope}
  */
@@ -183,15 +131,17 @@ class Scope {
      * @type {number} Unique scope ID (monotonically increasing) useful for debugging.
      */
     this.$id = nextUid();
-    this.$$phase = null;
+
+    /** @type {ScopePhase} */
+    this.$$phase = ScopePhase.NONE;
 
     /**
-     * @type {?Scope} Reference to the parent scope.
+     * @type {?angular.IScope} Reference to the parent scope.
      */
     this.$parent = null;
 
     /**
-     * @type {Scope}
+     * @type {?angular.IScope}
      */
     this.$root = this;
 
@@ -773,7 +723,7 @@ class Scope {
     let logIdx;
     let asyncTask;
 
-    this.beginPhase("$digest");
+    this.beginPhase(ScopePhase.DIGEST);
     // Check for changes to browser url that happened in sync before the call to $digest
     // TODO Implement browser
     $browser.$$checkUrlChange();
@@ -912,10 +862,10 @@ class Scope {
    * @param {ScopePhase} phase
    */
   beginPhase(phase) {
-    if (this.$root.$$phase) {
+    if (this.$root.$$phase !== ScopePhase.NONE) {
       throw $rootScopeMinErr(
         "inprog",
-        "{0} already in progress",
+        "digest already in progress",
         this.$root.$$phase,
       );
     }
@@ -1168,7 +1118,7 @@ class Scope {
     // if we are outside of an $digest loop and this is the first time we are scheduling async
     // task also schedule async auto-flush
     let id;
-    if (!this.$root.$$phase && !$$asyncQueue.length) {
+    if (this.$root.$$phase === ScopePhase.NONE && !$$asyncQueue.length) {
       id = $browser.defer(
         () => {
           if ($$asyncQueue.length) {
@@ -1239,7 +1189,7 @@ class Scope {
  */
   $apply(expr) {
     try {
-      this.beginPhase("$apply");
+      this.beginPhase(ScopePhase.APPLY);
       try {
         return this.$eval(expr);
       } finally {
@@ -1259,7 +1209,7 @@ class Scope {
   }
 
   clearPhase() {
-    this.$root.$$phase = null;
+    this.$root.$$phase = ScopePhase.NONE;
   }
 
   /**

package/src/directive/events.js

@@ -1,4 +1,5 @@
 import { directiveNormalize } from "../shared/utils";
+import { ScopePhase } from "../core/root-scope";
 
 /*
  * A collection of directives that allows creation of custom event handlers that are defined as
@@ -57,7 +58,7 @@ export function createEventDirective(
             fn(scope, { $event: event });
           };
 
-          if (!$rootScope.$$phase) {
+          if ($rootScope.$$phase === ScopePhase.NONE) {
             scope.$apply(callback);
           } else if (forceAsync) {
             scope.$evalAsync(callback);

package/src/directive/model.js

@@ -19,6 +19,8 @@ import {
 import { addSetValidityMethod, nullFormCtrl, setupValidity } from "./form";
 import { defaultModelOptions } from "./model-options";
 import { startingTag } from "../jqLite";
+import { ScopePhase } from "../core/root-scope";
+
 export const ngModelMinErr = minErr("ngModel");
 
 /**
@@ -839,7 +841,7 @@ NgModelController.prototype = {
       this.$$pendingDebounce = this.$$timeout(() => {
         that.$commitViewValue();
       }, debounceDelay);
-    } else if (this.$$rootScope.$$phase) {
+    } else if (this.$$rootScope.$$phase !== ScopePhase.NONE) {
       this.$commitViewValue();
     } else {
       this.$$scope.$apply(() => {
@@ -1343,7 +1345,7 @@ export const ngModelDirective = [
           element.on("blur", () => {
             if (modelCtrl.$touched) return;
 
-            if ($rootScope.$$phase) {
+            if ($rootScope.$$phase !== ScopePhase.NONE) {
               scope.$evalAsync(setTouched);
             } else {
               scope.$apply(setTouched);

package/src/router/directives/state-directives.js

@@ -251,10 +251,17 @@ function bindEvents(element, scope, hookFn, ngStateOpts) {
  * If you need to dynamically update the state being linked to, use the fully dynamic [[ngState]] directive.
  */
 export let ngSrefDirective = [
-  "$router",
+  "$state",
   "$timeout",
-  function $StateRefDirective($router, $timeout) {
-    const $state = $router.stateService;
+  "$stateRegistry",
+  "$transitions",
+  function $StateRefDirective(
+    $stateService,
+    $timeout,
+    $stateRegistry,
+    $transitions,
+  ) {
+    const $state = $stateService;
     return {
       restrict: "A",
       require: ["?^ngSrefActive", "?^ngSrefActiveEq"],
@@ -291,8 +298,8 @@ export let ngSrefDirective = [
           rawDef.ngStateParams = Object.assign({}, scope.$eval(ref.paramExpr));
         }
         update();
-        scope.$on("$destroy", $router.stateRegistry.onStatesChanged(update));
-        scope.$on("$destroy", $router.transitionService.onSuccess({}, update));
+        scope.$on("$destroy", $stateRegistry.onStatesChanged(update));
+        scope.$on("$destroy", $transitions.onSuccess({}, update));
         if (!type.clickable) return;
         const hookFn = clickHook(element, $state, $timeout, type, getDef);
         bindEvents(element, scope, hookFn, rawDef.ngStateOpts);
@@ -385,10 +392,16 @@ export let ngSrefDirective = [
  * ```
  */
 export let ngStateDirective = [
-  "$router",
+  "$state",
   "$timeout",
-  function $StateRefDynamicDirective($router, $timeout) {
-    const $state = $router.stateService;
+  "$stateRegistry",
+  "$transitions",
+  function $StateRefDynamicDirective(
+    $state,
+    $timeout,
+    $stateRegistry,
+    $transitions,
+  ) {
     return {
       restrict: "A",
       require: ["?^ngSrefActive", "?^ngSrefActiveEq"],
@@ -429,8 +442,8 @@ export let ngStateDirective = [
           });
         });
         update();
-        scope.$on("$destroy", $router.stateRegistry.onStatesChanged(update));
-        scope.$on("$destroy", $router.transitionService.onSuccess({}, update));
+        scope.$on("$destroy", $stateRegistry.onStatesChanged(update));
+        scope.$on("$destroy", $transitions.onSuccess({}, update));
         if (!type.clickable) return;
         hookFn = clickHook(element, $state, $timeout, type, getDef);
         bindEvents(element, scope, hookFn, rawDef.ngStateOpts);
@@ -532,14 +545,16 @@ export let ngStateDirective = [
  */
 export let ngSrefActiveDirective = [
   "$state",
-  "$stateParams",
+  "$routerGlobals",
   "$interpolate",
-  "$router",
+  "$stateRegistry",
+  "$transitions",
   function $StateRefActiveDirective(
     $state,
-    $stateParams,
+    $routerGlobals,
     $interpolate,
-    $router,
+    $stateRegistry,
+    $transitions,
   ) {
     return {
       restrict: "A",
@@ -583,13 +598,13 @@ export let ngSrefActiveDirective = [
             trans.promise.then(update, () => {});
           }
           $scope.$on("$destroy", setupEventListeners());
-          if ($router.globals.transition) {
-            updateAfterTransition($router.globals.transition);
+          if ($routerGlobals.transition) {
+            updateAfterTransition($routerGlobals.transition);
           }
           function setupEventListeners() {
             const deregisterStatesChangedListener =
-              $router.stateRegistry.onStatesChanged(handleStatesChanged);
-            const deregisterOnStartListener = $router.transitionService.onStart(
+              $stateRegistry.onStatesChanged(handleStatesChanged);
+            const deregisterOnStartListener = $transitions.onStart(
               {},
               updateAfterTransition,
             );

package/src/router/directives/view-directive.js

@@ -1,13 +1,12 @@
 import { filter, tail, unnestR } from "../../shared/common";
 import { isDefined, isFunction, isString } from "../../shared/utils";
 import { kebobString } from "../../shared/strings";
-
 import { parse } from "../../shared/hof";
 import { ResolveContext } from "../resolve/resolve-context";
 import { trace } from "../common/trace";
-import { getLocals } from "../services";
 import { Ng1ViewConfig } from "../state/views";
 import { jqLite } from "../../jqLite";
+import { getLocals } from "../state/state-registry";
 /**
  * `ui-view`: A viewport directive which is filled in by a view from the active state.
  *

package/src/router/globals.js

@@ -31,4 +31,6 @@ export class UIRouterGlobals {
      */
     this.successfulTransitions = new Queue([], 1);
   }
+
+  $get = [() => this];
 }

package/src/router/index.js

@@ -1,11 +1,4 @@
-import {
-  $routerProvider,
-  getProviderFor,
-  getStateProvider,
-  router,
-  runBlock,
-  watchDigests,
-} from "./services";
+import { runBlock, watchDigests } from "./services";
 import { TemplateFactory } from "./template-factory";
 import { trace } from "./common/trace";
 import { $ViewScrollProvider } from "./view-scroll";
@@ -16,27 +9,36 @@ import {
   ngSrefDirective,
 } from "./directives/state-directives";
 import { ngView, $ViewDirectiveFill } from "./directives/view-directive";
+import { UrlConfigProvider } from "./url/url-config";
+import { StateRegistry } from "./state/state-registry";
+import { ViewService } from "./view/view";
+import { UrlService } from "./url/url-service";
+import { StateService } from "./state/state-service";
+import { UIRouterGlobals } from "./globals";
+import { TransitionService } from "./transition/transition-service";
 
 export function initRouter() {
   window.angular
     .module("ng.router", ["ng"])
-    .provider("$router", $routerProvider)
-    .provider("$urlService", getProviderFor("urlService"))
-    .provider("$templateFactory", TemplateFactory)
-    .provider("$stateRegistry", getProviderFor("stateRegistry"))
-    .provider("$routerGlobals", getProviderFor("globals"))
-    .provider("$transitions", getProviderFor("transitionService"))
-    .provider("$state", ["$routerProvider", getStateProvider])
+    .provider("$urlConfig", UrlConfigProvider)
+    .provider("$routerGlobals", UIRouterGlobals)
+    .provider("$view", ViewService)
+    /** @type {TransitionService}  A service that exposes global Transition Hooks */
+    .provider("$transitions", TransitionService)
+    /** @type {StateService} Provides services related to states */
+    .provider("$state", StateService)
     .provider("$ngViewScroll", $ViewScrollProvider)
+    .provider("$templateFactory", TemplateFactory)
+    .provider("$urlService", UrlService)
+    /** Provides a registry for states, and related registration services */
+    .provider("$stateRegistry", StateRegistry)
     .factory("$stateParams", [
-      "$router",
-      function ($router) {
-        return $router.globals.params;
+      "$routerGlobals",
+      function (globals) {
+        return globals.params;
       },
     ])
-    .factory("$view", function () {
-      return router.viewService;
-    })
+
     .value("$trace", trace)
     .filter("isState", $IsStateFilter)
     .filter("includedByState", $IncludedByStateFilter)