Remove Url service rule customizers

Author: tolyo

@types/router/router.d.ts

@@ -16,15 +16,17 @@ export class RouterProvider {
   /**
    * @type {number}
    */
-  lastStartedTransitionId: number;
+  _lastStartedTransitionId: number;
   /**
    * @type {Queue<import("./transition/transition.js").Transition>}
    */
-  transitionHistory: Queue<import("./transition/transition.js").Transition>;
+  _transitionHistory: Queue<import("./transition/transition.js").Transition>;
   /**
    * @type {Queue<import("./transition/transition.js").Transition>}
    */
-  successfulTransitions: Queue<import("./transition/transition.js").Transition>;
+  _successfulTransitions: Queue<
+    import("./transition/transition.js").Transition
+  >;
   /**
    * @type {import("./state/interface.ts").StateDeclaration|undefined}
    */

@types/router/state/state-builder.d.ts

@@ -64,9 +64,9 @@ export class StateBuilder {
     matcher: import("./state-matcher.js").StateMatcher,
     urlService: ng.UrlService,
   );
-  matcher: import("./state-matcher.js").StateMatcher;
-  $injector: any;
-  builders: {
+  _matcher: import("./state-matcher.js").StateMatcher;
+  _$injector: any;
+  _builders: {
     name: ((state: any) => any)[];
     self: (typeof selfBuilder)[];
     parent: ((

@types/router/state/state-service.d.ts

@@ -34,8 +34,14 @@ export class StateProvider {
    * @deprecated This is a passthrough through to [[Router.$current]]
    */
   get $current(): import("./state-object.js").StateObject;
-  globals: import("../router.js").RouterProvider;
-  transitionService: import("../transition/transition-service.js").TransitionProvider;
+  /**
+   * @type {ng.RouterProvider}
+   */
+  globals: ng.RouterProvider;
+  /**
+   * @type {ng.TransitionProvider}
+   */
+  transitionService: ng.TransitionProvider;
   stateRegistry: any;
   /** @type {ng.UrlService} */
   urlService: ng.UrlService;

@types/router/url/url-rules.d.ts

@@ -15,88 +15,6 @@ export class UrlRules {
   _rules: any[];
   _id: number;
   _urlRuleFactory: UrlRuleFactory;
-  /**
-   * Defines the initial state, path, or behavior to use when the app starts.
-   *
-   * This rule defines the initial/starting state for the application.
-   *
-   * This rule is triggered the first time the URL is checked (when the app initially loads).
-   * The rule is triggered only when the url matches either `""` or `"/"`.
-   *
-   * Note: The rule is intended to be used when the root of the application is directly linked to.
-   * When the URL is *not* `""` or `"/"` and doesn't match other rules, the [[otherwise]] rule is triggered.
-   * This allows 404-like behavior when an unknown URL is deep-linked.
-   *
-   * #### Example:
-   * Start app at `home` state.
-   * ```js
-   * .initial({ state: 'home' });
-   * ```
-   *
-   * #### Example:
-   * Start app at `/home` (by url)
-   * ```js
-   * .initial('/home');
-   * ```
-   *
-   * #### Example:
-   * When no other url rule matches, go to `home` state
-   * ```js
-   * .initial((matchValue, url, router) => {
-   *   console.log('initial state');
-   *   return { state: 'home' };
-   * })
-   * ```
-   *
-   * @param handler The initial state or url path, or a function which returns the state or url path (or performs custom logic).
-   */
-  initial(handler: any): void;
-  /**
-   * Defines the state, url, or behavior to use when no other rule matches the URL.
-   *
-   * This rule is matched when *no other rule* matches.
-   * It is generally used to handle unknown URLs (similar to "404" behavior, but on the client side).
-   *
-   * - If `handler` a string, it is treated as a url redirect
-   *
-   * #### Example:
-   * When no other url rule matches, redirect to `/index`
-   * ```js
-   * .otherwise('/index');
-   * ```
-   *
-   * - If `handler` is an object with a `state` property, the state is activated.
-   *
-   * #### Example:
-   * When no other url rule matches, redirect to `home` and provide a `dashboard` parameter value.
-   * ```js
-   * .otherwise({ state: 'home', params: { dashboard: 'default' } });
-   * ```
-   *
-   * - If `handler` is a function, the function receives the current url ([[UrlParts]]) and the [[UIRouter]] object.
-   *   The function can perform actions, and/or return a value.
-   *
-   * #### Example:
-   * When no other url rule matches, manually trigger a transition to the `home` state
-   * ```js
-   * .otherwise((matchValue, urlParts, router) => {
-   *   router.stateService.go('home');
-   * });
-   * ```
-   *
-   * #### Example:
-   * When no other url rule matches, go to `home` state
-   * ```js
-   * .otherwise((matchValue, urlParts, router) => {
-   *   return { state: 'home' };
-   * });
-   * ```
-   *
-   * @param handler The url path to redirect to, or a function which returns the url path (or performs custom logic).
-   */
-  otherwise(handler: any): void;
-  _otherwiseFn: import("./url-rule.js").BaseUrlRule;
-  _sorted: boolean;
   /**
    * Remove a rule previously registered
    *
@@ -116,6 +34,7 @@ export class UrlRules {
    * @returns {() => void } a function that deregisters the rule
    */
   rule(rule: any): () => void;
+  _sorted: boolean;
   /**
    * Gets all registered rules
    *

src/router/hooks/update-globals.js

@@ -18,7 +18,7 @@ const updateGlobalState = (trans) => {
   const globals = trans._globals;
 
   const transitionSuccessful = () => {
-    globals.successfulTransitions.enqueue(trans);
+    globals._successfulTransitions.enqueue(trans);
     globals.$current = trans.$to();
     globals.current = globals.$current.self;
     copy(trans.params(), globals.params);

src/router/router-test.html

@@ -16,6 +16,7 @@
               requireBase: false,
               rewriteLinks: false,
             };
+            debugger;
             $stateProvider
               .state({
                 name: "home",

src/router/router.js

@@ -22,17 +22,17 @@ export class RouterProvider {
     /**
      * @type {number}
      */
-    this.lastStartedTransitionId = -1;
+    this._lastStartedTransitionId = -1;
 
     /**
      * @type {Queue<import("./transition/transition.js").Transition>}
      */
-    this.transitionHistory = new Queue([], 1);
+    this._transitionHistory = new Queue([], 1);
 
     /**
      * @type {Queue<import("./transition/transition.js").Transition>}
      */
-    this.successfulTransitions = new Queue([], 1);
+    this._successfulTransitions = new Queue([], 1);
 
     /**
      * @type {import("./state/interface.ts").StateDeclaration|undefined}

src/router/state/state-builder.js

@@ -302,8 +302,8 @@ export class StateBuilder {
    * @param {ng.UrlService} urlService
    */
   constructor(matcher, urlService) {
-    this.matcher = matcher;
-    this.$injector = undefined;
+    this._matcher = matcher;
+    this._$injector = undefined;
     const self = this;
 
     const root = () => matcher.find("");
@@ -313,7 +313,7 @@ export class StateBuilder {
 
       return matcher.find(self.parentName(state)) || root();
     }
-    this.builders = {
+    this._builders = {
       name: [(state) => state.name],
       self: [selfBuilder],
       parent: [parentBuilder],
@@ -336,7 +336,7 @@ export class StateBuilder {
   }
 
   builder(name, fn) {
-    const { builders } = this;
+    const { _builders: builders } = this;
 
     const array = builders[name] || [];
 
@@ -359,7 +359,7 @@ export class StateBuilder {
    * @returns the built State object
    */
   build(state) {
-    const { matcher, builders } = this;
+    const { _matcher: matcher, _builders: builders } = this;
 
     const parent = this.parentName(state);
 

src/router/state/state-matcher.js

@@ -30,10 +30,8 @@ export class StateMatcher {
     } else if (isStr && matchGlob) {
       const states = Object.values(this._states);
 
-      const matches = states.filter(
-        (stateObj) =>
-          stateObj._stateObjectCache.nameGlob &&
-          stateObj._stateObjectCache.nameGlob.matches(name),
+      const matches = states.filter((stateObj) =>
+        stateObj._stateObjectCache.nameGlob?.matches(name),
       );
 
       if (matches.length > 1) {

src/router/state/state-registry.js

@@ -70,7 +70,7 @@ export class StateRegistryProvider {
      */
     ($injector) => {
       this.$injector = $injector;
-      this.builder.$injector = $injector;
+      this.builder._$injector = $injector;
 
       return this;
     },