Format codebase with prettier

Author: davenquinn

.github/workflows/build-image.yaml

@@ -29,7 +29,7 @@ jobs:
             type=ref,event=tag,suffix=-{{date 'YYYYMMDDHHmmss'}}
             type=semver,pattern={{version}}
             type=semver,pattern={{version}},suffix=-{{date 'YYYYMMDDHHmmss'}}
-            
+
             # When a PRODUCTION tag (vX.Y.Z) is pushed → also tag staging and dev
             type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}
             type=semver,pattern={{version}},suffix=-beta.{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}

api-tests/app.ts

@@ -1,4 +1,4 @@
-import {describe} from "node:test";
+import { describe } from "node:test";
 
 var settings = require("./settings");
 //import { toExport as settings } from "./settings";
@@ -17,32 +17,32 @@ const endpointsToFix = [
   //'tiles.ts'
 ];*/
 const testFiles = [
-  'carto_small.ts',
-    'columns.ts',
-    'defs.ts',
-    'defs_columns.ts',
-    'defs_econs.ts',
-    'defs_environments.ts',
-    'defs_groups.ts',
-    'defs_intervals.ts',
-    'defs_lithologies.ts',
-    'defs_lithology_attributes.ts',
-    'defs_measurements.ts',
-    'defs_minerals.ts',
-    'defs_plates.ts',
-    'defs_projects.ts',
-    'defs_refs.ts',
-    'defs_sources.ts',
-    'defs_strat_name_concepts.ts',
-    'defs_strat_names.ts',
-    'defs_structures.ts',
-    'defs_timescales.ts',
-    'fossils.ts',
-    'geologic_units_burwell.ts',
-    'index.ts',
-    'mobile_fossil_collections.ts',
-    'mobile_macro_summary.ts',
-    'mobile_map_query.ts',
+  "carto_small.ts",
+  "columns.ts",
+  "defs.ts",
+  "defs_columns.ts",
+  "defs_econs.ts",
+  "defs_environments.ts",
+  "defs_groups.ts",
+  "defs_intervals.ts",
+  "defs_lithologies.ts",
+  "defs_lithology_attributes.ts",
+  "defs_measurements.ts",
+  "defs_minerals.ts",
+  "defs_plates.ts",
+  "defs_projects.ts",
+  "defs_refs.ts",
+  "defs_sources.ts",
+  "defs_strat_name_concepts.ts",
+  "defs_strat_names.ts",
+  "defs_structures.ts",
+  "defs_timescales.ts",
+  "fossils.ts",
+  "geologic_units_burwell.ts",
+  "index.ts",
+  "mobile_fossil_collections.ts",
+  "mobile_macro_summary.ts",
+  "mobile_map_query.ts",
   "mobile_point.ts",
   "mobile_point_details.ts",
   "paleogeography.ts",

api-tests/toReview/mancos_test_cases.ts

@@ -39,7 +39,7 @@ it("should return point data for Detroit", function (done) {
       ) {
         throw new Error("Invalid data returned for Detroit");
       }
-      if (res.body.success.data.strat_unit != 'Dundee Limestone') {
+      if (res.body.success.data.strat_unit != "Dundee Limestone") {
         throw new Error("Invalid strat unit returned for Detroit");
       }
       if (res.body.success.data.col_id !== 1594) {
@@ -105,7 +105,7 @@ it("should return point data for Toronto", function (done) {
       if (res.body.success.data.age != "Ordovician") {
         throw new Error("Invalid age returned for Toronto");
       }
-      if (res.body.success.data.name != 'Georgian Bay') {
+      if (res.body.success.data.name != "Georgian Bay") {
         throw new Error("Invalid data returned for Toronto");
       }
       if (res.body.success.data.col_id !== 1598) {
@@ -168,10 +168,10 @@ it("should return point data for Buenos Aires", function (done) {
       if (res.body.success.data.rocktype.length === 0) {
         throw new Error("Invalid rocktypes returned for Buenos Aires");
       }
-      if (res.body.success.data.age != 'Quaternary') {
+      if (res.body.success.data.age != "Quaternary") {
         throw new Error("Invalid age returned for Buenos Aires");
       }
-      if (res.body.success.data.name != 'Cenozoic sedimentary rocks') {
+      if (res.body.success.data.name != "Cenozoic sedimentary rocks") {
         throw new Error("Invalid data returned for Buenos Aires");
       }
       if (

api-tests/toReview/mobile_point_details.ts

@@ -32,7 +32,6 @@ it("should accept a lat and lng", function (done) {
     });
 });*/
 
-
 //TODO endpoint is failing because of the gmus error
 /*
 it("should accept a col_id and unit_id", function (done) {

api-tests/v2Tests/defs_econs.ts

@@ -3,8 +3,8 @@ var request = require("supertest"),
   settings = require("../settings");
 
 it("should return metadata", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/defs/econs")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)

api-tests/v2Tests/defs_measurements.ts

@@ -98,8 +98,8 @@ it("should return all definitions", function (done) {
 });
 
 it("should return CSV", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/defs/measurements?measurement_type=geochronological&format=csv")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.csv)

api-tests/v2Tests/tiles.ts

@@ -3,20 +3,22 @@ var request = require("supertest"),
   settings = require("../settings");
 //TODO need to modify these tests to work with the tileserver api
 
-
 const baseURL = "https://tiles.dev.macrostrat.org";
 const tilePath = "/maps/bounds/3/2/4";
 
 describe("Tileserver API", function () {
-    this.timeout(10000)
-    it("should return a valid tile response", function (done) {
+  this.timeout(10000);
+  it("should return a valid tile response", function (done) {
     request(baseURL)
       .get(tilePath)
       .expect(200)
       .expect("content-type", /application\/x-protobuf/)
       .end(function (err, res) {
         if (err) return done(err);
-        if (!res.headers["content-length"] || res.headers["content-length"] < 100) {
+        if (
+          !res.headers["content-length"] ||
+          res.headers["content-length"] < 100
+        ) {
           return done(new Error("Tile is empty or too small"));
         }
         done();
@@ -34,7 +36,11 @@ describe("Tileserver API", function () {
           return done(new Error(`Expected gzip compression, got: ${encoding}`));
         }
         if (!/application\/x-protobuf/.test(res.headers["content-type"])) {
-          return done(new Error(`Unexpected content-type: ${res.headers["content-type"]}`));
+          return done(
+            new Error(
+              `Unexpected content-type: ${res.headers["content-type"]}`,
+            ),
+          );
         }
         done();
       });
@@ -58,4 +64,4 @@ describe("Tileserver API", function () {
         done();
       });
   });
-});
+});

api-tests/v2Tests/units.ts

@@ -109,8 +109,8 @@ it("should accept a response parameter", function (done) {
 });
 
 it("should accept a lith parameter", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/units?lith=sandstone")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)
@@ -127,8 +127,8 @@ it("should accept a lith parameter", function (done) {
 });
 
 it("should accept a lith_type parameter", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/units?lith_type=organic")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)
@@ -147,8 +147,8 @@ it("should accept a lith_type parameter", function (done) {
 });
 
 it("should accept a lith_class parameter", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/units?lith_class=metamorphic")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)
@@ -167,8 +167,8 @@ it("should accept a lith_class parameter", function (done) {
 });
 
 it("should accept a environ parameter", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/units?environ=reef")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)
@@ -187,8 +187,8 @@ it("should accept a environ parameter", function (done) {
 });
 
 it("should accept a environ_type parameter", function (done) {
-    this.timeout(10000);
-    request(settings.host)
+  this.timeout(10000);
+  request(settings.host)
     .get("/units?environ_type=carbonate")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)
@@ -207,8 +207,8 @@ it("should accept a environ_type parameter", function (done) {
 });
 
 it("should accept a environ_class parameter", function (done) {
-    this.timeout(15000);
-    request(settings.host)
+  this.timeout(15000);
+  request(settings.host)
     .get("/units?environ_class=marine")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)
@@ -227,8 +227,8 @@ it("should accept a environ_class parameter", function (done) {
 });
 
 it("should accept a project_id", function (done) {
-    this.timeout(15000);
-    request(settings.host)
+  this.timeout(15000);
+  request(settings.host)
     .get("/units?project_id=4")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)

api-tests/validators.ts

@@ -6,7 +6,11 @@ function extractArrayData(payload) {
     if (!payload || !payload.success) return null;
     const data = payload.success.data;
     if (Array.isArray(data)) return data;
-    if (data && data.type === "FeatureCollection" && Array.isArray(data.features)) {
+    if (
+      data &&
+      data.type === "FeatureCollection" &&
+      Array.isArray(data.features)
+    ) {
       return data.features;
     }
     return null;
@@ -17,7 +21,8 @@ function extractArrayData(payload) {
 // Returns the object to scan for keys (GeoJSON Feature.properties if present)
 function surfaceForIdScan(item) {
   if (!item) return null;
-  if (item.properties && typeof item.properties === "object") return item.properties;
+  if (item.properties && typeof item.properties === "object")
+    return item.properties;
   return item;
 }
 
@@ -26,7 +31,7 @@ function firstStarIdKey(item) {
   const base = surfaceForIdScan(item);
   if (!base || typeof base !== "object") return null;
   for (const k of Object.keys(base)) {
-    if (/_id$/i.test(k)) return k;         // first *_id encountered wins
+    if (/_id$/i.test(k)) return k; // first *_id encountered wins
   }
   if (Object.prototype.hasOwnProperty.call(base, "id")) return "id";
   return null;
@@ -38,9 +43,12 @@ function arrayExposesKey(arr, key, sampleSize = 50) {
   for (let i = 0; i < n; i++) {
     const it = arr[i];
     if (!it) continue;
-    const props = it.properties && typeof it.properties === "object" ? it.properties : null;
-    if ((props && Object.prototype.hasOwnProperty.call(props, key)) ||
-        Object.prototype.hasOwnProperty.call(it, key)) {
+    const props =
+      it.properties && typeof it.properties === "object" ? it.properties : null;
+    if (
+      (props && Object.prototype.hasOwnProperty.call(props, key)) ||
+      Object.prototype.hasOwnProperty.call(it, key)
+    ) {
       return true;
     }
   }
@@ -61,15 +69,17 @@ function chooseCommonIdKey(localArr, prodArr) {
   return null;
 }
 
-
 // Build a set of unique IDs from an array given a chosen id key.
 // Supports both flat objects and GeoJSON Feature properties.
 function uniqueIds(arr, idKey) {
   const out = new Set();
   for (const item of arr) {
     if (!item) continue;
     // Prefer .properties[idKey] if available (GeoJSON Feature)
-    const props = item.properties && typeof item.properties === "object" ? item.properties : null;
+    const props =
+      item.properties && typeof item.properties === "object"
+        ? item.properties
+        : null;
     if (props && Object.prototype.hasOwnProperty.call(props, idKey)) {
       out.add(props[idKey]);
       continue;
@@ -86,8 +96,6 @@ function uniqueIds(arr, idKey) {
   return out;
 }
 
-
-
 module.exports = {
   aSuccessfulRequest: function (res: {
     statusCode: number;
@@ -288,7 +296,6 @@ module.exports = {
     );
   },
 
-
   async compareWithProduction(queryParams = "", localResponse) {
     const prodUrl = `https://www.macrostrat.org/api/v2${queryParams}`;
     const { data: prodData } = await axios.get(prodUrl);
@@ -300,26 +307,31 @@ module.exports = {
 
     // Lenient path for array-like payloads
     const localArr = extractArrayData(localResponse.body);
-    const prodArr  = extractArrayData(prodData);
-
-    if (Array.isArray(localArr) && Array.isArray(prodArr) && localArr.length && prodArr.length) {
+    const prodArr = extractArrayData(prodData);
+
+    if (
+      Array.isArray(localArr) &&
+      Array.isArray(prodArr) &&
+      localArr.length &&
+      prodArr.length
+    ) {
       // Auto-detect a shared *_id (or "id") to compare by counts
       const idKey = chooseCommonIdKey(localArr, prodArr);
 
       if (idKey) {
         console.info(`[compareWithProduction] Using id key: ${idKey}`);
         const localIds = uniqueIds(localArr, idKey);
-        const prodIds  = uniqueIds(prodArr,  idKey);
+        const prodIds = uniqueIds(prodArr, idKey);
         const localCount = localIds.size;
-        const prodCount  = prodIds.size;
+        const prodCount = prodIds.size;
 
         if (localCount !== prodCount) {
           console.warn(
             [
               `⚠️  ${idKey} count mismatch for endpoint: ${queryParams}`,
               `   - Dev (current host) ${idKey} count: ${localCount}`,
               `   - Prod (host_prod) ${idKey} count: ${prodCount}`,
-            ].join("\n")
+            ].join("\n"),
           );
 
           return;
@@ -332,8 +344,8 @@ module.exports = {
     // Strict mismatch error with helpful diff
     throw new Error(
       `Mismatch for endpoint: ${queryParams}\n` +
-      `Local: ${JSON.stringify(localResponse.body, null, 2)}\n` +
-      `Production: ${JSON.stringify(prodData, null, 2)}`
+        `Local: ${JSON.stringify(localResponse.body, null, 2)}\n` +
+        `Production: ${JSON.stringify(prodData, null, 2)}`,
     );
   },
 };

v2/definitions/projects.ts

@@ -92,4 +92,4 @@ module.exports = function (req, res, next, cb) {
       );
     }
   });
-};
+};