core-api/routing: make RouteRefs immutable + move out some types

packages/core-api/src/routing/RouteRef.ts

@@ -14,30 +14,25 @@
  * limitations under the License.
  */
 
-import type { RouteRefConfig, RouteRefOverrideConfig } from './types';
-
-export class MutableRouteRef {
-  private effectiveConfig: RouteRefConfig = this.config;
+import type { RouteRefConfig } from './types';
 
+export class AbsoluteRouteRef {
   constructor(private readonly config: RouteRefConfig) {}
 
-  override(overrideConfig: RouteRefOverrideConfig) {
-    this.effectiveConfig = { ...this.config, ...overrideConfig };
-  }
-
   get icon() {
-    return this.effectiveConfig.icon;
+    return this.config.icon;
   }
 
+  // TODO(Rugvip): Remove this, routes are looked up via the registry instead
   get path() {
-    return this.effectiveConfig.path;
+    return this.config.path;
   }
 
   get title() {
-    return this.effectiveConfig.title;
+    return this.config.title;
   }
 }
 
-export function createRouteRef(config: RouteRefConfig): MutableRouteRef {
-  return new MutableRouteRef(config);
+export function createRouteRef(config: RouteRefConfig): AbsoluteRouteRef {
+  return new AbsoluteRouteRef(config);
 }

packages/core-api/src/routing/RouteRefRegistry.test.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { RouteRefRegistry, resolveRoute } from './RouteRefRegistry';
+import { RouteRefRegistry } from './RouteRefRegistry';
+import { resolveRoute } from './types';
 
 const ref1 = { [resolveRoute]: (path: string) => path };
 const ref11 = { [resolveRoute]: (path: string) => path };

packages/core-api/src/routing/RouteRefRegistry.ts

@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-export const resolveRoute = Symbol('resolve-route');
-
-type ConcreteRoute = {
-  [resolveRoute](path: string): string;
-};
+import { ConcreteRoute, resolveRoute } from './types';
 
 const rootRoute: ConcreteRoute = {
   [resolveRoute]: () => '',

packages/core-api/src/routing/index.ts

@@ -14,6 +14,5 @@
  * limitations under the License.
  */
 
-export * from './types';
+export type { RouteRef, RouteRefConfig, ConcreteRoute } from './types';
 export { createRouteRef } from './RouteRef';
-export type { MutableRouteRef } from './RouteRef';

packages/core-api/src/routing/types.ts

@@ -16,7 +16,14 @@
 
 import { IconComponent } from '../icons';
 
+export const resolveRoute = Symbol('resolve-route');
+
+export type ConcreteRoute = {
+  [resolveRoute](path: string): string;
+};
+
 export type RouteRef = {
+  // TODO(Rugvip): Remove path, look up via registry instead
   path: string;
   icon?: IconComponent;
   title: string;
@@ -27,9 +34,3 @@ export type RouteRefConfig = {
   icon?: IconComponent;
   title: string;
 };
-
-export type RouteRefOverrideConfig = {
-  path?: string;
-  icon?: IconComponent;
-  title?: string;
-};