@tulip-systems/core 0.6.1 → 0.8.0

package/src/modules/inline-edit/components/editor.client.tsx

@@ -46,6 +46,9 @@ export function InlineEditor<Required extends boolean = false>({
       className={cn(inlineEditVariants({ variant, status }), className)}
       disabled={disabled || !isAllowed}
       variant={variant}
+      attributes={{
+        "data-inline-input": "editor",
+      }}
     >
       {children}
     </Editor>

package/src/modules/inline-edit/components/input-recipient.client.tsx

@@ -45,6 +45,7 @@ export function InlineRecipientInput<Required extends boolean = false>({
   return (
     <RecipientInput
       {...props}
+      data-inline-input="recipient"
       contacts={contacts}
       value={value ?? []}
       onChange={(newValue) => {

package/src/modules/inline-edit/components/input-toggle.client.tsx

@@ -50,12 +50,13 @@ export function InlineStringInputToggle<Required extends boolean>({
     <div className="relative">
       <Input
         {...props}
+        data-inline-input="input-toggle"
         type="text"
         value={value ?? undefined}
         disabled={isDisabled}
         onChange={(e) => handleChange(e.target.value ? e.target.value : null)}
         onBlur={(e) => handleBlur(e.target.value ? e.target.value : null)}
-        className={cn("border-border/70 hover:border-border w-full", className)}
+        className={cn("w-full border-border/70 hover:border-border", className)}
       />
 
       <Button
@@ -63,7 +64,7 @@ export function InlineStringInputToggle<Required extends boolean>({
         onClick={handleToggle}
         tabIndex={-1}
         className={cn(
-          "absolute bottom-0 right-0 top-0 opacity-50",
+          "absolute top-0 right-0 bottom-0 opacity-50",
           !value && "text-muted-foreground",
         )}
       >

package/src/modules/inline-edit/components/input.client.tsx

@@ -42,13 +42,14 @@ export function InlineStringInput<Required extends boolean = false>({
   return (
     <Input
       {...props}
+      data-inline-input="string"
       type="text"
       value={value ?? undefined}
       disabled={disabled || !isAllowed}
       onChange={(e) => handleChange(e.target.value ? e.target.value : null)}
       onBlur={(e) => handleBlur(e.target.value ? e.target.value : null)}
       className={cn(
-        "border-border/70 hover:border-border w-full",
+        "w-full border-border/70 hover:border-border",
         inlineEditVariants({ variant, status }),
         className,
       )}
@@ -88,13 +89,14 @@ export function InlineNumberInput<Required extends boolean = false>({
   return (
     <Input
       {...props}
+      data-inline-input="number"
       type="number"
       value={value ?? undefined}
       disabled={disabled || !isAllowed}
       onChange={(e) => handleChange(parseValueAsNumber(e.target.valueAsNumber))}
       onBlur={(e) => handleBlur(parseValueAsNumber(e.target.valueAsNumber))}
       className={cn(
-        "border-border/70 hover:border-border w-full",
+        "w-full border-border/70 hover:border-border",
         inlineEditVariants({ variant, status }),
         className,
       )}
@@ -131,13 +133,14 @@ export function InlineDecimalInput({
   return (
     <Input
       {...props}
+      data-inline-input="decimal"
       type="number"
       value={value ?? undefined}
       disabled={disabled || !isAllowed}
       onChange={(e) => handleChange(e.target.value ? e.target.value : null)}
       onBlur={(e) => handleBlur(e.target.value ? e.target.value : null)}
       className={cn(
-        "border-border/70 hover:border-border w-full",
+        "w-full border-border/70 hover:border-border",
         inlineEditVariants({ variant, status }),
         className,
       )}

package/src/modules/inline-edit/components/select.client.tsx

@@ -1,12 +1,6 @@
 "use client";
 
-import type {
-  SelectContentProps,
-  SelectItemProps,
-  SelectProps,
-  SelectTriggerProps,
-  SelectValueProps,
-} from "@radix-ui/react-select";
+import type { ComponentProps } from "react";
 import {
   Select,
   SelectContent,
@@ -27,7 +21,7 @@ export function InlineSelect<Required extends boolean = false>({
   isRequired,
   disabled,
   ...props
-}: SelectProps & useInlineEditOptions<string, Required>) {
+}: ComponentProps<typeof Select> & useInlineEditOptions<string, Required>) {
   const { value, handleChange, handleBlur, isAllowed } = useInlineEdit({
     initialValue,
     action,
@@ -53,34 +47,30 @@ export function InlineSelect<Required extends boolean = false>({
   );
 }
 
-export type InlineSelectTriggerProps = SelectTriggerProps;
-
 export function InlineSelectTrigger({
   variant,
   className,
   ...props
-}: InlineSelectTriggerProps & InlineEditVariantsProps) {
+}: ComponentProps<typeof SelectTrigger> & InlineEditVariantsProps) {
   const { status } = useIndicator();
 
   return (
-    <SelectTrigger {...props} className={cn(inlineEditVariants({ variant, status }), className)} />
+    <SelectTrigger
+      {...props}
+      data-inline-input="select"
+      className={cn(inlineEditVariants({ variant, status }), className)}
+    />
   );
 }
 
-export type InlineSelectContentProps = SelectContentProps;
-
-export function InlineSelectContent(props: InlineSelectContentProps) {
+export function InlineSelectContent(props: ComponentProps<typeof SelectContent>) {
   return <SelectContent {...props} />;
 }
 
-export type InlineSelectValueProps = SelectValueProps;
-
-export function InlineSelectValue(props: InlineSelectValueProps) {
+export function InlineSelectValue(props: ComponentProps<typeof SelectValue>) {
   return <SelectValue {...props} />;
 }
 
-export type InlineSelectItenProps = SelectItemProps;
-
-export function InlineSelectItem(props: InlineSelectItenProps) {
+export function InlineSelectItem(props: ComponentProps<typeof SelectItem>) {
   return <SelectItem {...props} />;
 }

package/src/modules/inline-edit/components/switch.client.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import type { SwitchProps } from "@radix-ui/react-switch";
-import { Switch } from "@/components/ui/switch";
+import type { ComponentProps } from "react";
+import { Switch } from "@/components/ui/switch.client";
 import { useInlineEdit, type useInlineEditOptions } from "../hooks/use-inline.client";
 
 export function InlineSwitch<Required extends boolean = false>({
@@ -12,7 +12,7 @@ export function InlineSwitch<Required extends boolean = false>({
   isRequired,
   disabled,
   ...props
-}: SwitchProps & useInlineEditOptions<boolean, Required>) {
+}: ComponentProps<typeof Switch> & useInlineEditOptions<boolean, Required>) {
   const { value, handleChange, handleBlur, isAllowed } = useInlineEdit({
     initialValue,
     action,
@@ -28,6 +28,7 @@ export function InlineSwitch<Required extends boolean = false>({
   return (
     <Switch
       {...props}
+      data-inline-input="switch"
       disabled={disabled || !isAllowed}
       defaultChecked={value ?? undefined}
       onCheckedChange={(checked) => {

package/src/modules/inline-edit/components/toggle.client.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import type React from "react";
-import { Toggle } from "@/components/ui/toggle";
+import { Toggle } from "@/components/ui/toggle.client";
 import { cn } from "@/lib/utils/cn";
 import { useInlineEdit, type useInlineEditOptions } from "../hooks/use-inline.client";
 
@@ -33,6 +33,7 @@ export function InlineToggle<Required extends boolean = false>({
   return (
     <div {...props} className={cn("flex flex-wrap items-center justify-start gap-1", className)}>
       <Toggle
+        data-inline-input="toggle"
         disabled={!isAllowed}
         variant="outline"
         pressed={value ?? undefined}

package/src/modules/inline-edit/lib/variants.ts

@@ -5,7 +5,7 @@ export const inlineEditVariants = cva("", {
     variant: {
       default: "",
       table:
-        "min-h-9 px-3 py-1 text-base md:text-sm rounded-none h-full w-full border-none outline-none ring-0 focus:border-0 focus:outline-none focus:ring-0 focus:ring-offset-0 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0",
+        "min-h-8 px-3 py-1 text-base md:text-sm rounded-none h-full w-full border-none outline-none ring-0 focus:border-0 focus:outline-none focus:ring-0 focus:ring-offset-0 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0",
     },
     status: {
       idle: "",

package/src/modules/router/handler/init.server.ts

@@ -33,7 +33,7 @@ export function initRPC<TSchema extends TDatabaseSchema>() {
   /**
    * Middleware function to check if the user has the required permission
    */
-  function permissionMiddleware(permission: Permission) {
+  function permissionMiddleware(permissions: Permission) {
     /**
      * Middleware function to check if the user has the required permission
      */
@@ -41,7 +41,7 @@ export function initRPC<TSchema extends TDatabaseSchema>() {
       const { success, error } = await opts.context.auth.api.userHasPermission({
         body: {
           userId: opts.context.session.user.id,
-          permission,
+          permissions,
         },
       });
 

package/src/modules/storage/components/dropzone.client.tsx

@@ -6,7 +6,7 @@ import type { DropEvent, DropzoneOptions, FileRejection } from "react-dropzone";
 import { useDropzone } from "react-dropzone";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils/cn";
-import { renderBytes } from "@/modules/storage/lib/helpers";
+import { renderBytes } from "../lib/helpers";
 import { DropzoneContext, useDropzoneContext } from "./dropzone-context.client";
 
 /**
@@ -55,7 +55,7 @@ export function Dropzone({
       <Button
         className={cn(
           "relative h-auto w-full flex-col overflow-hidden p-8",
-          isDragActive && "ring-ring outline-none ring-1",
+          isDragActive && "outline-none ring-1 ring-ring",
           className,
         )}
         disabled={disabled}
@@ -88,11 +88,11 @@ export function DropzoneContent({ children, className }: DropzoneContentProps) {
 
   return (
     <div className={cn("flex flex-col items-center justify-center", className)}>
-      <div className="bg-muted text-muted-foreground flex size-8 items-center justify-center rounded-md">
+      <div className="flex size-8 items-center justify-center rounded-md bg-muted text-muted-foreground">
         <UploadIcon size={16} />
       </div>
 
-      <p className="my-2 w-full truncate text-sm font-medium">
+      <p className="my-2 w-full truncate font-medium text-sm">
         {src.length > maxLabelItems
           ? `${new Intl.ListFormat("en").format(
               src.slice(0, maxLabelItems).map((file) => file.name),
@@ -100,7 +100,7 @@ export function DropzoneContent({ children, className }: DropzoneContentProps) {
           : new Intl.ListFormat("en").format(src.map((file) => file.name))}
       </p>
 
-      <p className="text-muted-foreground w-full text-wrap text-xs">
+      <p className="w-full text-wrap text-muted-foreground text-xs">
         Drag and drop or click to replace
       </p>
     </div>
@@ -137,16 +137,16 @@ export function DropzoneEmptyState({ children, className }: DropzoneEmptyStatePr
   }
   return (
     <div className={cn("flex flex-col items-center justify-center", className)}>
-      <div className="bg-muted text-muted-foreground flex size-8 items-center justify-center rounded-md">
+      <div className="flex size-8 items-center justify-center rounded-md bg-muted text-muted-foreground">
         <UploadIcon size={16} />
       </div>
-      <p className="my-2 w-full truncate text-wrap text-sm font-medium">
+      <p className="my-2 w-full truncate text-wrap font-medium text-sm">
         Upload {maxFiles === 1 ? "a file" : "files"}
       </p>
-      <p className="text-muted-foreground w-full truncate text-wrap text-xs">
+      <p className="w-full truncate text-wrap text-muted-foreground text-xs">
         Drag and drop or click to upload
       </p>
-      {caption && <p className="text-muted-foreground text-wrap text-xs">{caption}.</p>}
+      {caption && <p className="text-wrap text-muted-foreground text-xs">{caption}.</p>}
     </div>
   );
 }

package/src/modules/storage/components/image-grid.client.tsx

@@ -18,7 +18,6 @@ import {
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { GripIcon, UploadIcon } from "lucide-react";
-import Image from "next/image";
 import React, { type ComponentProps } from "react";
 import { Icons } from "@/components/common/icons";
 import { Button } from "@/components/ui/button";
@@ -29,21 +28,22 @@ import {
   CarouselItem,
   CarouselNext,
   CarouselPrevious,
-} from "@/components/ui/carousel";
+} from "@/components/ui/carousel.client";
 import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog.client";
 import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useAction } from "@/lib/entry.client";
 import { cn } from "@/lib/utils/cn";
-import { getFileUrl, imageLoader } from "../lib/helpers";
-import type { FileNode } from "../lib/validators";
+import { getAssetURL } from "../lib/helpers";
+import type { StorageAsset } from "../lib/validators";
+import { StorageImage } from "./image.client";
 import { useUploadZone } from "./upload-zone-context.client";
 
 /**
  * Image Grid
  */
 type ImageGridProps = ComponentProps<"div"> & {
-  nodes: FileNode[];
+  assets: StorageAsset[];
   disabled?: boolean;
   moveAction: (params: { fromIndex: number; toIndex: number }) => Promise<void>;
   optimistic?: {
@@ -51,10 +51,10 @@ type ImageGridProps = ComponentProps<"div"> & {
   };
 };
 
-export function ImageGrid({ nodes, moveAction, optimistic, disabled, ...props }: ImageGridProps) {
+export function ImageGrid({ assets, moveAction, optimistic, disabled, ...props }: ImageGridProps) {
   const uploadZone = useUploadZone();
 
-  const images = nodes.flatMap((node) => ({ ...node, url: getFileUrl(node.id) }));
+  const images = assets.flatMap((asset) => ({ ...asset, url: getAssetURL(asset.id) }));
 
   const [current, setCurrent] = React.useState<number>(0);
 
@@ -101,14 +101,14 @@ export function ImageGrid({ nodes, moveAction, optimistic, disabled, ...props }:
           className="grid grid-cols-[repeat(auto-fill,minmax(10rem,1fr))] gap-5"
         >
           <SortableContext items={images.map((image) => image.id)} strategy={rectSortingStrategy}>
-            {images.map((node, index) => (
-              <ImageGridItem key={node.id} node={node} index={index} setCurrent={setCurrent} />
+            {images.map((asset, index) => (
+              <ImageGridItem key={asset.id} asset={asset} index={index} setCurrent={setCurrent} />
             ))}
 
             {!disabled && (
               <label
                 htmlFor="file-upload"
-                className="border-muted-foreground bg-muted hover:border-primary relative flex aspect-square w-full cursor-pointer flex-col items-center justify-center rounded-lg border border-dashed"
+                className="relative flex aspect-square w-full cursor-pointer flex-col items-center justify-center rounded-lg border border-muted-foreground border-dashed bg-muted hover:border-primary"
               >
                 <UploadIcon className="h-8 w-8" />
                 <Input
@@ -133,13 +133,12 @@ export function ImageGrid({ nodes, moveAction, optimistic, disabled, ...props }:
           <CarouselContent className="md:max-h-[80vh]">
             {images.map(({ id, url }) => (
               <CarouselItem key={id} className="overflow-hidden rounded-xl">
-                <Image
+                <StorageImage
                   src={url}
                   alt="Image Preview"
                   width={1920}
                   height={1080}
                   className="h-full w-full rounded-xl object-contain"
-                  loader={imageLoader}
                 />
               </CarouselItem>
             ))}
@@ -156,36 +155,40 @@ export function ImageGrid({ nodes, moveAction, optimistic, disabled, ...props }:
  * Image Grid Item
  */
 type ImageGridItemProps = {
-  node: FileNode & { url: string };
+  asset: StorageAsset & { url: string };
   index: number;
   setCurrent: React.Dispatch<React.SetStateAction<number>>;
 };
 
-function ImageGridItem({ node, index, setCurrent }: ImageGridItemProps) {
+function ImageGridItem({ asset, index, setCurrent }: ImageGridItemProps) {
   const uploadZone = useUploadZone();
 
-  const { attributes, listeners, setNodeRef, transform, transition } = useSortable({ id: node.id });
+  const { attributes, listeners, setNodeRef, transform, transition } = useSortable({
+    id: asset.id,
+  });
 
   return (
     <Card
-      id={node.id}
+      id={asset.id}
       ref={setNodeRef}
       style={{
         transform: CSS.Transform.toString(transform),
         transition,
       }}
-      className={cn("group relative aspect-square w-full", node.isPending && "opacity-30")}
+      className={cn(
+        "group relative aspect-square w-full",
+        asset.status === "pending" && "opacity-30",
+      )}
     >
-      {!node.isPending ? (
+      {asset.status === "ready" ? (
         <>
           <DialogTrigger onClick={() => setCurrent(index)}>
-            <Image
-              src={node.url}
+            <StorageImage
+              src={asset.url}
               alt="Image Preview"
               width={100}
               height={100}
-              className="bg-muted absolute inset-0 h-full w-full cursor-pointer rounded-lg object-contain"
-              loader={imageLoader}
+              className="absolute inset-0 h-full w-full cursor-pointer rounded-lg bg-muted object-contain"
             />
           </DialogTrigger>
 
@@ -195,7 +198,7 @@ function ImageGridItem({ node, index, setCurrent }: ImageGridItemProps) {
             type="button"
             variant="secondary"
             size="icon"
-            className="absolute right-2 top-2 hidden p-1 group-hover:flex"
+            className="absolute top-2 right-2 hidden p-1 group-hover:flex"
           >
             <GripIcon className="size-4" />
           </Button>
@@ -204,8 +207,8 @@ function ImageGridItem({ node, index, setCurrent }: ImageGridItemProps) {
             type="button"
             variant="destructive"
             size="icon"
-            onClick={() => uploadZone.onRemove([node.id])}
-            className="absolute left-2 top-2 hidden p-1 group-hover:flex"
+            onClick={() => uploadZone.onRemove([asset.id])}
+            className="absolute top-2 left-2 hidden p-1 group-hover:flex"
           >
             <Icons.trash className="size-4" />
           </Button>

package/src/modules/storage/components/image.client.tsx

@@ -0,0 +1,8 @@
+"use client";
+
+import Image, { type ImageProps } from "next/image";
+import { imageLoader } from "../lib/helpers";
+
+export function StorageImage(props: Omit<ImageProps, "loader">) {
+  return <Image {...props} loader={imageLoader} />;
+}

package/src/modules/storage/components/upload-zone-context.client.tsx

@@ -1,31 +1,34 @@
 "use client";
 
 import React from "react";
-import type { UploadClient } from "../lib/create-upload.client";
-import type { FileNode, Node } from "../lib/validators";
+import type { UploadClient } from "../lib/upload.client";
+import type { StorageAsset } from "../lib/validators";
 
 /**
  * Upload Zone Context Value
  */
 export type UploadZoneContextValue = {
   uploadClient: UploadClient;
-  onUpload: (file: File) => Promise<Node>;
+  onUpload: (file: File) => Promise<StorageAsset>;
   onRemove: (ids: string[]) => Promise<void>;
   optimistic?: {
-    add?: (newValue: FileNode) => Promise<void> | void;
+    add?: (
+      newValue: Omit<
+        StorageAsset,
+        "id" | "key" | "bucket" | "provider" | "createdAt" | "updatedAt"
+      >,
+    ) => Promise<void> | void;
     remove?: (ids: string[]) => Promise<void> | void;
     invalidate?: () => Promise<void> | void;
     cancel?: () => Promise<void> | void;
   };
   disabled?: boolean;
-  // updateData: (newValue: FileNode[] | ((oldValue: FileNode[]) => FileNode[])) => Promise<void>;
-  // invalidateQuery: () => Promise<void> | void;
 };
 
 /**
  * Upload Zone Context
  */
-export const UploadZoneContext = React.createContext({} as UploadZoneContextValue);
+export const UploadZoneContext = React.createContext<UploadZoneContextValue | null>(null);
 
 /**
  * Upload Zone Hook
@@ -33,7 +36,7 @@ export const UploadZoneContext = React.createContext({} as UploadZoneContextValu
 export function useUploadZone() {
   const context = React.useContext(UploadZoneContext);
   if (!context) {
-    throw new Error("useUploadZone must be used within an UploadZoneProvider");
+    throw new Error("useUploadZone must be used within an UploadZoneContext provider");
   }
   return context;
 }

package/src/modules/storage/components/upload-zone.client.tsx

@@ -5,16 +5,16 @@ import { useDropzone } from "react-dropzone";
 import { toast } from "@/components/ui/sonner.client";
 import { useAction } from "@/lib/hooks/use-action";
 import { cn } from "@/lib/utils/cn";
-import type { UploadFileRequest, UploadHooks } from "../lib/create-upload.client";
-import type { FileNode, Node, UploadFileSchema } from "../lib/validators";
+import type { UploadFileRequest, UploadHooks } from "../lib/upload.client";
+import type { StorageAsset, UploadInput } from "../lib/validators";
 import { UploadZoneContext, type UploadZoneContextValue } from "./upload-zone-context.client";
 
 export type UploadZoneProps = ComponentProps<"div"> &
   Pick<UploadZoneContextValue, "optimistic" | "uploadClient" | "disabled"> & {
-    variables: Pick<UploadFileSchema, "namespace" | "parentId" | "mode" | "hidden" | "readonly">;
+    variables: Pick<UploadInput, "visibility">;
     uploadHooks?: UploadHooks;
 
-    onUploadCompleted?: (node: Node) => Promise<void> | void;
+    onUploadCompleted?: (asset: StorageAsset) => Promise<void> | void;
     onUploadFailed?: (error: unknown) => Promise<void> | void;
   };
 
@@ -34,7 +34,9 @@ export function UploadZone({
    * Delete mutation
    */
   const deleteMutation = useAction({
-    mutationFn: async (ids: string[]) => uploadClient.deleteFiles(ids),
+    mutationFn: async (ids: string[]) => {
+      await uploadClient.deleteAssets(ids);
+    },
     onMutate: async (ids) => {
       await optimistic?.cancel?.();
       await optimistic?.remove?.(ids);
@@ -54,30 +56,34 @@ export function UploadZone({
   const uploadMutation = useAction({
     mutationFn: async (params: UploadFileRequest) => uploadClient.upload(params, uploadHooks),
     onMutate: async (variables) => {
-      // Generate a new node
-      const newNode = {
+      await optimistic?.cancel?.();
+
+      const newAsset = {
         ...variables,
-        type: "file",
-        isPending: true,
-      } as FileNode;
+        visibility: variables.visibility ?? "private",
+        status: "pending",
+        name: variables.file.name,
+        size: variables.file.size,
+        contentType: variables.file.type || "application/octet-stream",
+        etag: null,
+        metadata: null,
+        uploadedAt: new Date(),
+        deletedAt: null,
+      } as Omit<StorageAsset, "id" | "key" | "bucket" | "provider" | "createdAt" | "updatedAt">;
 
-      await optimistic?.cancel?.();
-      await optimistic?.add?.(newNode);
+      await optimistic?.add?.(newAsset);
     },
     onSuccess: async (data) => {
       await onUploadCompleted?.(data);
       toast.success(`Succesvol geupload: ${data.name}`);
     },
-    onError: async (error, variables) => {
+    onError: async (error) => {
       await onUploadFailed?.(error);
 
       console.error("Upload error: ", error);
       toast.error("Bestand uploaden mislukt", {
         description: error instanceof Error ? error.message : undefined,
       });
-
-      console.info("Deleting failed upload");
-      await deleteMutation.mutateAsync([variables.id]);
     },
     onSettled: () => {
       optimistic?.invalidate?.();
@@ -119,7 +125,7 @@ export function UploadZone({
 
       {/* Show drag overlay when drag is active */}
       {isDragActive && (
-        <div className="bg-primary/20 absolute inset-0 z-10 rounded-md opacity-70 backdrop-blur-3xl" />
+        <div className="absolute inset-0 z-10 rounded-md bg-primary/20 opacity-70 backdrop-blur-3xl" />
       )}
 
       <UploadZoneContext

package/src/modules/storage/entry.client.ts

@@ -4,11 +4,13 @@
 
 export * from "./components/dropzone.client";
 export * from "./components/dropzone-context.client";
+export * from "./components/image.client";
 export * from "./components/image-grid.client";
+export * from "./components/upload-button.client";
 export * from "./components/upload-zone.client";
 export * from "./components/upload-zone-context.client";
 
 /**
  * Lib
  */
-export * from "./lib/create-upload.client";
+export * from "./lib/upload.client";

package/src/modules/storage/entry.server.ts

@@ -1,6 +1,12 @@
 /**
  * Lib
  */
-export * from "./lib/create-client.server";
-export * from "./lib/proxy.server";
-export * from "./lib/router.server";
+
+export * from "./lib/procedures.server";
+export * from "./lib/router-handlers.server";
+export * from "./lib/service.server";
+
+/**
+ * Providers
+ */
+export * from "./providers/adapters/s3.server";

package/src/modules/storage/entry.ts

@@ -1,5 +1,17 @@
-export * from "./config/filters";
+/**
+ * Lib
+ */
+
 export * from "./lib/constants";
 export * from "./lib/helpers";
 export * from "./lib/schema";
 export * from "./lib/validators";
+export * from "./lib/validators";
+
+/**
+ * Providers
+ */
+export * from "./providers/lib/constants";
+export * from "./providers/lib/errors";
+export * from "./providers/lib/types";
+export * from "./providers/lib/validators";

package/src/modules/storage/lib/constants.ts

@@ -1,14 +1,3 @@
-// Device sizes
-export const deviceSizes = [640, 750, 828, 1080, 1200, 1920, 2048, 3840];
-export const imageSizes = deviceSizes;
-
-// Image variants
-export const imageVariants = [
-  "main",
-  ...deviceSizes.map((size) => `preview-${size}` as const),
-] as const;
-export type ImageVariant = (typeof imageVariants)[number];
-
 // Image dispositions
 export const imageDispositions = ["inline", "attachment"] as const;
 export type ImageDisposition = (typeof imageDispositions)[number];