@jbrowse/core 4.3.0 → 5.0.0-beta.2

package/esm/ui/FileSelector/UrlChooser.js

@@ -1,9 +1,33 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useState } from 'react';
 import { TextField } from '@mui/material';
 import { observer } from 'mobx-react';
-import { isUriLocation } from "../../util/types/index.js";
+import { isUriLocation } from '../../util/types/index.js';
 const UrlChooser = observer(function UrlChooser({ location, label, style, setLocation, }) {
-    return (_jsx(TextField, { variant: "outlined", fullWidth: true, defaultValue: location && isUriLocation(location) ? location.uri : '', label: label || 'Enter URL', style: style, onChange: event => {
+    const uri = location && isUriLocation(location) ? location.uri : '';
+    // What the box shows, which is not quite the location: the location is
+    // trimmed and this is what was typed.
+    //
+    // The box used to be uncontrolled (`defaultValue`), which reads the location
+    // once at mount and ignores every later one — so a form that FILLS a field in
+    // for the user showed them an empty box, and the add-track widget's "found the
+    // index sitting next to your file" note sat under nothing.
+    //
+    // Both conditions are load-bearing. A uri that has not changed is not news,
+    // however far the box has drifted from it — that is the parent that ignores
+    // `setLocation`, where overwriting would make the field untypeable. And a uri
+    // that matches what is on screen once trimmed is our own edit coming back, so
+    // adopting it would delete a space as fast as it was typed.
+    const [typed, setTyped] = useState(uri);
+    const [lastUri, setLastUri] = useState(uri);
+    if (uri !== lastUri) {
+        setLastUri(uri);
+        if (uri !== typed.trim()) {
+            setTyped(uri);
+        }
+    }
+    return (_jsx(TextField, { variant: "outlined", fullWidth: true, value: typed, label: label || 'Enter URL', style: style, onChange: event => {
+            setTyped(event.target.value);
             setLocation({
                 uri: event.target.value.trim(),
                 locationType: 'UriLocation',

package/esm/ui/FileSelector/emptySourceType.d.ts

@@ -0,0 +1,2 @@
+export declare const EmptySourceTypeProvider: import("react").Provider<string | undefined>;
+export declare function useEmptySourceType(): string | undefined;

package/esm/ui/FileSelector/emptySourceType.js

@@ -0,0 +1,14 @@
+import { createContext, use } from 'react';
+// Which toggle a FileSelector opens on when its slot is still empty, for a form
+// whose surrounding UI has already answered the question — the add-genome pane
+// sets 'url' while its box of pasted URLs is on screen, so the index inputs
+// underneath don't offer a local file picker to someone working remotely.
+//
+// A context rather than a prop because it would otherwise thread four levels
+// down through components shared with other forms (the advanced options, the
+// per-format inputs), none of which have any business knowing about it.
+const EmptySourceTypeContext = createContext(undefined);
+export const EmptySourceTypeProvider = EmptySourceTypeContext.Provider;
+export function useEmptySourceType() {
+    return use(EmptySourceTypeContext);
+}

package/esm/ui/FileSelector/useInternetAccounts.d.ts

@@ -1,47 +1,37 @@
 import type { AbstractRootModel } from '../../util/types/index.ts';
 export default function useInternetAccounts(rootModel?: AbstractRootModel): {
     accountMap: {
-        [k: string]: {
-            id: string;
-            type: string;
-            configuration: {
-                [x: string]: any;
-            } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
-                setSubschema(slotName: string, data: Record<string, unknown>): Record<string, unknown> | ({
-                    [x: string]: any;
-                } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
-                    setSubschema(slotName: string, data: Record<string, unknown>): Record<string, unknown> | ({
-                        [x: string]: any;
-                    } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & any & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("../../configuration/types.ts").AnyConfigurationSchemaType>);
-                } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("../../configuration/types.ts").AnyConfigurationSchemaType>);
-            } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
-                name: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+        [k: string]: import("@jbrowse/mobx-state-tree").ModelInstanceTypeProps<{
+            id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
+            type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
+            configuration: import("../../configuration/configurationSchema.ts").IConfigurationReference<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
+                readonly name: {
+                    readonly description: "descriptive name of the internet account";
+                    readonly type: "string";
+                    readonly defaultValue: "";
                 };
-                description: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+                readonly description: {
+                    readonly description: "a description of the internet account";
+                    readonly type: "string";
+                    readonly defaultValue: "";
                 };
-                authHeader: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+                readonly authHeader: {
+                    readonly description: "request header for credentials";
+                    readonly type: "string";
+                    readonly defaultValue: "Authorization";
                 };
-                tokenType: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+                readonly tokenType: {
+                    readonly description: "a custom name for a token to include in the header";
+                    readonly type: "string";
+                    readonly defaultValue: "";
                 };
-                domains: {
-                    description: string;
-                    type: string;
-                    defaultValue: never[];
+                readonly domains: {
+                    readonly description: "array of valid domains the url can contain to use this account";
+                    readonly type: "stringArray";
+                    readonly defaultValue: readonly [];
                 };
             }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>>;
-        } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
+        }> & {
             readonly name: string;
             readonly description: string;
             readonly internetAccountId: string;
@@ -49,22 +39,21 @@ export default function useInternetAccounts(rootModel?: AbstractRootModel): {
             readonly tokenType: string;
             readonly domains: string[];
             readonly toggleContents: React.ReactNode;
-            readonly SelectorComponent: import("../../util/index.ts").AnyReactComponentType | undefined;
             readonly selectorLabel: string | undefined;
+            readonly showInFileSelector: boolean;
         } & {
             handlesLocation(location: import("../../util/index.ts").UriLocation): boolean;
             readonly tokenKey: string;
         } & {
             getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
             storeToken(token: string): void;
-            removeToken(): void;
-            retrieveToken(): string | null;
+            retrieveToken(): string | undefined;
             validateToken(token: string, _loc: import("../../util/index.ts").UriLocation): Promise<string>;
         } & {
+            removeToken(): void;
             getToken(location?: import("../../util/index.ts").UriLocation): Promise<string>;
         } & {
             addAuthHeaderToInit(init?: RequestInit, token?: string): {
-                headers: Headers;
                 body?: BodyInit | null;
                 cache?: RequestCache;
                 credentials?: RequestCredentials;
@@ -78,48 +67,50 @@ export default function useInternetAccounts(rootModel?: AbstractRootModel): {
                 referrerPolicy?: ReferrerPolicy;
                 signal?: AbortSignal | null;
                 window?: null;
+                headers: Headers;
             };
+            fetchWithToken(loc: import("../../util/index.ts").UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
             getPreAuthorizationInformation(location: import("../../util/index.ts").UriLocation): Promise<{
                 internetAccountType: string;
                 authInfo: {
                     token: string;
-                    configuration: any;
+                    configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
                 };
             }>;
         } & {
             getFetcher(loc?: import("../../util/index.ts").UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
         } & {
-            openLocation(location: import("../../util/index.ts").UriLocation): import("../../util/io/RemoteFileWithRangeCache.ts").RemoteFileWithRangeCache;
+            openLocation(location: import("../../util/index.ts").UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
         } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
             id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
             type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
-            configuration: import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
-                name: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+            configuration: import("../../configuration/configurationSchema.ts").IConfigurationReference<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
+                readonly name: {
+                    readonly description: "descriptive name of the internet account";
+                    readonly type: "string";
+                    readonly defaultValue: "";
                 };
-                description: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+                readonly description: {
+                    readonly description: "a description of the internet account";
+                    readonly type: "string";
+                    readonly defaultValue: "";
                 };
-                authHeader: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+                readonly authHeader: {
+                    readonly description: "request header for credentials";
+                    readonly type: "string";
+                    readonly defaultValue: "Authorization";
                 };
-                tokenType: {
-                    description: string;
-                    type: string;
-                    defaultValue: string;
+                readonly tokenType: {
+                    readonly description: "a custom name for a token to include in the header";
+                    readonly type: "string";
+                    readonly defaultValue: "";
                 };
-                domains: {
-                    description: string;
-                    type: string;
-                    defaultValue: never[];
+                readonly domains: {
+                    readonly description: "array of valid domains the url can contain to use this account";
+                    readonly type: "stringArray";
+                    readonly defaultValue: readonly [];
                 };
-            }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>;
+            }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>>;
         }, {
             readonly name: string;
             readonly description: string;
@@ -128,22 +119,21 @@ export default function useInternetAccounts(rootModel?: AbstractRootModel): {
             readonly tokenType: string;
             readonly domains: string[];
             readonly toggleContents: React.ReactNode;
-            readonly SelectorComponent: import("../../util/index.ts").AnyReactComponentType | undefined;
             readonly selectorLabel: string | undefined;
+            readonly showInFileSelector: boolean;
         } & {
             handlesLocation(location: import("../../util/index.ts").UriLocation): boolean;
             readonly tokenKey: string;
         } & {
             getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
             storeToken(token: string): void;
-            removeToken(): void;
-            retrieveToken(): string | null;
+            retrieveToken(): string | undefined;
             validateToken(token: string, _loc: import("../../util/index.ts").UriLocation): Promise<string>;
         } & {
+            removeToken(): void;
             getToken(location?: import("../../util/index.ts").UriLocation): Promise<string>;
         } & {
             addAuthHeaderToInit(init?: RequestInit, token?: string): {
-                headers: Headers;
                 body?: BodyInit | null;
                 cache?: RequestCache;
                 credentials?: RequestCredentials;
@@ -157,22 +147,344 @@ export default function useInternetAccounts(rootModel?: AbstractRootModel): {
                 referrerPolicy?: ReferrerPolicy;
                 signal?: AbortSignal | null;
                 window?: null;
+                headers: Headers;
             };
+            fetchWithToken(loc: import("../../util/index.ts").UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
             getPreAuthorizationInformation(location: import("../../util/index.ts").UriLocation): Promise<{
                 internetAccountType: string;
                 authInfo: {
                     token: string;
-                    configuration: any;
+                    configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
                 };
             }>;
         } & {
             getFetcher(loc?: import("../../util/index.ts").UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
         } & {
-            openLocation(location: import("../../util/index.ts").UriLocation): import("../../util/io/RemoteFileWithRangeCache.ts").RemoteFileWithRangeCache;
+            openLocation(location: import("../../util/index.ts").UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
         }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
     };
-    shownAccountIds: string[];
-    hiddenAccountIds: string[];
+    shownAccounts: (import("@jbrowse/mobx-state-tree").ModelInstanceTypeProps<{
+        id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
+        type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
+        configuration: import("../../configuration/configurationSchema.ts").IConfigurationReference<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
+            readonly name: {
+                readonly description: "descriptive name of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly description: {
+                readonly description: "a description of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly authHeader: {
+                readonly description: "request header for credentials";
+                readonly type: "string";
+                readonly defaultValue: "Authorization";
+            };
+            readonly tokenType: {
+                readonly description: "a custom name for a token to include in the header";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly domains: {
+                readonly description: "array of valid domains the url can contain to use this account";
+                readonly type: "stringArray";
+                readonly defaultValue: readonly [];
+            };
+        }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>>;
+    }> & {
+        readonly name: string;
+        readonly description: string;
+        readonly internetAccountId: string;
+        readonly authHeader: string;
+        readonly tokenType: string;
+        readonly domains: string[];
+        readonly toggleContents: React.ReactNode;
+        readonly selectorLabel: string | undefined;
+        readonly showInFileSelector: boolean;
+    } & {
+        handlesLocation(location: import("../../util/index.ts").UriLocation): boolean;
+        readonly tokenKey: string;
+    } & {
+        getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
+        storeToken(token: string): void;
+        retrieveToken(): string | undefined;
+        validateToken(token: string, _loc: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        removeToken(): void;
+        getToken(location?: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        addAuthHeaderToInit(init?: RequestInit, token?: string): {
+            body?: BodyInit | null;
+            cache?: RequestCache;
+            credentials?: RequestCredentials;
+            integrity?: string;
+            keepalive?: boolean;
+            method?: string;
+            mode?: RequestMode;
+            priority?: RequestPriority;
+            redirect?: RequestRedirect;
+            referrer?: string;
+            referrerPolicy?: ReferrerPolicy;
+            signal?: AbortSignal | null;
+            window?: null;
+            headers: Headers;
+        };
+        fetchWithToken(loc: import("../../util/index.ts").UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
+        getPreAuthorizationInformation(location: import("../../util/index.ts").UriLocation): Promise<{
+            internetAccountType: string;
+            authInfo: {
+                token: string;
+                configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
+            };
+        }>;
+    } & {
+        getFetcher(loc?: import("../../util/index.ts").UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+    } & {
+        openLocation(location: import("../../util/index.ts").UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
+    } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
+        id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
+        type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
+        configuration: import("../../configuration/configurationSchema.ts").IConfigurationReference<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
+            readonly name: {
+                readonly description: "descriptive name of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly description: {
+                readonly description: "a description of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly authHeader: {
+                readonly description: "request header for credentials";
+                readonly type: "string";
+                readonly defaultValue: "Authorization";
+            };
+            readonly tokenType: {
+                readonly description: "a custom name for a token to include in the header";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly domains: {
+                readonly description: "array of valid domains the url can contain to use this account";
+                readonly type: "stringArray";
+                readonly defaultValue: readonly [];
+            };
+        }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>>;
+    }, {
+        readonly name: string;
+        readonly description: string;
+        readonly internetAccountId: string;
+        readonly authHeader: string;
+        readonly tokenType: string;
+        readonly domains: string[];
+        readonly toggleContents: React.ReactNode;
+        readonly selectorLabel: string | undefined;
+        readonly showInFileSelector: boolean;
+    } & {
+        handlesLocation(location: import("../../util/index.ts").UriLocation): boolean;
+        readonly tokenKey: string;
+    } & {
+        getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
+        storeToken(token: string): void;
+        retrieveToken(): string | undefined;
+        validateToken(token: string, _loc: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        removeToken(): void;
+        getToken(location?: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        addAuthHeaderToInit(init?: RequestInit, token?: string): {
+            body?: BodyInit | null;
+            cache?: RequestCache;
+            credentials?: RequestCredentials;
+            integrity?: string;
+            keepalive?: boolean;
+            method?: string;
+            mode?: RequestMode;
+            priority?: RequestPriority;
+            redirect?: RequestRedirect;
+            referrer?: string;
+            referrerPolicy?: ReferrerPolicy;
+            signal?: AbortSignal | null;
+            window?: null;
+            headers: Headers;
+        };
+        fetchWithToken(loc: import("../../util/index.ts").UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
+        getPreAuthorizationInformation(location: import("../../util/index.ts").UriLocation): Promise<{
+            internetAccountType: string;
+            authInfo: {
+                token: string;
+                configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
+            };
+        }>;
+    } & {
+        getFetcher(loc?: import("../../util/index.ts").UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+    } & {
+        openLocation(location: import("../../util/index.ts").UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
+    }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>)[];
+    hiddenAccounts: (import("@jbrowse/mobx-state-tree").ModelInstanceTypeProps<{
+        id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
+        type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
+        configuration: import("../../configuration/configurationSchema.ts").IConfigurationReference<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
+            readonly name: {
+                readonly description: "descriptive name of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly description: {
+                readonly description: "a description of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly authHeader: {
+                readonly description: "request header for credentials";
+                readonly type: "string";
+                readonly defaultValue: "Authorization";
+            };
+            readonly tokenType: {
+                readonly description: "a custom name for a token to include in the header";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly domains: {
+                readonly description: "array of valid domains the url can contain to use this account";
+                readonly type: "stringArray";
+                readonly defaultValue: readonly [];
+            };
+        }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>>;
+    }> & {
+        readonly name: string;
+        readonly description: string;
+        readonly internetAccountId: string;
+        readonly authHeader: string;
+        readonly tokenType: string;
+        readonly domains: string[];
+        readonly toggleContents: React.ReactNode;
+        readonly selectorLabel: string | undefined;
+        readonly showInFileSelector: boolean;
+    } & {
+        handlesLocation(location: import("../../util/index.ts").UriLocation): boolean;
+        readonly tokenKey: string;
+    } & {
+        getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
+        storeToken(token: string): void;
+        retrieveToken(): string | undefined;
+        validateToken(token: string, _loc: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        removeToken(): void;
+        getToken(location?: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        addAuthHeaderToInit(init?: RequestInit, token?: string): {
+            body?: BodyInit | null;
+            cache?: RequestCache;
+            credentials?: RequestCredentials;
+            integrity?: string;
+            keepalive?: boolean;
+            method?: string;
+            mode?: RequestMode;
+            priority?: RequestPriority;
+            redirect?: RequestRedirect;
+            referrer?: string;
+            referrerPolicy?: ReferrerPolicy;
+            signal?: AbortSignal | null;
+            window?: null;
+            headers: Headers;
+        };
+        fetchWithToken(loc: import("../../util/index.ts").UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
+        getPreAuthorizationInformation(location: import("../../util/index.ts").UriLocation): Promise<{
+            internetAccountType: string;
+            authInfo: {
+                token: string;
+                configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
+            };
+        }>;
+    } & {
+        getFetcher(loc?: import("../../util/index.ts").UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+    } & {
+        openLocation(location: import("../../util/index.ts").UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
+    } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
+        id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
+        type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
+        configuration: import("../../configuration/configurationSchema.ts").IConfigurationReference<import("../../configuration/configurationSchema.ts").ConfigurationSchemaType<{
+            readonly name: {
+                readonly description: "descriptive name of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly description: {
+                readonly description: "a description of the internet account";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly authHeader: {
+                readonly description: "request header for credentials";
+                readonly type: "string";
+                readonly defaultValue: "Authorization";
+            };
+            readonly tokenType: {
+                readonly description: "a custom name for a token to include in the header";
+                readonly type: "string";
+                readonly defaultValue: "";
+            };
+            readonly domains: {
+                readonly description: "array of valid domains the url can contain to use this account";
+                readonly type: "stringArray";
+                readonly defaultValue: readonly [];
+            };
+        }, import("../../configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "internetAccountId">>>;
+    }, {
+        readonly name: string;
+        readonly description: string;
+        readonly internetAccountId: string;
+        readonly authHeader: string;
+        readonly tokenType: string;
+        readonly domains: string[];
+        readonly toggleContents: React.ReactNode;
+        readonly selectorLabel: string | undefined;
+        readonly showInFileSelector: boolean;
+    } & {
+        handlesLocation(location: import("../../util/index.ts").UriLocation): boolean;
+        readonly tokenKey: string;
+    } & {
+        getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
+        storeToken(token: string): void;
+        retrieveToken(): string | undefined;
+        validateToken(token: string, _loc: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        removeToken(): void;
+        getToken(location?: import("../../util/index.ts").UriLocation): Promise<string>;
+    } & {
+        addAuthHeaderToInit(init?: RequestInit, token?: string): {
+            body?: BodyInit | null;
+            cache?: RequestCache;
+            credentials?: RequestCredentials;
+            integrity?: string;
+            keepalive?: boolean;
+            method?: string;
+            mode?: RequestMode;
+            priority?: RequestPriority;
+            redirect?: RequestRedirect;
+            referrer?: string;
+            referrerPolicy?: ReferrerPolicy;
+            signal?: AbortSignal | null;
+            window?: null;
+            headers: Headers;
+        };
+        fetchWithToken(loc: import("../../util/index.ts").UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
+        getPreAuthorizationInformation(location: import("../../util/index.ts").UriLocation): Promise<{
+            internetAccountType: string;
+            authInfo: {
+                token: string;
+                configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
+            };
+        }>;
+    } & {
+        getFetcher(loc?: import("../../util/index.ts").UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+    } & {
+        openLocation(location: import("../../util/index.ts").UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
+    }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>)[];
     recentlyUsed: string[];
     setRecentlyUsed: (value: string[] | ((val: string[]) => string[])) => void;
 };

package/esm/ui/FileSelector/useInternetAccounts.js

@@ -1,17 +1,24 @@
-import { useLocalStorage } from "../../util/index.js";
-import { isAppRootModel } from "../../util/types/index.js";
+import { useLocalStorage } from '../../util/hooks.js';
+import { isAppRootModel } from '../../util/types/index.js';
 const NUM_SHOWN = 2;
 export default function useInternetAccounts(rootModel) {
     const [recentlyUsed, setRecentlyUsed] = useLocalStorage('fileSelector-recentlyUsedInternetAccounts', []);
     const accounts = isAppRootModel(rootModel)
-        ? rootModel.internetAccounts.filter(f => f.type !== 'HTTPBasicInternetAccount')
+        ? rootModel.internetAccounts.filter(f => f.showInFileSelector)
         : [];
+    // keyed by internetAccountId; also dedups any repeated account
     const accountMap = Object.fromEntries(accounts.map(a => [a.internetAccountId, a]));
-    const sortedIds = [...new Set(accounts.map(s => s.internetAccountId))].sort((a, b) => recentlyUsed.indexOf(a) - recentlyUsed.indexOf(b));
+    // recentlyUsed is ordered most-recent-first; accounts absent from it rank
+    // last (indexOf returns -1, which would otherwise sort them ahead of index 0)
+    const rank = (id) => {
+        const idx = recentlyUsed.indexOf(id);
+        return idx === -1 ? Number.POSITIVE_INFINITY : idx;
+    };
+    const sorted = Object.values(accountMap).sort((a, b) => rank(a.internetAccountId) - rank(b.internetAccountId));
     return {
         accountMap,
-        shownAccountIds: sortedIds.slice(0, NUM_SHOWN),
-        hiddenAccountIds: sortedIds.slice(NUM_SHOWN),
+        shownAccounts: sorted.slice(0, NUM_SHOWN),
+        hiddenAccounts: sorted.slice(NUM_SHOWN),
         recentlyUsed,
         setRecentlyUsed,
     };