@drawnagency/primitives 0.1.76 → 0.1.78

package/src/media/folder-drop.ts

@@ -0,0 +1,62 @@
+export interface DroppedFile {
+  file: File;
+  relativePath: string;
+}
+
+/** Structural subset of FileSystemEntry — lets tests fake the tree. */
+export interface EntryLike {
+  isFile: boolean;
+  isDirectory: boolean;
+  name: string;
+  fullPath: string;
+  file?: (cb: (f: File) => void, err: (e: unknown) => void) => void;
+  createReader?: () => {
+    readEntries: (cb: (entries: EntryLike[]) => void, err: (e: unknown) => void) => void;
+  };
+}
+
+const readAll = (reader: NonNullable<ReturnType<NonNullable<EntryLike["createReader"]>>>): Promise<EntryLike[]> =>
+  new Promise((resolve, reject) => {
+    const all: EntryLike[] = [];
+    const step = () =>
+      reader.readEntries((batch) => {
+        if (batch.length === 0) return resolve(all);
+        all.push(...batch);
+        // Defer rather than call step() synchronously: readers return results
+        // in batches and loop until empty, but a synchronous re-entrant call
+        // here would run before any state a caller sets after this callback
+        // returns (e.g. a "served" flag in a synchronous test fake) — causing
+        // infinite recursion. Real FileSystemDirectoryReader impls are async
+        // anyway, so the microtask tick is free in the browser.
+        queueMicrotask(step);
+      }, reject);
+    step();
+  });
+
+export async function traverseEntries(entries: EntryLike[]): Promise<DroppedFile[]> {
+  const out: DroppedFile[] = [];
+  for (const entry of entries) {
+    if (entry.isFile && entry.file) {
+      const file = await new Promise<File>((resolve, reject) => entry.file!(resolve, reject));
+      out.push({ file, relativePath: entry.fullPath.replace(/^\//, "") });
+    } else if (entry.isDirectory && entry.createReader) {
+      out.push(...(await traverseEntries(await readAll(entry.createReader()))));
+    }
+  }
+  return out;
+}
+
+/**
+ * Dropped-payload traversal. Returns null when nothing in the drop is a
+ * directory — the caller should fall back to the plain flat-file path.
+ */
+export async function collectDroppedFiles(dataTransfer: DataTransfer): Promise<DroppedFile[] | null> {
+  const entries: EntryLike[] = [];
+  for (const item of Array.from(dataTransfer.items)) {
+    const getEntry = (item as DataTransferItem & { webkitGetAsEntry?: () => EntryLike | null }).webkitGetAsEntry;
+    const entry = typeof getEntry === "function" ? getEntry.call(item) : null;
+    if (entry) entries.push(entry);
+  }
+  if (!entries.some((e) => e.isDirectory)) return null;
+  return traverseEntries(entries);
+}

package/src/media/types.ts

@@ -3,10 +3,12 @@ export {
   MediaItemSchema,
   ImageManifestSchema,
   MediaConfigSchema,
+  MediaFolderSchema,
   type Variant,
   type MediaItem,
   type MediaManifest,
   type MediaConfig,
+  type MediaFolder,
 } from "../schemas/media";
 
 import type { MediaItem } from "../schemas/media";

package/src/media/utils.ts

@@ -1,4 +1,5 @@
 import { slugifyPageSlug } from "../lib/pages";
+import type { MediaItem } from "./types";
 
 export async function hashFileBuffer(buffer: ArrayBuffer): Promise<string> {
   if (typeof crypto !== "undefined" && crypto.subtle) {
@@ -65,3 +66,12 @@ export function formatFileSize(bytes: number): string {
   if (bytes >= 1024) return `${Math.round(bytes / 1024)}KB`;
   return `${bytes}B`;
 }
+
+/**
+ * Display name for a media item. v2 batch-rename seam: will read a future
+ * optional `displayName` field with originalName fallback — UI must call this
+ * instead of touching originalName directly.
+ */
+export function displayName(item: Pick<MediaItem, "originalName">): string {
+  return item.originalName;
+}

package/src/schemas/media.ts

@@ -8,6 +8,15 @@ export const VariantSchema = z.object({
 
 export type Variant = z.infer<typeof VariantSchema>;
 
+// Display folders for the media library. Pure metadata: a folder assignment
+// never moves files in git (that's MediaItem.folder, the storage dir).
+export const MediaFolderSchema = z.object({
+  name: z.string().min(1),
+  parentId: z.string().nullable(), // null = root
+});
+
+export type MediaFolder = z.infer<typeof MediaFolderSchema>;
+
 export const MediaItemSchema = z.object({
   id: z.string(),
   hash: z.string(),
@@ -29,12 +38,16 @@ export const MediaItemSchema = z.object({
   url: z.string().optional(),
   // Seconds; videos only. Informational (library UI).
   duration: z.number().positive().optional(),
+  // Display folder (MediaFolderSchema key). Absent = root/unfiled. NOT the
+  // git storage dir — that's `folder` above, which never changes.
+  folderId: z.string().optional(),
 });
 
 export type MediaItem = z.infer<typeof MediaItemSchema>;
 
 export const ImageManifestSchema = z.object({
   images: z.record(z.string(), MediaItemSchema),
+  folders: z.record(z.string(), MediaFolderSchema).default({}),
 });
 
 export type MediaManifest = z.infer<typeof ImageManifestSchema>;

package/src/types/database.ts

@@ -223,6 +223,41 @@ export type Database = {
           },
         ]
       }
+      editor_locks: {
+        Row: {
+          acquired_at: string
+          email: string
+          heartbeat_at: string
+          section_id: string
+          site_id: string
+          user_id: string
+        }
+        Insert: {
+          acquired_at?: string
+          email: string
+          heartbeat_at?: string
+          section_id: string
+          site_id: string
+          user_id: string
+        }
+        Update: {
+          acquired_at?: string
+          email?: string
+          heartbeat_at?: string
+          section_id?: string
+          site_id?: string
+          user_id?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: "editor_locks_site_id_fkey"
+            columns: ["site_id"]
+            isOneToOne: false
+            referencedRelation: "sites"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       github_installations: {
         Row: {
           created_at: string | null
@@ -680,6 +715,17 @@ export type Database = {
       [_ in never]: never
     }
     Functions: {
+      acquire_section_lock: {
+        Args: { p_section_id: string; p_site_id: string; p_steal?: boolean }
+        Returns: {
+          acquired_at: string
+          email: string
+          heartbeat_at: string
+          section_id: string
+          site_id: string
+          user_id: string
+        }[]
+      }
       chat_usage_hit: {
         Args: {
           p_day: string
@@ -690,7 +736,12 @@ export type Database = {
         }
         Returns: undefined
       }
+      collab_site_member: { Args: { p_site_id: string }; Returns: boolean }
       get_user_id_by_email: { Args: { lookup_email: string }; Returns: string }
+      heartbeat_section_locks: {
+        Args: { p_section_ids: string[]; p_site_id: string }
+        Returns: undefined
+      }
       is_site_member: { Args: { p_site_id: string }; Returns: boolean }
       is_site_owner: { Args: { p_site_id: string }; Returns: boolean }
       oauth_cleanup: { Args: { p_max_age_ms: number }; Returns: undefined }
@@ -716,6 +767,10 @@ export type Database = {
           retry_after_ms: number
         }[]
       }
+      release_section_locks: {
+        Args: { p_section_ids: string[]; p_site_id: string }
+        Returns: undefined
+      }
       revoke_site_user: {
         Args: { p_site_id: string; p_user_id: string }
         Returns: undefined