@ibgib/space-gib 0.0.34 → 0.0.35

package/src/client/ui/router/space-gib-router-service.mts

@@ -1,175 +1,52 @@
 /**
  * @module client/ui/router/space-gib-router-service
  *
- * Singleton HTML5 History API router service for space-gib.
- * Manages URL updates (pushState/replaceState), browser back/forward (popstate),
- * internal link click interception, and route change notification.
+ * Singleton HTML5 History API Cosmos router service for space-gib.
+ * Extends the Tier 2 IbGibCosmosRouterServiceBase from @ibgib/web-gib.
  */
 
-import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { IbGibCosmosRouterServiceBase, safeDecode } from '@ibgib/web-gib/dist/ui/router/index.mjs';
 
 import {
     SpaceGibRouteInfo,
     RouterNavigateOptions,
     SpaceGibRouteListener,
+    AdminReviewRouteInfo,
 } from './space-gib-router-types.mjs';
-import {
-    parseSpaceGibRoute,
-    formatSpaceGibRoute,
-    isSameRoute,
-} from './space-gib-router-helpers.mjs';
-
-export class SpaceGibRouterService {
-    private lc: string = `[SpaceGibRouterService]`;
-    private currentRoute?: SpaceGibRouteInfo;
-    private listeners: SpaceGibRouteListener[] = [];
-    private isNavigating: boolean = false;
-
-    constructor() {
-        if (typeof window !== 'undefined') {
-            this.initBrowserListeners();
-        }
-    }
-
-    private initBrowserListeners(): void {
-        const lc = `${this.lc}[${this.initBrowserListeners.name}]`;
 
-        // 1. Popstate listener (browser back / forward buttons)
-        window.addEventListener('popstate', async () => {
-            try {
-                const newRoute = parseSpaceGibRoute(window.location.pathname);
-                if (isSameRoute(this.currentRoute, newRoute)) {
-                    return;
-                }
-                this.currentRoute = newRoute;
-                await this.notifyListeners(newRoute);
-            } catch (err) {
-                console.error(`${lc} Popstate routing error: ${extractErrorMsg(err)}`);
-            }
-        });
+export class SpaceGibRouterService extends IbGibCosmosRouterServiceBase<SpaceGibRouteInfo> {
+    protected override lc: string = `[SpaceGibRouterService]`;
 
-        // 2. Intercept internal anchor link clicks for seamless SPA navigation
-        document.addEventListener('click', (e: MouseEvent) => {
-            if (e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) {
-                return;
-            }
-
-            const target = e.target as HTMLElement | null;
-            const anchor = target?.closest('a') as HTMLAnchorElement | null;
-            if (!anchor) { return; }
-
-            const href = anchor.getAttribute('href');
-            if (!href || href.startsWith('#') || href.startsWith('javascript:') || href.startsWith('mailto:')) {
-                return;
-            }
-
-            // Exclude external links and target="_blank"
-            if (anchor.target && anchor.target !== '_self') { return; }
-            if (anchor.origin && anchor.origin !== window.location.origin) { return; }
-
-            // Exclude API and asset routes
-            if (href.startsWith('/api/') || href.startsWith('/assets/') || href.startsWith('/css/')) {
-                return;
-            }
-
-            // Intercept internal routing
-            e.preventDefault();
-            this.navigatePath(href);
-        });
-    }
+    protected override parseCustomRoute(pathname: string): SpaceGibRouteInfo | undefined {
+        let cleanPath = (pathname || '').trim();
+        const qIdx = cleanPath.indexOf('?');
+        if (qIdx !== -1) { cleanPath = cleanPath.substring(0, qIdx); }
+        const hIdx = cleanPath.indexOf('#');
+        if (hIdx !== -1) { cleanPath = cleanPath.substring(0, hIdx); }
 
-    /**
-     * Subscribes a listener to route change events.
-     * Returns an unsubscribe function.
-     */
-    public subscribe(listener: SpaceGibRouteListener): () => void {
-        this.listeners.push(listener);
-        return () => {
-            const idx = this.listeners.indexOf(listener);
-            if (idx !== -1) {
-                this.listeners.splice(idx, 1);
-            }
-        };
-    }
-
-    /**
-     * Returns the current active route info, if any.
-     */
-    public getCurrentRoute(): SpaceGibRouteInfo | undefined {
-        return this.currentRoute;
-    }
-
-    /**
-     * Navigates to a given SpaceGibRouteInfo.
-     */
-    public async navigate(route: SpaceGibRouteInfo, opts?: RouterNavigateOptions): Promise<void> {
-        const lc = `${this.lc}[${this.navigate.name}]`;
-        if (this.isNavigating) { return; }
-        this.isNavigating = true;
-
-        try {
-            const targetPath = formatSpaceGibRoute(route);
-
-            if (typeof window !== 'undefined') {
-                if (window.location.pathname !== targetPath) {
-                    if (opts?.replace) {
-                        window.history.replaceState(null, '', targetPath);
-                    } else {
-                        window.history.pushState(null, '', targetPath);
-                    }
-                }
-            }
-
-            const wasSame = isSameRoute(this.currentRoute, route);
-            this.currentRoute = route;
-
-            if (!opts?.silent && !wasSame) {
-                await this.notifyListeners(route);
-            }
-        } catch (err) {
-            console.error(`${lc} Navigation error: ${extractErrorMsg(err)}`);
-        } finally {
-            this.isNavigating = false;
+        if (cleanPath === '/admin/review') {
+            return { kind: 'admin-review' };
         }
+        if (cleanPath.startsWith('/admin/review/')) {
+            const tjpGib = safeDecode(cleanPath.slice('/admin/review/'.length)).trim();
+            return { kind: 'admin-review', ...(tjpGib ? { tjpGib } : {}) };
+        }
+        return undefined;
     }
 
-    /**
-     * Navigates to a raw pathname string by parsing it into a SpaceGibRouteInfo.
-     */
-    public async navigatePath(pathname: string, opts?: RouterNavigateOptions): Promise<void> {
-        const route = parseSpaceGibRoute(pathname);
-        await this.navigate(route, opts);
-    }
-
-    /**
-     * Reads current window.location.pathname, parses the route, updates internal state,
-     * and notifies all listeners. Call during application bootstrap after Shell is ready.
-     */
-    public async loadCurrentURL(): Promise<SpaceGibRouteInfo> {
-        const lc = `${this.lc}[${this.loadCurrentURL.name}]`;
-        try {
-            const pathname = typeof window !== 'undefined' ? window.location.pathname : '/';
-            const route = parseSpaceGibRoute(pathname);
-            this.currentRoute = route;
-            await this.notifyListeners(route);
-            return route;
-        } catch (err) {
-            console.error(`${lc} loadCurrentURL error: ${extractErrorMsg(err)}`);
-            const fallback: SpaceGibRouteInfo = { kind: 'polycosmos' };
-            this.currentRoute = fallback;
-            return fallback;
+    protected override formatCustomRoute(route: SpaceGibRouteInfo): string | undefined {
+        if (route.kind === 'admin-review') {
+            return `/admin/review${route.tjpGib ? `/${encodeURIComponent(route.tjpGib)}` : ''}`;
         }
+        return undefined;
     }
 
-    private async notifyListeners(route: SpaceGibRouteInfo): Promise<void> {
-        const lc = `${this.lc}[${this.notifyListeners.name}]`;
-        for (const listener of this.listeners) {
-            try {
-                await listener(route);
-            } catch (listenerErr) {
-                console.error(`${lc} Listener error: ${extractErrorMsg(listenerErr)}`);
-            }
+    protected override isSameCustomRoute(a?: SpaceGibRouteInfo, b?: SpaceGibRouteInfo): boolean | undefined {
+        if (a?.kind === 'admin-review' || b?.kind === 'admin-review') {
+            if (a?.kind !== b?.kind) { return false; }
+            return (a as AdminReviewRouteInfo).tjpGib === (b as AdminReviewRouteInfo).tjpGib;
         }
+        return undefined;
     }
 }
 

package/src/client/ui/router/space-gib-router-types.mts

@@ -1,73 +1,37 @@
 /**
  * @module client/ui/router/space-gib-router-types
  *
- * Types for the Phase 1.5 Space-Gib Client Router.
- * Supports dual routing mechanisms:
- * 1. Space-Qualified Raw Addr (Content-Addressed & Space-Scoped):
- *    - Snapshot / Immutable point-in-time: /:cosmos/:spaceId/addr/:ibGibAddr
- *    - Living Timeline Tip: /:cosmos/:spaceId/tjp/:tjpAddr
- * 2. Workspace / Galaxy Projections (Human-Readable & Timeline-Aware):
- *    - Polycosmos: / or /polycosmos or /@:siteUsername or /keystone/:keystoneTjp
- *    - Cosmos: /:cosmos or /@:siteUsername/:cosmos
- *    - Code Galaxy: /:cosmos/code/:galaxyId[/:branch[/*filePath]]
- *    - Notes Galaxy: /:cosmos/notes/:galaxyId[/:topicTjp]
- * 3. Special Routes:
- *    - Admin Review: /admin/review[/:tjpGib]
+ * Types for the Space-Gib Client Router.
+ * Re-exports universal Cosmos & Galaxy route types from @ibgib/web-gib,
+ * and adds space-gib specific routes (e.g. AdminReviewRouteInfo).
  */
 
-export type SpaceGibTenant =
-    | { type: 'username'; siteUsername: string }
-    | { type: 'keystone'; keystoneTjp: string };
-
-export interface SpaceGibRouteBase {
-    tenant?: SpaceGibTenant;
-}
-
-export interface PolycosmosRouteInfo extends SpaceGibRouteBase {
-    kind: 'polycosmos';
-}
-
-export interface CosmosRouteInfo extends SpaceGibRouteBase {
-    kind: 'cosmos';
-    cosmos: string;
-}
-
-export interface CodeGalaxyRouteInfo extends SpaceGibRouteBase {
-    kind: 'code-galaxy';
-    cosmos: string;
-    galaxyId: string;
-    branch?: string;
-    filePath?: string;
-}
-
-export interface NotesGalaxyRouteInfo extends SpaceGibRouteBase {
-    kind: 'notes-galaxy';
-    cosmos: string;
-    galaxyId: string;
-    trailMode?: 'tjp' | 'addr';
-    trail?: string[];
-    topicTjp?: string;
-    query?: {
-        inspect?: string;
-        lens?: string;
-        tag?: string;
-        [key: string]: string | undefined;
-    };
-}
-
-export interface RawAddrRouteInfo extends SpaceGibRouteBase {
-    kind: 'raw-addr';
-    cosmos: string;
-    spaceId: string;
-    ibGibAddr: string;
-}
-
-export interface RawTjpRouteInfo extends SpaceGibRouteBase {
-    kind: 'raw-tjp';
-    cosmos: string;
-    spaceId: string;
-    tjpAddr: string;
-}
+import {
+    CosmosRouteInfo as WebGibCosmosRouteInfo,
+    CosmosTenant,
+    PolycosmosRouteInfo,
+    CosmosOnlyRouteInfo,
+    CosmosGalaxyRouteInfo,
+    CosmosRawAddrRouteInfo,
+    CosmosRawTjpRouteInfo,
+    RouterNavigateOptions,
+    RouteListener,
+} from '@ibgib/web-gib/dist/ui/router/index.mjs';
+
+export {
+    RouterNavigateOptions,
+    RouteListener,
+    PolycosmosRouteInfo,
+    CosmosGalaxyRouteInfo,
+    CosmosRawAddrRouteInfo,
+    CosmosRawTjpRouteInfo,
+};
+
+export type SpaceGibTenant = CosmosTenant;
+export type CosmosRouteInfo = CosmosOnlyRouteInfo;
+export type GalaxyRouteInfo = CosmosGalaxyRouteInfo;
+export type RawAddrRouteInfo = CosmosRawAddrRouteInfo;
+export type RawTjpRouteInfo = CosmosRawTjpRouteInfo;
 
 export interface AdminReviewRouteInfo {
     kind: 'admin-review';
@@ -75,19 +39,11 @@ export interface AdminReviewRouteInfo {
 }
 
 export type SpaceGibRouteInfo =
-    | PolycosmosRouteInfo
     | CosmosRouteInfo
-    | CodeGalaxyRouteInfo
-    | NotesGalaxyRouteInfo
+    | GalaxyRouteInfo
+    | PolycosmosRouteInfo
     | RawAddrRouteInfo
     | RawTjpRouteInfo
     | AdminReviewRouteInfo;
 
-export interface RouterNavigateOptions {
-    /** If true, uses history.replaceState instead of pushState */
-    replace?: boolean;
-    /** If true, does not fire route change listeners */
-    silent?: boolean;
-}
-
-export type SpaceGibRouteListener = (route: SpaceGibRouteInfo) => Promise<void> | void;
+export type SpaceGibRouteListener = RouteListener<SpaceGibRouteInfo>;

package/src/client/ui/shell/cosmic-big-bang.mts

@@ -622,12 +622,18 @@ export class CosmicBigBangController {
         if (leftCosmos) { leftCosmos.style.display = 'none'; }
 
         if (space.type === 'code') {
-            if (leftCode) { leftCode.style.display = 'block'; }
+            if (leftCode) {
+                leftCode.style.display = 'flex';
+                leftCode.style.flexDirection = 'column';
+            }
             if (leftText) { leftText.style.display = 'none'; }
             const titleEl = document.getElementById('left-code-space-title');
             if (titleEl) { titleEl.textContent = space.name; }
         } else {
-            if (leftText) { leftText.style.display = 'block'; }
+            if (leftText) {
+                leftText.style.display = 'flex';
+                leftText.style.flexDirection = 'column';
+            }
             if (leftCode) { leftCode.style.display = 'none'; }
             const titleEl = document.getElementById('left-text-space-title');
             if (titleEl) { titleEl.textContent = space.name; }
@@ -673,7 +679,10 @@ export class CosmicBigBangController {
         const leftCode = document.getElementById('left-panel-code-view');
         const leftText = document.getElementById('left-panel-text-view');
 
-        if (leftCosmos) { leftCosmos.style.display = 'block'; }
+        if (leftCosmos) {
+            leftCosmos.style.display = 'flex';
+            leftCosmos.style.flexDirection = 'column';
+        }
         if (leftCode) { leftCode.style.display = 'none'; }
         if (leftText) { leftText.style.display = 'none'; }