@hanzo/rooms 0.1.34 → 0.1.35

package/README.md

@@ -11,13 +11,13 @@ import { CalScheduler } from '@hanzo/rooms/CalScheduler'
 
 configure({ site: '', home: '/home', signUp: '/signup' })
 
-<Rooms router={router} search={search} route={route} Link={Link}>
+<Rooms router={router} search={search} path={pathname} route={route} Link={Link}>
   <Room mode="cal"><CalScheduler /></Room>
 </Rooms>
 ```
 
 `configure()` names the host's addresses (where its own pages live, the
 gateway and IAM, the plan catalogue to paint first). `<Rooms>` carries what
-moves: the router, the query, the route and the link component. The rooms
+moves: the router, the query, the path, the route and the link component. The rooms
 import nothing from a host, and their look comes from `@hanzo/appearance` and
 `@hanzo/design` through `@hanzo/ui`.

package/dist/dev.js

@@ -7,12 +7,12 @@
 // to leave. The name drawn at the top left is Hanzo Dev: this host is the
 // dev agent. Chat, on the rooms shell, is Hanzo AI.
 //
-// THE ADDRESS IS THE QUERY. The app is `/` (app/page.tsx), and what it shows
-// rides `?at=` in the builder's own grammar (lib/host.ts `AT`), so a run, a
+// THE ADDRESS IS THE PATH. Dev is `/dev`, and what it shows is the path under
+// it in the builder's own grammar (lib/host.ts `app`, `under`), so a run, a
 // screen, a Settings section, a Customize tab, the plans and a project all
 // survive a reload, and Back steps through them. A move is a native history
-// entry, which the Next router folds into `useSearchParams`, so reading the
-// address and moving it are one query.
+// entry, which the Next router folds into `usePathname`, so reading the address
+// and moving it are one path.
 import { useMemo } from 'react';
 import { useLook, useRooms } from './host.js';
 import { useIam } from '@hanzo/iam/react';
@@ -21,7 +21,7 @@ import { administers, path, route } from '@hanzo/build';
 import { bearer, named, org, orgs, pick } from './lib/session.js';
 import { enter } from './lib/destination.js';
 import { api } from './lib/api.js';
-import { app, AT } from './lib/host.js';
+import { app, under } from './lib/host.js';
 import { link } from './lib/tags.js';
 /** Where the builder links out: every one of them an address of this site. */
 const LINKS = {
@@ -32,14 +32,14 @@ const LINKS = {
 };
 /** The person's theme, when they have chosen one the builder can name. */
 const theme = (t) => (t === 'light' || t === 'dark' || t === 'system' ? t : undefined);
-/** The app address a query value names, canonical; '' for anything that is not one. */
+/** The app address a builder path names, canonical; '' for anything that is not one. */
 const canonical = (at) => path(route(at ?? ''));
 /** The host for a signed-in reader. */
 export function useDevHost() {
     const { user, accessToken } = useIam();
     const logout = useSignOut();
-    const { router, search } = useRooms();
-    const here = canonical(search?.get(AT) ?? null);
+    const { router, path: pathname } = useRooms();
+    const here = canonical(under(pathname));
     const look = useLook();
     // The token's claims change only when the token does: a sign-in, a refresh.
     const memberships = useMemo(() => orgs(), [accessToken]); // eslint-disable-line react-hooks/exhaustive-deps
@@ -70,7 +70,7 @@ export function useDevHost() {
         path: here,
         go: (to, how) => {
             const next = app(canonical(to));
-            if (`${window.location.pathname}${window.location.search}` === next)
+            if (window.location.pathname === next && !window.location.search)
                 return;
             if (how?.replace)
                 window.history.replaceState(null, '', next);

package/dist/host.d.ts

@@ -7,7 +7,7 @@
  *
  *   configure({ site: 'https://hanzo.ai', home: '/', signUp: '/start' })
  *
- *   <Rooms router={useRouter()} search={useSearchParams()} route={route} Link={Link}>
+ *   <Rooms router={useRouter()} search={useSearchParams()} path={usePathname()} route={route} Link={Link}>
  *     <Room mode="cal" />
  *   </Rooms>
  *
@@ -17,7 +17,7 @@
  * any component and on pages the rooms never draw. So the host states them once
  * with `configure()`, in a module its root imports, before anything renders.
  *
- * The ROUTER, the query and the route change as the page moves, so they ride
+ * The ROUTER, the query, the path and the route change as the page moves, so they ride
  * React context, and a room reads them with `useRooms()`.
  */
 import { type AnchorHTMLAttributes, type ComponentType, type ReactNode } from 'react';
@@ -34,14 +34,18 @@ export interface Router {
 }
 interface Moving {
     router: Router;
-    /** The address's query, for the rooms that read one (Dev's `?at=`). */
+    /** The address's query, for the rooms that read one (Chat's `?chat=`). */
     search: URLSearchParams | null;
+    /** The address's path, for the rooms that read one (Dev's, under `/dev`). */
+    path: string | null;
     route: string;
     Link: Link;
 }
-export interface RoomsProps extends Omit<Moving, 'search'> {
+export interface RoomsProps extends Omit<Moving, 'search' | 'path'> {
     /** Absent where no mounted room reads the query, so a static export needs no Suspense for it. */
     search?: URLSearchParams | null;
+    /** Absent where no mounted room reads the path. */
+    path?: string | null;
     children?: ReactNode;
 }
 /** The router, the query, the route and the link the host mounted the rooms with. */
@@ -72,5 +76,5 @@ export declare function useLook(): {
  * keeps their choice in step with IAM.
  */
 export declare function Look(): any;
-export declare function Rooms({ router, search, route, Link, children }: RoomsProps): import("react").JSX.Element;
+export declare function Rooms({ router, search, path, route, Link, children }: RoomsProps): import("react").JSX.Element;
 export {};

package/dist/host.js

@@ -9,7 +9,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *
  *   configure({ site: 'https://hanzo.ai', home: '/', signUp: '/start' })
  *
- *   <Rooms router={useRouter()} search={useSearchParams()} route={route} Link={Link}>
+ *   <Rooms router={useRouter()} search={useSearchParams()} path={usePathname()} route={route} Link={Link}>
  *     <Room mode="cal" />
  *   </Rooms>
  *
@@ -19,7 +19,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * any component and on pages the rooms never draw. So the host states them once
  * with `configure()`, in a module its root imports, before anything renders.
  *
- * The ROUTER, the query and the route change as the page moves, so they ride
+ * The ROUTER, the query, the path and the route change as the page moves, so they ride
  * React context, and a room reads them with `useRooms()`.
  */
 import { createContext, useContext } from 'react';
@@ -35,6 +35,7 @@ const Context = createContext({
         forward: () => window.history.forward(),
     },
     search: null,
+    path: null,
     route: '/',
     Link: Plain,
 });
@@ -71,6 +72,6 @@ export function Look() {
     useLook();
     return null;
 }
-export function Rooms({ router, search = null, route, Link, children }) {
-    return _jsx(Context.Provider, { value: { router, search, route, Link }, children: children });
+export function Rooms({ router, search = null, path = null, route, Link, children }) {
+    return _jsx(Context.Provider, { value: { router, search, path, route, Link }, children: children });
 }

package/dist/lib/host.d.ts

@@ -30,30 +30,35 @@ export declare const ENTRY = "https://hanzo.team/?signin";
  */
 export declare const START = "https://hanzo.team/start";
 /**
- * The web app, at `/` for a signed-in reader, in two modes. Chat is the default.
- * Dev is @hanzo/build's `<Builder>`, and what it shows rides ONE query, `?at=`,
- * in the builder's own grammar (`route` in @hanzo/build): '' New, `sess_<id>` a
- * run, `-/<screen>`, `-/settings[/<section>]`, `-/customize[/<tab>]`,
- * `-/plans`, `<slug>` a project. A query and not a path, because a static
- * export has no server to answer a path under `/`.
+ * The web app, for a signed-in reader, in two modes. Chat is the default, at
+ * `/`. Dev is @hanzo/build's `<Builder>` at `/dev`, and what it shows is the
+ * PATH under it, in the builder's own grammar (`route` in @hanzo/build): `/dev`
+ * New, `/dev/sess_<id>` a run, `/dev/<org>/<repo>` a project,
+ * `/dev/-/<screen>`, `/dev/-/settings[/<section>]`, `/dev/-/customize[/<tab>]`,
+ * `/dev/<slug>` a deployed site. The export holds one page for all of them,
+ * `/dev`, and the edge serves it for every path under it (hanzo.ai's
+ * lib/edge.ts `APP`).
  */
-export declare const AT = "at";
-/** `/` in Dev at an app address; '' is Dev's New, `/?at=`. The key is the mode. */
+export declare const DEV = "/dev";
+/** Dev at an app address; '' is Dev's New, `/dev` itself. */
 export declare const app: (path: string) => string;
+/** The app address a pathname names under `/dev`, or null for a pathname that is not Dev's. */
+export declare const under: (pathname: string | null | undefined) => string | null;
 /**
  * Chat, the app's default mode: `/` is a new conversation and `?chat=<id>` one
- * of the reader's. So the address says which mode the app is in — `at` for Dev,
- * anything else Chat — and a reload keeps it.
+ * of the reader's. So the address says which mode the app is in — a path under
+ * `/dev` for Dev, anything else Chat — and a reload keeps it.
  */
 export declare const TALK = "chat";
 /** `/` in Chat, on a conversation, or `/` itself for a new one. */
 export declare const talk: (id?: string | null) => string;
 /**
- * The door opened on one run or project: `?run=` or `?project=`, the query the
- * door turns into `?at=` — and the one the console and shared links already
- * carry. Only a value that is exactly a session id or a project slug is
- * carried; anything else opens /dev itself, so no caller can make this name
- * another address.
+ * Dev opened on one run, project or site, from anywhere: every "Try Hanzo Dev"
+ * link, a room's Dev, the console's "open in the builder". It signs a stranger
+ * in on the way (app/(app)/dev/_door.tsx), and is reached through `site()`:
+ * here on hanzo.ai, across to hanzo.ai from hanzo.team. Only a value that is
+ * exactly a session id, a repository or a site's slug is carried; anything else
+ * opens /dev itself, so no caller can make this name another address.
  */
 export declare const dev: (ref?: string | null) => string;
 /**

package/dist/lib/host.js

@@ -32,44 +32,59 @@ export const ENTRY = `${WORKSPACE}/?signin`;
  */
 export const START = `${WORKSPACE}/start`;
 /**
- * The web app, at `/` for a signed-in reader, in two modes. Chat is the default.
- * Dev is @hanzo/build's `<Builder>`, and what it shows rides ONE query, `?at=`,
- * in the builder's own grammar (`route` in @hanzo/build): '' New, `sess_<id>` a
- * run, `-/<screen>`, `-/settings[/<section>]`, `-/customize[/<tab>]`,
- * `-/plans`, `<slug>` a project. A query and not a path, because a static
- * export has no server to answer a path under `/`.
+ * The web app, for a signed-in reader, in two modes. Chat is the default, at
+ * `/`. Dev is @hanzo/build's `<Builder>` at `/dev`, and what it shows is the
+ * PATH under it, in the builder's own grammar (`route` in @hanzo/build): `/dev`
+ * New, `/dev/sess_<id>` a run, `/dev/<org>/<repo>` a project,
+ * `/dev/-/<screen>`, `/dev/-/settings[/<section>]`, `/dev/-/customize[/<tab>]`,
+ * `/dev/<slug>` a deployed site. The export holds one page for all of them,
+ * `/dev`, and the edge serves it for every path under it (hanzo.ai's
+ * lib/edge.ts `APP`).
  */
-export const AT = 'at';
-/** `/` in Dev at an app address; '' is Dev's New, `/?at=`. The key is the mode. */
-export const app = (path) => `/?${AT}=${path}`;
+export const DEV = '/dev';
+/** Dev at an app address; '' is Dev's New, `/dev` itself. */
+export const app = (path) => {
+    const p = path.replace(/^\/+|\/+$/g, '');
+    return p ? `${DEV}/${p}` : DEV;
+};
+/** The app address a pathname names under `/dev`, or null for a pathname that is not Dev's. */
+export const under = (pathname) => {
+    if (!pathname)
+        return null;
+    if (pathname === DEV || pathname === `${DEV}/`)
+        return '';
+    if (!pathname.startsWith(`${DEV}/`))
+        return null;
+    try {
+        return decodeURIComponent(pathname.slice(DEV.length + 1));
+    }
+    catch {
+        return '';
+    }
+};
 /**
  * Chat, the app's default mode: `/` is a new conversation and `?chat=<id>` one
- * of the reader's. So the address says which mode the app is in — `at` for Dev,
- * anything else Chat — and a reload keeps it.
+ * of the reader's. So the address says which mode the app is in — a path under
+ * `/dev` for Dev, anything else Chat — and a reload keeps it.
  */
 export const TALK = 'chat';
 /** `/` in Chat, on a conversation, or `/` itself for a new one. */
 export const talk = (id) => (id ? `/?${TALK}=${encodeURIComponent(id)}` : '/');
-/**
- * The door into the app: every "Try Hanzo Dev" link, the rail's Dev, the
- * console's "open in the builder", dev.hanzo.ai. It signs a stranger in and
- * forwards a member to Dev in the app, `/?at=` (app/(app)/dev/_door.tsx). It is
- * the app's page, so it is reached through `site()`: here on hanzo.ai, across
- * to hanzo.ai from hanzo.team.
- */
-const DEV = '/dev';
 /** A run, as the platform mints its id. */
 const SESSION = /^sess_[0-9a-f]{32}$/;
-/** A project, as the Sites plane slugs it. */
+/** A deployed site, as the Sites plane slugs it. */
 const SLUG = /^[a-z0-9](?:[a-z0-9-]{0,38}[a-z0-9])?$/;
+/** A repository on the forge, `<org>/<name>`. */
+const REPO = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}\/[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
 /**
- * The door opened on one run or project: `?run=` or `?project=`, the query the
- * door turns into `?at=` — and the one the console and shared links already
- * carry. Only a value that is exactly a session id or a project slug is
- * carried; anything else opens /dev itself, so no caller can make this name
- * another address.
+ * Dev opened on one run, project or site, from anywhere: every "Try Hanzo Dev"
+ * link, a room's Dev, the console's "open in the builder". It signs a stranger
+ * in on the way (app/(app)/dev/_door.tsx), and is reached through `site()`:
+ * here on hanzo.ai, across to hanzo.ai from hanzo.team. Only a value that is
+ * exactly a session id, a repository or a site's slug is carried; anything else
+ * opens /dev itself, so no caller can make this name another address.
  */
-export const dev = (ref) => site(!ref ? DEV : SESSION.test(ref) ? `${DEV}?run=${ref}` : SLUG.test(ref) ? `${DEV}?project=${ref}` : DEV);
+export const dev = (ref) => site(ref && (SESSION.test(ref) || REPO.test(ref) || SLUG.test(ref)) ? app(ref) : DEV);
 /** The routes under app/(app) the apex keeps: the app — /chat, a chat shared by link, and /dev. */
 const KEPT = new Set(['/chat', '/chat/shared', '/dev']);
 /** Settings, and every page under it: the person's and the organization's, served wherever the app is. */

package/dist/lib/session.js

@@ -14,7 +14,7 @@
  * who was signed in, which reads as a permissions problem rather than a typo.
  * Two derivations of one name never agree; this is the one derivation.
  */
-import { AT, TALK } from './host.js';
+import { TALK } from './host.js';
 import { api } from './api.js';
 /** The SDK's own keys, `hanzo_iam_`-prefixed. The far side of a boundary. */
 const PREFIX = 'hanzo_iam_';
@@ -59,12 +59,13 @@ export function live() {
 /** The attribute on `<html>` that says `/` is showing the app, not the landing. */
 export const APP = 'data-app';
 /**
- * An address on `/` that names a place in the app — `?at=` in Dev, `?chat` in
- * Chat (lib/host.ts `AT`, `TALK`). The app is signed-in only, so a reader
- * nobody has signed in is sent to hanzo.id with it rather than shown the
- * landing, and it comes back with them.
+ * An address on `/` that names a place in the app — `?chat` in Chat
+ * (lib/host.ts `TALK`; Dev's places are paths under `/dev`, whose own page
+ * signs a stranger in). The app is signed-in only, so a reader nobody has
+ * signed in is sent to hanzo.id with it rather than shown the landing, and it
+ * comes back with them.
  */
-const PLACE = new RegExp(`[?&](?:${AT}|${TALK})(?:[=&]|$)`);
+const PLACE = new RegExp(`[?&]${TALK}(?:[=&]|$)`);
 /** Whether `search` names a place in the app. */
 export const place = (search) => PLACE.test(search);
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/rooms",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "The workspace rooms — Home, Chat, Inbox, Contacts, Meet, Cal, Drive, Board, Work, Bots — and the frame that holds them, once, for every Hanzo surface.",
   "type": "module",
   "main": "./dist/index.js",