@parallelworks/ui 0.20.0 → 0.21.0

package/dist/file-explorer/FilePreview/Viewer.js

@@ -187,7 +187,6 @@ function PreviewError({ onDownload }) {
 }
 function PdfView({ node, url, onDownload, storage, onCorsRetry }) {
 	const { blobUrl, loading, error, tooLarge, corsError } = useObjectBlobUrl(url, {
-		enabled: true,
 		maxBytes: PDF_PREVIEW_MAX_BYTES,
 		knownSize: node.size,
 		mimeType: "application/pdf",
@@ -213,7 +212,6 @@ function CodeView({ node, url, onDownload, storage, onCorsRetry }) {
 	const language = getMonacoLanguage(node);
 	const [tail, setTail] = useState(false);
 	const { text, loading, error, tooLarge, truncated, corsError } = useObjectText(url, {
-		enabled: true,
 		maxBytes: CODE_PREVIEW_MAX_BYTES,
 		maxLines: CODE_PREVIEW_MAX_LINES,
 		knownSize: node.size,
@@ -291,7 +289,6 @@ function toFencedCode(text, language) {
 }
 function CsvView({ node, url, onDownload, storage, onCorsRetry }) {
 	const { text, loading, error, tooLarge, corsError } = useObjectText(url, {
-		enabled: true,
 		maxBytes: TABULAR_PREVIEW_MAX_BYTES,
 		maxLines: 502,
 		knownSize: node.size,
@@ -354,7 +351,6 @@ function CsvTable({ node, text }) {
 }
 function NotebookView({ node, url, onDownload, storage, onCorsRetry }) {
 	const { text, loading, error, tooLarge, corsError } = useObjectText(url, {
-		enabled: true,
 		maxBytes: TABULAR_PREVIEW_MAX_BYTES,
 		knownSize: node.size,
 		cacheKey: node.path

package/dist/file-explorer/FilePreview/index.d.ts

@@ -9,7 +9,6 @@ interface FilePreviewProps {
     onClose: () => void;
     onDownload: (node: TreeNode) => void;
     onCopyUri: (node: TreeNode) => void;
-    showSecurityIndicator?: boolean;
 }
-export declare function FilePreview({ open, node, siblings, storage, getPresignedUrl, onNavigate, onClose, onDownload, onCopyUri, showSecurityIndicator, }: FilePreviewProps): import("react").ReactPortal | null;
+export declare function FilePreview({ open, node, siblings, storage, getPresignedUrl, onNavigate, onClose, onDownload, onCopyUri, }: FilePreviewProps): import("react").ReactPortal | null;
 export {};

package/dist/file-explorer/FilePreview/index.js

@@ -16,11 +16,11 @@ import { createPortal } from "react-dom";
 function isDocumentView(kind) {
 	return kind === "code" || kind === "csv" || kind === "notebook";
 }
-function FilePreview({ open, node, siblings, storage, getPresignedUrl, onNavigate, onClose, onDownload, onCopyUri, showSecurityIndicator = true }) {
+function FilePreview({ open, node, siblings, storage, getPresignedUrl, onNavigate, onClose, onDownload, onCopyUri }) {
 	const t = useStrings().fileExplorer;
 	const [style, setStyle] = useLocalStorage("fileExplorer.previewStyle", "quicklook");
 	const [zoom, setZoom] = useState(100);
-	const { url, loading: urlLoading, error: urlError } = usePresignedUrl(open ? node : null, getPresignedUrl, {
+	const { url, loading: urlLoading, error: urlError } = usePresignedUrl(node, getPresignedUrl, {
 		enabled: open,
 		linkErrorMessage: t.preview.linkError
 	});
@@ -76,7 +76,7 @@ function FilePreview({ open, node, siblings, storage, getPresignedUrl, onNavigat
 					className: "truncate font-semibold",
 					children: node.name
 				}),
-				showSecurityIndicator && url && /* @__PURE__ */ jsx(StreamedBadge, {})
+				url && /* @__PURE__ */ jsx(StreamedBadge, {})
 			]
 		}), /* @__PURE__ */ jsxs("div", {
 			className: "flex shrink-0 items-center gap-1.5",

package/dist/file-explorer/FilePreview/parse.d.ts

@@ -9,7 +9,7 @@ export interface NotebookOutput {
     evalue?: string;
     traceback?: string[];
 }
-export interface NotebookCell {
+interface NotebookCell {
     cell_type: string;
     source: string | string[];
     outputs?: NotebookOutput[];
@@ -22,3 +22,4 @@ export declare function parseNotebook(text: string): ParsedNotebook | null;
 /** nbformat `source`/`text` is a string or an array of lines; normalize to one string. */
 export declare function joinSource(source: unknown): string;
 export declare function stripAnsi(text: string): string;
+export {};

package/dist/file-explorer/FilePreview/useObjectBlobUrl.d.ts

@@ -1,13 +1,14 @@
-interface ObjectBlobState {
+interface BlobResult {
     blobUrl: string | null;
+    tooLarge: boolean;
+}
+interface ObjectBlobState extends BlobResult {
     loading: boolean;
     error: string | null;
-    tooLarge: boolean;
     corsError: boolean;
 }
 /** Fetch an object into a blob URL with a forced MIME type so e.g. PDFs render inline even when served as octet-stream; cached per `cacheKey` so repeated mounts share one download and one blob URL, revoked when the cache drops it. */
-export declare function useObjectBlobUrl(url: string | null, { enabled, maxBytes, knownSize, mimeType, cacheKey, }: {
-    enabled: boolean;
+export declare function useObjectBlobUrl(url: string, { maxBytes, knownSize, mimeType, cacheKey, }: {
     maxBytes: number;
     knownSize?: number | undefined;
     mimeType: string;

package/dist/file-explorer/FilePreview/useObjectBlobUrl.js

@@ -3,44 +3,40 @@ import { fetchPreviewObject, loadPreviewContent, peekPreviewContent } from "./pr
 import { readCappedBytes } from "./readCappedBytes.js";
 import { useEffect, useState } from "react";
 //#region src/file-explorer/FilePreview/useObjectBlobUrl.ts
+var IDLE = {
+	blobUrl: null,
+	loading: false,
+	error: null,
+	tooLarge: false,
+	corsError: false
+};
 function toState(result) {
 	return {
-		blobUrl: result.blobUrl,
-		loading: false,
-		error: null,
-		tooLarge: result.tooLarge,
-		corsError: false
+		...IDLE,
+		...result
 	};
 }
 function disposeBlob(result) {
 	if (result.blobUrl) URL.revokeObjectURL(result.blobUrl);
 }
 /** Fetch an object into a blob URL with a forced MIME type so e.g. PDFs render inline even when served as octet-stream; cached per `cacheKey` so repeated mounts share one download and one blob URL, revoked when the cache drops it. */
-function useObjectBlobUrl(url, { enabled, maxBytes, knownSize, mimeType, cacheKey }) {
+function useObjectBlobUrl(url, { maxBytes, knownSize, mimeType, cacheKey }) {
 	const [state, setState] = useState({
-		blobUrl: null,
-		loading: enabled,
-		error: null,
-		tooLarge: false,
-		corsError: false
+		...IDLE,
+		loading: true
 	});
 	const tooLarge = typeof knownSize === "number" && knownSize > maxBytes;
-	const key = enabled ? cacheKey : null;
 	useEffect(() => {
-		if (!enabled || !url || !key) return;
 		if (tooLarge) {
 			setState({
-				blobUrl: null,
-				loading: false,
-				error: null,
-				tooLarge: true,
-				corsError: false
+				...IDLE,
+				tooLarge: true
 			});
 			return;
 		}
 		let cancelled = false;
-		const record = loadPreviewContent(key, async (signal) => {
-			const response = await fetchPreviewObject(key, url, signal);
+		const record = loadPreviewContent(cacheKey, async (signal) => {
+			const response = await fetchPreviewObject(cacheKey, url, signal);
 			const { bytes, tooLarge: exceeded } = await readCappedBytes(response, maxBytes);
 			if (exceeded) return {
 				blobUrl: null,
@@ -52,21 +48,16 @@ function useObjectBlobUrl(url, { enabled, maxBytes, knownSize, mimeType, cacheKe
 			};
 		}, disposeBlob);
 		setState(record.value ? toState(record.value) : {
-			blobUrl: null,
-			loading: true,
-			error: null,
-			tooLarge: false,
-			corsError: false
+			...IDLE,
+			loading: true
 		});
 		record.promise.then((result) => {
 			if (!cancelled) setState(toState(result));
 		}).catch((err) => {
 			if (err instanceof DOMException && err.name === "AbortError") return;
 			if (!cancelled) setState({
-				blobUrl: null,
-				loading: false,
+				...IDLE,
 				error: err instanceof Error ? err.message : "Failed to load file",
-				tooLarge: false,
 				corsError: err instanceof CorsError
 			});
 		});
@@ -75,20 +66,16 @@ function useObjectBlobUrl(url, { enabled, maxBytes, knownSize, mimeType, cacheKe
 		};
 	}, [
 		url,
-		enabled,
-		key,
+		cacheKey,
 		maxBytes,
 		mimeType,
 		tooLarge
 	]);
 	if (tooLarge) return {
-		blobUrl: null,
-		loading: false,
-		error: null,
-		tooLarge: true,
-		corsError: false
+		...IDLE,
+		tooLarge: true
 	};
-	const cached = key ? peekPreviewContent(key) : void 0;
+	const cached = peekPreviewContent(cacheKey);
 	return cached ? toState(cached) : state;
 }
 //#endregion

package/dist/file-explorer/FilePreview/useObjectText.d.ts

@@ -12,8 +12,7 @@ interface ObjectTextState extends TextResult {
  * download it once. `maxLines` stops the read early and `maxBytes` cuts short what it
  * hasn't. `tail` reads the end of the object instead of the start, and caches
  * separately because the same object yields different text. */
-export declare function useObjectText(url: string | null, { enabled, maxBytes, maxLines, knownSize, cacheKey, tail, }: {
-    enabled: boolean;
+export declare function useObjectText(url: string, { maxBytes, maxLines, knownSize, cacheKey, tail, }: {
     maxBytes: number;
     maxLines?: number | undefined;
     knownSize?: number | undefined;

package/dist/file-explorer/FilePreview/useObjectText.js

@@ -37,23 +37,22 @@ async function readObjectText(signal, { url, cacheKey, maxBytes, maxLines, known
 * download it once. `maxLines` stops the read early and `maxBytes` cuts short what it
 * hasn't. `tail` reads the end of the object instead of the start, and caches
 * separately because the same object yields different text. */
-function useObjectText(url, { enabled, maxBytes, maxLines, knownSize, cacheKey, tail = false }) {
+function useObjectText(url, { maxBytes, maxLines, knownSize, cacheKey, tail = false }) {
 	const tooLarge = maxLines === void 0 && !tail && typeof knownSize === "number" && knownSize > maxBytes;
-	const key = enabled ? tail ? `${cacheKey}#tail` : cacheKey : null;
+	const key = tail ? `${cacheKey}#tail` : cacheKey;
 	const [state, setState] = useState({
 		...IDLE,
-		loading: enabled
+		loading: true
 	});
 	const [stateKey, setStateKey] = useState(key);
 	if (stateKey !== key) {
 		setStateKey(key);
 		setState({
 			...IDLE,
-			loading: key !== null
+			loading: true
 		});
 	}
 	useEffect(() => {
-		if (!enabled || !url || !key) return;
 		if (tooLarge) {
 			setState({
 				...IDLE,
@@ -89,7 +88,6 @@ function useObjectText(url, { enabled, maxBytes, maxLines, knownSize, cacheKey,
 		};
 	}, [
 		url,
-		enabled,
 		key,
 		maxBytes,
 		maxLines,
@@ -102,7 +100,7 @@ function useObjectText(url, { enabled, maxBytes, maxLines, knownSize, cacheKey,
 		...IDLE,
 		tooLarge: true
 	};
-	const cached = key ? peekPreviewContent(key) : void 0;
+	const cached = peekPreviewContent(key);
 	return cached ? toState(cached) : state;
 }
 //#endregion

package/dist/file-explorer/FileRow.js

@@ -111,7 +111,7 @@ function FileRow({ node, icon, rowId, rowIndex, active, checked, canPreview, get
 							children: [/* @__PURE__ */ jsx("div", {
 								className: "truncate text-[13px] font-medium leading-tight text-(--theme-app)",
 								children: node.displayName || node.name
-							}), !isDir && node.contentType && /* @__PURE__ */ jsx("div", {
+							}), isTwoLineRow(node) && /* @__PURE__ */ jsx("div", {
 								className: "truncate text-xs leading-tight text-(--theme-muted-text-color)",
 								children: node.contentType
 							})]

package/dist/file-explorer/FileRowsWindow.d.ts

@@ -1,4 +1,5 @@
 import type { OpenMenu, RowMenuItem } from '../list/index.js';
+import { type LoadMoreState } from './LoadMoreRow.js';
 import type { TreeNode } from './lib/types.js';
 interface Span {
     start: number;
@@ -10,13 +11,10 @@ export declare function spacerHeights(items: readonly Span[], totalSize: number,
     top: number;
     bottom: number;
 };
-interface VirtualRow {
-    index: number;
-    start: number;
-    size: number;
-}
 interface FileRowsWindowProps {
-    items: readonly VirtualRow[];
+    items: readonly {
+        index: number;
+    }[];
     padTop: number;
     padBottom: number;
     nodes: TreeNode[];
@@ -25,12 +23,7 @@ interface FileRowsWindowProps {
     activeIndex: number;
     rowIdPrefix: string;
     scrollEl: HTMLElement | null;
-    loadMore?: {
-        loading: boolean;
-        error: string | undefined;
-        auto: boolean;
-        onLoadMore: () => void;
-    } | undefined;
+    loadMore?: LoadMoreState | undefined;
     getItems: (node: TreeNode) => RowMenuItem[];
     openMenu: OpenMenu;
     onOpen: (node: TreeNode) => void;

package/dist/file-explorer/FileTable.d.ts

@@ -1,4 +1,5 @@
 import { type OpenMenu, type RowMenuItem } from '../list/index.js';
+import { type LoadMoreState } from './LoadMoreRow.js';
 import type { TreeNode } from './lib/types.js';
 interface FileTableProps {
     nodes: TreeNode[];
@@ -12,12 +13,7 @@ interface FileTableProps {
     onToggleCheck: (node: TreeNode, checked: boolean) => void;
     onPreview: (node: TreeNode) => void;
     /** Set when the folder has pages left to fetch. */
-    loadMore?: {
-        loading: boolean;
-        error: string | undefined;
-        auto: boolean;
-        onLoadMore: () => void;
-    } | undefined;
+    loadMore?: LoadMoreState | undefined;
 }
 /** The file table. Give it a `key` of the folder path: a folder change must reset
  *  the cursor, the scroll offset and the virtualizer's measurements, and a remount

package/dist/file-explorer/LoadMoreRow.d.ts

@@ -1,5 +1,13 @@
 /** The virtualizer sizes this row from the constant, never by measuring it. */
 export declare const LOAD_MORE_ROW_HEIGHT = 45;
+/** A folder's paging state, as the table's sentinel row needs it. */
+export interface LoadMoreState {
+    loading: boolean;
+    error: string | undefined;
+    /** False past the auto-load cap, where the user asks for each page. */
+    auto: boolean;
+    onLoadMore: () => void;
+}
 interface LoadMoreRowProps {
     rowId: string;
     rowIndex: number;

package/dist/file-explorer/TreeView.d.ts

@@ -2,7 +2,6 @@ import type { TreeNode } from './lib/types.js';
 /** Row pitch, with `space-y-0.5` folded in: absolutely positioned rows cannot use
  *  sibling margins. useTreePitchAudit warns if this drifts from the DOM. */
 export declare const TREE_ROW_HEIGHT = 30;
-export declare const TREE_SKELETON_HEIGHT = 64;
 interface TreeViewProps {
     rootNodes: TreeNode[];
     parentToChildrenMap: Record<string, TreeNode[]>;

package/dist/file-explorer/TreeView.js

@@ -16,8 +16,9 @@ var INDENT_PER_LEVEL = 21;
 var GUIDE_OFFSET = 9;
 var ROW_PAD_DIRECTORY = 8;
 var ROW_PAD_FILE = 28;
+var TREE_SKELETON_HEIGHT = 64;
 function rowHeight(row) {
-	return row.kind === "skeleton" ? 64 : 30;
+	return row.kind === "skeleton" ? TREE_SKELETON_HEIGHT : 30;
 }
 /** The sidebar tree, flattened and windowed. The flat array is the single source
 *  of truth for rendering, arrow keys and ARIA. */
@@ -194,9 +195,6 @@ function RowIcons({ isDirectory, isExpanded, customIcon }) {
 	const folder = isExpanded ? /* @__PURE__ */ jsx(FolderOpenIcon, { className: "h-4 w-4 mr-1 text-sky-500" }) : /* @__PURE__ */ jsx(FolderIcon, { className: "h-4 w-4 mr-1 text-sky-500/80" });
 	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(AngleRightIcon, { className: cx("h-3.5 w-3.5 shrink-0 theme-muted-text transition-transform duration-150", isExpanded && "rotate-90") }), customIcon ?? folder] });
 }
-/** Sized by the slot, not by its contents: react-loading-skeleton wraps each bar
-*  in an inline span, so a bar occupies a line box taller than its `height` and
-*  the overflow would sit on top of the absolutely positioned row below. */
 /** Click-only, unlike the table's sentinel: the tree is a navigation aid, and
 *  growing it automatically as the user scrolls is what the cap exists to prevent. */
 function TreeMoreRow({ depth, hiddenFiles, partial, loading, failed, onReveal }) {
@@ -220,6 +218,9 @@ function TreeMoreRow({ depth, hiddenFiles, partial, loading, failed, onReveal })
 		})]
 	});
 }
+/** Sized by the slot, not by its contents: react-loading-skeleton wraps each bar
+*  in an inline span, so a bar occupies a line box taller than its `height` and
+*  the overflow would sit on top of the absolutely positioned row below. */
 function TreeSkeletonRow({ depth }) {
 	return /* @__PURE__ */ jsxs("div", {
 		className: "relative h-full overflow-hidden",
@@ -312,7 +313,6 @@ function dispatchRowKey(e, { node, isDirectory, isExpanded, onSelect, onToggleEx
 var TreeRowItem = memo(function TreeRowItem({ row, isSelected, onToggleExpand, onSelect, onDropToFolder, onContextMenu, onKeyDown }) {
 	const { node, depth, isExpanded } = row;
 	const isDirectory = node.type === "directory";
-	const isStorageNode = !!node.displayName && node.storageId;
 	const { dragActive, dragHandlers } = useSpringLoadedDrop({
 		node,
 		dropPath: isDirectory ? node.path : getParentPath(node.path),
@@ -335,7 +335,7 @@ var TreeRowItem = memo(function TreeRowItem({ row, isSelected, onToggleExpand, o
 		onDelegate: onKeyDown
 	});
 	const customIcon = getNodeIcon(node);
-	const label = isDirectory && isStorageNode && node.displayName ? node.displayName : node.name;
+	const label = isDirectory && node.storageId && node.displayName ? node.displayName : node.name;
 	return /* @__PURE__ */ jsxs("div", {
 		className: cx("relative h-full rounded-md transition-[box-shadow,background-color] duration-150", dragActive && "ring-1 ring-(--theme-link)/60"),
 		...dragHandlers,

package/dist/file-explorer/helpers.js

@@ -91,7 +91,7 @@ function getNodeIcon(node, storageIconUrl, storageIconAlt = "Storage icon") {
 			}
 		});
 	}
-	if (!isStorageNode && !isUserNode && node.type === "directory") return null;
+	if (!isStorageNode && node.type === "directory") return null;
 	if (node.contentType) {
 		for (const { pattern, icon } of contentTypeIconMap) if (pattern.test(node.contentType)) return icon;
 	}
@@ -253,7 +253,6 @@ function CorsPropagatingPreview() {
 	const [elapsedMs, setElapsedMs] = useState(0);
 	useEffect(() => {
 		const start = Date.now();
-		setElapsedMs(0);
 		const id = setInterval(() => {
 			setElapsedMs(Date.now() - start);
 		}, 500);
@@ -523,8 +522,7 @@ async function addCorsRules({ provision, notify, strings, csp, type, username, s
 	const deadline = Date.now() + pollBudgetMs;
 	await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
 	while (Date.now() < deadline) {
-		const result = await onRefresh({ silent: true });
-		if (!result || !result.corsError) {
+		if (!(await onRefresh({ silent: true }))?.corsError) {
 			await onRefresh();
 			notify.success(strings.corsAdded);
 			return;

package/dist/file-explorer/lib/fileExplorer.d.ts

@@ -8,7 +8,6 @@ export interface FileExplorerDeleteFilesResult {
     Errors?: unknown[] | undefined;
 }
 export interface IFileExplorerClient {
-    getStorageName(): string;
     getExpiresAt(): Date;
     getFile(input: unknown): Promise<FileExplorerGetFileResult>;
     listDirectory(input: unknown): Promise<unknown>;
@@ -20,7 +19,6 @@ export interface IFileExplorerClient {
     }) => void, abortController?: AbortController): Promise<unknown>;
 }
 export interface IFileExplorerProvider {
-    createClient: ((organization: string, username: string, name: string) => Promise<IFileExplorerClient | null>) | null;
     convertDataToStorageObjects?(data: unknown): TStorageObject[];
     /** Absent ⇒ the explorer treats one page as the whole directory. Method syntax for
      *  the same bivariance reason as the two above. */

package/dist/file-explorer/lib/types.d.ts

@@ -8,7 +8,6 @@ export type TStorage = {
     type?: string;
     created?: string;
     modified?: string;
-    region?: string;
     csp?: string;
     imageUrl?: string;
     canWrite?: boolean | undefined;

package/dist/file-explorer/lib/utils.js

@@ -10,14 +10,13 @@ function formatFileSize(bytes) {
 		"TB"
 	];
 	const i = Math.floor(Math.log(bytes) / Math.log(k));
-	return Number.parseFloat((bytes / k ** i).toFixed(2)) + " " + sizes[i];
+	return `${Number.parseFloat((bytes / k ** i).toFixed(2))} ${sizes[i]}`;
 }
 function getFileExtension(filename) {
 	return filename.match(/\.([a-zA-Z0-9]+)$/)?.[1]?.toLowerCase() ?? null;
 }
 function getNodeName(node) {
-	const parts = removeTrailingSlash(node.path || "").split("/");
-	return parts[parts.length - 1] ?? "";
+	return removeTrailingSlash(node.path).split("/").pop() ?? "";
 }
 function toNode(entry, storage, storagePath, storageName) {
 	const relativePath = removeLeadingSlash(entry.path);
@@ -79,8 +78,8 @@ function createTreeBuilder() {
 			};
 			directories.set(dirPath, dir);
 		}
-		for (let i = dir.entries.length; i < entries.length; i++) {
-			const node = toNode(entries[i], storage, storagePath, storageName);
+		for (const entry of entries.slice(dir.entries.length)) {
+			const node = toNode(entry, storage, storagePath, storageName);
 			if (node.path === dirPath) continue;
 			if (node.type === "directory") dir.directories.push(node);
 			else dir.files.push(node);
@@ -124,14 +123,14 @@ function createTreeBuilder() {
 			parentToChildrenMap: {},
 			rootNodes: []
 		};
-		if (storages.length === 1 && !options.forceUserHierarchy) {
-			const storage = storages[0];
-			const storagePath = ensureTrailingSlash(storage.user ? `${storage.user}/${storage.name}` : storage.name);
-			tree.rootNodes.push(addStorage(storage, storagePath, options, tree));
+		const onlyStorage = storages.length === 1 ? storages[0] : void 0;
+		if (onlyStorage && !options.forceUserHierarchy) {
+			const storagePath = ensureTrailingSlash(onlyStorage.user ? `${onlyStorage.user}/${onlyStorage.name}` : onlyStorage.name);
+			tree.rootNodes.push(addStorage(onlyStorage, storagePath, options, tree));
 		} else {
 			const userGroups = {};
 			for (const storage of storages) {
-				const username = storage.user ?? "";
+				const username = storage.user;
 				if (!userGroups[username]) userGroups[username] = [];
 				userGroups[username].push(storage);
 			}
@@ -159,7 +158,7 @@ function createTreeBuilder() {
 	};
 }
 function getNodeChildren(parentToChildrenMap, parentPath) {
-	return parentToChildrenMap[parentPath.endsWith("/") ? parentPath : parentPath + "/"] || [];
+	return parentToChildrenMap[parentPath.endsWith("/") ? parentPath : `${parentPath}/`] || [];
 }
 function getParentPath(currentPath) {
 	return ensureTrailingSlash(removeLastPathSegment(currentPath));
@@ -183,13 +182,13 @@ async function getUploadNodesFromDataTransferItems(items) {
 				uploadNodes.push({
 					name: file.name,
 					file,
-					relativePath: path ? path + file.name : file.name
+					relativePath: path + file.name
 				});
 				totalSize += file.size;
 				resolve();
 			}, reject);
 			else if (entry.isDirectory) entry.createReader().readEntries(async (entries) => {
-				const newPath = path ? path + entry.name + "/" : entry.name + "/";
+				const newPath = `${path}${entry.name}/`;
 				if (entries.length === 0) uploadNodes.push({
 					name: entry.name,
 					file: new Blob(),
@@ -213,9 +212,7 @@ async function getUploadNodesFromDataTransferItems(items) {
 	};
 }
 function calculateUploadNodesTotalSize(uploadNodes) {
-	return uploadNodes.reduce((total, node) => {
-		return total + (node.file?.size || 0);
-	}, 0);
+	return uploadNodes.reduce((total, node) => total + node.file.size, 0);
 }
 function getObjectKeyFromNode(node) {
 	return node.relativePath || node.path.split("/").filter(Boolean).slice(1).join("/");
@@ -261,12 +258,10 @@ function removeLastPathSegment(path) {
 	return path.replace(/\/[^/]+\/?$/, "");
 }
 function ensureTrailingSlash(path) {
-	return path.endsWith("/") ? path : path + "/";
+	return path.endsWith("/") ? path : `${path}/`;
 }
 function isClientValid(client) {
-	if (!client?.getExpiresAt) return false;
-	const expiresAt = client.getExpiresAt();
-	return expiresAt && expiresAt > /* @__PURE__ */ new Date();
+	return client.getExpiresAt() > /* @__PURE__ */ new Date();
 }
 function getUploadSessionETA(totalLoadedBytes, totalSizeBytes, lastProgressTime, lastProgressBytes) {
 	const now = Date.now();