zudoku 0.3.0-dev.9 → 0.3.0-dev.90

package/src/lib/core/plugins.ts

@@ -1,32 +1,48 @@
-import { type RouteObject } from "react-router-dom";
-import {
-  DevPortalContext,
-  type ApiIdentity,
-  type NavigationCategory,
-} from "./DevPortalContext.js";
-
-export type PluginNavigationCategory = {
-  path: string;
-} & NavigationCategory;
+import { type ReactElement } from "react";
+import { NavigateFunction, type RouteObject } from "react-router-dom";
+import type { Sidebar } from "../../config/validators/SidebarSchema.js";
+import { MdxComponentsType } from "../util/MdxComponents.js";
+import { DevPortalContext, type ApiIdentity } from "./DevPortalContext.js";
 
 export type DevPortalPlugin =
+  | CommonPlugin
+  | ProfileMenuPlugin
   | NavigationPlugin
-  | ApiIdentityPlugin
-  | InitializationPlugin;
+  | ApiIdentityPlugin;
 
 export interface NavigationPlugin {
   getRoutes: () => RouteObject[];
-  getNavigation?: (path: string) => Promise<PluginNavigationCategory[]>;
+  getSidebar?: (path: string) => Promise<Sidebar>;
 }
 
 export interface ApiIdentityPlugin {
   getIdentities: (context: DevPortalContext) => Promise<ApiIdentity[]>;
 }
 
-export interface InitializationPlugin {
-  initialize: (context: DevPortalContext) => Promise<void> | void;
+export interface ProfileMenuPlugin {
+  getProfileMenuItems: (context: DevPortalContext) => ProfileNavigationItem[];
 }
 
+export type ProfileNavigationItem = {
+  label: string;
+  path?: string;
+  children?: ProfileNavigationItem[];
+};
+
+export interface CommonPlugin {
+  initialize?: (
+    context: DevPortalContext,
+    options: { navigate: NavigateFunction },
+  ) => Promise<void | boolean> | void | boolean;
+  getHead?: () => ReactElement | undefined;
+  getMdxComponents?: () => MdxComponentsType;
+}
+
+export const isProfileMenuPlugin = (
+  obj: DevPortalPlugin,
+): obj is ProfileMenuPlugin =>
+  "getProfileMenuItems" in obj && typeof obj.getProfileMenuItems === "function";
+
 export const isNavigationPlugin = (
   obj: DevPortalPlugin,
 ): obj is NavigationPlugin =>
@@ -34,9 +50,17 @@ export const isNavigationPlugin = (
 
 export const needsInitialization = (
   obj: DevPortalPlugin,
-): obj is InitializationPlugin =>
+): obj is CommonPlugin =>
   "initialize" in obj && typeof obj.initialize === "function";
 
+export const hasHead = (obj: DevPortalPlugin): obj is CommonPlugin =>
+  "getHead" in obj && typeof obj.getHead === "function";
+
+export const isMdxProviderPlugin = (
+  obj: DevPortalPlugin,
+): obj is CommonPlugin =>
+  "getMdxComponents" in obj && typeof obj.getMdxComponents === "function";
+
 export const isApiIdentityPlugin = (
   obj: DevPortalPlugin,
 ): obj is ApiIdentityPlugin =>

package/src/lib/errors/ErrorAlert.tsx

@@ -0,0 +1,21 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function ErrorAlert({ error }: { error: any }) {
+  const message = error?.message ?? "Something went wrong";
+  const stack = error?.stack;
+
+  return (
+    <div className="flex h-screen max-h-screen min-h-full items-center justify-center bg-primary-background px-4 py-16 lg:px-8">
+      <div className="mx-auto max-w-[85%] sm:max-w-[50%]">
+        <h1 className="text-4xl font-bold tracking-tight text-h1-text sm:text-5xl">
+          Something went wrong
+        </h1>
+        <p className="mt-5 text-h1-text">{message}</p>
+        {stack ? (
+          <pre className="mt-5 max-h-[400px] w-full overflow-scroll rounded-md border border-input-border bg-input-background p-3 text-property-name-text text-red-700">
+            {stack}
+          </pre>
+        ) : null}
+      </div>
+    </div>
+  );
+}

package/src/lib/errors/RouterError.tsx

@@ -0,0 +1,13 @@
+import { isRouteErrorResponse, useRouteError } from "react-router-dom";
+import { NotFoundPage } from "../components/NotFoundPage.js";
+import { ErrorAlert } from "./ErrorAlert.js";
+
+export function RouterError() {
+  const error = useRouteError();
+
+  if (isRouteErrorResponse(error) && error.status === 404) {
+    return <NotFoundPage />;
+  }
+
+  return <ErrorAlert error={error} />;
+}

package/src/lib/errors/ServerError.tsx

@@ -0,0 +1,5 @@
+import { ErrorAlert } from "./ErrorAlert.js";
+
+export function ServerError({ error }: { error: unknown }) {
+  return <ErrorAlert error={error} />;
+}

package/src/lib/errors/TopLevelError.tsx

@@ -0,0 +1,8 @@
+import { FallbackProps } from "react-error-boundary";
+import { ErrorAlert } from "./ErrorAlert.js";
+
+export function TopLevelError({ error, resetErrorBoundary }: FallbackProps) {
+  // Call resetErrorBoundary() to reset the error boundary and retry the render.
+
+  return <ErrorAlert error={error} />;
+}

package/src/lib/oas/graphql/index.ts

@@ -36,16 +36,21 @@ type OperationLike = {
   method: string;
 };
 export const slugifyOperation = (operation: OperationLike, tag?: string) => {
+  const summary =
+    operation.summary +
+    (operation.operationId
+      ? "-" +
+        operation.operationId.slice(0, operation.summary ? Infinity : Infinity)
+      : "");
+
   return slugify(
     (tag ? tag + "-" : "") +
-      (operation.summary ??
-        operation.operationId ??
-        `${operation.method}-${operation.path}`),
+      (summary || `${operation.method}-${operation.path}`),
     { lower: true, trim: true },
   );
 };
 
-const cache = new LRUCache<string, OpenAPIDocument>({
+const cache = new LRUCache<string, Promise<OpenAPIDocument>>({
   ttl: 60 * 10 * 1000,
   ttlAutopurge: true,
 });
@@ -207,7 +212,7 @@ const MediaTypeItem = builder
   .implement({
     fields: (t) => ({
       mediaType: t.exposeString("mediaType"),
-      schema: t.expose("schema", { type: JSONScalar }),
+      schema: t.expose("schema", { type: JSONScalar, nullable: true }),
       examples: t.expose("examples", { type: [ExampleItem], nullable: true }),
       encoding: t.expose("encoding", { type: [EncodingItem], nullable: true }),
     }),
@@ -384,7 +389,7 @@ const loadOpenAPISchema = async (input: NonNullable<unknown>) => {
     return cache.get(hash)!;
   }
 
-  const schema = await validate(input);
+  const schema = validate(input);
 
   cache.set(hash, schema);
 

package/src/lib/oas/parser/index.ts

@@ -1,3 +1,4 @@
+import { GraphQLError } from "graphql/error/index.js";
 import { OpenAPIV3, type OpenAPIV3_1 } from "openapi-types";
 import { dereference, type JSONSchema } from "./dereference/index.js";
 import { upgradeSchema } from "./upgrade/index.js";
@@ -9,10 +10,6 @@ type DeepOmitReference<T> = T extends ReferenceObject
     ? { [K in keyof T]: DeepOmitReference<T[K]> }
     : T;
 
-// type Prettify<T> = {
-//   [K in keyof T]: T[K];
-// } & {};
-
 export type OpenAPIDocument = DeepOmitReference<OpenAPIV3_1.Document>;
 export type ResponseObject = DeepOmitReference<OpenAPIV3_1.ResponseObject>;
 export type OperationObject = DeepOmitReference<OpenAPIV3_1.OperationObject>;
@@ -46,35 +43,63 @@ export const HttpMethods = Object.values(OpenAPIV3.HttpMethods);
 // };
 
 const parseSchemaInput = async (
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  schemaInput: any,
+  schemaInput: unknown,
 ): Promise<JSONSchema & { openapi?: string }> => {
   if (typeof schemaInput === "string") {
     if (schemaInput.trim().startsWith("{")) {
-      return JSON.parse(schemaInput);
+      try {
+        return JSON.parse(schemaInput);
+      } catch (err) {
+        throw new GraphQLError("Invalid JSON schema", {
+          originalError: err,
+        });
+      }
     }
     if (schemaInput.includes("://")) {
-      const response = await fetch(schemaInput);
-      return (await response.json()) as JSONSchema;
+      let response;
+      try {
+        response = await fetch(schemaInput, {
+          cache: "force-cache",
+        });
+      } catch (err) {
+        throw new GraphQLError("Failed to fetch schema", {
+          originalError: err,
+        });
+      }
+
+      if (!response.ok) {
+        throw new GraphQLError(
+          `Failed to fetch schema: ${response.statusText}`,
+        );
+      }
+
+      try {
+        return (await response.json()) as JSONSchema;
+      } catch (err) {
+        throw new GraphQLError("Fetched invalid JSON schema", {
+          originalError: err,
+        });
+      }
     }
     const yaml = await import("yaml");
-    return yaml.parse(schemaInput);
+    const parsed = yaml.parse(schemaInput);
+
+    if (typeof parsed === "object") return parsed;
   }
 
-  if (typeof schemaInput === "object") return schemaInput;
+  if (typeof schemaInput === "object") return schemaInput as JSONSchema;
 
-  throw new Error("Unsupported schema input");
+  throw new GraphQLError("Unsupported schema input: " + schemaInput);
 };
 
 /**
  * Validates, dereferences and upgrades the OpenAPI schema (to v3.1) if necessary.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const validate = async (schemaInput: any) => {
+export const validate = async (schemaInput: unknown) => {
   const schema = await parseSchemaInput(schemaInput);
 
   if (!schema.openapi) {
-    throw new Error("OpenAPI version is not defined");
+    throw new GraphQLError("OpenAPI version is not defined");
   }
 
   // const validator = await getValidator(schema.openapi);
@@ -86,9 +111,5 @@ export const validate = async (schemaInput: any) => {
 
   const dereferenced = await dereference(schema);
 
-  const upgraded = upgradeSchema(
-    dereferenced as OpenAPIV3_1.Document | OpenAPIV3.Document,
-  );
-
-  return upgraded;
+  return upgradeSchema(dereferenced);
 };

package/src/lib/plugins/{api-key → api-keys}/CreateApiKey.tsx

@@ -1,8 +1,7 @@
 import { useMutation } from "@tanstack/react-query";
 import { useForm } from "react-hook-form";
 import { Link, useNavigate } from "react-router-dom";
-import { useDevPortal } from "../../components/context/DevPortalProvider.js";
-import { Input } from "../../components/Input.js";
+import { useZudoku } from "../../components/context/ZudokuContext.js";
 import {
   Select,
   SelectContent,
@@ -12,12 +11,13 @@ import {
   SelectValue,
 } from "../../components/Select.js";
 import { Button } from "../../ui/Button.js";
+import { Input } from "../../ui/Input.js";
 import { ApiKeyService } from "./index.js";
 
 type CreateApiKey = { description: string; expiresOn?: string };
 
 export const CreateApiKey = ({ service }: { service: ApiKeyService }) => {
-  const context = useDevPortal();
+  const context = useZudoku();
   const navigate = useNavigate();
   const form = useForm<CreateApiKey>({
     defaultValues: {
@@ -47,7 +47,7 @@ export const CreateApiKey = ({ service }: { service: ApiKeyService }) => {
 
   return (
     <div className="max-w-screen-lg pt-[--padding-content-top] pb-[--padding-content-bottom]">
-      <div className="flex justify-between mb-4 border-b border-border pb-1">
+      <div className="flex justify-between mb-4 border-b pb-1">
         <h1 className="font-medium text-2xl">New API Key</h1>
       </div>
       <form

package/src/lib/plugins/api-keys/ProtectedRoute.tsx

@@ -0,0 +1,29 @@
+import { Outlet } from "react-router-dom";
+import { useAuth } from "../../authentication/hook.js";
+import { DeveloperHint } from "../../components/DeveloperHint.js";
+import { Button } from "../../ui/Button.js";
+
+export const ProtectedRoute = () => {
+  const auth = useAuth();
+
+  // TODO: should we suspend here somehow?
+  if (auth.isAuthEnabled && auth.isPending) {
+    return null;
+  }
+
+  return auth.isAuthenticated ? (
+    <Outlet />
+  ) : !auth.isAuthEnabled ? (
+    <div className="flex flex-col justify-center gap-2 items-center h-1/2">
+      <DeveloperHint className="max-w-[600px]">
+        Authentication needs to be enabled for API keys to work. Enable it in
+        your Zudoku configuration under <code>authentication</code>.
+      </DeveloperHint>
+    </div>
+  ) : (
+    <div className="flex flex-col justify-center gap-2 items-center h-1/2">
+      Please login first to view this page
+      <Button onClick={() => auth.login()}>Login</Button>
+    </div>
+  );
+};

package/src/lib/plugins/{api-key → api-keys}/SettingsApiKeys.tsx

@@ -6,12 +6,14 @@ import {
 import { EyeIcon, EyeOffIcon, RotateCwIcon, TrashIcon } from "lucide-react";
 import { useState } from "react";
 import { Link } from "react-router-dom";
-import { useDevPortal } from "../../components/context/DevPortalProvider.js";
+import { useZudoku } from "../../components/context/ZudokuContext.js";
+import { Slotlet } from "../../components/SlotletProvider.js";
 import { Button } from "../../ui/Button.js";
+import { cn } from "../../util/cn.js";
 import { ApiKeyService } from "./index.js";
 
 export const SettingsApiKeys = ({ service }: { service: ApiKeyService }) => {
-  const context = useDevPortal();
+  const context = useZudoku();
   const queryClient = useQueryClient();
   const { data } = useSuspenseQuery({
     queryFn: () => service.getKeys(context),
@@ -32,9 +34,22 @@ export const SettingsApiKeys = ({ service }: { service: ApiKeyService }) => {
     },
   });
 
+  const rollKeyMutation = useMutation({
+    mutationFn: (id: string) => {
+      if (!service.rollKey) {
+        throw new Error("rollKey not implemented");
+      }
+
+      return service.rollKey(id, context);
+    },
+    onSuccess: () => queryClient.invalidateQueries({ queryKey: ["api-keys"] }),
+  });
+
   return (
     <div className="max-w-screen-lg h-full pt-[--padding-content-top] pb-[--padding-content-bottom]">
-      <div className="flex justify-between mb-4 border-b border-border pb-3">
+      <Slotlet name="api-keys-list-page" />
+
+      <div className="flex justify-between mb-4 border-b pb-3">
         <h1 className="font-medium text-2xl">API Keys</h1>
         {service.createKey && (
           <Button asChild>
@@ -43,24 +58,31 @@ export const SettingsApiKeys = ({ service }: { service: ApiKeyService }) => {
         )}
       </div>
 
+      <Slotlet name="api-keys-list-page-before-keys" />
+
       {data.length === 0 ? (
-        <div className="flex flex-col justify-center gap-4 items-center h-1/2 my-8">
-          <div className="text-center">
+        <div className="flex flex-col justify-center gap-4 items-center p-8 border rounded bg-muted/30 text-muted-foreground">
+          <p className="text-center">
             No API keys created yet.
             <br />
-            Get started and create the first one now
-          </div>
+            Get started and create your first key.
+          </p>
           {service.createKey && (
-            <Button asChild>
+            <Button asChild variant="outline">
               <Link to="/settings/api-keys/new">Create API Key</Link>
             </Button>
           )}
         </div>
       ) : (
-        <ul className="grid grid-cols-[minmax(250px,min-content)_1fr_min-content] ">
-          {data.map((key: any) => (
+        <ul
+          className={cn(
+            "grid grid-cols-1  rounded border",
+            "lg:grid-cols-[minmax(250px,min-content)_1fr_min-content]",
+          )}
+        >
+          {data.map((key) => (
             <li
-              className="border-b border-border p-5 grid grid-cols-subgrid col-span-full gap-2 items-center"
+              className="border-b p-5 grid grid-cols-subgrid col-span-full gap-2 items-center"
               key={key.id}
             >
               <div className="flex flex-col gap-1 text-sm">
@@ -78,12 +100,23 @@ export const SettingsApiKeys = ({ service }: { service: ApiKeyService }) => {
                   )}
                 </div>
               </div>
-              <div className="items-center flex justify-center">
+              <div className="items-center flex lg:justify-center">
                 <RevealApiKey apiKey={key.key} />
               </div>
               <div className="flex gap-2">
                 {service.rollKey && (
-                  <Button size="icon">
+                  <Button
+                    size="icon"
+                    title="Roll this key"
+                    variant="ghost"
+                    onClick={() => {
+                      if (!confirm("Do you want to roll this key?")) {
+                        return;
+                      }
+
+                      rollKeyMutation.mutate(key.id);
+                    }}
+                  >
                     <RotateCwIcon size={16} />
                   </Button>
                 )}
@@ -116,10 +149,10 @@ const RevealApiKey = ({ apiKey }: { apiKey: string }) => {
   const [revealed, setRevealed] = useState(false);
 
   return (
-    <div className="flex gap-2 items-center text-sm">
-      <code className="border border-border rounded bg-gray-100 dark:bg-gray-950 p-1 font-mono">
+    <div className="flex gap-2 items-center text-sm w-full">
+      <div className="border rounded bg-gray-100 dark:bg-gray-950 p-1 font-mono w-fit overflow-x-scroll h-9 items-center flex px-2">
         {revealed ? apiKey : "•".repeat(apiKey.length)}
-      </code>
+      </div>
       <Button
         variant="outline"
         onClick={() => setRevealed((prev) => !prev)}

package/src/lib/plugins/{api-key → api-keys}/index.tsx

@@ -1,26 +1,25 @@
-import logger from "loglevel";
-import { Outlet, useRouteError } from "react-router-dom";
-import invariant from "tiny-invariant";
-import { useAuth } from "../../authentication/hook.js";
+import { type RouteObject } from "react-router-dom";
 import { DevPortalContext } from "../../core/DevPortalContext.js";
 import {
   type ApiIdentityPlugin,
   type DevPortalPlugin,
+  ProfileMenuPlugin,
 } from "../../core/plugins.js";
-import { Button } from "../../ui/Button.js";
+import { RouterError } from "../../errors/RouterError.js";
+import invariant from "../../util/invariant.js";
 import { CreateApiKey } from "./CreateApiKey.js";
+import { ProtectedRoute } from "./ProtectedRoute.js";
 import { SettingsApiKeys } from "./SettingsApiKeys.js";
 
-export type ApiKeyResults = Promise<ApiKey[]>;
 const DEFAULT_API_KEY_ENDPOINT =
   "https://zudoku-rewiringamerica-main-ef9c9c0.d2.zuplo.dev";
 
 export type ApiKeyService = {
-  getKeys: (context: DevPortalContext) => ApiKeyResults;
+  getKeys: (context: DevPortalContext) => Promise<ApiKey[]>;
   rollKey?: (id: string, context: DevPortalContext) => Promise<void>;
   deleteKey?: (id: string, context: DevPortalContext) => Promise<void>;
   updateKeyDescription?: (
-    apiKey: { jd: string; description: string },
+    apiKey: { id: string; description: string },
     context: DevPortalContext,
   ) => Promise<void>;
   getUsage?: (apiKeys: string[], context: DevPortalContext) => Promise<void>;
@@ -55,6 +54,16 @@ const createDefaultHandler = (endpoint: string): ApiKeyService => {
       const response = await fetch(request);
       invariant(response.ok, "Failed to delete API key");
     },
+    rollKey: async (id, context) => {
+      const response = await fetch(
+        await context.signRequest(
+          new Request(endpoint + `/v1/developer/api-keys/${id}/key`, {
+            method: "DELETE",
+          }),
+        ),
+      );
+      invariant(response.ok, "Failed to delete API key");
+    },
     createKey: async (apiKey, context) => {
       const request = new Request(endpoint + `/v1/developer/api-keys`, {
         method: "POST",
@@ -82,39 +91,9 @@ const createDefaultHandler = (endpoint: string): ApiKeyService => {
   };
 };
 
-const ProtectedRoute = () => {
-  const auth = useAuth();
-
-  // TODO: should we suspend here somehow?
-  if (auth.isPending) {
-    return null;
-  }
-
-  return auth.isAuthenticated ? (
-    <Outlet />
-  ) : (
-    <div className="flex flex-col justify-center gap-2 items-center h-1/2 my-12">
-      Please login first to view this page
-      <Button onClick={() => auth.login()}>Login</Button>
-    </div>
-  );
-};
-
-const SettingsErrorBoundary = () => {
-  const error = useRouteError();
-  logger.error(String(error));
-
-  return (
-    <div className="flex flex-col justify-center gap-2 items-center h-1/2 my-12">
-      <h1>Something went wrong</h1>
-      {error instanceof Error && <p>{error.message}</p>}
-    </div>
-  );
-};
-
 export const apiKeyPlugin = (
   options: ApiKeyPluginOptions,
-): DevPortalPlugin & ApiIdentityPlugin => {
+): DevPortalPlugin & ApiIdentityPlugin & ProfileMenuPlugin => {
   const endpoint =
     "endpoint" in options ? options.endpoint : DEFAULT_API_KEY_ENDPOINT;
 
@@ -122,6 +101,12 @@ export const apiKeyPlugin = (
     "getKeys" in options ? options : createDefaultHandler(endpoint);
 
   return {
+    getProfileMenuItems: () => [
+      {
+        label: "API Keys",
+        path: "/settings/api-keys",
+      },
+    ],
     getIdentities: async (context) => {
       try {
         const keys = await service.getKeys(context);
@@ -138,11 +123,12 @@ export const apiKeyPlugin = (
         return [];
       }
     },
-    getRoutes: () => {
+    getRoutes: (): RouteObject[] => {
+      // TODO: Make lazy
       return [
         {
           element: <ProtectedRoute />,
-          errorElement: <SettingsErrorBoundary />,
+          errorElement: <RouterError />,
           children: [
             {
               path: "/settings/api-keys",

package/src/lib/plugins/custom-page/index.tsx

@@ -0,0 +1,22 @@
+import type { ReactNode } from "react";
+import type { RouteObject } from "react-router-dom";
+import { ProseClasses } from "../../components/Markdown.js";
+import type { DevPortalPlugin, NavigationPlugin } from "../../core/plugins.js";
+
+type CustomPageConfig = Array<{
+  path: string;
+  element: ReactNode;
+}>;
+
+export const customPagePlugin = (
+  config: CustomPageConfig,
+): DevPortalPlugin & NavigationPlugin => {
+  return {
+    getRoutes: (): RouteObject[] =>
+      config.map(({ path, element }) => ({
+        path,
+        // TODO: we should componentize prose pages
+        element: <div className={ProseClasses + " max-w-full"}>{element}</div>,
+      })),
+  };
+};