zudoku 0.0.0-ed94abf → 0.0.0-edd80c1

package/src/lib/ui/SyntaxHighlight.tsx

@@ -1,186 +1,27 @@
-import {
-  Highlight,
-  Prism,
-  themes,
-  type HighlightProps,
-} from "prism-react-renderer";
-
-import { CheckIcon, CopyIcon } from "lucide-react";
-
-globalThis.Prism = Prism;
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-bash.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-ruby.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-markup.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-json.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-java.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-csharp.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-objectivec.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-markdown.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-javascript.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-typescript.min.js");
-// @ts-expect-error This is untyped
-void import("prismjs/components/prism-jsstacktrace.min.js");
-
-import { useTheme } from "next-themes";
-import { memo, useState } from "react";
-import { ClientOnly } from "../components/ClientOnly.js";
-import { cn } from "../util/cn.js";
-
-export type SyntaxHighlightProps = {
-  className?: string;
-  noBackground?: boolean;
-  wrapLines?: boolean;
-  showLanguageIndicator?: boolean;
-  language?: string;
-  title?: string;
-  children?: string;
-  code?: string;
-  showCopy?: "hover" | "always" | "never";
-  showCopyText?: boolean;
-  disabled?: boolean;
-} & Omit<HighlightProps, "children" | "language">;
-
-const remapLang = {
-  mdx: "md",
-} as Record<string, string>;
-
-const SyntaxHighlightInner = ({
-  language = "plain",
-  showCopy = "hover",
-  showCopyText,
-  title,
-  children,
-  disabled,
-  ...props
-}: SyntaxHighlightProps) => {
-  const { resolvedTheme } = useTheme();
-  const [isCopied, setIsCopied] = useState(false);
-
-  const code = children ?? props.code;
-
-  if (!code) {
-    return null;
-  }
-
-  const highlightTheme =
-    resolvedTheme === "dark" ? themes.vsDark : themes.github;
-
-  // hardcoded values from the themes to avoid color flash in SSR
-  const themeColorClasses =
-    "bg-[#f6f8fa] text-[#393a34] dark:bg-[#1e1e1e] dark:text-[#9cdcfe]";
-
-  const Wrapper = ({
-    children,
-    className,
-    style,
-  }: {
-    children: React.ReactNode;
-    className?: string;
-    style?: React.CSSProperties;
-  }) => (
-    <div className="relative group">
-      {title && (
-        <div className="text-xs text-muted-foreground absolute top-2 font-mono border-b w-full pb-2 px-4 ">
-          {title}
-        </div>
-      )}
-      <pre
-        className={cn(
-          "relative scrollbar overflow-x-auto",
-          props.className,
-          props.noBackground ? "!bg-transparent" : themeColorClasses,
-          props.wrapLines && "whitespace-pre-wrap break-words",
-          title && "pt-10",
-          className,
-        )}
-        style={style}
-      >
-        {children}
-      </pre>
-      {props.showLanguageIndicator && (
-        <span className="absolute top-1.5 right-3 text-[11px] font-mono text-muted-foreground transition group-hover:opacity-0">
-          {language}
-        </span>
-      )}
-      {showCopy !== "never" && (
-        <button
-          type="button"
-          aria-label="Copy code"
-          title="Copy code"
-          className={cn(
-            "absolute top-2 right-2 p-2  hover:outline hover:outline-border/75 dark:hover:outline-border rounded-md text-sm text-muted-foreground transition",
-            showCopy === "hover"
-              ? "opacity-0 group-hover:opacity-100 group-hover:bg-zinc-100 group-hover:dark:bg-zinc-700"
-              : "bg-zinc-100 dark:bg-zinc-700",
-            showCopyText && "flex gap-2 items-center font-medium",
-          )}
-          disabled={isCopied}
-          onClick={() => {
-            setIsCopied(true);
-            void navigator.clipboard.writeText(code);
-            setTimeout(() => setIsCopied(false), 2000);
-          }}
-        >
-          {isCopied ? (
-            <CheckIcon
-              className="text-emerald-600"
-              size={16}
-              strokeWidth={2.5}
-              absoluteStrokeWidth
-            />
-          ) : (
-            <CopyIcon size={16} />
-          )}
-          {showCopyText && "Copy"}
-        </button>
-      )}
-    </div>
-  );
-
-  if (disabled) {
-    return (
-      <ClientOnly fallback={<Wrapper>{code}</Wrapper>}>
-        <Wrapper>{code}</Wrapper>
-      </ClientOnly>
+import { memo } from "react";
+import { useZudoku } from "../components/context/ZudokuContext.js";
+import { highlight } from "../shiki.js";
+import invariant from "../util/invariant.js";
+import { CodeBlock, type CodeBlockProps } from "./CodeBlock.js";
+
+type SyntaxHighlightProps = CodeBlockProps &
+  ({ code: string; children?: never } | { code?: never; children: string });
+
+export const SyntaxHighlight = memo(
+  ({ code, children, ...props }: SyntaxHighlightProps) => {
+    const { syntaxHighlighting } = useZudoku().options;
+
+    invariant(syntaxHighlighting?.highlighter, "Highlighter not found");
+
+    const highlightedCode = highlight(
+      syntaxHighlighting.highlighter,
+      code ?? children,
+      props.language,
+      syntaxHighlighting.themes,
     );
-  }
-
-  return (
-    <ClientOnly fallback={<Wrapper>{code}</Wrapper>}>
-      <Highlight
-        theme={highlightTheme}
-        language={remapLang[language] ?? language}
-        {...props}
-        code={code}
-      >
-        {({ className, style, tokens, getLineProps, getTokenProps }) => (
-          <Wrapper className={className} style={style}>
-            {tokens.map((line, i) => (
-              // eslint-disable-next-line react/no-array-index-key
-              <div key={i} {...getLineProps({ line })}>
-                {line.map((token, key) => (
-                  // eslint-disable-next-line react/no-array-index-key
-                  <span key={key} {...getTokenProps({ token })} />
-                ))}
-              </div>
-            ))}
-          </Wrapper>
-        )}
-      </Highlight>
-    </ClientOnly>
-  );
-};
 
-export const SyntaxHighlight = memo(SyntaxHighlightInner);
+    return <CodeBlock {...props}>{highlightedCode}</CodeBlock>;
+  },
+);
 
 SyntaxHighlight.displayName = "SyntaxHighlight";

package/src/lib/ui/Tabs.tsx

@@ -26,7 +26,7 @@ const TabsTrigger = React.forwardRef<
   <TabsPrimitive.Trigger
     ref={ref}
     className={cn(
-      "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow",
+      "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm",
       className,
     )}
     {...props}
@@ -41,7 +41,7 @@ const TabsContent = React.forwardRef<
   <TabsPrimitive.Content
     ref={ref}
     className={cn(
-      "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+      "mt-2 ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
       className,
     )}
     {...props}

package/src/lib/ui/Textarea.tsx

@@ -9,7 +9,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
     return (
       <textarea
         className={cn(
-          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
           className,
         )}
         ref={ref}

package/src/lib/ui/Toggle.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import { cn } from "../util/cn.js";
 
 const toggleVariants = cva(
-  "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 gap-2",
+  "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 gap-2",
   {
     variants: {
       variant: {

package/src/lib/ui/Tooltip.tsx

@@ -9,6 +9,15 @@ const Tooltip = TooltipPrimitive.Root;
 
 const TooltipTrigger = TooltipPrimitive.Trigger;
 
+const TooltipArrow = (
+  props: React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Arrow>,
+) => (
+  <TooltipPrimitive.Arrow
+    {...props}
+    className={cn(props.className, "fill-border")}
+  />
+);
+
 const TooltipContent = React.forwardRef<
   React.ElementRef<typeof TooltipPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
@@ -25,4 +34,10 @@ const TooltipContent = React.forwardRef<
 ));
 TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
-export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };
+export {
+  Tooltip,
+  TooltipArrow,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+};

package/src/lib/util/MdxComponents.tsx

@@ -1,4 +1,5 @@
 import { type MDXComponents } from "mdx/types.js";
+import { CodeBlock } from "zudoku/ui/CodeBlock.js";
 import { AnchorLink } from "../components/AnchorLink.js";
 import { Heading } from "../components/Heading.js";
 import { InlineCode } from "../components/InlineCode.js";
@@ -6,6 +7,7 @@ import { Button } from "../ui/Button.js";
 import { Callout } from "../ui/Callout.js";
 import { Stepper } from "../ui/Stepper.js";
 import { SyntaxHighlight } from "../ui/SyntaxHighlight.js";
+import { cn } from "./cn.js";
 
 export type MdxComponentsType = Readonly<MDXComponents> | null | undefined;
 
@@ -62,26 +64,37 @@ export const MdxComponents = {
   caution: (props) => <Callout type="caution" {...props} />,
   warning: (props) => <Callout type="caution" {...props} />,
   danger: (props) => <Callout type="danger" {...props} />,
-  pre: ({ children }) => <>{children}</>,
-  code: ({ className, children, ...props }) => {
-    // `inline` provided by the rehype plugin, as react-markdown removed support for that
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const { inline, title } = props as Record<string, unknown>;
+  pre: (props) => (
+    <pre className={cn("not-prose my-4", props.className)} {...props} />
+  ),
+  code: ({
+    className,
+    node: _node,
+    children,
+    title,
+    inline,
+    showLineNumbers,
+    ...props
+  }) => {
+    const match = className?.match(/language?-(\w+)/);
 
-    if (inline === true || inline === "true") {
-      return <InlineCode className={className}>{children}</InlineCode>;
+    if (inline === "true" || inline === true) {
+      return (
+        <InlineCode className={cn(className, "inline")}>{children}</InlineCode>
+      );
     }
 
-    const match = className?.match(/language?-(\w+)/);
-
     return (
-      <SyntaxHighlight
+      <CodeBlock
         language={match?.[1]}
-        className="rounded-xl p-4 border dark:!bg-foreground/10 dark:border-transparent"
         showLanguageIndicator
-        code={String(children).trim()}
-        title={typeof title === "string" ? title : undefined}
-      />
+        showLineNumbers={showLineNumbers}
+        title={title}
+      >
+        <code className={cn(className, "not-inline")} {...props}>
+          {children}
+        </code>
+      </CodeBlock>
     );
   },
 } satisfies MdxComponentsType;

package/src/lib/util/ensureArray.ts

@@ -0,0 +1,3 @@
+export const ensureArray = <T extends NonNullable<unknown>>(
+  value: T | T[],
+): T[] => (Array.isArray(value) ? value : [value]);

package/src/lib/util/traverse.ts

@@ -4,9 +4,10 @@ export type { RecordAny };
 
 export const traverse = <T extends JsonValue = RecordAny>(
   specification: RecordAny,
-  transform: (specification: RecordAny) => T,
+  transform: (specification: RecordAny, path?: string[]) => T,
+  path: string[] = [],
 ) => {
-  const transformed = transform(specification);
+  const transformed = transform(specification, path);
   if (typeof transformed !== "object" || transformed === null) {
     return transformed;
   }
@@ -14,14 +15,16 @@ export const traverse = <T extends JsonValue = RecordAny>(
   const result: RecordAny = Array.isArray(transformed) ? [] : {};
 
   for (const [key, value] of Object.entries(transformed)) {
+    const currentPath = [...path, key];
+
     if (Array.isArray(value)) {
-      result[key] = value.map((item) =>
+      result[key] = value.map((item, index) =>
         typeof item === "object" && item != null
-          ? traverse(item, transform)
+          ? traverse(item, transform, [...currentPath, index.toString()])
           : item,
       );
     } else if (typeof value === "object" && value != null) {
-      result[key] = traverse(value, transform);
+      result[key] = traverse(value, transform, currentPath);
     } else {
       result[key] = value;
     }

package/src/lib/util/url.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, it } from "vitest";
+import { normalizeRedirectUrl } from "./url.js";
+
+describe("normalizeRedirectUrl", () => {
+  const mockOrigin = "https://example.com";
+
+  it("should return original URL if it doesn't start with origin", () => {
+    const result = normalizeRedirectUrl(
+      "https://other.com/path",
+      mockOrigin,
+      "/",
+    );
+    expect(result).toBe("https://other.com/path");
+  });
+
+  it("should remove origin when root is /", () => {
+    const result = normalizeRedirectUrl(
+      "https://example.com/some/path",
+      mockOrigin,
+      "/",
+    );
+    expect(result).toBe("/some/path");
+  });
+
+  it("should remove origin and root path when root is not /", () => {
+    const result = normalizeRedirectUrl(
+      "https://example.com/docs/some/path",
+      mockOrigin,
+      "/docs",
+    );
+    expect(result).toBe("/some/path");
+  });
+
+  it("should only remove origin when URL doesn't match root path", () => {
+    const result = normalizeRedirectUrl(
+      "https://example.com/other/path",
+      mockOrigin,
+      "/docs",
+    );
+    expect(result).toBe("/other/path");
+  });
+
+  it("should handle empty root path", () => {
+    const result = normalizeRedirectUrl(
+      "https://example.com/path",
+      mockOrigin,
+      "",
+    );
+    expect(result).toBe("/path");
+  });
+});

package/src/lib/util/url.ts

@@ -0,0 +1,18 @@
+/**
+ * Normalizes a redirect URL by removing the origin and optionally the root path
+ */
+export function normalizeRedirectUrl(
+  redirectTo: string,
+  origin: string,
+  basePath: string = "/",
+): string {
+  if (!redirectTo.startsWith(origin)) {
+    return redirectTo;
+  }
+
+  if (basePath !== "/" && redirectTo.startsWith(origin + basePath)) {
+    return redirectTo.slice(origin.length + basePath.length);
+  }
+
+  return redirectTo.slice(origin.length);
+}

package/src/lib/util/useExposedProps.tsx

@@ -1,10 +1,21 @@
 import {
+  type Location,
+  type NavigateFunction,
+  type Params,
+  type SetURLSearchParams,
   useLocation,
   useNavigate,
   useParams,
   useSearchParams,
 } from "react-router";
-import type { ExposedComponentProps } from "../components/SlotletProvider.js";
+
+export type ExposedComponentProps = {
+  location: Location;
+  navigate: NavigateFunction;
+  searchParams: URLSearchParams;
+  setSearchParams: SetURLSearchParams;
+  params: Params;
+};
 
 export const useExposedProps = (): ExposedComponentProps => {
   const location = useLocation();

package/src/shiki/langs/abap.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/abap";

package/src/shiki/langs/actionscript-3.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/actionscript-3";

package/src/shiki/langs/ada.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/ada";

package/src/shiki/langs/angular-expression.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-expression";

package/src/shiki/langs/angular-html.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-html";

package/src/shiki/langs/angular-inline-style.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-inline-style";

package/src/shiki/langs/angular-inline-template.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-inline-template";

package/src/shiki/langs/angular-let-declaration.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-let-declaration";

package/src/shiki/langs/angular-template-blocks.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-template-blocks";

package/src/shiki/langs/angular-template.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-template";

package/src/shiki/langs/angular-ts.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/angular-ts";

package/src/shiki/langs/apache.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/apache";

package/src/shiki/langs/apex.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/apex";

package/src/shiki/langs/apl.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/apl";

package/src/shiki/langs/applescript.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/applescript";

package/src/shiki/langs/ara.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/ara";

package/src/shiki/langs/asciidoc.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/asciidoc";

package/src/shiki/langs/asm.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/asm";

package/src/shiki/langs/astro.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/astro";

package/src/shiki/langs/awk.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/awk";

package/src/shiki/langs/ballerina.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/ballerina";

package/src/shiki/langs/bat.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/bat";

package/src/shiki/langs/beancount.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/beancount";

package/src/shiki/langs/berry.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/berry";

package/src/shiki/langs/bibtex.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/bibtex";

package/src/shiki/langs/bicep.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/bicep";

package/src/shiki/langs/blade.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/blade";

package/src/shiki/langs/bsl.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/bsl";

package/src/shiki/langs/c.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/c";

package/src/shiki/langs/cadence.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cadence";

package/src/shiki/langs/cairo.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cairo";

package/src/shiki/langs/clarity.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/clarity";

package/src/shiki/langs/clojure.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/clojure";

package/src/shiki/langs/cmake.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cmake";

package/src/shiki/langs/cobol.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cobol";

package/src/shiki/langs/codeowners.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/codeowners";

package/src/shiki/langs/codeql.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/codeql";

package/src/shiki/langs/coffee.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/coffee";

package/src/shiki/langs/common-lisp.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/common-lisp";

package/src/shiki/langs/coq.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/coq";

package/src/shiki/langs/cpp-macro.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cpp-macro";

package/src/shiki/langs/cpp.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cpp";

package/src/shiki/langs/crystal.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/crystal";

package/src/shiki/langs/csharp.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/csharp";

package/src/shiki/langs/css.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/css";

package/src/shiki/langs/csv.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/csv";

package/src/shiki/langs/cue.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cue";

package/src/shiki/langs/cypher.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/cypher";

package/src/shiki/langs/d.js

@@ -0,0 +1 @@
+export { default } from "@shikijs/langs/d";