@noya-app/noya-file-explorer 0.0.15 → 0.0.17

package/src/__tests__/validateMediaItemRename.test.ts

@@ -1,6 +1,6 @@
 import { MediaMap } from "@noya-app/noya-schemas";
 import { expect, it } from "bun:test";
-import { validateMediaItemRename } from "../utils/files";
+import { mediaValidateMediaItemRename } from "../utils/files";
 import { createMediaAsset, createMediaFolder } from "../utils/mediaItemTree";
 
 it("should return true for valid rename with no conflicts", () => {
@@ -11,7 +11,7 @@ it("should return true for valid rename with no conflicts", () => {
     "dir1/file1.jpg": file1,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "newname.jpg",
     selectedItemPath: "dir1/file1.jpg",
     media: mediaMap,
@@ -30,7 +30,7 @@ it("should return false when a file with the same name already exists", () => {
     "dir1/file2.jpg": file2,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "file2.jpg",
     selectedItemPath: "dir1/file1.jpg",
     media: mediaMap,
@@ -47,7 +47,7 @@ it("should return false when renaming a file to its own name", () => {
     "dir1/file1.jpg": file1,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "file1.jpg",
     selectedItemPath: "dir1/file1.jpg",
     media: mediaMap,
@@ -64,7 +64,7 @@ it("should return true when renaming a folder with no conflicts", () => {
     "dir1/dir2": dir2,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "newdir",
     selectedItemPath: "dir1/dir2",
     media: mediaMap,
@@ -83,7 +83,7 @@ it("should return false when a folder with the same name already exists", () =>
     "dir1/dir3": dir3,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "dir3",
     selectedItemPath: "dir1/dir2",
     media: mediaMap,
@@ -100,7 +100,7 @@ it("should handle special characters in basename", () => {
     "dir1/file1.jpg": file1,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "new-file@name.jpg",
     selectedItemPath: "dir1/file1.jpg",
     media: mediaMap,
@@ -121,7 +121,7 @@ it("should return true when renaming to a name that exists in a different direct
     "dir2/file2.jpg": file2,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "file2.jpg",
     selectedItemPath: "dir1/file1.jpg",
     media: mediaMap,
@@ -138,7 +138,7 @@ it("should return false when trying to rename to an empty basename", () => {
     "dir1/file1.jpg": file1,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "",
     selectedItemPath: "dir1/file1.jpg",
     media: mediaMap,
@@ -159,7 +159,7 @@ it("should handle deep nested directories", () => {
     "dir1/dir2/dir3/file1.jpg": file1,
   };
 
-  const result = validateMediaItemRename({
+  const result = mediaValidateMediaItemRename({
     basename: "renamed.jpg",
     selectedItemPath: "dir1/dir2/dir3/file1.jpg",
     media: mediaMap,
@@ -189,7 +189,7 @@ it("should return false when basename contains invalid filesystem characters", (
   ];
 
   invalidNames.forEach((basename) => {
-    const result = validateMediaItemRename({
+    const result = mediaValidateMediaItemRename({
       basename,
       selectedItemPath: "dir1/file1.jpg",
       media: mediaMap,

package/src/index.ts

@@ -1,5 +1,6 @@
 import "./index.css";
-export * from "./formatByteSize";
 export * from "./MediaCollection";
+export * from "./ResourceExplorer";
 export * from "./utils/files";
 export * from "./utils/mediaItemTree";
+export * from "./utils/resourceUtils";

package/src/utils/files.ts

@@ -6,27 +6,28 @@ import {
   MediaItemTree,
   rootMediaItem,
 } from "./mediaItemTree";
+import { basenameValidator } from "./resourceUtils";
 
-export type FileKindFilter = "assets" | "directories" | "all";
-export type ExpandedMap = Record<string, boolean | undefined>;
+export type MediaFileKindFilter = "assets" | "directories" | "all";
+export type MediaExpandedMap = Record<string, boolean | undefined>;
 
-export type GetVisibleItemsOptions = {
-  expandedMap: ExpandedMap;
-  fileKindFilter: FileKindFilter;
+export type MediaGetVisibleItemsOptions = {
+  expandedMap: MediaExpandedMap;
+  fileKindFilter: MediaFileKindFilter;
   rootItemId: string;
   tree: MediaItemTree;
   showAllDescendants: boolean;
   showRootItem: boolean;
 };
 
-export const getVisibleItems = ({
+export const mediaGetVisibleItems = ({
   expandedMap,
   fileKindFilter,
   rootItemId,
   tree,
   showAllDescendants,
   showRootItem,
-}: GetVisibleItemsOptions) => {
+}: MediaGetVisibleItemsOptions) => {
   const filteredItems: MediaItem[] = [];
   const relativeRootItem =
     tree.find(rootMediaItem, (item) => item.id === rootItemId) ?? rootMediaItem;
@@ -38,6 +39,9 @@ export const getVisibleItems = ({
       }
       return;
     }
+    if (item.kind === "noyaFile" && fileKindFilter === "all") {
+      filteredItems.push(item);
+    }
     if (item.kind === "file" && fileKindFilter === "all") {
       filteredItems.push(item);
     }
@@ -58,23 +62,7 @@ export const getVisibleItems = ({
   return filteredItems;
 };
 
-/**
- * Validates if a basename follows typical file naming conventions
- * Disallows:
- * - Path separators (/ and \)
- * - Characters typically invalid in filesystems (<, >, :, ", |, ?, *)
- * - Empty names
- */
-export const basenameValidator = (basename: string): boolean => {
-  // Check for empty string
-  if (!basename || basename.trim() === "") return false;
-
-  // Simple regex matching common invalid filesystem characters
-  const invalidCharsRegex = /[/\\<>:"|?*]/;
-  return !invalidCharsRegex.test(basename);
-};
-
-export const validateMediaItemRename = ({
+export const mediaValidateMediaItemRename = ({
   basename,
   selectedItemPath,
   media,
@@ -91,7 +79,7 @@ export const validateMediaItemRename = ({
   return true;
 };
 
-export const movePathsIntoTarget = ({
+export const mediaMovePathsIntoTarget = ({
   media,
   sourceItemPaths,
   targetItemPath,
@@ -123,7 +111,7 @@ export const movePathsIntoTarget = ({
         ancestorPath,
         newAncestorPath
       );
-      const newPathIsValid = validateMediaItemRename({
+      const newPathIsValid = mediaValidateMediaItemRename({
         basename: path.basename(descendantPath),
         selectedItemPath: newDescendantPath,
         media,
@@ -137,7 +125,7 @@ export const movePathsIntoTarget = ({
   return mediaClone;
 };
 
-export const moveUpAFolder = ({
+export const mediaMoveUpAFolder = ({
   tree,
   media,
   selectedIds,
@@ -163,7 +151,7 @@ export const moveUpAFolder = ({
   const sourceItemPaths = selectedIds
     .map((id) => tree.idToPathMap.get(id))
     .filter((path): path is string => Boolean(path));
-  return movePathsIntoTarget({
+  return mediaMovePathsIntoTarget({
     media,
     targetItemPath: grandparentFolderPath,
     sourceItemPaths,
@@ -171,7 +159,7 @@ export const moveUpAFolder = ({
   });
 };
 
-export const getDepthMap = (
+export const mediaGetDepthMap = (
   item: MediaItem,
   tree: MediaItemTree,
   showAllDescendants: boolean
@@ -187,7 +175,7 @@ export const getDepthMap = (
   return depthMap;
 };
 
-export const updateExpandedMap = ({
+export const mediaUpdateExpandedMap = ({
   item,
   expanded,
   expandable,
@@ -197,9 +185,9 @@ export const updateExpandedMap = ({
   item: MediaItem;
   expanded: boolean;
   expandable: boolean;
-  expandedMap: ExpandedMap;
+  expandedMap: MediaExpandedMap;
   tree: MediaItemTree;
-}): ExpandedMap => {
+}): MediaExpandedMap => {
   const newExpandedMap = { ...expandedMap };
   const inner = (item: MediaItem, expanded: boolean) => {
     if (!expandable) return {};
@@ -216,7 +204,7 @@ export const updateExpandedMap = ({
   return newExpandedMap;
 };
 
-export const deleteMediaItems = ({
+export const mediaDeleteMediaItems = ({
   selectedIds,
   media,
   tree,
@@ -241,7 +229,7 @@ export const deleteMediaItems = ({
   );
 };
 
-export const moveMediaInsideFolder = ({
+export const mediaMoveMediaInsideFolder = ({
   sourceItemIds,
   targetItemId,
   media,
@@ -259,7 +247,7 @@ export const moveMediaInsideFolder = ({
     .map((id) => tree.idToPathMap.get(id))
     .filter((path): path is string => Boolean(path));
 
-  return movePathsIntoTarget({
+  return mediaMovePathsIntoTarget({
     media,
     sourceItemPaths,
     targetItemPath,
@@ -267,7 +255,10 @@ export const moveMediaInsideFolder = ({
   });
 };
 
-export const getParentDirectories = (mediaMap: MediaMap, folderId: string) => {
+export const mediaGetParentDirectories = (
+  mediaMap: MediaMap,
+  folderId: string
+) => {
   const tree = createMediaItemTree(mediaMap);
 
   const indexPath = tree.findPath(
@@ -280,7 +271,7 @@ export const getParentDirectories = (mediaMap: MediaMap, folderId: string) => {
   return tree.accessPath(rootMediaItem, indexPath);
 };
 
-export const renameMediaItemAndDescendantPaths = ({
+export const mediaRenameMediaItemAndDescendantPaths = ({
   newName,
   selectedItemPath,
   media,

package/src/utils/handleFileDrop.ts

@@ -0,0 +1,165 @@
+import {
+  createAssetResource,
+  createDirectoryResource,
+  Resource,
+  ResourceCreate,
+  ResourceCreateMap,
+  ResourceMap,
+} from "@noya-app/noya-schemas";
+import { Base64, uuid } from "@noya-app/noya-utils";
+import { path } from "imfs";
+
+function isDirectoryEntry(
+  entry: FileSystemEntry
+): entry is FileSystemDirectoryEntry {
+  return entry.isDirectory;
+}
+
+function isFileEntry(entry: FileSystemEntry): entry is FileSystemFileEntry {
+  return entry.isFile;
+}
+
+export async function handleDataTransfer({
+  accessibleByFileId,
+  dataTransfer,
+  rootItemPath,
+  resourceMap,
+}: {
+  accessibleByFileId: string;
+  dataTransfer: DataTransfer;
+  rootItemPath: string;
+  resourceMap: ResourceMap;
+}): Promise<ResourceCreateMap | undefined> {
+  try {
+    const dataTransferItems = Array.from(dataTransfer.items ?? []);
+
+    const supportsEntries = dataTransferItems.some(
+      (item) => typeof item?.webkitGetAsEntry === "function"
+    );
+
+    type DroppedFile = { file: File; relativePath: string };
+
+    const collectFromEntry = async (
+      entry: FileSystemEntry,
+      basePath: string
+    ): Promise<DroppedFile[]> => {
+      if (!entry) return [];
+      if (isFileEntry(entry)) {
+        const file: File = await new Promise((resolve) =>
+          (entry as FileSystemFileEntry).file((f: File) => resolve(f))
+        );
+        return [
+          {
+            file,
+            relativePath: path.join(basePath, file.name),
+          },
+        ];
+      }
+      if (isDirectoryEntry(entry)) {
+        const reader = entry.createReader();
+        const readAll = async (): Promise<FileSystemEntry[]> => {
+          const all: FileSystemEntry[] = [];
+          // readEntries may return partial results; loop until empty
+          // eslint-disable-next-line no-constant-condition
+          while (true) {
+            const entries: FileSystemEntry[] = await new Promise((resolve) =>
+              reader.readEntries((ents: FileSystemEntry[]) => resolve(ents))
+            );
+            if (!entries.length) break;
+            all.push(...entries);
+          }
+          return all;
+        };
+        const children = await readAll();
+        const results = await Promise.all(
+          children.map((child) =>
+            collectFromEntry(child, path.join(basePath, entry.name))
+          )
+        );
+        return results.flat();
+      }
+      return [];
+    };
+
+    let dropped: DroppedFile[] = [];
+
+    if (supportsEntries) {
+      const topLevelEntries = dataTransferItems.flatMap((item) => {
+        const entry = item.webkitGetAsEntry?.();
+        if (!entry) return [];
+        return [entry];
+      });
+      const nested = await Promise.all(
+        topLevelEntries.map((entry) => collectFromEntry(entry, ""))
+      );
+      dropped = nested.flat();
+    } else {
+      const files = Array.from(dataTransfer.files);
+      if (files.length === 0) return;
+      dropped = files.map((file) => ({
+        file,
+        // Best effort: try webkitRelativePath; fall back to name
+        relativePath:
+          file.webkitRelativePath && file.webkitRelativePath.length > 0
+            ? file.webkitRelativePath
+            : file.name,
+      }));
+    }
+
+    if (dropped.length === 0) return;
+
+    const folderRelativePaths = new Set<string>();
+    for (const { relativePath } of dropped) {
+      const dir = path.dirname(relativePath);
+      if (dir && dir !== ".") {
+        const parts = dir.split("/").filter(Boolean);
+        let acc = "";
+        for (const part of parts) {
+          acc = acc ? path.join(acc, part) : part;
+          folderRelativePaths.add(acc);
+        }
+      }
+    }
+
+    const folderEntries: [string, Resource][] = Array.from(folderRelativePaths)
+      .map((rel) => path.join(rootItemPath, rel))
+      .filter((full) => !resourceMap[full])
+      .map((full) => [
+        full,
+        createDirectoryResource({
+          id: uuid(),
+          path: full,
+          accessibleByFileId,
+          stableId: uuid(),
+        }) as Resource,
+      ]);
+
+    const uploadResults = await Promise.all(
+      dropped.map(
+        async ({ file, relativePath }): Promise<[string, ResourceCreate]> => {
+          return [
+            path.join(rootItemPath, relativePath),
+            createAssetResource({
+              id: uuid(),
+              asset: {
+                content: Base64.encode(await file.arrayBuffer()),
+                contentType: file.type,
+                encoding: "base64",
+              },
+              path: path.join(rootItemPath, relativePath),
+              accessibleByFileId,
+              stableId: uuid(),
+            }) as Resource,
+          ];
+        }
+      )
+    );
+
+    return {
+      ...resourceMap,
+      ...Object.fromEntries([...folderEntries, ...uploadResults]),
+    };
+  } catch (error) {
+    console.error("Failed to upload dropped files:", error);
+  }
+}