Fixed types etc. so that column-views is publishable

Author: davenquinn

packages/column-views/package.json

@@ -34,11 +34,16 @@
     "@macrostrat/column-components": "workspace:^",
     "@macrostrat/data-components": "workspace:^",
     "@macrostrat/hyper": "^3.0.6",
+    "@macrostrat/map-interface": "workspace:^",
+    "@macrostrat/map-styles": "workspace:^",
+    "@macrostrat/mapbox-react": "workspace:^",
+    "@macrostrat/mapbox-utils": "workspace:^",
     "@macrostrat/stratigraphy-utils": "workspace:^",
     "@macrostrat/svg-map-components": "workspace:^",
     "@macrostrat/timescale": "workspace:^",
     "@macrostrat/ui-components": "workspace:^",
     "@turf/buffer": "^7.2.0",
+    "@turf/centroid": "^7.2.0",
     "@turf/distance": "^7.2.0",
     "@turf/line-intersect": "^7.2.0",
     "@turf/nearest-point-on-line": "^7.2.0",
@@ -55,7 +60,10 @@
     "d3-format": "^3.1.0",
     "d3-geo": "^3.1.1",
     "d3-geo-voronoi": "^2.1.0",
+    "d3-path": "^3.1.0",
+    "d3-scale": "^4.0.2",
     "d3-shape": "^3.2.0",
+    "mapbox-gl": "^2.11.0",
     "react-spring": "^9.7.5",
     "topojson-client": "^3.1.0",
     "zustand": "^5.0.3",
@@ -71,6 +79,8 @@
     "directory": "packages/column-views"
   },
   "devDependencies": {
+    "@types/d3-path": "^3",
+    "@types/d3-scale": "^4",
     "parcel": "^2.13.3",
     "postcss": "^8.0.0",
     "postcss-modules": "^6.0.0"

packages/column-views/src/carbon-isotopes/column.ts

@@ -6,7 +6,7 @@ import {
   ColumnAxis,
   ColumnContext,
 } from "@macrostrat/column-components";
-import { SimpleUnitsColumn, IUnit, ColumnArgs } from "../units";
+import { SimpleUnitsColumn, IUnit } from "../units";
 import { useContext } from "react";
 import { IsotopesColumn } from "./isotopes-column";
 import { MacrostratColumnProvider } from "../data-provider";
@@ -98,6 +98,8 @@ const Section = (props: IColumnProps) => {
   );
 };
 
+type ColumnArgs = any;
+
 function Column(props: Omit<IColumnProps, "data"> & { params: ColumnArgs }) {
   const { params } = props;
   const data: IUnit[] = useAPIResult("/units", {

packages/column-views/src/column.ts

@@ -182,7 +182,7 @@ function ColumnInner(props: ColumnInnerProps) {
   );
 }
 
-interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {
+export interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {
   className?: string;
 }
 

packages/column-views/src/data-provider/base.ts

@@ -22,7 +22,7 @@ import { ColumnProvider } from "@macrostrat/column-components";
 import { ReactNode } from "react";
 import { useMacrostratColumnData } from "./store";
 
-interface MacrostratDataProviderProps {
+export interface MacrostratDataProviderProps {
   baseURL: string;
   children: React.ReactNode;
 }

packages/column-views/src/data-provider/store.ts

@@ -7,7 +7,7 @@ import {
 import { ExtUnit } from "../prepare-units/helpers";
 import { ColumnAxisType } from "@macrostrat/column-components";
 
-interface MacrostratColumnDataContext {
+export interface MacrostratColumnDataContext {
   units: ExtUnit[];
   sections: PackageLayoutData[];
   totalHeight?: number;

packages/column-views/src/maps/column-correlation/state.ts

@@ -15,12 +15,8 @@ import {
   useEffect,
 } from "react";
 import h from "@macrostrat/hyper";
-import { useAsyncEffect } from "@macrostrat/ui-components";
 import { createComputed } from "zustand-computed";
-import {
-  useMacrostratColumns,
-  useMacrostratStore,
-} from "../../data-provider/base";
+import { useMacrostratColumns } from "../../data-provider/base";
 
 export interface CorrelationMapInput {
   columns: ColumnGeoJSONRecord[];

packages/column-views/src/maps/column-navigation/mapbox/state.ts

@@ -11,7 +11,7 @@ import h from "@macrostrat/hyper";
 import {
   useMacrostratColumns,
   useMacrostratStore,
-} from "@macrostrat/column-views";
+} from "../../../data-provider";
 
 export interface NavigationStore {
   columns: ColumnGeoJSONRecordWithID[];

packages/column-views/src/unit-details/panel.ts

@@ -14,7 +14,7 @@ import {
   Parenthetical,
   Value,
 } from "@macrostrat/data-components";
-import { useMacrostratData, useMacrostratDefs } from "@macrostrat/column-views";
+import { useMacrostratData, useMacrostratDefs } from "../data-provider";
 import { Environment, UnitLong, UnitLongFull } from "@macrostrat/api-types";
 import { defaultNameFunction } from "../units/names";
 import classNames from "classnames";

yarn.lock

@@ -2588,17 +2588,24 @@ __metadata:
     "@macrostrat/column-components": "workspace:^"
     "@macrostrat/data-components": "workspace:^"
     "@macrostrat/hyper": "npm:^3.0.6"
+    "@macrostrat/map-interface": "workspace:^"
+    "@macrostrat/map-styles": "workspace:^"
+    "@macrostrat/mapbox-react": "workspace:^"
+    "@macrostrat/mapbox-utils": "workspace:^"
     "@macrostrat/stratigraphy-utils": "workspace:^"
     "@macrostrat/svg-map-components": "workspace:^"
     "@macrostrat/timescale": "workspace:^"
     "@macrostrat/ui-components": "workspace:^"
     "@turf/buffer": "npm:^7.2.0"
+    "@turf/centroid": "npm:^7.2.0"
     "@turf/distance": "npm:^7.2.0"
     "@turf/line-intersect": "npm:^7.2.0"
     "@turf/nearest-point-on-line": "npm:^7.2.0"
     "@types/chroma-js": "npm:^3"
     "@types/d3-format": "npm:^3"
     "@types/d3-geo": "npm:^3"
+    "@types/d3-path": "npm:^3"
+    "@types/d3-scale": "npm:^4"
     "@types/d3-shape": "npm:^3"
     "@types/topojson-client": "npm:^3.1.5"
     "@visx/axis": "npm:^3.12.0"
@@ -2609,7 +2616,10 @@ __metadata:
     d3-format: "npm:^3.1.0"
     d3-geo: "npm:^3.1.1"
     d3-geo-voronoi: "npm:^2.1.0"
+    d3-path: "npm:^3.1.0"
+    d3-scale: "npm:^4.0.2"
     d3-shape: "npm:^3.2.0"
+    mapbox-gl: "npm:^2.11.0"
     parcel: "npm:^2.13.3"
     postcss: "npm:^8.0.0"
     postcss-modules: "npm:^6.0.0"
@@ -2744,7 +2754,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@macrostrat/map-interface@workspace:packages/map-interface":
+"@macrostrat/map-interface@workspace:^, @macrostrat/map-interface@workspace:packages/map-interface":
   version: 0.0.0-use.local
   resolution: "@macrostrat/map-interface@workspace:packages/map-interface"
   dependencies:
@@ -5257,7 +5267,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@turf/centroid@npm:^7.1.0":
+"@turf/centroid@npm:^7.1.0, @turf/centroid@npm:^7.2.0":
   version: 7.2.0
   resolution: "@turf/centroid@npm:7.2.0"
   dependencies:
@@ -5555,7 +5565,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-path@npm:*":
+"@types/d3-path@npm:*, @types/d3-path@npm:^3":
   version: 3.1.1
   resolution: "@types/d3-path@npm:3.1.1"
   checksum: 10c0/2c36eb31ebaf2ce4712e793fd88087117976f7c4ed69cc2431825f999c8c77cca5cea286f3326432b770739ac6ccd5d04d851eb65e7a4dbcc10c982b49ad2c02
@@ -5578,6 +5588,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/d3-scale@npm:^4":
+  version: 4.0.9
+  resolution: "@types/d3-scale@npm:4.0.9"
+  dependencies:
+    "@types/d3-time": "npm:*"
+  checksum: 10c0/4ac44233c05cd50b65b33ecb35d99fdf07566bcdbc55bc1306b2f27d1c5134d8c560d356f2c8e76b096e9125ffb8d26d95f78d56e210d1c542cb255bdf31d6c8
+  languageName: node
+  linkType: hard
+
 "@types/d3-selection@npm:*, @types/d3-selection@npm:^3.0.0, @types/d3-selection@npm:^3.0.10":
   version: 3.0.11
   resolution: "@types/d3-selection@npm:3.0.11"
@@ -7238,7 +7257,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-scale@npm:4, d3-scale@npm:4.0.2":
+"d3-scale@npm:4, d3-scale@npm:4.0.2, d3-scale@npm:^4.0.2":
   version: 4.0.2
   resolution: "d3-scale@npm:4.0.2"
   dependencies:
@@ -9964,7 +9983,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mapbox-gl@npm:^2.15.0":
+"mapbox-gl@npm:^2.11.0, mapbox-gl@npm:^2.15.0":
   version: 2.15.0
   resolution: "mapbox-gl@npm:2.15.0"
   dependencies: