Fixed type errors

Author: davenquinn

packages/column-components/src/flooding-surface.ts

@@ -61,6 +61,7 @@ export class TriangleBars extends UUIDComponent<TriangleBarsProps> {
     order: 2,
   };
 
+  // @ts-ignore
   context: ColumnCtx<ColumnDivision>;
 
   render() {

packages/column-views/package.json

@@ -85,7 +85,8 @@
     "@types/d3-scale": "^4.0.9",
     "parcel": "^2.16.0",
     "postcss": "^8.0.0",
-    "postcss-modules": "^6.0.0"
+    "postcss-modules": "^6.0.0",
+    "vite": "^7.3.0"
   },
   "files": [
     "dist",

packages/column-views/src/age-model-overlay.ts

@@ -26,6 +26,8 @@ import styles from "./age-model-overlay.module.sass";
 import { useAPIResult } from "@macrostrat/ui-components";
 import { useCompositeScale, useMacrostratUnits } from "./data-provider";
 import { buildColumnSurfaces } from "./prepare-units/dynamic-scales";
+import { ExtUnit } from "./prepare-units";
+import { UnitLong } from "@macrostrat/api-types";
 const h = hyper.styled(styles);
 
 interface AgeModelSurface {
@@ -47,7 +49,7 @@ interface AgeModelSurface {
 }
 
 export function BoundaryAgeModelOverlay() {
-  const col_id = useMacrostratUnits()?.[0]?.col_id;
+  const col_id = (useMacrostratUnits() as ExtUnit[])?.[0]?.col_id;
   const scale = useCompositeScale();
 
   const ageModel = useAPIResult(
@@ -77,7 +79,7 @@ export function ComputedSurfacesOverlay() {
   /** Overlay showing age surfaces. This is like the boundary age model overlay but
    * it is computed on the fly from unit tops and bottoms.
    */
-  const units = useMacrostratUnits();
+  const units = useMacrostratUnits() as UnitLong[];
   const surfaces = buildColumnSurfaces(units);
   const scale = useCompositeScale();
 

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

@@ -4,7 +4,19 @@ import { BaseUnit } from "@macrostrat/api-types";
 import { ReactNode, useEffect, useRef } from "react";
 import h from "@macrostrat/hyper";
 
-export const scope = createIsolation();
+interface StateIsolation {
+  Provider: (props: {
+    store?: any;
+    initialValues?: AtomMap;
+    children: ReactNode;
+  }) => ReactNode;
+  useStore: () => any;
+  useAtom: any;
+  useAtomValue: any;
+  useSetAtom: any;
+}
+
+export const scope: StateIsolation = createIsolation();
 
 export type AtomMap = [WritableAtom<any, any, any>, any][];
 

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

@@ -21,7 +21,7 @@ import {
   ScopedProvider,
 } from "./core";
 
-interface ColumnStateProviderProps<
+export interface ColumnStateProviderProps<
   T extends BaseUnit,
 > extends Partial<UnitSelectionCallbacks> {
   children: ReactNode;
@@ -80,7 +80,7 @@ export interface MacrostratColumnDataContext<T extends BaseUnit> {
   allowUnitSelection?: boolean;
 }
 
-interface ColumnDataProviderProps<T extends BaseUnit>
+export interface ColumnDataProviderProps<T extends BaseUnit>
   extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {
   children: ReactNode;
 }

packages/column-views/tsconfig.json

@@ -2,6 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "../../",
-    "include": ["./src", "../../global.d.ts"]
+    "include": ["./src", "../../global.d.ts"],
   }
 }

packages/timescale/src/age-axis.ts

@@ -39,7 +39,7 @@ function AgeAxis(props: AgeAxisProps) {
     "svg.timescale-axis",
     { ...size, style },
     h(Axis, {
-      scale,
+      scale: scale as any,
       numTicks: Math.floor(length / 50),
       tickLabelProps(tickValue, index) {
         const vertProps = isHorizontal

tsconfig.base.json

@@ -8,6 +8,7 @@
     "esModuleInterop": true,
     "downlevelIteration": true,
     "skipLibCheck": true,
+    "noEmitOnError": false,
     "lib": ["esnext", "es2017", "dom"],
     "target": "ESNext", // "ES3" (default), "ES5", "ES6"/"ES2015", "ES2016", "ES2017" or "ESNext".
     "paths": {

yarn.lock

@@ -2361,6 +2361,7 @@ __metadata:
     postcss-modules: "npm:^6.0.0"
     react-spring: "npm:^9.7.5"
     topojson-client: "npm:^3.1.0"
+    vite: "npm:^7.3.0"
     zustand: "npm:^5.0.3"
     zustand-computed: "npm:^2.0.2"
   peerDependencies:
@@ -7964,7 +7965,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0":
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0, esbuild@npm:^0.27.0":
   version: 0.27.1
   resolution: "esbuild@npm:0.27.1"
   dependencies:
@@ -14149,6 +14150,61 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite@npm:^7.3.0":
+  version: 7.3.0
+  resolution: "vite@npm:7.3.0"
+  dependencies:
+    esbuild: "npm:^0.27.0"
+    fdir: "npm:^6.5.0"
+    fsevents: "npm:~2.3.3"
+    picomatch: "npm:^4.0.3"
+    postcss: "npm:^8.5.6"
+    rollup: "npm:^4.43.0"
+    tinyglobby: "npm:^0.2.15"
+  peerDependencies:
+    "@types/node": ^20.19.0 || >=22.12.0
+    jiti: ">=1.21.0"
+    less: ^4.0.0
+    lightningcss: ^1.21.0
+    sass: ^1.70.0
+    sass-embedded: ^1.70.0
+    stylus: ">=0.54.8"
+    sugarss: ^5.0.0
+    terser: ^5.16.0
+    tsx: ^4.8.1
+    yaml: ^2.4.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    jiti:
+      optional: true
+    less:
+      optional: true
+    lightningcss:
+      optional: true
+    sass:
+      optional: true
+    sass-embedded:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+    tsx:
+      optional: true
+    yaml:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 10c0/0457c196cdd5761ec351c0f353945430fbad330e615b9eeab729c8ae163334f18acdc1d9cd7d9d673dbf111f07f6e4f0b25d4ac32360e65b4a6df9991046f3ff
+  languageName: node
+  linkType: hard
+
 "vt-pbf@npm:^3.1.3":
   version: 3.1.3
   resolution: "vt-pbf@npm:3.1.3"