Updated data manager components

Author: davenquinn

packages/column-views/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.0] - 2026-01-31
+
+- Moved `MacrostratDataProvider` and data fetchers to
+  `@macrostrat/data-provider` for better modularity.
+- Standardize approach to clickable/linkable data items in `UnitDetailsPanel`,
+  using a new `MacrostratInteractionProvider` from
+  `@macrostrat/data-components`.
+
 ## [3.0.3] - 2026-01-29
 
 - Change layout of `package.json`

packages/column-views/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",

packages/column-views/src/data-provider/unit-selection.ts

@@ -69,7 +69,7 @@ const selectedUnitAtom = atom(
     target: HTMLElement | null = null,
   ): BaseUnit | null => {
     if (!get(allowUnitSelectionAtom)) {
-      throw new Error("Unit selection is disabled.");
+      console.error("Unit selection is disabled.");
     }
 
     let unitID: number | null;

packages/data-components/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.1.0] - 2026-01-31
+
+- Create a `MacrostratInteractionProvider` to standardize handling of navigation
+  for clickable/linkable data items.
+- Moved scoped data store utilities (based on `jotai-scope`) to this library.
+
 ## [1.0.1] - 2026-01-29
 
 - Change layout of `package.json`

packages/data-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/data-components",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A library of React components tailored for Macrostrat data and endpoints",
   "repository": {
     "type": "git",

packages/data-provider/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
-## [0.1.0] - 2026-01-31
+## [1.0.0] - 2026-01-31
 
-Moved data provider functionality to a separate package for better modularity.
+Moved `MacrostratDataProvider` and data fetchers from `@macrostrat/column-views`
+for better modularity.

packages/data-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/data-provider",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",
@@ -44,6 +44,7 @@
     "@macrostrat/ui-components": "workspace:^",
     "@types/topojson-client": "^3.1.5",
     "cross-fetch": "^4.1.0",
+    "d3-geo": "^3.1.1",
     "topojson-client": "^3.1.0",
     "zustand": "^5.0.3"
   },

packages/data-provider/src/fetch.ts

@@ -5,11 +5,7 @@ import {
   StratName,
   UnitLong,
 } from "@macrostrat/api-types";
-import {
-  addQueryString,
-  joinURL,
-  useAPIResult,
-} from "@macrostrat/ui-components";
+import { addQueryString, joinURL } from "@macrostrat/ui-components";
 import crossFetch from "cross-fetch";
 import { feature } from "topojson-client";
 import { geoArea } from "d3-geo";
@@ -24,12 +20,16 @@ const defaultFetch = createScopedFetch("https://macrostrat.org/api/v2");
 
 export type ColumnStatusCode = "in process" | "active" | "obsolete";
 
-export interface ColumnFetchOptions {
+interface FetchBaseOptions {
+  // The fetch implementation to use
+  fetch?: (url: string, options?: RequestInit) => Promise<Response>;
+}
+
+export interface ColumnFetchOptions extends FetchBaseOptions {
   apiBaseURL?: string;
   projectID?: number;
   statusCode?: ColumnStatusCode | ColumnStatusCode[];
   format?: "geojson" | "topojson" | "geojson_bare";
-  fetch?: any;
 }
 
 export async function fetchAllColumns(
@@ -153,15 +153,17 @@ async function unwrapResponse(res) {
   return resData["success"]["data"];
 }
 
-export async function fetchLithologies(fetch = defaultFetch) {
+export async function fetchLithologies(opts: FetchBaseOptions = {}) {
+  const { fetch = defaultFetch } = opts;
   const res = await fetch("/defs/lithologies?all");
   return await unwrapResponse(res);
 }
 
 export async function fetchIntervals(
   timescaleID: number | null,
-  fetch = defaultFetch,
+  opts: FetchBaseOptions = {},
 ) {
+  const { fetch = defaultFetch } = opts;
   let url = `/defs/intervals`;
   if (timescaleID != null) {
     url += `?timescale_id=${timescaleID}`;
@@ -172,15 +174,17 @@ export async function fetchIntervals(
   return await unwrapResponse(res);
 }
 
-export async function fetchEnvironments(fetch = defaultFetch) {
+export async function fetchEnvironments(opts: FetchBaseOptions = {}) {
+  const { fetch = defaultFetch } = opts;
   const res = await fetch("/defs/environments?all");
   return await unwrapResponse(res);
 }
 
 export async function fetchRefs(
   refs: number[],
-  fetch = defaultFetch,
+  opts: FetchBaseOptions = {},
 ): Promise<MacrostratRef[]> {
+  const { fetch = defaultFetch } = opts;
   let url = `/defs/refs`;
   if (refs.length == 0) {
     return [];
@@ -192,8 +196,9 @@ export async function fetchRefs(
 
 export async function fetchStratNames(
   names: number[],
-  fetch = defaultFetch,
+  opts: FetchBaseOptions = {},
 ): Promise<StratName[]> {
+  const { fetch = defaultFetch } = opts;
   let url = `/defs/strat_names`;
   if (names.length == 0) {
     return [];
@@ -210,8 +215,9 @@ export type ColumnData = {
 
 export async function fetchUnits(
   columns: number[],
-  fetch = defaultFetch,
+  opts: FetchBaseOptions = {},
 ): Promise<ColumnData[]> {
+  const { fetch = defaultFetch } = opts;
   const params = new URLSearchParams();
   params.append("response", "long");
 
@@ -245,8 +251,9 @@ export async function fetchUnits(
 
 export async function fetchColumnUnits(
   col_id: number,
-  fetch = defaultFetch,
+  opts: FetchBaseOptions = {},
 ): Promise<ColumnData> {
+  const { fetch = defaultFetch } = opts;
   const params = new URLSearchParams();
   params.append("response", "long");
   params.append("col_id", col_id.toString());

packages/data-provider/src/provider.ts

@@ -105,7 +105,7 @@ function createRefsSlice(set, get) {
       if (missing.length == 0) {
         return ids.map((id) => refs.get(id));
       }
-      const data = await fetchRefs(missing, fetch);
+      const data = await fetchRefs(missing, { fetch });
       if (data == null) return [];
       for (const d of data) {
         refs.set(d.ref_id, d);
@@ -163,7 +163,7 @@ function createLithologiesSlice(set, get) {
       const { lithologies, fetch } = get();
       let lithMap = lithologies;
       if (lithMap == null) {
-        const data = await fetchLithologies(fetch);
+        const data = await fetchLithologies({ fetch });
         if (data == null) return;
         lithMap = new Map(data.map((d) => [d.lith_id, d]));
         set({ lithologies: lithMap });
@@ -182,7 +182,7 @@ function createEnvironmentsSlice(set, get) {
       const { environments, fetch } = get();
       let envMap = environments;
       if (envMap == null) {
-        const data = await fetchEnvironments(fetch);
+        const data = await fetchEnvironments({ fetch });
         if (data == null) return [];
         envMap = new Map(data.map((d) => [d.environ_id, d]));
         set({ environments: envMap });
@@ -202,7 +202,7 @@ function createIntervalsSlice(set, get) {
       let _intervals = intervals;
       if (intervals == null || !includesTimescale(intervals, timescaleID)) {
         // Fetch the intervals
-        const data = await fetchIntervals(timescaleID, fetch);
+        const data = await fetchIntervals(timescaleID, { fetch });
         if (data == null) {
           return [];
         }
@@ -241,7 +241,7 @@ function createStratNamesSlice(set, get) {
         }
       }
       if (stratNamesToLoad.length > 0) {
-        const data = await fetchStratNames(stratNamesToLoad, fetch);
+        const data = await fetchStratNames(stratNamesToLoad, { fetch });
         if (data == null) return stratNamesAlreadyLoaded;
         for (const d of data) {
           nameMap.set(d.strat_name_id, d);

scripts/publish-helpers/status.ts

@@ -179,8 +179,10 @@ async function packageVersionExistsInRegistry(pkg): Promise<PackageStatus> {
 
   let msg = chalk.bold(moduleString(pkg));
   // Show last version
-  const lastVersion: string | null =
-    info.versions[info.versions.length - 1] ?? null;
+  let lastVersion: string | null = null;
+  if (info != null && info.versions != null && info.versions.length > 0) {
+    lastVersion = info.versions[info.versions.length - 1];
+  }
 
   let hasChanges: boolean | null = null;
   if (lastVersion != null) {