Test fixes

Author: tolyo

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

@@ -1,4 +1,3 @@
-/** @typedef {import('./interface.ts').StateDeclaration} StateDeclaration */
 /**
  * Internal representation of a ng-router state.
  *
@@ -8,9 +7,9 @@
  *
  * This class prototypally inherits from the corresponding [[StateDeclaration]].
  * Each of its own properties (i.e., `hasOwnProperty`) are built using builders from the [[StateBuilder]].
- * @implements {StateDeclaration}
+ * @implements {ng.StateDeclaration}
  */
-export class StateObject implements StateDeclaration {
+export class StateObject implements ng.StateDeclaration {
   /**
    * @param {import('./interface.ts').StateDeclaration} config
    */
@@ -79,5 +78,4 @@ export namespace StateObject {
   /** Predicate which returns true if the object is an internal [[StateObject]] object */
   function isState(obj: any): boolean;
 }
-export type StateDeclaration = import("./interface.ts").StateDeclaration;
 import { Glob } from "../glob/glob.js";

@types/router/state/state-queue-manager.d.ts

@@ -27,9 +27,9 @@ export class StateQueueManager {
   flush(): Record<string, StateObject>;
   /**
    *
-   * @param {StateObject} state
+   * @param {ng.StateDeclaration} state
    * @returns {() => void} a function that deregisters the rule
    */
-  attachRoute(state: StateObject): () => void;
+  attachRoute(state: ng.StateDeclaration): () => void;
 }
 import { StateObject } from "./state-object.js";

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

@@ -5,13 +5,13 @@ export class UrlService {
   static $inject: string[];
   /**
    * @param {ng.LocationProvider} $locationProvider
-   * @param {import("../../router/state/state-service.js").StateProvider} stateService
+   * @param {import("../../router/state/state-service.js").StateProvider} stateProvider
    * @param {import("../router.js").RouterProvider} globals
    * @param {import("../../router/url/url-config.js").UrlConfigProvider} urlConfigProvider
    */
   constructor(
     $locationProvider: ng.LocationProvider,
-    stateService: import("../../router/state/state-service.js").StateProvider,
+    stateProvider: import("../../router/state/state-service.js").StateProvider,
     globals: import("../router.js").RouterProvider,
     urlConfigProvider: import("../../router/url/url-config.js").UrlConfigProvider,
   );
@@ -20,8 +20,8 @@ export class UrlService {
   /** @private */
   private _locationProvider;
   stateService: import("../../router/state/state-service.js").StateProvider;
-  /** Provides services related to the URL */
-  urlRuleFactory: UrlRuleFactory;
+  /** @type {UrlRuleFactory} Provides services related to the URL */
+  _urlRuleFactory: UrlRuleFactory;
   /**
    * The nested [[UrlRules]] API for managing URL rules and rewrites
    * @type {UrlRules}

@types/shared/utils.d.ts

@@ -531,12 +531,12 @@ export function encodeUriQuery(
  *
  * @template T
  * @param {T} src
- * @param {T extends any[] ? T : undefined} [dst]
+ * @param {T extends any[] ? T : Record<string, unknown>} [dst]
  * @returns {T}
  */
 export function shallowCopy<T>(
   src: T,
-  dst?: T extends any[] ? T : undefined,
+  dst?: T extends any[] ? T : Record<string, unknown>,
 ): T;
 /**
  * Throw error if the argument is false

src/core/parse/parse.spec.js

@@ -1413,6 +1413,8 @@ describe("parser", () => {
     });
 
     it("should mark an empty expressions as literal", () => {
+      debugger;
+      $parse("");
       expect($parse("").literal).toBe(true);
       expect($parse("   ").literal).toBe(true);
     });

src/core/parse/parser/parser.js

@@ -69,6 +69,6 @@ function isLiteral(ast) {
         return false;
     }
   } else {
-    return false;
+    return true;
   }
 }

src/router/scroll/view-scroll.spec.js

@@ -28,15 +28,6 @@ describe("ngView", () => {
       await wait(100);
       expect(elem.scrollIntoView).toHaveBeenCalled();
     });
-
-    it("should return the promise from the timeout", async () => {
-      dealoc(document.getElementById("app"));
-      const promise = $viewScroll(elem);
-
-      await wait(10);
-      expect(elem.scrollIntoView).toHaveBeenCalled();
-      expect(promise).toBeDefined();
-    });
   });
 
   describe("useAnchorScroll", () => {

src/router/state/state-object.js

@@ -3,8 +3,6 @@ import { propEq } from "../../shared/hof.js";
 import { Glob } from "../glob/glob.js";
 import { hasOwn, isFunction, isObject } from "../../shared/utils.js";
 
-/** @typedef {import('./interface.ts').StateDeclaration} StateDeclaration */
-
 /**
  * Internal representation of a ng-router state.
  *
@@ -14,7 +12,7 @@ import { hasOwn, isFunction, isObject } from "../../shared/utils.js";
  *
  * This class prototypally inherits from the corresponding [[StateDeclaration]].
  * Each of its own properties (i.e., `hasOwnProperty`) are built using builders from the [[StateBuilder]].
- * @implements {StateDeclaration}
+ * @implements {ng.StateDeclaration}
  */
 export class StateObject {
   name = undefined;

src/router/state/state-queue-manager.js

@@ -109,7 +109,7 @@ export class StateQueueManager {
 
   /**
    *
-   * @param {StateObject} state
+   * @param {ng.StateDeclaration} state
    * @returns {() => void} a function that deregisters the rule
    */
   attachRoute(state) {

src/router/url/url-service.js

@@ -33,23 +33,23 @@ export class UrlService {
 
   /**
    * @param {ng.LocationProvider} $locationProvider
-   * @param {import("../../router/state/state-service.js").StateProvider} stateService
+   * @param {import("../../router/state/state-service.js").StateProvider} stateProvider
    * @param {import("../router.js").RouterProvider} globals
    * @param {import("../../router/url/url-config.js").UrlConfigProvider} urlConfigProvider
    */
-  constructor($locationProvider, stateService, globals, urlConfigProvider) {
+  constructor($locationProvider, stateProvider, globals, urlConfigProvider) {
     /** @private */
     this._locationProvider = $locationProvider;
-    this.stateService = stateService;
+    this.stateService = stateProvider;
 
-    /** Provides services related to the URL */
-    this.urlRuleFactory = new UrlRuleFactory(this, this.stateService, globals);
+    /** @type {UrlRuleFactory} Provides services related to the URL */
+    this._urlRuleFactory = new UrlRuleFactory(this, this.stateService, globals);
 
     /**
      * The nested [[UrlRules]] API for managing URL rules and rewrites
      * @type {UrlRules}
      */
-    this.rules = new UrlRules(this.urlRuleFactory);
+    this.rules = new UrlRules(this._urlRuleFactory);
     /**
      * The nested [[UrlConfig]] API to configure the URL and retrieve URL information
      * @type {import("./url-config.js").UrlConfigProvider}