@morscherlab/mint-sdk 1.3.0-beta.3 → 1.3.0-beta.4

package/src/components/internal/FilePickerListInternal.vue

@@ -22,6 +22,8 @@ const props = defineProps<{
   loading: boolean
   error: string
   query: string
+  /** Search results stopped at a limit; the rows are the first matches only. */
+  truncated?: boolean
   mode: PickerSelectionMode
   selected: (node: PickerNode) => boolean
   selectable: (node: PickerNode) => boolean
@@ -171,6 +173,9 @@ function parts(name: string) {
     <div class="mint-picker__list-head" aria-hidden="true">
       <span /><span>Name</span><span>Size</span><span>Modified</span>
     </div>
+    <p v-if="truncated && !loading && !error && rows.length" class="mint-picker__truncated" role="status">
+      Showing the first {{ rows.length }} matches. Search a smaller folder or use a more specific search to see the rest.
+    </p>
     <div v-if="loading" class="mint-picker__skeleton">
       <Skeleton v-for="n in 6" :key="n" width="100%" height="1.25rem" />
     </div>
@@ -180,10 +185,14 @@ function parts(name: string) {
     </div>
     <div v-else-if="!rows.length" class="mint-picker__empty" role="status">
       <strong>{{
-        query ? 'No matching folders or files' : emptyTitle || 'No readable files'
+        truncated
+          ? 'Search stopped before finding a match'
+          : query ? 'No matching folders or files' : emptyTitle || 'No readable files'
       }}</strong>
       <span>{{
-        query ? 'Try a different search or include subfolders.' : 'Choose another location.'
+        truncated
+          ? 'Search a smaller folder or use a more specific search.'
+          : query ? 'Try a different search or include subfolders.' : 'Choose another location.'
       }}</span>
     </div>
     <template v-for="row in rows" v-else :key="row.node.path">

package/src/composables/createFilePickerAdapter.ts

@@ -1,10 +1,26 @@
-import type { PickerAdapter, PickerNode, PickerRequest } from '../types/filePicker'
-import type { FileBrowserLocation, FileDirectoryListing, ServerMount } from '../types/fileBrowserTypes'
+import type { PickerAdapter, PickerNode, PickerRequest, PickerSearchResult } from '../types/filePicker'
+import type {
+  FileBrowserLocation,
+  FileDirectoryListing,
+  FileDirectoryTree,
+  FileEntry,
+  FileSearchResult,
+  ServerMount,
+} from '../types/fileBrowserTypes'
 import { pickerFormat } from './filePicker/validation'
 
 export interface FilePickerTransport {
   listMounts(request?: PickerRequest): Promise<ServerMount[]>
   browse(location: FileBrowserLocation, request?: PickerRequest): Promise<FileDirectoryListing>
+  /** `GET …/filesystem/tree`: one request fills the cache for the subfolders too. */
+  tree?(location: FileBrowserLocation, request?: PickerRequest): Promise<FileDirectoryTree>
+  /** `GET …/filesystem/search`: replaces the folder-by-folder search walk. */
+  search?(
+    location: FileBrowserLocation,
+    query: string,
+    recursive: boolean,
+    request?: PickerRequest,
+  ): Promise<FileSearchResult>
 }
 export interface FilePickerAdapterOptions {
   /** Show this directory's contents directly and prevent navigation outside it. */
@@ -82,31 +98,75 @@ export function createFilePickerAdapter(
           unavailableReason: mount.available === false ? 'This mount is offline.' : undefined,
         }
       })
+    } else if (transport.tree) {
+      const tree = await transport.tree(location, request)
+      check(request, token)
+      for (const listing of tree.listings ?? []) {
+        const at = { mount_id: listing.mount_id, path: listing.path }
+        validateLocation(at)
+        if (at.mount_id !== location.mount_id) throw new Error('Invalid file picker directory entry.')
+        // A capped subfolder is read on its own when opened, and reports the cap then.
+        if (!listing.truncated) listings.set(encodePlatformPickerPath(at.mount_id, at.path), toNodes(at, listing))
+      }
+      const cached = listings.get(key)
+      if (!cached)
+        throw new Error('This directory exceeds the server listing limit. Choose a smaller data directory.')
+      return cached
     } else {
       const listing = await transport.browse(location, request)
       check(request, token)
       if (listing.truncated)
         throw new Error('This directory exceeds the server listing limit. Choose a smaller data directory.')
-      const atRoot = root && location.mount_id === root.mount_id && location.path === root.path
-      nodes = (listing.entries ?? []).map((entry): PickerNode => {
-        if (!isRelativePath(entry.path) || !entry.name ||
-          entry.path !== `${location.path ? `${location.path}/` : ''}${entry.name}` ||
-          entry.name.includes('/')) throw new Error('Invalid file picker directory entry.')
-        const common = {
-          path: encodePlatformPickerPath(location.mount_id, entry.path),
-          parentPath: atRoot ? null : key,
-          parentName: `${mountLabels.get(location.mount_id) ?? location.mount_id}${location.path ? ` / ${location.path}` : ''}`,
-          name: entry.name, bytes: entry.size_bytes, modifiedAt: entry.modified_at,
-        }
-        return entry.kind === 'directory'
-          // Counts may include only matching formats, not nested directories.
-          ? { ...common, kind: 'folder' }
-          : { ...common, kind: 'file', format: pickerFormat(entry.name) }
-      })
+      nodes = toNodes(location, listing)
     }
     listings.set(key, nodes)
     return nodes
   }
+  function toNodes(location: FileBrowserLocation, listing: FileDirectoryListing): PickerNode[] {
+    return (listing.entries ?? []).map((entry) => {
+      if (entry.path !== `${location.path ? `${location.path}/` : ''}${entry.name}`)
+        throw new Error('Invalid file picker directory entry.')
+      return toNode(location.mount_id, entry)
+    })
+  }
+  /** One entry, parented on the folder its mount-relative path names. */
+  function toNode(mountId: string, entry: FileEntry): PickerNode {
+    if (!isRelativePath(entry.path) || !entry.name || entry.name.includes('/') ||
+      (entry.path !== entry.name && !entry.path.endsWith(`/${entry.name}`)))
+      throw new Error('Invalid file picker directory entry.')
+    const parent = entry.path.slice(0, Math.max(0, entry.path.length - entry.name.length - 1))
+    const atRoot = root && mountId === root.mount_id && parent === root.path
+    const common = {
+      path: encodePlatformPickerPath(mountId, entry.path),
+      parentPath: atRoot ? null : encodePlatformPickerPath(mountId, parent),
+      parentName: `${mountLabels.get(mountId) ?? mountId}${parent ? ` / ${parent}` : ''}`,
+      name: entry.name, bytes: entry.size_bytes, modifiedAt: entry.modified_at,
+    }
+    return entry.kind === 'directory'
+      // Counts may include only matching formats, not nested directories.
+      ? { ...common, kind: 'folder' }
+      : { ...common, kind: 'file', format: pickerFormat(entry.name) }
+  }
+  async function serverSearch(
+    query: string,
+    scope: { path: string; recursive: boolean },
+    request: PickerRequest | undefined,
+  ): Promise<PickerNode[] | PickerSearchResult> {
+    const token = begin(request)
+    const decoded = scope.path ? decodePlatformPickerPath(scope.path) : undefined
+    const location = decoded ? { mount_id: decoded.mountId, path: decoded.path } : root!
+    validateLocation(location)
+    const result = await transport.search!(location, query, scope.recursive, request)
+    check(request, token)
+    const prefix = location.path ? `${location.path}/` : ''
+    const nodes = (result.entries ?? []).map((entry) => {
+      // "This folder" searches may return direct children only.
+      if (!entry.path.startsWith(prefix) || (!scope.recursive && entry.path.slice(prefix.length).includes('/')))
+        throw new Error('Invalid file picker directory entry.')
+      return toNode(location.mount_id, entry)
+    })
+    return result.truncated ? { nodes, truncated: true } : nodes
+  }
   return {
     mounts: !root,
     mountOf(path) {
@@ -120,6 +180,8 @@ export function createFilePickerAdapter(
     listRoot: async (request) => read('', request, begin(request)),
     listChildren: async (path, request) => read(path, request, begin(request)),
     async search(query, scope, request) {
+      // The mount list itself has no server to search, so it keeps the walk.
+      if (transport.search && (scope.path || root)) return serverSearch(query, scope, request)
       const token = begin(request)
       const matches: PickerNode[] = []
       const queue = [scope.path]
@@ -131,8 +193,7 @@ export function createFilePickerAdapter(
         const path = queue.shift()!
         if (visited.has(path)) continue
         visited.add(path)
-        if (visited.size > 500)
-          throw new Error('Search reached its folder limit. Search a smaller location or turn off Subfolders.')
+        if (visited.size > 500) return { nodes: matches, truncated: true }
         const nodes = await read(path, currentRequest, token)
         check(request, token)
         if (currentRequest?.refresh) {
@@ -144,8 +205,7 @@ export function createFilePickerAdapter(
           if (scope.recursive && node.kind === 'folder' && !node.unavailableReason)
             queue.push(node.path)
         }
-        if (matches.length > 10000)
-          throw new Error('Too many search results. Use a more specific search.')
+        if (matches.length > 10000) return { nodes: matches.slice(0, 10000), truncated: true }
       }
       return matches
     },

package/src/composables/filePicker/usePickerNavigation.ts

@@ -3,13 +3,33 @@ import type {
   PickerAdapter,
   PickerNode,
   PickerRequest,
+  PickerSort,
   PickerTreeRow,
 } from '../../types/filePicker'
 
+const byName = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare
+/** Folders first; undated rows go last in either time order. */
+function ordered(items: PickerNode[], sort: PickerSort | undefined): PickerNode[] {
+  if (!sort) return items
+  // Parse each timestamp once rather than on every comparison.
+  const times = new Map(items.map((node) => [node, node.modifiedAt ? Date.parse(node.modifiedAt) : NaN]))
+  const time = (node: PickerNode) => times.get(node)!
+  return [...items].sort((a, b) => {
+    if (a.kind !== b.kind) return a.kind === 'folder' ? -1 : 1
+    if (sort === 'name') return byName(a.name, b.name)
+    if (sort === 'name-desc') return byName(b.name, a.name)
+    const [ta, tb] = [time(a), time(b)]
+    if (Number.isNaN(ta) || Number.isNaN(tb))
+      return Number.isNaN(ta) === Number.isNaN(tb) ? byName(a.name, b.name) : Number.isNaN(ta) ? 1 : -1
+    return (sort === 'newest' ? tb - ta : ta - tb) || byName(a.name, b.name)
+  })
+}
+
 export function usePickerNavigation(
   adapter: () => PickerAdapter,
   request: () => PickerRequest,
   systemFilter: (node: PickerNode) => boolean = () => true,
+  sort: () => PickerSort | undefined = () => undefined,
 ) {
   const path = shallowRef('')
   const trail = ref<{ path: string; label: string }[]>([])
@@ -21,6 +41,8 @@ export function usePickerNavigation(
   const expansionErrors = ref(new Map<string, string>())
   const loading = shallowRef(false)
   const error = shallowRef('')
+  /** True when the current search results stopped at an adapter limit. */
+  const truncated = shallowRef(false)
   let epoch = 0
   let navigation = 0
   let controller: AbortController | undefined
@@ -154,14 +176,17 @@ export function usePickerNavigation(
     const options = { ...request(), ...(refresh && { refresh }), signal: controller.signal }
     loading.value = true
     error.value = ''
+    truncated.value = false
     entries.value = []
     try {
-      const items = query.trim()
+      const found = query.trim()
         ? await adapter().search(query.trim(), { path: path.value, recursive }, options)
         : path.value
           ? await loadChildren(path.value, [], refresh)
           : await adapter().listRoot(options)
       if (token !== navigation) return
+      const items = Array.isArray(found) ? found : found.nodes
+      truncated.value = !Array.isArray(found) && found.truncated
       register(items, query.trim() ? undefined : path.value)
       entries.value = items
       if (!query.trim()) prefetch(items)
@@ -215,8 +240,9 @@ export function usePickerNavigation(
   }
   const rows = computed(() => {
     const result: PickerTreeRow[] = []
+    const order = sort()
     function visit(items: PickerNode[], depth: number, ancestors: Set<string>) {
-      for (const item of items) {
+      for (const item of ordered(items, order)) {
         if (ancestors.has(item.path) || depth > 30) continue
         const node = nodes.value.get(item.path) ?? item
         if (!isAllowed(node)) continue
@@ -246,6 +272,7 @@ export function usePickerNavigation(
     expansionErrors,
     loading,
     error,
+    truncated,
     rows,
     isAllowed,
     clear,

package/src/composables/useFilePicker.ts

@@ -5,6 +5,7 @@ import type {
   PickerNode,
   PickerSelection,
   PickerSelectionMode,
+  PickerSort,
   PickerSource,
 } from '../types/filePicker'
 import type { SegmentedOption } from '../types'
@@ -20,6 +21,7 @@ interface PickerStateProps {
   capabilities: PickerCapabilities
   initialPath: string
   initialSelection: PickerSelection | null
+  defaultSort: PickerSort
   systemFilter?: (node: PickerNode, source: PickerSource) => boolean
 }
 type PickerEmit = {
@@ -50,6 +52,7 @@ export function useFilePicker(
   )
   const query = shallowRef('')
   const recursive = shallowRef(false)
+  const sort = shallowRef<PickerSort>(props.defaultSort)
   const skipBlanks = shallowRef(false)
   const reviewing = shallowRef(false)
   const localFiles = shallowRef<File[]>([])
@@ -61,6 +64,7 @@ export function useFilePicker(
     () => (source.value === 'localFile' ? localAdapter.value : props.adapter),
     () => ({ source: source.value }),
     (node) => props.systemFilter?.(node, source.value) !== false,
+    () => sort.value,
   )
   const capability = computed(() => props.capabilities[source.value])
   const selection = usePickerSelection(
@@ -182,6 +186,7 @@ export function useFilePicker(
     (open) => {
       clearTimeout(timer)
       if (open) {
+        sort.value = props.defaultSort
         if (!initialized) {
           path.value = props.initialPath
           if (path.value) trail.value = [{ path: path.value, label: 'Current folder' }]
@@ -348,9 +353,10 @@ export function useFilePicker(
   }
   async function selectLocalFiles() {
     const token = openGeneration
-    const items = props.selectionMode === 'single-file' || props.selectionMode === 'multi-file'
+    const found = props.selectionMode === 'single-file' || props.selectionMode === 'multi-file'
       ? await localAdapter.value.search('', { path: '', recursive: true })
       : nav.entries.value
+    const items = Array.isArray(found) ? found : found.nodes
     if (token !== openGeneration || !props.open || source.value !== 'localFile') return
     nav.register(items)
     const candidates = items.filter((node) => selection.selectable(node))
@@ -411,6 +417,7 @@ export function useFilePicker(
     source,
     query,
     recursive,
+    sort,
     skipBlanks,
     reviewing,
     nav,

package/src/composables/usePlatformFilePickerAdapter.ts

@@ -1,11 +1,24 @@
 import type { PickerAdapter } from '../types/filePicker'
-import type { FileDirectoryListing, ServerMount } from '../types/fileBrowserTypes'
+import type {
+  FileBrowserLocation,
+  FileDirectoryListing,
+  FileDirectoryTree,
+  FileSearchResult,
+  ServerMount,
+} from '../types/fileBrowserTypes'
+import type { PickerRequest } from '../types/filePicker'
 import { useApi } from './useApi'
 import { getInjectedPlatformContext } from './platformContextHelpers'
 import { createFilePickerAdapter, type FilePickerAdapterOptions } from './createFilePickerAdapter'
 
 export { encodePlatformPickerPath, decodePlatformPickerPath } from './createFilePickerAdapter'
 
+function query(location: FileBrowserLocation, request?: PickerRequest): URLSearchParams {
+  const params = new URLSearchParams({ mount_id: location.mount_id, path: location.path })
+  if (request?.refresh) params.set('refresh', 'true')
+  return params
+}
+
 /** Adapt the authenticated MINT mount API without exposing absolute host paths. */
 export function usePlatformFilePickerAdapter(
   options: FilePickerAdapterOptions & { apiBaseUrl?: string } = {},
@@ -27,11 +40,20 @@ export function usePlatformFilePickerAdapter(
       }
     },
     browse(location, request) {
-      const query = new URLSearchParams({ mount_id: location.mount_id, path: location.path })
-      if (request?.refresh) query.set('refresh', 'true')
-      return api.get<FileDirectoryListing>(`/filesystem/browse?${query}`, {
+      return api.get<FileDirectoryListing>(`/filesystem/browse?${query(location, request)}`, {
+        signal: request?.signal,
+      })
+    },
+    tree(location, request) {
+      return api.get<FileDirectoryTree>(`/filesystem/tree?${query(location, request)}`, {
         signal: request?.signal,
       })
     },
+    search(location, text, recursive, request) {
+      const params = query(location, request)
+      params.set('q', text)
+      params.set('recursive', String(recursive))
+      return api.get<FileSearchResult>(`/filesystem/search?${params}`, { signal: request?.signal })
+    },
   }, options)
 }

package/src/styles/components/action-menu.css

@@ -18,3 +18,13 @@
   min-width: 10rem;
   max-width: min(18rem, calc(100vw - 1rem));
 }
+
+.mint-action-menu__check {
+  flex-shrink: 0;
+  color: var(--color-primary);
+}
+
+/* Unchecked radio rows keep the check's width so labels stay aligned. */
+.mint-action-menu__check--off {
+  visibility: hidden;
+}

package/src/styles/components/file-picker.css

@@ -106,6 +106,7 @@
   white-space: nowrap;
 }
 .mint-picker__scope,
+.mint-picker__sort,
 .mint-picker__link {
   padding: 2px 6px;
   border: 0;
@@ -116,10 +117,20 @@
   cursor: pointer;
   transition: background-color 150ms ease;
 }
-.mint-picker__scope {
+.mint-picker__scope,
+.mint-picker__sort {
   flex-shrink: 0;
   color: var(--text-secondary-strong);
 }
+.mint-picker__sort {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+}
+.mint-picker__sort svg {
+  width: 12px;
+  height: 12px;
+}
 .mint-picker__link {
   color: var(--_ink-primary);
 }
@@ -138,10 +149,13 @@
   cursor: not-allowed;
 }
 .mint-picker__scope:hover,
+.mint-picker__sort:hover,
+.mint-picker__sort[aria-expanded='true'],
 .mint-picker__link:hover {
   background: var(--bg-hover);
 }
 .mint-picker__scope:focus-visible,
+.mint-picker__sort:focus-visible,
 .mint-picker__link:focus-visible {
   outline: none;
   box-shadow: var(--focus-ring-offset);
@@ -185,6 +199,14 @@
 .mint-picker__list-head > span:nth-child(n + 3) {
   text-align: right;
 }
+.mint-picker__truncated {
+  margin: 0;
+  padding: 6px 12px;
+  border-bottom: 1px solid var(--border-light);
+  background: var(--bg-secondary);
+  font-size: 12px;
+  color: var(--text-secondary);
+}
 .mint-picker__row {
   box-sizing: border-box;
   height: 34px;

package/src/types/auth.ts

@@ -33,6 +33,10 @@ export interface TokenVerifyResponse {
   valid: boolean
   username: string | null
   expires_at: string | null
+  /** Platform 1.3+: `access_token` for a personal access token. */
+  token_type?: 'session' | 'access_token'
+  /** Platform 1.3+: true for a read-only personal access token. */
+  read_only?: boolean
 }
 
 // Registration request

package/src/types/components.ts

@@ -13,6 +13,8 @@ interface ActionMenuItemBase {
   label: string
   disabled?: boolean
   danger?: boolean
+  /** Set on every item to make the menu a single choice (`menuitemradio`); true marks the current one. */
+  checked?: boolean
 }
 
 export type ActionMenuItem =
@@ -23,6 +25,8 @@ export type ActionMenuItem =
   | (ActionMenuItemBase & {
       href: string
       target?: '_self' | '_blank' | '_parent' | '_top'
+      /** Links navigate; only buttons can be single-choice items. */
+      checked?: never
     })
 
 // Input types

package/src/types/fileBrowserTypes.ts

@@ -83,3 +83,18 @@ export interface FileBrowserLocation {
   mount_id: string
   path: string
 }
+
+/** Several directory levels in one response, parents before children. */
+export interface FileDirectoryTree {
+  listings?: FileDirectoryListing[]
+  /** True when the server's entry budget stopped before the requested depth. */
+  truncated?: boolean
+}
+
+/** Entries whose name contains a query, below one directory. */
+export interface FileSearchResult {
+  entries?: FileEntry[]
+  searched_directories?: number
+  /** True when a directory, result or time budget ended the search early. */
+  truncated?: boolean
+}

package/src/types/filePicker.ts

@@ -3,6 +3,8 @@ export type PickerSource = 'server' | 'localFile'
 export type PickerSelectionMode = 'single-file' | 'multi-file' | 'folder' | 'folder+files'
 /** `list` shows one folder at a time (the default); `tree` adds disclosure triangles. */
 export type PickerView = 'list' | 'tree'
+/** Row order inside each folder; folders always come before files. */
+export type PickerSort = 'newest' | 'oldest' | 'name' | 'name-desc'
 
 interface PickerNodeBase {
   path: string
@@ -39,6 +41,11 @@ export interface PickerRequest {
    */
   refresh?: true
 }
+/** What a search found before a server or walk limit stopped it. */
+export interface PickerSearchResult {
+  nodes: PickerNode[]
+  truncated: boolean
+}
 export interface PickerAdapter {
   /**
    * `listRoot()` returns mount points. FilePicker then shows them as header
@@ -55,7 +62,7 @@ export interface PickerAdapter {
     query: string,
     scope: { path: string; recursive: boolean },
     request?: PickerRequest,
-  ): Promise<PickerNode[]>
+  ): Promise<PickerNode[] | PickerSearchResult>
 }
 export interface PickerCapability {
   /** Case-insensitive suffixes, including compound extensions such as mzML.gz. */

package/src/types/index.ts

@@ -218,9 +218,11 @@ export type {
   FileBrowserLocation,
   FileBrowserSortKey,
   FileDirectoryListing,
+  FileDirectoryTree,
   FileEntry,
   FileEntryKind,
   FilePathCrumb,
+  FileSearchResult,
   FileSelection,
   ServerMount,
 } from './fileBrowserTypes'