chore(client): migrate Moorhen 0.23.1 → 1.0.0-alpha.3

CLAUDE.md

@@ -125,8 +125,12 @@ wander ~20Å across runs).
 
 ## Moorhen integration — THE big lesson: Moorhen is Redux-driven
 
-The client embeds Moorhen 0.23 (real source for reference:
-`~/Developer/emsdk/Moorhen/baby-gru/src`). The hardest-won, most reusable lesson:
+The client embeds Moorhen 1.0 (`file:moorhen-1.0.0-alpha.3-*.tgz`; real source
+for reference: `~/Developer/emsdk/Moorhen/baby-gru/src`). Imports come from the
+`moorhen/react-lib` entry (1.0 has an `exports` map; bare `from "moorhen"` no
+longer resolves), and `<MoorhenInstanceProvider>` now requires a `menuSystem={new
+MoorhenMenuSystem()}` prop — see InspectPage. The hardest-won, most reusable
+lesson still holds:
 
 > **Camera origin, map contour level, and map registration are all driven by the
 > Redux store. Mutating the imperative `glRef.current.*` / `map.*` properties

client/package.json

@@ -19,7 +19,7 @@
     "@rdkit/rdkit": "^2024.3.5-1.0.0",
     "@reduxjs/toolkit": "^2.8.2",
     "chart.js": "^4.5.1",
-    "moorhen": "file:moorhen-0.23.1-alpha.0.tgz",
+    "moorhen": "file:moorhen-1.0.0-alpha.3-dev.g065becee.tgz",
     "react": "^19.0.0",
     "react-chartjs-2": "^5.3.1",
     "react-dom": "^19.0.0",

client/src/components/InspectDrawer.tsx

@@ -2,7 +2,12 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { RefObject } from "react";
 import { Link as RouterLink } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
-import { addMap, addMolecule, removeMap, removeMolecule } from "moorhen";
+import {
+  addMap,
+  addMolecule,
+  removeMap,
+  removeMolecule,
+} from "moorhen/react-lib";
 import type { moorhen } from "moorhen/types/moorhen";
 import {
   Accordion,

client/src/moorhen-shim.ts

@@ -1,9 +1,9 @@
 /**
- * Moorhen 0.23.1-alpha.0 has an incomplete/loose type surface for a few things
- * we use (setActiveMap action, MoorhenMap/Molecule constructor arities, contour
- * control, glRef.setOriginAndZoomAnimated). Rather than fight the alpha's .d.ts,
- * we funnel those through thin, explicitly-typed wrappers here. Tighten once the
- * upstream types stabilise.
+ * Moorhen 1.0.0-alpha.3 still has an incomplete/loose type surface for a few
+ * things we use (setActiveMap action, MoorhenMap/Molecule constructor arities,
+ * contour control, glRef.setOriginAndZoomAnimated). Rather than fight the
+ * alpha's .d.ts, we funnel those through thin, explicitly-typed wrappers here.
+ * Tighten once the upstream types stabilise.
  *
  * NOTE on constructor signatures: ground truth is the working MoorhenPanddaApp
  * prototype (same tgz), which constructs:
@@ -22,7 +22,7 @@ import {
   setRequestDrawScene as _setRequestDrawScene,
   showMap as _showMap,
   hideMap as _hideMap,
-} from "moorhen";
+} from "moorhen/react-lib";
 
 // Loosely-typed handles. `any` is deliberate and localised to this shim.
 const MoleculeCtor = _Molecule as unknown as new (

client/src/pages/InspectPage.tsx

@@ -5,9 +5,10 @@ import { useDispatch, useSelector } from "react-redux";
 import {
   MoorhenContainer,
   MoorhenInstanceProvider,
+  MoorhenMenuSystem,
   setShownSidePanel,
-} from "moorhen";
-import type { MoorhenPanel } from "moorhen";
+} from "moorhen/react-lib";
+import type { MoorhenPanel } from "moorhen/react-lib";
 import type { webGL } from "moorhen/types/mgWebGL";
 import type { moorhen } from "moorhen/types/moorhen";
 import store, { resetMoorhenStore } from "../store";
@@ -119,8 +120,16 @@ export function InspectPage() {
       : {}),
   };
 
+  // Moorhen 1.0 moved per-instance state into a React context, and
+  // MoorhenInstanceProvider now REQUIRES a menuSystem (it builds
+  // `new MoorhenInstance(ref, menuSystem)` from it). One per provider; memoise
+  // so it isn't rebuilt each render. We manage our own store (store.ts), so we
+  // wire the provider directly rather than via MoorhenProvider (which would
+  // create a second, un-memoised store). See migration guide §2.
+  const menuSystem = useMemo(() => new MoorhenMenuSystem(), []);
+
   return (
-    <MoorhenInstanceProvider>
+    <MoorhenInstanceProvider menuSystem={menuSystem}>
       <div style={{ position: "absolute", inset: 0 }}>
         <MoorhenContainer {...collectedProps} />
       </div>

client/src/store.ts

@@ -3,9 +3,10 @@ import {
   combineReducers,
   type Action,
 } from "@reduxjs/toolkit";
-// Moorhen 0.23 exposes a single combined reducer map. If this import fails with
-// a missing 'generalStates', clear node_modules/.vite and restart vite.
-import { MoorhenStoreReducers } from "moorhen";
+// Moorhen exposes a single combined reducer map (the react-lib entry in 1.0).
+// If this import fails with a missing 'generalStates', clear node_modules/.vite
+// and restart vite.
+import { MoorhenStoreReducers } from "moorhen/react-lib";
 
 if (!MoorhenStoreReducers || !("generalStates" in MoorhenStoreReducers)) {
   throw new Error(

client/tsconfig.json

@@ -6,6 +6,16 @@
     "module": "ESNext",
     "skipLibCheck": true,
     "moduleResolution": "bundler",
+    // Moorhen 1.0's package.json `exports` map has no `./types/*` key, so under
+    // `bundler` resolution `moorhen/types/moorhen` / `moorhen/types/mgWebGL`
+    // (the still-shipped, deprecated ambient namespaces) no longer resolve.
+    // Point TS straight at the physical .d.ts files. The bundler never sees
+    // these type-only imports (erased pre-bundle), so no Vite change is needed.
+    // See the Moorhen 0.23->1.0 migration guide (module-resolution gotcha).
+    "baseUrl": ".",
+    "paths": {
+      "moorhen/types/*": ["./node_modules/moorhen/types/*"]
+    },
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,