@shophost/react 2.0.28 → 2.0.30

package/config.d.ts

@@ -0,0 +1,6 @@
+export type { AdminConfig, ResolvedAdminConfig } from './types';
+/**
+ * Define and validate an AdminConfig object. Applies default basePath of "/admin".
+ * Use this in your host app's config file.
+ */
+export declare function defineConfig(config: import('./types').AdminConfig): import('./types').ResolvedAdminConfig;

package/contexts/route-params-context.d.ts

@@ -0,0 +1,16 @@
+import { default as React } from 'react';
+interface RouteParams {
+    organizationId?: string;
+    id?: string;
+}
+export declare function RouteParamsProvider({ children, organizationId, id, }: {
+    children: React.ReactNode;
+    organizationId?: string;
+    id?: string;
+}): import("react/jsx-runtime").JSX.Element;
+export declare function useRouteParams(): RouteParams;
+/** Returns the current organizationId. Only call this from org-scoped routes. */
+export declare function useOrgId(): string;
+/** Returns the current route entity id. Only call this from edit/detail routes. */
+export declare function useRouteId(): string;
+export {};

package/index.d.ts

@@ -1,7 +1,7 @@
 export { defineConfig } from './config';
 export type { AdminConfig, ResolvedAdminConfig } from './types';
-export { AdminProvider } from './providers/admin-provider';
-export { createAdminAuthClient, getAdminAuthClient } from './lib/auth';
-export type { AdminAuthClient } from './lib/auth';
-export { createRoutes } from './router/routes';
-export type { AdminRoutes } from './router/routes';
+export { AdminProvider } from './admin/providers/admin-provider';
+export { createAdminAuthClient, getAdminAuthClient } from './admin/lib/auth';
+export type { AdminAuthClient } from './admin/lib/auth';
+export { createRoutes } from './admin/router/routes';
+export type { AdminRoutes } from './admin/router/routes';

package/index.mjs

@@ -1,4 +1,4 @@
-import { A as a, c as r, b as o, g as d } from "./admin-client.js";
+import { A as i, c as r, a as o, g as d } from "./admin-client.js";
 function t(e) {
   return {
     basePath: "/admin",
@@ -6,7 +6,7 @@ function t(e) {
   };
 }
 export {
-  a as AdminProvider,
+  i as AdminProvider,
   r as createAdminAuthClient,
   o as createRoutes,
   t as defineConfig,

package/index.react-server.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function i(s){return{basePath:"/admin",...s}}function n(s){const t=s.replace(/\/$/,"");return{home:t,signIn:`${t}/auth/sign-in`,signUp:`${t}/auth/sign-up`,organizations:`${t}/organizations`,dashboard:e=>`${t}/${e}/dashboard`,liveOrders:e=>`${t}/${e}/live-orders`,orders:e=>`${t}/${e}/orders`,reservations:e=>`${t}/${e}/reservations`,products:e=>`${t}/${e}/products`,productCreate:e=>`${t}/${e}/products/create`,productEdit:(e,r)=>`${t}/${e}/products/${r}`,productCategories:e=>`${t}/${e}/product-categories`,productCategoryCreate:e=>`${t}/${e}/product-categories/create`,productCategoryEdit:(e,r)=>`${t}/${e}/product-categories/${r}`,manufacturers:e=>`${t}/${e}/manufacturers`,manufacturerCreate:e=>`${t}/${e}/manufacturers/create`,manufacturerEdit:(e,r)=>`${t}/${e}/manufacturers/${r}`,settings:e=>`${t}/${e}/settings`,settingsOpeningTimes:e=>`${t}/${e}/settings/opening-times`,settingsShippingMethods:e=>`${t}/${e}/settings/shipping-methods`,settingsShippingMethodCreate:e=>`${t}/${e}/settings/shipping-methods/create`,settingsShippingMethodEdit:(e,r)=>`${t}/${e}/settings/shipping-methods/${r}`}}exports.createRoutes=n;exports.defineConfig=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function r(i){return{basePath:"/admin",...i}}function n(i){const t=i.replace(/\/$/,"");return{home:t,signIn:`${t}/auth/sign-in`,signUp:`${t}/auth/sign-up`,organizations:`${t}/organizations`,dashboard:e=>`${t}/${e}/dashboard`,liveOrders:e=>`${t}/${e}/live-orders`,orders:e=>`${t}/${e}/orders`,reservations:e=>`${t}/${e}/reservations`,products:e=>`${t}/${e}/products`,productCreate:e=>`${t}/${e}/products/create`,productEdit:(e,s)=>`${t}/${e}/products/${s}`,productCategories:e=>`${t}/${e}/product-categories`,productCategoryCreate:e=>`${t}/${e}/product-categories/create`,productCategoryEdit:(e,s)=>`${t}/${e}/product-categories/${s}`,manufacturers:e=>`${t}/${e}/manufacturers`,manufacturerCreate:e=>`${t}/${e}/manufacturers/create`,manufacturerEdit:(e,s)=>`${t}/${e}/manufacturers/${s}`,settings:e=>`${t}/${e}/settings`,settingsOpeningTimes:e=>`${t}/${e}/settings/opening-times`,settingsShippingMethods:e=>`${t}/${e}/settings/shipping-methods`,settingsShippingMethodCreate:e=>`${t}/${e}/settings/shipping-methods/create`,settingsShippingMethodEdit:(e,s)=>`${t}/${e}/settings/shipping-methods/${s}`,settingsAccess:e=>`${t}/${e}/settings/access`,settingsAccessInvite:e=>`${t}/${e}/settings/access/invite`,settingsAccessMemberEdit:(e,s)=>`${t}/${e}/settings/access/${s}`}}exports.createRoutes=n;exports.defineConfig=r;

package/index.react-server.d.ts

@@ -1,8 +1,8 @@
 export type { AdminConfig, ResolvedAdminConfig } from './types';
-export type { AdminRoutes } from './router/routes';
+export type { AdminRoutes } from './admin/router/routes';
 /**
  * Define and validate an AdminConfig object. Applies default basePath of "/admin".
  * Use this in your host app's config file.
  */
 export declare function defineConfig(config: import('./types').AdminConfig): import('./types').ResolvedAdminConfig;
-export declare function createRoutes(basePath: string): import('./router/routes').AdminRoutes;
+export declare function createRoutes(basePath: string): import('./admin/router/routes').AdminRoutes;

package/index.react-server.mjs

@@ -1,11 +1,11 @@
-function i(s) {
+function r(i) {
   return {
     basePath: "/admin",
-    ...s
+    ...i
   };
 }
-function n(s) {
-  const e = s.replace(/\/$/, "");
+function n(i) {
+  const e = i.replace(/\/$/, "");
   return {
     home: e,
     signIn: `${e}/auth/sign-in`,
@@ -17,21 +17,24 @@ function n(s) {
     reservations: (t) => `${e}/${t}/reservations`,
     products: (t) => `${e}/${t}/products`,
     productCreate: (t) => `${e}/${t}/products/create`,
-    productEdit: (t, r) => `${e}/${t}/products/${r}`,
+    productEdit: (t, s) => `${e}/${t}/products/${s}`,
     productCategories: (t) => `${e}/${t}/product-categories`,
     productCategoryCreate: (t) => `${e}/${t}/product-categories/create`,
-    productCategoryEdit: (t, r) => `${e}/${t}/product-categories/${r}`,
+    productCategoryEdit: (t, s) => `${e}/${t}/product-categories/${s}`,
     manufacturers: (t) => `${e}/${t}/manufacturers`,
     manufacturerCreate: (t) => `${e}/${t}/manufacturers/create`,
-    manufacturerEdit: (t, r) => `${e}/${t}/manufacturers/${r}`,
+    manufacturerEdit: (t, s) => `${e}/${t}/manufacturers/${s}`,
     settings: (t) => `${e}/${t}/settings`,
     settingsOpeningTimes: (t) => `${e}/${t}/settings/opening-times`,
     settingsShippingMethods: (t) => `${e}/${t}/settings/shipping-methods`,
     settingsShippingMethodCreate: (t) => `${e}/${t}/settings/shipping-methods/create`,
-    settingsShippingMethodEdit: (t, r) => `${e}/${t}/settings/shipping-methods/${r}`
+    settingsShippingMethodEdit: (t, s) => `${e}/${t}/settings/shipping-methods/${s}`,
+    settingsAccess: (t) => `${e}/${t}/settings/access`,
+    settingsAccessInvite: (t) => `${e}/${t}/settings/access/invite`,
+    settingsAccessMemberEdit: (t, s) => `${e}/${t}/settings/access/${s}`
   };
 }
 export {
   n as createRoutes,
-  i as defineConfig
+  r as defineConfig
 };

package/next/server.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("react/jsx-runtime"),a=require("../admin-client.cjs");async function o({config:e,params:t}){const{segments:n=[]}=await t;return i.jsx(a.AdminProvider,{config:e,children:i.jsx(a.AdminRouter,{segments:n})})}function d(e,t){var r;return{title:(r=e.branding)!=null&&r.name?`${e.branding.name} Admin`:"Admin",robots:{index:!1,follow:!1},...e.metadata,...t}}exports.NotFoundPage=a.ErrorView;exports.RootPage=o;exports.generatePageMetadata=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("react/jsx-runtime"),e=require("../admin-client.cjs"),f=require("next/navigation.js"),w=require("react");function V(s){if(s.length===0)return{type:"home"};const[a,n,i,o,c]=s;if(a==="auth")return n==="sign-in"?{type:"sign-in"}:n==="sign-up"?{type:"sign-up"}:{type:"not-found"};if(a==="organizations")return{type:"organizations"};const r=a;return n?n==="dashboard"?{type:"dashboard",orgId:r}:n==="orders"?{type:"orders",orgId:r}:n==="reservations"?{type:"reservations",orgId:r}:n==="products"?i?i==="create"?{type:"product-create",orgId:r}:{type:"product-edit",orgId:r,id:i}:{type:"products-list",orgId:r}:n==="product-categories"?i?i==="create"?{type:"product-category-create",orgId:r}:{type:"product-category-edit",orgId:r,id:i}:{type:"product-categories-list",orgId:r}:n==="manufacturers"?i?i==="create"?{type:"manufacturer-create",orgId:r}:{type:"manufacturer-edit",orgId:r,id:i}:{type:"manufacturers-list",orgId:r}:n==="settings"?i?i==="opening-times"?{type:"settings-opening-times",orgId:r}:i==="shipping-methods"?o?o==="create"?{type:"shipping-method-create",orgId:r}:{type:"shipping-method-edit",orgId:r,id:o}:{type:"shipping-methods-list",orgId:r}:i==="access"?o?o==="invite"?{type:"access-invite",orgId:r}:{type:"access-member-edit",orgId:r,id:o}:{type:"access-list",orgId:r}:{type:"settings",orgId:r}:{type:"settings",orgId:r}:{type:"not-found"}:{type:"not-found"}}function v({segments:s}){const a=e.useAdminAuth(),n=e.useAdminRoutes(),i=f.useRouter(),o=f.usePathname(),c=f.useSearchParams(),{data:r,isPending:p}=a.useSession(),u=V(s),d=u.type==="sign-in"||u.type==="sign-up",l=u.type==="home"||u.type==="organizations",y=c==null?void 0:c.get("redirect"),h=c==null?void 0:c.toString(),m=o?`${o}${h?`?${h}`:""}`:n.home,g=d?e.resolveAdminRedirectPath(y,n):m;if(w.useEffect(()=>{if(!p){if(!r&&!d){i.replace(e.buildAdminAuthHref(n.signIn,g));return}r&&d&&i.replace(g)}},[r,p,d,i,n.signIn,g]),p)return t.jsx("div",{className:"flex justify-center items-center h-screen",children:t.jsx("div",{className:"animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"})});if(d){if(u.type==="sign-in")return t.jsx(e.SignInView,{});if(u.type==="sign-up")return t.jsx(e.SignUpView,{})}if(!r)return null;if(l)return t.jsx(e.OrganizationProvider,{children:t.jsx(e.OrganizationsView,{})});if(u.type==="not-found")return t.jsx(e.ErrorView,{});const j="orgId"in u?u.orgId:void 0,x="id"in u?u.id:void 0;return t.jsx(e.RouteParamsProvider,{organizationId:j,id:x,children:t.jsx(e.OrganizationProvider,{children:t.jsx(e.FlyoutProvider,{children:t.jsx(e.AdminShell,{children:P(u)})})})})}function P(s){switch(s.type){case"dashboard":return t.jsx(e.DashboardView,{});case"orders":return t.jsx(e.OrdersView,{});case"reservations":return t.jsx(e.ReservationsView,{});case"products-list":return t.jsx(e.ProductsListView,{});case"product-create":return t.jsx(e.ProductCreateView,{});case"product-edit":return t.jsx(e.ProductEditView,{});case"product-categories-list":return t.jsx(e.ProductCategoriesListView,{});case"product-category-create":return t.jsx(e.ProductCategoryCreateView,{});case"product-category-edit":return t.jsx(e.ProductCategoryEditView,{});case"manufacturers-list":return t.jsx(e.ManufacturersListView,{});case"manufacturer-create":return t.jsx(e.ManufacturerCreateView,{});case"manufacturer-edit":return t.jsx(e.ManufacturerEditView,{});case"settings":return t.jsx(e.SettingsLayout,{children:t.jsx(e.SettingsView,{})});case"settings-opening-times":return t.jsx(e.SettingsLayout,{children:t.jsx(e.OpeningTimesView,{})});case"shipping-methods-list":return t.jsx(e.SettingsLayout,{children:t.jsx(e.ShippingMethodsListView,{})});case"shipping-method-create":return t.jsx(e.SettingsLayout,{children:t.jsx(e.ShippingMethodCreateView,{})});case"shipping-method-edit":return t.jsx(e.SettingsLayout,{children:t.jsx(e.ShippingMethodEditView,{})});case"access-list":return t.jsx(e.SettingsLayout,{children:t.jsx(e.AccessListView,{})});case"access-invite":return t.jsx(e.SettingsLayout,{children:t.jsx(e.AccessInviteView,{})});case"access-member-edit":return t.jsx(e.SettingsLayout,{children:t.jsx(e.AccessMemberEditView,{})});default:return t.jsx(e.ErrorView,{})}}async function S({config:s,params:a}){const{segments:n=[]}=await a;return t.jsx(e.AdminProvider,{config:s,children:t.jsx(v,{segments:n})})}function b(s,a){var i;return{title:(i=s.branding)!=null&&i.name?`${s.branding.name} Admin`:"Admin",robots:{index:!1,follow:!1},...s.metadata,...a}}exports.NotFoundPage=e.ErrorView;exports.RootPage=S;exports.generatePageMetadata=b;

package/next/server.d.ts

@@ -25,7 +25,7 @@ export declare function RootPage({ config, params }: RootPageProps): Promise<imp
  *   import { NotFoundPage } from "@shophost/react/next/server";
  *   export default NotFoundPage;
  */
-export { ErrorView as NotFoundPage } from '../views/ErrorView';
+export { ErrorView as NotFoundPage } from '../admin/shell/views/error-view';
 /**
  * Generate page metadata from AdminConfig.
  *

package/next/server.mjs

@@ -1,21 +1,102 @@
-import { jsx as o } from "react/jsx-runtime";
-import { A as r, a as i } from "../admin-client.js";
-import { E as g } from "../admin-client.js";
-async function s({ config: e, params: t }) {
-  const { segments: a = [] } = await t;
-  return /* @__PURE__ */ o(r, { config: e, children: /* @__PURE__ */ o(i, { segments: a }) });
+import { jsx as e } from "react/jsx-runtime";
+import { u as P, b, r as A, d as S, S as R, e as C, O as h, f as I, E as l, R as M, F as z, h as E, i as o, j as O, k as L, l as x, m as $, n as j, o as F, p as N, q as T, M as q, s as D, t as H, P as k, v as B, w as U, x as G, y as J, z as K, B as Q, C as W, D as X, A as Y } from "../admin-client.js";
+import { useRouter as Z, usePathname as _, useSearchParams as ee } from "next/navigation.js";
+import { useEffect as te } from "react";
+function re(n) {
+  if (n.length === 0) return { type: "home" };
+  const [a, i, r, u, c] = n;
+  if (a === "auth")
+    return i === "sign-in" ? { type: "sign-in" } : i === "sign-up" ? { type: "sign-up" } : { type: "not-found" };
+  if (a === "organizations") return { type: "organizations" };
+  const t = a;
+  return i ? i === "dashboard" ? { type: "dashboard", orgId: t } : i === "orders" ? { type: "orders", orgId: t } : i === "reservations" ? { type: "reservations", orgId: t } : i === "products" ? r ? r === "create" ? { type: "product-create", orgId: t } : { type: "product-edit", orgId: t, id: r } : { type: "products-list", orgId: t } : i === "product-categories" ? r ? r === "create" ? { type: "product-category-create", orgId: t } : { type: "product-category-edit", orgId: t, id: r } : { type: "product-categories-list", orgId: t } : i === "manufacturers" ? r ? r === "create" ? { type: "manufacturer-create", orgId: t } : { type: "manufacturer-edit", orgId: t, id: r } : { type: "manufacturers-list", orgId: t } : i === "settings" ? r ? r === "opening-times" ? { type: "settings-opening-times", orgId: t } : r === "shipping-methods" ? u ? u === "create" ? { type: "shipping-method-create", orgId: t } : { type: "shipping-method-edit", orgId: t, id: u } : { type: "shipping-methods-list", orgId: t } : r === "access" ? u ? u === "invite" ? { type: "access-invite", orgId: t } : { type: "access-member-edit", orgId: t, id: u } : { type: "access-list", orgId: t } : { type: "settings", orgId: t } : { type: "settings", orgId: t } : { type: "not-found" } : { type: "not-found" };
 }
-function l(e, t) {
-  var n;
+function ie({ segments: n }) {
+  const a = P(), i = b(), r = Z(), u = _(), c = ee(), { data: t, isPending: p } = a.useSession(), s = re(n), d = s.type === "sign-in" || s.type === "sign-up", m = s.type === "home" || s.type === "organizations", y = c == null ? void 0 : c.get("redirect"), g = c == null ? void 0 : c.toString(), w = u ? `${u}${g ? `?${g}` : ""}` : i.home, f = d ? A(y, i) : w;
+  if (te(() => {
+    if (!p) {
+      if (!t && !d) {
+        r.replace(S(i.signIn, f));
+        return;
+      }
+      t && d && r.replace(f);
+    }
+  }, [t, p, d, r, i.signIn, f]), p)
+    return /* @__PURE__ */ e("div", { className: "flex justify-center items-center h-screen", children: /* @__PURE__ */ e("div", { className: "animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600" }) });
+  if (d) {
+    if (s.type === "sign-in") return /* @__PURE__ */ e(R, {});
+    if (s.type === "sign-up") return /* @__PURE__ */ e(C, {});
+  }
+  if (!t)
+    return null;
+  if (m)
+    return /* @__PURE__ */ e(h, { children: /* @__PURE__ */ e(I, {}) });
+  if (s.type === "not-found")
+    return /* @__PURE__ */ e(l, {});
+  const V = "orgId" in s ? s.orgId : void 0, v = "id" in s ? s.id : void 0;
+  return /* @__PURE__ */ e(M, { organizationId: V, id: v, children: /* @__PURE__ */ e(h, { children: /* @__PURE__ */ e(z, { children: /* @__PURE__ */ e(E, { children: ne(s) }) }) }) });
+}
+function ne(n) {
+  switch (n.type) {
+    case "dashboard":
+      return /* @__PURE__ */ e(X, {});
+    case "orders":
+      return /* @__PURE__ */ e(W, {});
+    case "reservations":
+      return /* @__PURE__ */ e(Q, {});
+    case "products-list":
+      return /* @__PURE__ */ e(K, {});
+    case "product-create":
+      return /* @__PURE__ */ e(J, {});
+    case "product-edit":
+      return /* @__PURE__ */ e(G, {});
+    case "product-categories-list":
+      return /* @__PURE__ */ e(U, {});
+    case "product-category-create":
+      return /* @__PURE__ */ e(B, {});
+    case "product-category-edit":
+      return /* @__PURE__ */ e(k, {});
+    case "manufacturers-list":
+      return /* @__PURE__ */ e(H, {});
+    case "manufacturer-create":
+      return /* @__PURE__ */ e(D, {});
+    case "manufacturer-edit":
+      return /* @__PURE__ */ e(q, {});
+    case "settings":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(T, {}) });
+    case "settings-opening-times":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(N, {}) });
+    case "shipping-methods-list":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(F, {}) });
+    case "shipping-method-create":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(j, {}) });
+    case "shipping-method-edit":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e($, {}) });
+    case "access-list":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(x, {}) });
+    case "access-invite":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(L, {}) });
+    case "access-member-edit":
+      return /* @__PURE__ */ e(o, { children: /* @__PURE__ */ e(O, {}) });
+    default:
+      return /* @__PURE__ */ e(l, {});
+  }
+}
+async function ce({ config: n, params: a }) {
+  const { segments: i = [] } = await a;
+  return /* @__PURE__ */ e(Y, { config: n, children: /* @__PURE__ */ e(ie, { segments: i }) });
+}
+function de(n, a) {
+  var r;
   return {
-    title: (n = e.branding) != null && n.name ? `${e.branding.name} Admin` : "Admin",
+    title: (r = n.branding) != null && r.name ? `${n.branding.name} Admin` : "Admin",
     robots: { index: !1, follow: !1 },
-    ...e.metadata,
-    ...t
+    ...n.metadata,
+    ...a
   };
 }
 export {
-  g as NotFoundPage,
-  s as RootPage,
-  l as generatePageMetadata
+  l as NotFoundPage,
+  ce as RootPage,
+  de as generatePageMetadata
 };

package/next/views.d.ts

@@ -4,4 +4,4 @@
  * This entry is kept for backward compatibility. The server-safe exports
  * (RootPage, generatePageMetadata) have moved to "@shophost/react/next/server".
  */
-export { ErrorView as NotFoundPage } from '../views/ErrorView';
+export { ErrorView as NotFoundPage } from '../admin/shell/views/error-view';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shophost/react",
-  "version": "2.0.28",
+  "version": "2.0.30",
   "type": "module",
   "main": "./index.cjs",
   "module": "./index.mjs",
@@ -31,21 +31,16 @@
   },
   "license": "UNLICENSED",
   "files": [
-    "components",
+    "admin",
     "config",
-    "data",
+    "contexts",
     "lib",
     "next",
     "providers",
-    "router",
     "storefront",
+    "ui",
     "utils",
-    "views",
-    "index.d.ts",
-    "index.react-server.d.ts",
-    "index.mjs",
-    "index.react-server.mjs",
-    "index.cjs",
+    "*.d.ts",
     "*.mjs",
     "*.js",
     "*.cjs",
@@ -71,8 +66,8 @@
     "@hookform/resolvers": "^3.9.0",
     "@react-aria/datepicker": "^3.16.1",
     "@react-stately/datepicker": "^3.16.1",
-    "@shophost/client": "^2.0.28",
-    "@shophost/rest-api": "^2.0.28",
+    "@shophost/client": "^2.0.30",
+    "@shophost/rest-api": "^2.0.30",
     "@internationalized/date": "^3.12.0",
     "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-dialog": "^1.1.6",