Merge branch 'column-queries'

* column-queries: (38 commits)
  Updated small definition issues
  Removed unnecessary dependencies
  Remove multiline dependency
  Streamlined and simplified API tests
  Major standardization to handling of columns and units
  Seemed to really improve query handling
  Updated columns query
  Improve SQL query building
  Updated units query
  Updated handling of valid params
  Further broke apart units query
  Improved querying of column params
  Started streamlining some unit params
  Slightly streamline unit management
  Improved parameter validity handling
  Streamlined where clause handling for units
  Added column and unit routes
  Column routes work with original unit-based filtering
  Started movement to ESM
  Improve query construction
  ...

Author: davenquinn

.mocharc.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://json.schemastore.org/mocharc.json",
+  "require": "tsx"
+}

v2/CHANGELOG.md CHANGELOG.mdv2/CHANGELOG.md renamed to CHANGELOG.md

@@ -1,5 +1,19 @@
 # Macrostrat API v2 Changelog
 
+## [2.3.0-beta.1] - 2026-01-24
+
+- Create a "fast path" for column queries that do not require unit-based filtering
+- Reduce the number of queries made when fetching columns and units
+- Convert lots of callback-based code to async/await for better readability
+- Started conversion to ESM modules
+- Switch from `ts-node` to `tsx`
+
+## [2.2.0] - 2025-12-18
+
+- Update `project_id` handling to accept composite projects or multiple projects.
+- `project_id=all` now returns results from all projects.
+- Add `project_name` to column output.
+
 ## [2.1.7] - 2025-11-19
 
 - Allow multiple `status_code` values in `/columns` route

README.md

@@ -57,6 +57,9 @@ Additionally, you can set a `TEST_PRODUCTION_API_URL` to run comparisons against
 another running instance of the API (e.g., production). This is useful for
 ensuring that new versions of the API return the same results as older versions.
 
+**NOTE:** The API must be running for tests to succeed. Currently, cryptic errors
+are produced if this is not the case.
+
 ## Generating a release
 
 Update the version string in `package.json` and run:

v2/hillshade.ts __archive/hillshade.tsv2/hillshade.ts renamed to __archive/hillshade.ts

@@ -108,6 +108,30 @@ it("should return topojson", async function () {
     .expect(validators.topoJSON);
 });
 
+it("should return all columns as topojson", async function () {
+  this.timeout(10000);
+  const localResponse = await request(settings.host)
+    .get("/columns?all=true&format=topojson")
+    .expect(validators.aSuccessfulRequest)
+    .expect(validators.topoJSON)
+    .expect(returnsManyColumns);
+});
+
+function returnsManyColumns(res: {
+  body: {
+    success: {
+      data: { type: "Topology"; objects: { output: { geometries: any[] } } };
+    };
+  };
+}) {
+  if (res.body.success.data.type !== "Topology") {
+    throw new Error("TopoJSON was not returned");
+  }
+  if (res.body.success.data.objects.output.geometries.length < 500) {
+    throw new Error("Not all columns being returned");
+  }
+}
+
 it("should return csv", async function () {
   const localResponse = await request(settings.host)
     .get("/columns?age=2&format=csv")

v2/hillshadeCache.ts __archive/hillshadeCache.tsv2/hillshadeCache.ts renamed to __archive/hillshadeCache.ts

@@ -0,0 +1,61 @@
+import type { Suite } from "mocha";
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+
+require("../settings");
+
+const loadTests = (path: string) => {
+  return () => {
+    return require(path);
+  };
+};
+
+describe("api/v2", () => {
+  describe("root", loadTests("./root"));
+  describe("columns", loadTests("./columns"));
+  describe("sections", loadTests("./sections"));
+  describe("units", loadTests("./units"));
+  describe("fossils", loadTests("./fossils"));
+  describe("stats", loadTests("./stats"));
+
+  describe("defs", loadTests("./defs"));
+  describe("defs/lithologies", loadTests("./defs_lithologies"));
+  describe(
+    "defs/lithology_attributes",
+    loadTests("./defs_lithology_attributes"),
+  );
+  describe("defs/columns", loadTests("./defs_columns"));
+  describe("defs/econs", loadTests("./defs_econs"));
+  describe("defs/environments", loadTests("./defs_environments"));
+  describe("defs/intervals", loadTests("./defs_intervals"));
+  describe("defs/measurements", loadTests("./defs_measurements"));
+  describe("defs/minerals", loadTests("./defs_minerals"));
+  describe("defs/timescales", loadTests("./defs_timescales"));
+  describe("defs/plates", loadTests("./defs_plates"));
+  describe("defs/projects", loadTests("./defs_projects"));
+  describe("defs/groups", loadTests("./defs_groups"));
+  describe("defs/strat_names", loadTests("./defs_strat_names"));
+  describe("defs/strat_name_concepts", loadTests("./defs_strat_name_concepts"));
+  describe("defs/structures", loadTests("./defs_structures"));
+  describe("defs/refs", loadTests("./defs_refs"));
+  describe("defs/sources", loadTests("./defs_sources"));
+
+  describe("paleogeography", loadTests("./paleogeography"));
+  //describe("geologic_units/gmna", loadTests("./geologic_units_gmna"), null, true);
+  //describe("geologic_units/gmus", loadTests("./geologic_units_gmus"));
+  describe("geologic_units/burwell", loadTests("./geologic_units_burwell"));
+
+  describe("carto/small", loadTests("./carto_small"));
+
+  describe("tiles", loadTests("./tiles"));
+
+  describe("mobile/point", loadTests("./mobile_point"));
+  //describe("mobile/point_details", loadTests("./mobile_point_details"));
+  describe(
+    "mobile/fossil_collections",
+    loadTests("./mobile_fossil_collections"),
+  );
+  describe("mobile/macro_summary", loadTests("./mobile_macro_summary"));
+  describe("mobile/map_query", loadTests("./mobile_map_query"));
+  //describe("Mancos test cases", loadTests("./mancos_test_cases"));
+});

api-tests/app.ts

@@ -2,7 +2,7 @@ var request = require("supertest"),
   validators = require("../validators"),
   settings = require("../settings");
 
-it("should return metadata", function (done) {
+it("sections - should return metadata", function (done) {
   request(settings.host)
     .get("/sections")
     .expect(validators.aSuccessfulRequest)
@@ -14,7 +14,7 @@ it("should return metadata", function (done) {
     });
 });
 
-it("should return a sample", function (done) {
+it("sections - should return a sample", function (done) {
   request(settings.host)
     .get("/sections?sample")
     .expect(validators.aSuccessfulRequest)
@@ -25,7 +25,7 @@ it("should return a sample", function (done) {
     });
 });
 
-it("should accept a column id", function (done) {
+it("sections - should accept a column id", function (done) {
   request(settings.host)
     .get("/sections?col_id=49")
     .expect(validators.aSuccessfulRequest)
@@ -37,7 +37,7 @@ it("should accept a column id", function (done) {
     });
 });
 
-it("should return csv", function (done) {
+it("sections - should return csv", function (done) {
   request(settings.host)
     .get("/sections?col_id=17&format=csv")
     .expect(validators.aSuccessfulRequest)