@adventurelabs/scout-core 2.1.2 → 2.2.1

package/dist/helpers/connectivity.queries.js

@@ -1,35 +1,51 @@
 import { EnumWebResponse, IWebResponse, } from "../types/requests";
+function connectivityError(msg, data) {
+    return {
+        status: EnumWebResponse.ERROR,
+        msg,
+        data,
+    };
+}
+function herdRangeError(msg, offset) {
+    return {
+        ...connectivityError(msg, []),
+        hasMore: false,
+        nextOffset: offset,
+    };
+}
+function connectivityTimestampMs(timestamp) {
+    if (!timestamp)
+        return null;
+    const time = new Date(timestamp).getTime();
+    return Number.isNaN(time) ? null : time;
+}
 function sortConnectivityByTimestamp(data) {
-    return data.sort((a, b) => {
-        if (!a.timestamp_start || !b.timestamp_start)
+    const withTimes = data.map((row) => ({
+        row,
+        time: connectivityTimestampMs(row.timestamp_start),
+    }));
+    withTimes.sort((a, b) => {
+        if (a.time == null || b.time == null)
             return 0;
-        return (new Date(a.timestamp_start).getTime() -
-            new Date(b.timestamp_start).getTime());
+        return a.time - b.time;
     });
+    return withTimes.map(({ row }) => row);
 }
 export async function get_connectivity_by_session_id_query(client, sessionId) {
     const { data, error } = await client.rpc("get_connectivity_with_coordinates", { session_id_caller: sessionId });
     if (error) {
         console.warn("Error fetching connectivity by session id:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-        };
+        return connectivityError(error.message, []);
     }
-    return IWebResponse.success(sortConnectivityByTimestamp(data || [])).to_compatible();
+    return IWebResponse.success(sortConnectivityByTimestamp(data ?? [])).to_compatible();
 }
 export async function get_connectivity_by_device_id_query(client, deviceId, timestamp) {
     const { data, error } = await client.rpc("get_connectivity_with_coordinates_by_device_and_timestamp", { device_id_caller: deviceId, timestamp_filter: timestamp });
     if (error) {
-        console.warn("Error fetching connectivity by session id:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-        };
+        console.warn("Error fetching connectivity by device id:", error.message);
+        return connectivityError(error.message, []);
     }
-    return IWebResponse.success(sortConnectivityByTimestamp(data || [])).to_compatible();
+    return IWebResponse.success(sortConnectivityByTimestamp(data ?? [])).to_compatible();
 }
 export async function insert_connectivity_query(client, connectivity) {
     const connectivityArray = Array.isArray(connectivity)
@@ -41,13 +57,9 @@ export async function insert_connectivity_query(client, connectivity) {
         .select("*");
     if (error) {
         console.warn("Error inserting connectivity:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-        };
+        return connectivityError(error.message, []);
     }
-    return IWebResponse.success(data || []).to_compatible();
+    return IWebResponse.success(data ?? []).to_compatible();
 }
 export async function update_connectivity_query(client, connectivity) {
     const connectivityArray = Array.isArray(connectivity)
@@ -65,11 +77,7 @@ export async function update_connectivity_query(client, connectivity) {
             .single();
         if (error) {
             console.warn("Error updating connectivity:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: [],
-            };
+            return connectivityError(error.message, []);
         }
         if (data) {
             updatedConnectivity.push(data);
@@ -87,15 +95,9 @@ export async function get_connectivity_for_herd_time_range_query(client, herdId,
     });
     if (error) {
         console.warn("Error fetching connectivity for herd time range:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-            hasMore: false,
-            nextOffset: offset,
-        };
+        return herdRangeError(error.message, offset);
     }
-    const sorted = sortConnectivityByTimestamp(data || []);
+    const sorted = sortConnectivityByTimestamp(data ?? []);
     const hasMore = sorted.length > maxCount;
     const items = hasMore ? sorted.slice(0, maxCount) : sorted;
     return {
@@ -111,11 +113,7 @@ export async function get_connectivity_for_artifact_query(client, artifactId, ma
     });
     if (error) {
         console.warn("Error fetching connectivity for artifact:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-        };
+        return connectivityError(error.message, []);
     }
-    return IWebResponse.success(sortConnectivityByTimestamp(data || [])).to_compatible();
+    return IWebResponse.success(sortConnectivityByTimestamp(data ?? [])).to_compatible();
 }

package/dist/helpers/db.d.ts

@@ -1,3 +1,3 @@
-import { SupabaseClient } from "@supabase/supabase-js";
-import { Database } from "../types/supabase";
-export declare function createClientWithApiKey(user_api_key: string): SupabaseClient<Database> | null;
+import type { AnyScoutDatabase, ScoutDatabase } from "../types/extend";
+import type { ScoutDatabaseClient } from "../types/db";
+export declare function createClientWithApiKey<DB extends AnyScoutDatabase = ScoutDatabase>(user_api_key: string): ScoutDatabaseClient<DB> | null;

package/dist/helpers/parts.js

@@ -1,6 +1,6 @@
 import { IWebResponse } from "../types/requests";
 import { update_part_lifecycle } from "./lifecycle";
-import { build_product_catalog, EMPTY_PRODUCT_CATALOG, } from "./product_catalog";
+import { build_product_catalog, catalog_product_from_join, EMPTY_PRODUCT_CATALOG, } from "./product_catalog";
 export async function get_parts_by_device_id(client, device_id) {
     const { data, error } = await client
         .from("parts")
@@ -185,7 +185,10 @@ export async function get_parts_by_herd_ids(client, herd_ids) {
       *,
       devices!parts_device_id_fkey(herd_id),
       product_numbers!parts_product_number_fkey(
-        products!product_numbers_product_id_fkey(*)
+        products!product_numbers_product_id_fkey(
+          *,
+          manufacturers!products_manufacturer_id_fkey(name)
+        )
       )
     `)
         .in("devices.herd_id", herd_ids)
@@ -204,7 +207,7 @@ export async function get_parts_by_herd_ids(client, herd_ids) {
         const part = partRow;
         product_entries.push({
             product_number: part.product_number,
-            product: product_numbers?.products ?? null,
+            product: catalog_product_from_join(product_numbers?.products),
         });
         (parts_by_device[_a = row.device_id] ?? (parts_by_device[_a] = [])).push(part);
     }

package/dist/helpers/product_catalog.d.ts

@@ -1,9 +1,12 @@
-import { IDevice, IPart, IProduct, IProductCatalog } from "../types/db";
+import { ICatalogProduct, IDevice, IManufacturer, IPart, IProduct, IProductCatalog } from "../types/db";
 export declare const EMPTY_PRODUCT_CATALOG: IProductCatalog;
+export declare function catalog_product_from_join(product: (IProduct & {
+    manufacturers?: Pick<IManufacturer, "name"> | null;
+}) | null | undefined): ICatalogProduct | null;
 export declare function build_product_catalog(entries: Iterable<{
     product_number: string;
-    product: IProduct | null | undefined;
+    product: ICatalogProduct | IProduct | null | undefined;
 }>): IProductCatalog;
-export declare function get_product_for_part(catalog: IProductCatalog | null | undefined, part: Pick<IPart, "product_number"> | null | undefined): IProduct | null;
+export declare function get_product_for_part(catalog: IProductCatalog | null | undefined, part: Pick<IPart, "product_number"> | null | undefined): ICatalogProduct | null;
 /** Distinct products across a device's parts, in part order. */
-export declare function get_products_for_device(catalog: IProductCatalog | null | undefined, device: Pick<IDevice, "parts"> | null | undefined): IProduct[];
+export declare function get_products_for_device(catalog: IProductCatalog | null | undefined, device: Pick<IDevice, "parts"> | null | undefined): ICatalogProduct[];

package/dist/helpers/product_catalog.js

@@ -2,6 +2,15 @@ export const EMPTY_PRODUCT_CATALOG = {
     products: {},
     product_id_by_number: {},
 };
+export function catalog_product_from_join(product) {
+    if (!product)
+        return null;
+    const { manufacturers, ...row } = product;
+    return {
+        ...row,
+        manufacturers: manufacturers ?? null,
+    };
+}
 export function build_product_catalog(entries) {
     var _a, _b;
     const catalog = {
@@ -9,10 +18,11 @@ export function build_product_catalog(entries) {
         product_id_by_number: {},
     };
     for (const { product_number, product } of entries) {
-        if (!product)
+        const catalog_product = catalog_product_from_join(product);
+        if (!catalog_product)
             continue;
-        catalog.product_id_by_number[product_number] = product.id;
-        (_a = catalog.products)[_b = product.id] ?? (_a[_b] = product);
+        catalog.product_id_by_number[product_number] = catalog_product.id;
+        (_a = catalog.products)[_b = catalog_product.id] ?? (_a[_b] = catalog_product);
     }
     return catalog;
 }

package/dist/helpers/product_numbers.d.ts

@@ -1,7 +1,7 @@
-import { IProduct, IProductNumber, ProductNumberInsert, ProductNumberUpdate } from "../types/db";
+import { ICatalogProduct, IProductNumber, ProductNumberInsert, ProductNumberUpdate } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
 export declare function server_get_product_numbers_by_product(product_id: number): Promise<IWebResponseCompatible<IProductNumber[]>>;
 export declare function server_get_product_number(product_number: string): Promise<IWebResponseCompatible<IProductNumber | null>>;
-export declare function server_get_product_for_product_number(product_number: string): Promise<IWebResponseCompatible<IProduct | null>>;
+export declare function server_get_product_for_product_number(product_number: string): Promise<IWebResponseCompatible<ICatalogProduct | null>>;
 export declare function server_create_product_number(row: ProductNumberInsert): Promise<IWebResponseCompatible<IProductNumber | null>>;
 export declare function server_update_product_number(product_number: string, updates: ProductNumberUpdate): Promise<IWebResponseCompatible<IProductNumber | null>>;

package/dist/helpers/product_numbers.queries.d.ts

@@ -1,9 +1,9 @@
 import { SupabaseClient } from "@supabase/supabase-js";
-import { IProduct, IProductNumber, ProductNumberInsert, ProductNumberUpdate } from "../types/db";
+import { ICatalogProduct, IProductNumber, ProductNumberInsert, ProductNumberUpdate } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
 import { Database } from "../types/supabase";
 export declare function get_product_numbers_by_product_query(client: SupabaseClient<Database>, product_id: number): Promise<IWebResponseCompatible<IProductNumber[]>>;
 export declare function get_product_number_query(client: SupabaseClient<Database>, product_number: string): Promise<IWebResponseCompatible<IProductNumber | null>>;
-export declare function get_product_for_product_number_query(client: SupabaseClient<Database>, product_number: string): Promise<IWebResponseCompatible<IProduct | null>>;
+export declare function get_product_for_product_number_query(client: SupabaseClient<Database>, product_number: string): Promise<IWebResponseCompatible<ICatalogProduct | null>>;
 export declare function create_product_number_query(client: SupabaseClient<Database>, row: ProductNumberInsert): Promise<IWebResponseCompatible<IProductNumber | null>>;
 export declare function update_product_number_query(client: SupabaseClient<Database>, product_number: string, updates: ProductNumberUpdate): Promise<IWebResponseCompatible<IProductNumber | null>>;

package/dist/helpers/product_numbers.queries.js

@@ -1,4 +1,5 @@
 import { EnumWebResponse, IWebResponse, } from "../types/requests";
+import { catalog_product_from_join } from "./product_catalog";
 export async function get_product_numbers_by_product_query(client, product_id) {
     const { data, error } = await client
         .from("product_numbers")
@@ -24,14 +25,13 @@ export async function get_product_number_query(client, product_number) {
 export async function get_product_for_product_number_query(client, product_number) {
     const { data, error } = await client
         .from("product_numbers")
-        .select("products!product_numbers_product_id_fkey(*)")
+        .select("products!product_numbers_product_id_fkey(*, manufacturers!products_manufacturer_id_fkey(name))")
         .eq("product_number", product_number)
         .maybeSingle();
     if (error) {
         return { status: EnumWebResponse.ERROR, msg: error.message, data: null };
     }
-    const product = data?.products ?? null;
-    return IWebResponse.success(product).to_compatible();
+    return IWebResponse.success(catalog_product_from_join(data?.products)).to_compatible();
 }
 export async function create_product_number_query(client, row) {
     const { data, error } = await client

package/dist/store/api.d.ts

@@ -175,7 +175,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -199,7 +199,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -284,7 +284,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -308,7 +308,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -391,7 +391,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -415,7 +415,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -500,7 +500,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -524,7 +524,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -607,7 +607,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -631,7 +631,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -716,7 +716,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -740,7 +740,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -823,7 +823,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -847,7 +847,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -932,7 +932,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -956,7 +956,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -1039,7 +1039,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -1063,7 +1063,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -1148,7 +1148,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -1172,7 +1172,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -1255,7 +1255,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -1279,7 +1279,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -1364,7 +1364,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -1388,7 +1388,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -1467,7 +1467,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -1487,7 +1487,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -1560,7 +1560,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -1580,7 +1580,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -1651,7 +1651,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -1671,7 +1671,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -1744,7 +1744,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -1764,7 +1764,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -1835,7 +1835,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -1855,7 +1855,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -1928,7 +1928,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -1948,7 +1948,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -2019,7 +2019,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -2039,7 +2039,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -2112,7 +2112,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -2132,7 +2132,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -2203,7 +2203,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -2223,7 +2223,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -2296,7 +2296,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -2316,7 +2316,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;
@@ -2387,7 +2387,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: true;
     error: undefined;
@@ -2407,7 +2407,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
     isFetching: false;
     isSuccess: false;
     isError: false;
-}, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+}, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
     isSuccess: true;
     isFetching: false;
     error: undefined;
@@ -2480,7 +2480,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: true;
         error: undefined;
@@ -2500,7 +2500,7 @@ export declare const useGetSessionsInfiniteByHerdQuery: <R extends Record<string
         isFetching: false;
         isSuccess: false;
         isError: false;
-    }, "data" | "error" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
+    }, "error" | "data" | "fulfilledTimeStamp" | "currentData" | "isFetching" | "isSuccess"> & {
         isSuccess: true;
         isFetching: false;
         error: undefined;

package/dist/store/hooks.d.ts

@@ -1,5 +1,5 @@
 import { LoadingPerformance } from "./scout";
-import { IDevice, IPart, IProduct, IProductCatalog, ISessionSummary } from "../types/db";
+import { ICatalogProduct, IDevice, IPart, IProductCatalog, ISessionSummary } from "../types/db";
 export declare const useAppDispatch: import("react-redux").UseDispatch<import("redux").Dispatch<import("redux").UnknownAction>>;
 export declare const useHerdModulesLoadingState: () => any;
 export declare const useIsHerdModulesLoading: () => boolean;
@@ -11,6 +11,6 @@ export declare const useLoadingPerformance: () => LoadingPerformance;
 export declare const useSessionSummariesByHerd: (herdId: number) => ISessionSummary | null;
 export declare const useHasSessionSummaries: (herdId: number) => boolean;
 export declare const useProductCatalog: () => IProductCatalog;
-export declare const useProductForPart: (part: Pick<IPart, "product_number"> | null | undefined) => IProduct | null;
-export declare const useProductsForDevice: (device: Pick<IDevice, "parts"> | null | undefined) => IProduct[];
+export declare const useProductForPart: (part: Pick<IPart, "product_number"> | null | undefined) => ICatalogProduct | null;
+export declare const useProductsForDevice: (device: Pick<IDevice, "parts"> | null | undefined) => ICatalogProduct[];
 export declare const useHerdModulesLoadingTimeAgo: () => string | null;

package/dist/supabase/client.d.ts

@@ -1,3 +1,3 @@
-import type { SupabaseClient } from "@supabase/supabase-js";
-import type { Database } from "../types/supabase";
-export declare function createScoutBrowserClient(): SupabaseClient<Database>;
+import type { AnyScoutDatabase, ScoutDatabase } from "../types/extend";
+import type { ScoutDatabaseClient } from "../types/db";
+export declare function createScoutBrowserClient<DB extends AnyScoutDatabase = ScoutDatabase>(): ScoutDatabaseClient<DB>;

package/dist/supabase/server.d.ts

@@ -1,6 +1,6 @@
 import "server-only";
-import type { Database } from "../types/supabase";
-import type { SupabaseClient } from "@supabase/supabase-js";
+import type { AnyScoutDatabase, ScoutDatabase } from "../types/extend";
+import type { ScoutDatabaseClient } from "../types/db";
 export interface IServerClientOptions {
     persistSession?: boolean;
 }
@@ -8,4 +8,4 @@ export interface IServerClientOptions {
  * Reuses one read client per RSC request. Cookie writes are opt-in for
  * auth-mutating actions; middleware persists normal session refreshes.
  */
-export declare function newServerClient(options?: IServerClientOptions): Promise<SupabaseClient<Database>>;
+export declare function newServerClient<DB extends AnyScoutDatabase = ScoutDatabase>(options?: IServerClientOptions): Promise<ScoutDatabaseClient<DB>>;

package/dist/supabase/server.js

@@ -31,5 +31,6 @@ const cachedRequestClient = cache(() => createRequestClient({}));
 export function newServerClient(options = {}) {
     return options.persistSession
         ? createRequestClient(options)
-        : cachedRequestClient();
+        : // The schema only exists at compile time, so the cached client serves any extension of it.
+            cachedRequestClient();
 }

package/dist/types/db.d.ts

@@ -1,6 +1,11 @@
 import type { SupabaseClient, User } from "@supabase/supabase-js";
 import type { Database } from "./supabase";
-export type ScoutDatabaseClient = SupabaseClient<Database, "public">;
+import type { AnyScoutDatabase, ScoutDatabase } from "./extend";
+/**
+ * A Supabase client over Scout's schema, or over any deployment schema that extends it (see
+ * `ExtendDatabase`). Scout helpers accept both.
+ */
+export type ScoutDatabaseClient<DB extends AnyScoutDatabase = ScoutDatabase> = SupabaseClient<DB>;
 export type DeviceType = Database["public"]["Enums"]["device_type"];
 export type MediaType = Database["public"]["Enums"]["media_type"];
 export type TagObservationType = Database["public"]["Enums"]["tag_observation_type"];
@@ -63,6 +68,10 @@ export type IProvider = Database["public"]["Tables"]["providers"]["Row"];
 export type IPart = Database["public"]["Tables"]["parts"]["Row"];
 export type IManufacturer = Database["public"]["Tables"]["manufacturers"]["Row"];
 export type IProduct = Database["public"]["Tables"]["products"]["Row"];
+/** Product in `IProductCatalog`, with manufacturer name from the products join. */
+export type ICatalogProduct = IProduct & {
+    manufacturers?: Pick<IManufacturer, "name"> | null;
+};
 export type IProductNumber = Database["public"]["Tables"]["product_numbers"]["Row"];
 export type IProductCompatibility = Database["public"]["Tables"]["product_compatibilities"]["Row"];
 export type ISensorPose = Database["public"]["Tables"]["sensor_poses"]["Row"];
@@ -200,10 +209,10 @@ export type HerdOperatingPermissionCreateInput = Pick<HerdOperatingPermissionIns
 export type HerdOperatingPermissionUpdateInput = Partial<Pick<HerdOperatingPermissionCreateInput, "operating_permission_id">> & LifecyclePatch;
 /**
  * Products stored once and shared by every part that references them
- * (parts.product_number -> product_numbers -> products).
+ * (parts.product_number -> product_numbers -> products -> manufacturers).
  */
 export interface IProductCatalog {
-    products: Record<number, IProduct>;
+    products: Record<number, ICatalogProduct>;
     product_id_by_number: Record<string, number>;
 }
 export type IUserCredential = Database["public"]["Tables"]["user_credentials"]["Row"];

package/dist/types/extend.d.ts

@@ -0,0 +1,126 @@
+import type { DatabaseWithoutInternals } from "@supabase/supabase-js";
+import type { Database } from "./supabase";
+/**
+ * Scout's generated schema. Deployments that add their own tables, views, functions, enums or
+ * composite types describe the additions with `ExtendDatabase` instead of replacing this, so
+ * Scout's own helpers keep working against the same client.
+ */
+export type ScoutDatabase = Database;
+/**
+ * What Scout requires of a deployment's schema: that it covers Scout's own. Generator metadata
+ * is excluded because `__InternalSupabase` pins the PostgREST version the types were generated
+ * against, and a deployment that runs its own `supabase gen types` will not report Scout's.
+ */
+export type AnyScoutDatabase = DatabaseWithoutInternals<ScoutDatabase>;
+type ScoutSchema = ScoutDatabase["public"];
+/**
+ * A foreign key reachable from a table, as the Supabase generator emits it. Mirrors PostgREST's
+ * own `GenericRelationship`, which the package declares but does not export.
+ */
+export interface TableRelationship {
+    foreignKeyName: string;
+    columns: string[];
+    isOneToOne?: boolean;
+    referencedRelation: string;
+    referencedColumns: string[];
+}
+/**
+ * A table (or updatable view) a deployment adds. Only `Row` is required.
+ *
+ * Declare row shapes as type aliases, not interfaces: PostgREST needs an index signature to
+ * resolve a schema, and TypeScript only infers one for aliases. Loosening this constraint does
+ * not help, it just trades this error for a silently untyped client.
+ */
+export interface TableExtension {
+    Row: Record<string, unknown>;
+    Insert?: Record<string, unknown>;
+    Update?: Record<string, unknown>;
+    Relationships?: TableRelationship[];
+}
+/** A PostgREST function a deployment adds, as reached through `client.rpc(...)`. */
+export interface FunctionExtension {
+    Args: Record<string, unknown>;
+    Returns: unknown;
+}
+/** Everything a deployment adds to the `public` schema on top of Scout's. */
+export interface SchemaExtension {
+    Tables?: Record<string, TableExtension>;
+    Views?: Record<string, TableExtension>;
+    Functions?: Record<string, FunctionExtension>;
+    Enums?: Record<string, string>;
+    CompositeTypes?: Record<string, Record<string, unknown>>;
+}
+type Added<Ext extends SchemaExtension, K extends keyof SchemaExtension> = K extends keyof Ext ? Exclude<Ext[K], undefined> : {};
+/** Supplies the `Insert`/`Update`/`Relationships` members the Supabase generator would emit. */
+type NormalizeTables<T> = {
+    [K in keyof T]: {
+        Row: T[K] extends {
+            Row: infer R;
+        } ? R : never;
+        Insert: T[K] extends {
+            Insert: infer I;
+        } ? I : T[K] extends {
+            Row: infer R;
+        } ? R : never;
+        Update: T[K] extends {
+            Update: infer U;
+        } ? U : T[K] extends {
+            Row: infer R;
+        } ? Partial<R> : never;
+        Relationships: T[K] extends {
+            Relationships: infer L;
+        } ? L : [];
+    };
+};
+type NormalizeViews<T> = {
+    [K in keyof T]: Omit<T[K], "Relationships"> & {
+        Relationships: T[K] extends {
+            Relationships: infer L;
+        } ? L : [];
+    };
+};
+/**
+ * Merges a deployment's additions into Scout's schema. The result stays assignable to
+ * `ScoutDatabase`, so a client built from it satisfies every Scout helper while also typing the
+ * deployment's own tables and RPCs.
+ *
+ * ```ts
+ * type AppDatabase = ExtendDatabase<{
+ *   Tables: { field_notes: { Row: { id: number; body: string } } };
+ *   Functions: { notes_for_herd: { Args: { herd_id: number }; Returns: { id: number }[] } };
+ * }>;
+ * ```
+ *
+ * Each member intersects rather than being merged with a mapped type. Intersecting leaves
+ * Scout's schema as one constituent that resolves lazily, so the constraint check short-circuits
+ * on its identity; a mapped merge has to walk all of it eagerly and measured ~49% more type
+ * instantiations. The cost is that hover text shows the intersection unreduced.
+ */
+export type ExtendDatabase<Ext extends SchemaExtension> = Omit<ScoutDatabase, "public"> & {
+    public: {
+        Tables: ScoutSchema["Tables"] & NormalizeTables<Added<Ext, "Tables">>;
+        Views: ScoutSchema["Views"] & NormalizeViews<Added<Ext, "Views">>;
+        Functions: ScoutSchema["Functions"] & Added<Ext, "Functions">;
+        Enums: ScoutSchema["Enums"] & Added<Ext, "Enums">;
+        CompositeTypes: ScoutSchema["CompositeTypes"] & Added<Ext, "CompositeTypes">;
+    };
+};
+/**
+ * Adopts a schema a deployment generated from its own project, for deployments whose own
+ * `supabase gen types` run already covers Scout's tables alongside theirs.
+ *
+ * Only the generator metadata is rewritten. `supabase gen types` records the PostgREST version
+ * of the project it ran against, and `SupabaseClient` carries that version in its own type, so a
+ * deployment on a different version would otherwise produce a client no Scout helper accepts
+ * even though the schemas agree. Scout's helpers are written against Scout's PostgREST
+ * regardless. The `AnyScoutDatabase` constraint still rejects a schema that does not cover
+ * Scout's.
+ *
+ * ```ts
+ * import type { Database as Generated } from "@/types/supabase";
+ *
+ * export type AppDatabase = AdoptDatabase<Generated>;
+ * ```
+ */
+export type AdoptDatabase<DB extends AnyScoutDatabase> = Omit<DB, "__InternalSupabase"> & Pick<ScoutDatabase, "__InternalSupabase">;
+export {};

package/dist/types/extend.js

@@ -0,0 +1 @@
+export {};

package/dist/types/index.d.ts

@@ -4,6 +4,7 @@ export * from "./ui";
 export * from "./requests";
 export * from "./gps";
 export * from "./supabase";
+export * from "./extend";
 export * from "./bounding_boxes";
 export * from "./events";
 export * from "./data_source";

package/dist/types/index.js

@@ -4,6 +4,7 @@ export * from "./ui";
 export * from "./requests";
 export * from "./gps";
 export * from "./supabase";
+export * from "./extend";
 export * from "./bounding_boxes";
 export * from "./events";
 export * from "./data_source";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "exports": {
     "./client": {