zudoku 0.0.0-fix-firebase-export.f8270825 → 0.0.0-fix-warnings.z053d4e27

package/src/lib/plugins/api-keys/settings/RevealApiKey.tsx

@@ -0,0 +1,124 @@
+import { TrashIcon } from "lucide-react";
+import { useState } from "react";
+import { Button } from "zudoku/ui/Button.js";
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "zudoku/ui/Dialog.js";
+import { Secret } from "zudoku/ui/Secret.js";
+import { cn } from "../../../util/cn.js";
+import type { ApiKey } from "../index.js";
+
+export const RevealApiKey = ({
+  apiKey,
+  onDeleteKey,
+  className,
+}: {
+  apiKey: ApiKey;
+  onDeleteKey: () => void;
+  className?: string;
+}) => {
+  const [revealed, setRevealed] = useState(false);
+
+  const { key, createdOn, expiresOn } = apiKey;
+  const isExpired = expiresOn && new Date(expiresOn) < new Date();
+  const daysUntilExpiry = expiresOn
+    ? Math.ceil(
+        (new Date(expiresOn).getTime() - Date.now()) / (1000 * 60 * 60 * 24),
+      )
+    : Infinity;
+  const expiresSoon = daysUntilExpiry <= 7 && !isExpired;
+
+  return (
+    <div className={cn("grid col-span-full grid-cols-subgrid p-6", className)}>
+      <div className="flex flex-col gap-1">
+        <Secret
+          className="max-w-fit w-full"
+          secret={key}
+          status={isExpired ? "expired" : expiresSoon ? "expiring" : "active"}
+          revealed={revealed}
+          onReveal={setRevealed}
+        />
+        <div className="flex gap-1 mt-0.5 text-nowrap">
+          {createdOn && (
+            <span className="text-xs text-muted-foreground">
+              Created {getTimeAgo(createdOn)}.
+            </span>
+          )}{" "}
+          {expiresOn && expiresSoon && (
+            <span className="text-xs text-primary">
+              Expires in {daysUntilExpiry}{" "}
+              {daysUntilExpiry === 1 ? "day" : "days"}.
+            </span>
+          )}
+          {expiresOn && isExpired && (
+            <span className="text-xs text-primary">
+              Expired{" "}
+              {daysUntilExpiry === 0
+                ? "today."
+                : `${daysUntilExpiry * -1} days ago.`}
+            </span>
+          )}
+        </div>
+      </div>
+      <div className="flex justify-end">
+        {expiresOn && onDeleteKey && (
+          <Dialog>
+            <DialogTrigger asChild>
+              <Button variant="ghost" size="icon">
+                <TrashIcon size={16} />
+              </Button>
+            </DialogTrigger>
+            <DialogContent>
+              <DialogHeader>
+                <DialogTitle>Delete API Key</DialogTitle>
+                <DialogDescription>
+                  Are you sure you want to delete this API key?
+                </DialogDescription>
+              </DialogHeader>
+              <DialogFooter>
+                <DialogClose asChild>
+                  <Button variant="outline">Cancel</Button>
+                </DialogClose>
+                <DialogClose asChild>
+                  <Button
+                    onClick={() => {
+                      onDeleteKey();
+                    }}
+                  >
+                    Delete
+                  </Button>
+                </DialogClose>
+              </DialogFooter>
+            </DialogContent>
+          </Dialog>
+        )}
+      </div>
+    </div>
+  );
+};
+
+const getTimeAgo = (date: string) => {
+  const now = new Date();
+  const created = new Date(date);
+  const diffInSeconds = Math.floor((now.getTime() - created.getTime()) / 1000);
+
+  const rtf = new Intl.RelativeTimeFormat("en", { numeric: "auto" });
+
+  if (diffInSeconds < 60) return rtf.format(-diffInSeconds, "second");
+  if (diffInSeconds < 3600)
+    return rtf.format(-Math.floor(diffInSeconds / 60), "minute");
+  if (diffInSeconds < 86400)
+    return rtf.format(-Math.floor(diffInSeconds / 3600), "hour");
+  if (diffInSeconds < 2592000)
+    return rtf.format(-Math.floor(diffInSeconds / 86400), "day");
+  if (diffInSeconds < 31536000)
+    return rtf.format(-Math.floor(diffInSeconds / 2592000), "month");
+  return rtf.format(-Math.floor(diffInSeconds / 31536000), "year");
+};

package/src/lib/plugins/openapi/OasProvider.tsx

@@ -19,13 +19,21 @@ export const OasProvider = ({
   client: GraphQLClient;
 }) => {
   const value = useMemo(() => {
-    const { versions: availableVersions, labels } = getVersionMetadata(config);
+    const {
+      versions: availableVersions,
+      labels,
+      downloadUrls,
+    } = getVersionMetadata(config);
     const currentVersion = version ?? availableVersions.at(0);
 
     const versionLinks = Object.fromEntries(
       availableVersions.map((id) => [
         id,
-        { path: joinUrl(basePath, id), label: labels[id] ?? id },
+        {
+          path: joinUrl(basePath, id),
+          label: labels[id] ?? id,
+          downloadUrl: downloadUrls[id],
+        },
       ]),
     );
 

package/src/lib/plugins/openapi/OperationList.tsx

@@ -20,7 +20,6 @@ import { Heading } from "../../components/Heading.js";
 import { Markdown } from "../../components/Markdown.js";
 import { PagefindSearchMeta } from "../../components/PagefindSearchMeta.js";
 import { Pagination } from "../../components/Pagination.js";
-import { joinUrl } from "../../util/joinUrl.js";
 import { useCreateQuery } from "./client/useCreateQuery.js";
 import { useOasConfig } from "./context.js";
 import { DownloadSchemaButton } from "./DownloadSchemaButton.js";
@@ -158,7 +157,7 @@ export const OperationList = ({
   tag?: string;
   untagged?: boolean;
 }) => {
-  const { path, input, type, versions, version, options } = useOasConfig();
+  const { input, type, versions, version, options } = useOasConfig();
   const { tag: tagFromParams } = useParams<"tag">();
   const query = useCreateQuery(OperationsForTagQuery, {
     input,
@@ -247,11 +246,12 @@ export const OperationList = ({
   const tagTitle = schema.tag.extensions?.["x-displayName"] ?? schema.tag.name;
   const helmetTitle = [tagTitle, title].filter(Boolean).join(" - ");
 
+  const currentVersion = version != null ? versions[version] : undefined;
   const downloadUrl =
     typeof input === "string"
       ? type === "url"
         ? input
-        : joinUrl(path, version, input.split("/").pop())
+        : currentVersion?.downloadUrl
       : undefined;
 
   return (
@@ -286,7 +286,7 @@ export const OperationList = ({
                 {showVersions && (
                   <span className="text-xl text-muted-foreground ms-1.5">
                     {" "}
-                    ({version})
+                    ({schema.version})
                   </span>
                 )}
               </Heading>

package/src/lib/plugins/openapi/ParamInfos.tsx

@@ -40,6 +40,7 @@ const getSchemaInfos = (schema?: SchemaObject) => {
     schema.enum && "enum",
     schema.const && "const",
     schema.format,
+    schema.type === "array" && schema.items?.contentMediaType,
     schema.minimum !== undefined && `min: ${schema.minimum}`,
     schema.maximum !== undefined && `max: ${schema.maximum}`,
     schema.minLength !== undefined && `minLength: ${schema.minLength}`,

package/src/lib/plugins/openapi/Sidecar.tsx

@@ -149,10 +149,10 @@ export const Sidecar = ({
       selectedServer,
       exampleBody: currentExampleCode
         ? {
-            mimeType: "application/json",
+            mimeType: selectedContent?.mediaType ?? "application/json",
             text: JSON.stringify(currentExampleCode, null, 2),
           }
-        : { mimeType: "application/json" },
+        : { mimeType: selectedContent?.mediaType ?? "application/json" },
     });
 
     return getConverted(snippet, selectedLang);
@@ -161,6 +161,7 @@ export const Sidecar = ({
     operation,
     selectedServer,
     selectedLang,
+    selectedContent,
     options,
     auth,
     context,

package/src/lib/plugins/openapi/interfaces.ts

@@ -7,6 +7,8 @@ type DynamicInput = () => Promise<unknown>;
 
 export type VersionedInput<T> = Array<{
   path: string;
+  version?: string;
+  downloadUrl?: string;
   label?: string;
   input: T;
 }>;
@@ -85,5 +87,8 @@ export type OasPluginConfig = BaseOasConfig & OasSource;
 export type OasPluginContext = BaseOasConfig &
   ContextOasSource & {
     version?: string;
-    versions: Record<string, { path: string; label: string }>;
+    versions: Record<
+      string,
+      { path: string; label: string; downloadUrl?: string }
+    >;
   };

package/src/lib/plugins/openapi/schema/SchemaView.tsx

@@ -154,10 +154,12 @@ export const SchemaView = ({
             <FrameDescription>{schema.description}</FrameDescription>
           </FrameHeader>
         )}
-        <FramePanel className="p-0!">
-          {itemsList}
-          {additionalObjectProperties}
-        </FramePanel>
+        {(itemsList.length > 0 || additionalObjectProperties) && (
+          <FramePanel className="p-0!">
+            {itemsList}
+            {additionalObjectProperties}
+          </FramePanel>
+        )}
         {schema.additionalProperties === true && (
           <FrameFooter>
             <a

package/src/lib/plugins/openapi/schema/utils.ts

@@ -1,4 +1,7 @@
-import { CIRCULAR_REF } from "../../../oas/graphql/circular.js";
+import {
+  CIRCULAR_REF,
+  SCHEMA_REF_PREFIX,
+} from "../../../oas/graphql/circular.js";
 import type {
   ArraySchemaObject,
   SchemaObject,
@@ -25,7 +28,8 @@ export const isComplexType = (value?: SchemaObject) =>
       (!value.items.type || value.items.type === "object")));
 
 export const isCircularRef = (schema: unknown): schema is string =>
-  typeof schema === "string" && schema.startsWith(CIRCULAR_REF);
+  typeof schema === "string" &&
+  (schema.startsWith(CIRCULAR_REF) || schema.startsWith(SCHEMA_REF_PREFIX));
 
 export const isArrayCircularRef = (
   schema: SchemaObject,
@@ -34,5 +38,12 @@ export const isArrayCircularRef = (
 
 export const extractCircularRefInfo = (
   ref?: string | SchemaObject,
-): string | undefined =>
-  typeof ref === "string" ? ref.split(":")[1] : undefined;
+): string | undefined => {
+  if (typeof ref !== "string") return undefined;
+
+  if (ref.startsWith(SCHEMA_REF_PREFIX)) {
+    return ref.slice(SCHEMA_REF_PREFIX.length).split("/").pop();
+  }
+
+  return ref.split(":")[1];
+};

package/src/lib/plugins/openapi/util/createHttpSnippet.ts

@@ -1,6 +1,23 @@
 import { HTTPSnippet } from "@zudoku/httpsnippet";
 import type { OperationsFragmentFragment } from "../graphql/graphql.js";
 
+const toFormDataParams = (text?: string) => {
+  const stringify = (v: unknown) =>
+    typeof v === "string" ? v : JSON.stringify(v);
+
+  try {
+    const obj = text && JSON.parse(text);
+    if (typeof obj !== "object" || !obj) return [];
+
+    return Object.entries(obj).flatMap(([name, value]) => {
+      const values = Array.isArray(value) ? value : [value];
+      return values.map((v) => ({ name, value: stringify(v) }));
+    });
+  } catch {
+    return [];
+  }
+};
+
 export const createHttpSnippet = ({
   operation,
   selectedServer,
@@ -13,11 +30,22 @@ export const createHttpSnippet = ({
     text?: string;
   };
 }) => {
+  const isMultipart =
+    exampleBody.mimeType === "multipart/form-data" ||
+    exampleBody.mimeType === "application/x-www-form-urlencoded";
+
+  const postData = isMultipart
+    ? {
+        mimeType: exampleBody.mimeType,
+        params: toFormDataParams(exampleBody.text),
+      }
+    : exampleBody;
+
   return new HTTPSnippet({
     method: operation.method.toUpperCase(),
     url:
       selectedServer + operation.path.replaceAll("{", ":").replaceAll("}", ""),
-    postData: exampleBody,
+    postData,
     headers: [
       ...(exampleBody.text
         ? [{ name: "Content-Type", value: exampleBody.mimeType }]

package/src/lib/plugins/openapi/util/getRoutes.tsx

@@ -150,7 +150,7 @@ const createVersionRoutes = (
 
 export const getVersionMetadata = (config: OasPluginConfig) => {
   if (config.type === "raw" || !Array.isArray(config.input)) {
-    return { versions: [], labels: {} };
+    return { versions: [], labels: {}, downloadUrls: {} };
   }
 
   return {
@@ -158,6 +158,9 @@ export const getVersionMetadata = (config: OasPluginConfig) => {
     labels: Object.fromEntries(
       config.input.map((v) => [v.path, v.label ?? v.path]),
     ),
+    downloadUrls: Object.fromEntries(
+      config.input.map((v) => [v.path, v.downloadUrl]),
+    ),
   };
 };
 

package/src/lib/ui/Button.tsx

@@ -51,6 +51,7 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     const Comp = asChild ? Slot : "button";
     return (
       <Comp
+        type={asChild ? undefined : "button"}
         className={cn(buttonVariants({ variant, size, className }))}
         ref={ref}
         {...props}

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

@@ -1,7 +1,8 @@
 import type { JSONSchema7 } from "json-schema";
 import { describe, expect, it, vi } from "vitest";
 import type { OpenAPIDocument } from "../oas/parser/index.js";
-import { flattenAllOf, flattenAllOfProcessor } from "./flattenAllOf.js";
+import { flattenAllOf } from "./flattenAllOf.js";
+import { flattenAllOfProcessor } from "./flattenAllOfProcessor.js";
 import invariant from "./invariant.js";
 
 describe("flattenAllOf", () => {

package/src/lib/util/flattenAllOf.ts

@@ -1,4 +1,3 @@
-import { $RefParser } from "@apidevtools/json-schema-ref-parser";
 import {
   createComparator,
   createMerger,
@@ -9,62 +8,6 @@ import {
   createIntersector,
 } from "@x0k/json-schema-merge/lib/array";
 import type { JSONSchema7Definition } from "json-schema";
-import type { Processor } from "../../config/validators/BuildSchema.js";
-import type { OpenAPIDocument } from "../oas/parser/index.js";
-import { type RecordAny, traverse } from "./traverse.js";
-
-export const flattenAllOfProcessor: Processor = async ({ schema, file }) => {
-  try {
-    // Resolve refs once - creates a lookup table without modifying the schema
-    const parser = new $RefParser();
-    await parser.resolve(schema);
-    const $refs = parser.$refs;
-
-    const flattened = traverse(schema, (spec) => {
-      if (!spec || typeof spec !== "object" || Array.isArray(spec)) {
-        return spec;
-      }
-
-      const isSchemaObject =
-        "type" in spec ||
-        "properties" in spec ||
-        "allOf" in spec ||
-        "anyOf" in spec ||
-        "oneOf" in spec;
-
-      if (!isSchemaObject) return spec;
-
-      if ("allOf" in spec && Array.isArray(spec.allOf)) {
-        const resolvedAllOf = spec.allOf.map((item) => {
-          if (
-            item &&
-            typeof item === "object" &&
-            "$ref" in item &&
-            typeof item.$ref === "string"
-          ) {
-            try {
-              return $refs.get(item.$ref) ?? item;
-            } catch {
-              return item;
-            }
-          }
-          return item;
-        });
-        return flattenAllOf({ ...spec, allOf: resolvedAllOf }) as RecordAny;
-      }
-
-      return flattenAllOf(spec) as RecordAny;
-    }) as OpenAPIDocument;
-
-    return flattened;
-  } catch (error) {
-    // biome-ignore lint/suspicious/noConsole: Logging allowed here
-    console.warn(
-      `Failed to flatten \`allOf\` in ${file}: ${error instanceof Error ? error.message : error}`,
-    );
-    return schema;
-  }
-};
 
 const { compareSchemaDefinitions, compareSchemaValues } = createComparator();
 const { mergeArrayOfSchemaDefinitions } = createMerger({

package/src/lib/util/flattenAllOfProcessor.ts

@@ -0,0 +1,58 @@
+import { $RefParser } from "@apidevtools/json-schema-ref-parser";
+import type { Processor } from "../../config/validators/BuildSchema.js";
+import type { OpenAPIDocument } from "../oas/parser/index.js";
+import { flattenAllOf } from "./flattenAllOf.js";
+import { type RecordAny, traverse } from "./traverse.js";
+
+export const flattenAllOfProcessor: Processor = async ({ schema, file }) => {
+  try {
+    // Resolve refs once - creates a lookup table without modifying the schema
+    const parser = new $RefParser();
+    await parser.resolve(schema);
+    const $refs = parser.$refs;
+
+    const flattened = traverse(schema, (spec) => {
+      if (!spec || typeof spec !== "object" || Array.isArray(spec)) {
+        return spec;
+      }
+
+      const isSchemaObject =
+        "type" in spec ||
+        "properties" in spec ||
+        "allOf" in spec ||
+        "anyOf" in spec ||
+        "oneOf" in spec;
+
+      if (!isSchemaObject) return spec;
+
+      if ("allOf" in spec && Array.isArray(spec.allOf)) {
+        const resolvedAllOf = spec.allOf.map((item) => {
+          if (
+            item &&
+            typeof item === "object" &&
+            "$ref" in item &&
+            typeof item.$ref === "string"
+          ) {
+            try {
+              return $refs.get(item.$ref) ?? item;
+            } catch {
+              return item;
+            }
+          }
+          return item;
+        });
+        return flattenAllOf({ ...spec, allOf: resolvedAllOf }) as RecordAny;
+      }
+
+      return flattenAllOf(spec) as RecordAny;
+    }) as OpenAPIDocument;
+
+    return flattened;
+  } catch (error) {
+    // biome-ignore lint/suspicious/noConsole: Logging allowed here
+    console.warn(
+      `Failed to flatten \`allOf\` in ${file}: ${error instanceof Error ? error.message : error}`,
+    );
+    return schema;
+  }
+};

package/src/lib/util/invariant.ts

@@ -7,6 +7,7 @@ export default function invariant(
    * the message takes a fair amount of effort to compute
    */
   message?: string | (() => string),
+  options?: ZudokuErrorOptions,
 ): asserts condition {
   if (condition) {
     return;
@@ -16,7 +17,7 @@ export default function invariant(
   const provided: string | undefined =
     typeof message === "function" ? message() : message;
 
-  throw new ZudokuError(provided ?? "Invariant failed");
+  throw new ZudokuError(provided ?? "Invariant failed", options);
 }
 
 export type ZudokuErrorOptions = {

package/src/lib/util/readFrontmatter.ts

@@ -9,5 +9,6 @@ export const yaml = {
 
 export const readFrontmatter = async (filePath: string) => {
   const content = await readFile(filePath, "utf-8");
-  return matter(content, { engines: { yaml } });
+  const normalizedContent = content.replace(/\r\n/g, "\n");
+  return matter(normalizedContent, { engines: { yaml } });
 };

package/src/shiki/langs/c3.js

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

package/src/shiki/langs/gn.js

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

package/src/shiki/langs/moonbit.js

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