@jbrowse/plugin-config 5.0.0-beta.4 → 5.0.0-beta.7

package/esm/ConfigurationEditorWidget/components/BooleanEditor.d.ts

@@ -3,7 +3,6 @@ declare const BooleanEditor: ({ slot, }: {
     slot: {
         name: string;
         value: boolean | undefined;
-        promotedBase?: unknown;
         set: (arg: boolean) => void;
         description: string;
     };

package/esm/ConfigurationEditorWidget/components/BooleanEditor.js

@@ -4,20 +4,7 @@ import { FormControl, FormHelperText } from '@mui/material';
 import { observer } from 'mobx-react';
 /** #slotEditor checkbox */
 const BooleanEditor = observer(function BooleanEditor({ slot, }) {
-    return (_jsxs(FormControl, { children: [_jsx(LabeledCheckbox, { label: slot.name, 
-                // An unset promotable slot renders its `promotedBase`, not `false`.
-                // Coercing every unset slot to unchecked mis-stated the three whose
-                // base is `true` (displayDirectionalChevrons, showSashimiArcs,
-                // readConnectionsDown): the box read unchecked on a track that was
-                // drawing chevrons, and ticking it wrote the value the track already
-                // had — no visible change, but the slot silently left the cascade and
-                // stopped following later session-wide defaults. The reset button
-                // (SlotEditor's `modified`) is what still separates inherited from
-                // customized; this only fixes which state is *shown*. The session tier
-                // is out of reach here, so a value promoted this session isn't
-                // reflected — see agent-docs/ideas/promotable-slot-ui.md, which is
-                // where that raw-vs-resolved gap is worked out.
-                checked: slot.value ?? !!slot.promotedBase, onChange: val => {
+    return (_jsxs(FormControl, { children: [_jsx(LabeledCheckbox, { label: slot.name, checked: !!slot.value, onChange: val => {
                     slot.set(val);
                 } }), _jsx(FormHelperText, { children: slot.description })] }));
 });

package/esm/ConfigurationEditorWidget/components/JsonEditor.d.ts

@@ -4,7 +4,6 @@ declare const JsonEditor: ({ slot, }: {
         name: string;
         description: string;
         value: unknown;
-        promotedBase?: unknown;
         set: (arg: unknown) => void;
     };
 }) => import("react").JSX.Element;

package/esm/ConfigurationEditorWidget/components/JsonEditor.js

@@ -15,16 +15,11 @@ const useStyles = makeStyles()(theme => ({
 /** #slotEditor monospace textarea holding arbitrary JSON */
 const JsonEditor = observer(function JsonEditor({ slot, }) {
     const { classes } = useStyles();
-    // A `maybeFrozen` slot is `undefined` when unset — the promotable inherit
-    // state (alignments/synteny `colorBy`). `JSON.stringify(undefined)` returns
-    // the *value* `undefined`, not a string, so seeding straight off `slot.value`
-    // handed MonospaceTextField an undefined `value` and made the field
-    // uncontrolled until the first keystroke (React then warns on the switch).
-    // Show what unset resolves to instead, as BooleanEditor does.
-    const [contents, setContents] = useState(() => {
-        const shown = slot.value ?? slot.promotedBase;
-        return shown === undefined ? '' : JSON.stringify(shown, null, 2);
-    });
+    // A `maybeFrozen` slot is `undefined` when unset, and `JSON.stringify(undefined)`
+    // returns the *value* `undefined` rather than a string — which handed
+    // MonospaceTextField an undefined `value` and made the field uncontrolled
+    // until the first keystroke (React then warns on the switch).
+    const [contents, setContents] = useState(() => slot.value === undefined ? '' : JSON.stringify(slot.value, null, 2));
     const [error, setError] = useState();
     return (_jsx(MonospaceTextField, { className: classes.jsonEditor, label: slot.name, value: contents, error: error, helperText: slot.description, onChange: val => {
             setContents(val);

package/esm/ConfigurationEditorWidget/components/NumberEditor.d.ts

@@ -4,7 +4,6 @@ declare const NumberEditor: ({ slot, integer, }: {
         name?: string;
         value: number | undefined;
         description?: string;
-        promotedBase?: unknown;
         set: (val: number) => void;
     };
     integer?: boolean;

package/esm/ConfigurationEditorWidget/components/NumberEditor.js

@@ -5,16 +5,7 @@ import ConfigurationTextField from './ConfigurationTextField.js';
 /** #slotEditor numeric text field */
 const NumberEditor = observer(function NumberEditor({ slot, integer = false, }) {
     const [val, setVal] = useState(slot.value === undefined ? '' : String(slot.value));
-    // An unset `maybeNumber` is a promotable slot's inherit sentinel, and an
-    // empty box is the honest rendering of it — a number field, unlike a
-    // checkbox, has a state for "nothing". What it did not say is what the track
-    // is therefore drawing at, so `featureHeight` read as a blank with no clue
-    // that reads are 7px tall. The placeholder is that, in the affordance meant
-    // for it; the label has to float for MUI to draw one over a labelled field.
-    const placeholder = slot.value === undefined && slot.promotedBase !== undefined
-        ? String(slot.promotedBase)
-        : undefined;
-    return (_jsx(ConfigurationTextField, { label: slot.name, helperText: slot.description, placeholder: placeholder, slotProps: placeholder ? { inputLabel: { shrink: true } } : undefined, value: val, onChange: evt => {
+    return (_jsx(ConfigurationTextField, { label: slot.name, helperText: slot.description, value: val, onChange: evt => {
             const v = evt.target.value;
             setVal(v);
             const num = Number(v);

package/esm/ConfigurationEditorWidget/components/SlotEditor.js

@@ -36,18 +36,10 @@ const UNSET_CHOICE = '';
 /** #slotEditor dropdown of the `model`'s members */
 const StringEnumEditor = observer(function StringEnumEditor({ slot, }) {
     const nullable = slot.type === 'maybeStringEnum';
-    // Naming the member unset resolves to, rather than a bare "default": every
-    // other choice in the list is a value the user can read off the plot, and
-    // this one was the only one that said nothing about what picking it draws.
-    // `promotedBase` is the honest half to show — the editor's target is often a
-    // detached config node, so it cannot see a value promoted this session.
-    const unsetLabel = typeof slot.promotedBase === 'string'
-        ? `default (${slot.promotedBase})`
-        : 'default';
     return (_jsxs(ConfigurationTextField, { value: slot.value ?? UNSET_CHOICE, label: slot.name, select: true, helperText: slot.description, onChange: evt => {
             const { value } = evt.target;
             slot.set(value === UNSET_CHOICE ? undefined : value);
-        }, children: [nullable ? (_jsx(MenuItem, { value: UNSET_CHOICE, children: _jsx("em", { children: unsetLabel }) })) : null, (slot.choices ?? []).map(str => (_jsx(MenuItem, { value: str, children: str }, str)))] }));
+        }, children: [nullable ? (_jsx(MenuItem, { value: UNSET_CHOICE, children: _jsx("em", { children: "default" }) })) : null, (slot.choices ?? []).map(str => (_jsx(MenuItem, { value: str, children: str }, str)))] }));
 });
 /** #slotEditor URL, local file path (desktop) or file blob (browser) */
 const FileSelectorWrapper = observer(function FileSelectorWrapper({ slot, }) {
@@ -98,8 +90,6 @@ const SlotEditor = observer(function SlotEditor({ slot, }) {
     const ValueComponent = callbackMode
         ? CallbackEditor
         : (TypedComponent ?? StringEditor);
-    // a promotable slot's default is its inherit sentinel, so resetting it here
-    // doubles as "un-pin / follow the session-wide default"
     const { modified } = slot;
     return (_jsxs(Paper, { className: classes.paper, children: [_jsx("div", { className: classes.paperContent, children: _jsx(ValueComponent, { slot: slot }, resetNonce) }), modified ? (_jsx("div", { className: classes.resetButton, children: _jsx(Tooltip, { title: "Reset to default", children: _jsx(IconButton, { "aria-label": "reset to default", onClick: () => {
                             slot.set(slot.defaultValue);

package/esm/normalizeUriSnapshot.js

@@ -1,13 +1,13 @@
+import { fillLocations } from '@jbrowse/core/configuration';
 // allows a minimal config of `{ uri: "..." }` by lifting `uri`/`baseUri` into
 // a proper `location` fileLocation slot. Shared by the alias adapters.
 export function normalizeUriSnapshot(snap) {
     return snap.uri
-        ? {
-            ...snap,
+        ? fillLocations(snap, {
             location: {
                 uri: snap.uri,
                 baseUri: snap.baseUri,
             },
-        }
+        })
         : snap;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-config",
-  "version": "5.0.0-beta.4",
+  "version": "5.0.0-beta.7",
   "type": "module",
   "description": "JBrowse 2 config utilities",
   "keywords": [
@@ -27,7 +27,7 @@
     "mobx": "^7.0.3",
     "mobx-react": "^10.0.2",
     "rxjs": "^7.8.2",
-    "@jbrowse/core": "^5.0.0-beta.4"
+    "@jbrowse/core": "^5.0.0-beta.7"
   },
   "peerDependencies": {
     "react": ">=19.0.0",