Merge branch 'prepare-for-publishing'

* prepare-for-publishing: (153 commits)
  Fixed types etc. so that column-views is publishable
  Update changelogs and versions
  fixed state management
  Fix some typescript errors
  Fixed some small typescript errors
  Fixed a ton of typescript errors
  Sovlved some typing issues
  Solved some small typing errors
  Remove circular imports from column-views package
  Small updates to stories
  Updated style system exports
  Rename publish script
  Simplify storybook dependencies and update Yarn
  Add upload script
  Improved correlation diagram styling
  Correlation diagram now mostly works like normal column
  Cleverly align preparation of correlation diagram with single-column prep
  Updated accounting for correlation chart
  Update packages calculation
  Remove redundant AgeScaleMode
  ...

Author: davenquinn

.storybook/main.ts

@@ -1,24 +1,13 @@
-import { dirname, join } from "path";
 import type { StorybookConfig } from "@storybook/react-vite";
 
-// Resolve geologic patterns from the package
-// If we're using PnP mode, we have to have an "unplugged" version of the package
-// to allow node_modules to be resolved.
-const geologicPatterns = dirname(require.resolve("geologic-patterns"));
-
 export default {
   // vite
   stories: [
+    "../stories/**/*.@(mdx|js|jsx|ts|tsx)",
     "../packages/*/src/**/*.mdx",
     "../packages/*/stories/*.mdx",
     "../packages/**/*.stories.@(mdx|js|jsx|ts|tsx)",
   ],
-  staticDirs: [
-    {
-      from: join(geologicPatterns, "assets/svg"),
-      to: "/patterns",
-    },
-  ],
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-essentials",

.storybook/preview.ts

@@ -1,13 +1,13 @@
 import "@blueprintjs/core/lib/css/blueprint.css";
 import { themes } from "@storybook/theming";
-import macrostratTheme from "./theme";
 
 import { FocusStyleManager } from "@blueprintjs/core";
 import h from "@macrostrat/hyper";
-import "@macrostrat/style-system";
+import "@macrostrat/style-system/src/main.sass";
 import { DarkModeProvider } from "@macrostrat/ui-components";
 import { useDarkMode } from "storybook-dark-mode";
 import { DocsContainer } from "./docs-container";
+import { GeologicPatternProvider } from "@macrostrat/column-components";
 
 FocusStyleManager.onlyShowFocusOnTabs();
 
@@ -34,13 +34,38 @@ export const parameters = {
     lightClass: [],
     stylePreview: true,
   },
+  parameters: {
+    options: {
+      storySort: {
+        order: [
+          "Web components",
+          "Map interface",
+          "Column views",
+          "Timescale",
+          "Column components",
+        ],
+      },
+    },
+  },
 };
 
 export const decorators = [
   (renderStory) => {
     const isEnabled = useDarkMode();
-    return h(DarkModeProvider, { isEnabled }, renderStory());
+    return h(
+      PatternProvider,
+      h(DarkModeProvider, { isEnabled }, renderStory())
+    );
   },
 ];
 
 export const tags = ["autodocs"];
+
+function PatternProvider({ children }) {
+  return h(GeologicPatternProvider, {
+    resolvePattern(id: string) {
+      return `https://dev2.macrostrat.org/assets/geologic-patterns/svg/${id}.svg`;
+    },
+    children,
+  });
+}

.yarn/releases/yarn-4.6.0.cjs .yarn/releases/yarn-4.8.1.cjs.yarn/releases/yarn-4.6.0.cjs renamed to .yarn/releases/yarn-4.8.1.cjs

@@ -1,34 +1,32 @@
 packageExtensions:
-  debug@*:
-    dependencies:
-      supports-color: "*"
-  follow-redirects@*:
-    dependencies:
-      debug: "*"
   "@blueprintjs/datetime@*":
     dependencies:
-      "@types/react": "^16||^17||^18"
+      "@types/react": ^16||^17||^18
   "@parcel/fs@^2.13.3":
     dependencies:
-      "@parcel/core": "^2.13.3"
+      "@parcel/core": ^2.13.3
   "@parcel/workers@^2.13.3":
     dependencies:
-      "@parcel/core": "^2.13.3"
-  "node-fetch@*":
+      "@parcel/core": ^2.13.3
+  "@types/react@*":
+    dependencies:
+      prop-types: "*"
+  debug@*:
+    dependencies:
+      supports-color: "*"
+  follow-redirects@*:
+    dependencies:
+      debug: "*"
+  node-fetch@*:
     dependencies:
       "@types/node": "*"
-  "ui-box@*":
+  ui-box@*:
     dependencies:
       "@types/prop-types": "*"
-      "csstype": "*"
-  "@types/react@*":
-    dependencies:
-      "prop-types": "*"
-
-# We could make this stricter if we wanted to ensure correctness
-# https://yarnpkg.com/configuration/yarnrc
+      csstype: "*"
 
 pnpFallbackMode: all
+
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-4.6.0.cjs
+yarnPath: .yarn/releases/yarn-4.8.1.cjs

.yarnrc.yml

@@ -128,3 +128,11 @@ yarn up -i <package-name>
 ```sh
 yarn why @macrostrat/column-components
 ```
+
+#### Find circular dependencies
+
+Circular dependencies prevent building and Vite compilation in some cases
+
+```sh
+yarn dlx madge --circular --extensions ts packages/column-views
+```

README.md

@@ -11,7 +11,9 @@
     "status": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers status",
     "prepare": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers prepare",
     "publish": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers publish",
-    "check": "tsc --noEmit"
+    "publish:storybook": "./scripts/publish-storybook.sh",
+    "check-types": "tsc --noEmit",
+    "check-circular": "madge --circular --extensions ts,tsx ."
   },
   "type": "module",
   "author": "Daven Quinn",
@@ -26,25 +28,24 @@
     "@parcel/config-default": "^2.13.3",
     "@parcel/transformer-sass": "^2.13.3",
     "@parcel/transformer-typescript-types": "^2.13.3",
-    "@storybook/addon-actions": "^8.5.3",
-    "@storybook/addon-docs": "^8.5.3",
-    "@storybook/addon-essentials": "^8.5.3",
-    "@storybook/addon-links": "^8.5.3",
-    "@storybook/addon-viewport": "^8.5.3",
-    "@storybook/builder-vite": "^8.5.3",
-    "@storybook/components": "^8.5.3",
-    "@storybook/manager-api": "^8.5.3",
-    "@storybook/preview-api": "^8.5.3",
-    "@storybook/react": "^8.5.3",
-    "@storybook/react-vite": "^8.5.3",
-    "@storybook/theming": "^8.5.3",
+    "@storybook/addon-actions": "^8.6.8",
+    "@storybook/addon-docs": "^8.6.8",
+    "@storybook/addon-essentials": "^8.6.8",
+    "@storybook/addon-links": "^8.6.8",
+    "@storybook/addon-viewport": "^8.6.8",
+    "@storybook/builder-vite": "^8.6.8",
+    "@storybook/components": "^8.6.8",
+    "@storybook/manager-api": "^8.6.8",
+    "@storybook/preview-api": "^8.6.8",
+    "@storybook/react": "^8.6.8",
+    "@storybook/react-vite": "^8.6.8",
+    "@storybook/theming": "^8.6.8",
     "@types/d3-geo": "^2.0.0",
     "@types/geojson": "^7946.0.7",
     "@types/react": "^18.3.12",
     "chalk": "^5.0.1",
     "concurrently": "^7.2.2",
     "date-fns": "^4.1.0",
-    "geologic-patterns": "^2.0.0-dev1",
     "glob": "^11.0.1",
     "lorem-ipsum": "^2.0.8",
     "marked": "^11.0",
@@ -55,7 +56,7 @@
     "react": "^18",
     "react-dom": "^18",
     "sass-embedded": "^1.83.0",
-    "storybook": "^8.5.3",
+    "storybook": "^8.6.8",
     "storybook-dark-mode": "^4.0.2",
     "tsx": "^4.19.1",
     "typescript": "^5.6.2",
@@ -71,15 +72,11 @@
     "toolchain/*",
     "examples/*"
   ],
-  "packageManager": "[email protected]",
-  "dependenciesMeta": {
-    "[email protected]": {
-      "unplugged": true
-    }
-  },
+  "packageManager": "[email protected]",
   "devDependencies": {
     "@parcel/packager-ts": "2.13.3",
     "@types/d3-array": "^3.2.1",
-    "@types/underscore": "^1.13.0"
+    "@types/underscore": "^1.13.0",
+    "madge": "^8.0.0"
   }
 }

package.json

@@ -3,9 +3,17 @@
 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).
+and this project adheres to
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.1.0] - 2025-04-09
+
+- Add types for `Environment`, `Lithology`, `MacrostratRef`, and
+  `ColumnGeoJSONRecord`
+- Improve types for `UnitLong`
+- Add a `UnitLongFull` type to allow access to deprecated fields
 
 ## [1.0.0] - 2025-02-14
 
-First public release of the API types package, including types for columns, units and measurements
-for Macrostrat's v2 API.
+First public release of the API types package, including types for columns,
+units and measurements for Macrostrat's v2 API.

packages/api-types/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/api-types",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Type definitions for Macrostrat's API",
   "main": "./src/index.d.ts",
   "types": "./src/index.d.ts",
@@ -20,5 +20,8 @@
   },
   "devDependencies": {
     "parcel": "^2.13.3"
+  },
+  "dependencies": {
+    "@types/geojson": "^7946.0.16"
   }
 }

packages/api-types/package.json

@@ -1,5 +1,27 @@
+import { Polygon, MultiPolygon } from "geojson";
+
 export type ColumnSpec = {
   col_id: number | string;
   status_code?: string;
   project_id?: number;
 };
+
+export type ColumnProperties = {
+  col_id: number;
+  col_area: string;
+  col_name: string;
+  col_group?: string;
+  col_group_id?: number;
+  project_id: number;
+  group_col_id?: number;
+};
+
+export interface ColumnGeoJSONRecord {
+  type: "Feature";
+  geometry: Polygon | MultiPolygon;
+  properties: ColumnProperties;
+}
+
+export interface ColumnGeoJSONRecordWithID extends ColumnGeoJSONRecord {
+  id: number;
+}

packages/api-types/src/columns.d.ts

@@ -0,0 +1,24 @@
+/** References:
+ * /defs/refs
+ *
+ *  Example: {
+ *   ref_id: 1,
+ *   pub_year: 1985,
+ *   author: "Childs, O.E.",
+ *   ref: "Correlation of stratigraphic units of North America; COSUNA. AAPG Bulletin 69:173-180.",
+ *   doi: null,
+ *   url: null,
+ *   t_units: 17045,
+ * };
+ *
+ */
+
+export interface MacrostratRef {
+  ref_id: number;
+  pub_year: number;
+  author: string;
+  ref: string;
+  doi: string | null;
+  url: string | null;
+  t_units: number;
+}