fix hub types

packages/hub/src/app/models/[owner]/[slug]/exports/[variableName]/SquiggleModelExportPage.tsx

@@ -2,11 +2,13 @@
 import { FC, use, useState } from "react";
 import { graphql, useFragment } from "react-relay";
 
+import { SqValuePathEdge } from "@quri/squiggle-lang";
 import {
   squiggleLangByVersion,
   useAdjustSquiggleVersion,
   VersionedSquiggleChart,
   versionSupportsExports,
+  versionSupportsSqPathV2,
 } from "@quri/versioned-squiggle-components";
 
 import { squiggleHubLinker } from "@/squiggle/components/linker";
@@ -36,10 +38,16 @@ const VersionedSquiggleModelExportPage: FC<
       linker: squiggleHubLinker,
     });
 
-    const rootPath = new squiggleLang.SqValuePath({
-      root: "bindings",
-      items: [{ type: "string", value: variableName }],
-    });
+    const rootPath = versionSupportsSqPathV2.props(squiggleLang)
+      ? new squiggleLang.SqValuePath({
+          root: "bindings",
+          edges: [SqValuePathEdge.fromKey(variableName)],
+        })
+      : new squiggleLang.SqValuePath({
+          root: "bindings",
+          items: [{ type: "string", value: variableName }],
+        });
+
     return { project, rootPath };
   });
 

packages/versioned-components/src/index.ts

@@ -11,6 +11,7 @@ export {
   versionSupportsDropdownMenu,
   versionSupportsExports,
   versionSupportsImportTooltip,
+  versionSupportsSqPathV2,
   versionSupportsSquiggleChart,
 } from "./versions.js";
 

packages/versioned-components/src/squiggleLangByVersion.ts

@@ -8,7 +8,7 @@ type PackageTypes = {
   dev: Awaited<typeof import("@quri/squiggle-lang")>;
 };
 
-export async function squiggleLangByVersion<T extends SquiggleVersion>(
+async function squiggleLangPackageByVersion<T extends SquiggleVersion>(
   version: T
 ): Promise<PackageTypes[T]> {
   // We do explicit casting of imports, but it shouldn't matter.
@@ -27,3 +27,17 @@ export async function squiggleLangByVersion<T extends SquiggleVersion>(
       throw new Error(`Unkonwn version ${version satisfies never}`);
   }
 }
+
+// Conditional is a trick from https://stackoverflow.com/a/51691257
+type VersionedSquiggleLang<T extends SquiggleVersion = SquiggleVersion> =
+  T extends string ? PackageTypes[T] & { version: T } : never;
+
+export async function squiggleLangByVersion<T extends SquiggleVersion>(
+  version: T
+): Promise<VersionedSquiggleLang<T>> {
+  const squiggleLang = await squiggleLangPackageByVersion(version);
+  return {
+    ...squiggleLang,
+    version,
+  } as VersionedSquiggleLang<T>;
+}