Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.
TypeScript ai-agentsbill-of-materialserpinventory-managementleanmanufacturingmanufacturing-execution-systemmcp-servermesmrpopen-source-erppostgresqlproduction-planningqmsquality-management-systemreact-routerself-hostedsupabasetraceabilitytypescript
fix: scope traceability reads and company storage prefixes (#1762)
Sid75c4a0579172
diff --git a/.github/workflows/check.yml b/.github/workflows/check.ymlindex fcda2410f5..f1a90f7717 100644--- a/.github/workflows/check.yml+++ b/.github/workflows/check.yml@@ -62,6 +62,11 @@ jobs:- run: pnpm exec biome check+ - name: Conformance checks+ run: |+ pnpm --filter @carbon/config build+ pnpm --filter @carbon/checks exec vitest run src/run.test.ts+typecheck:name: Typecheckneeds: installdiff --git a/apps/erp/app/modules/inventory/lineage.server.ts b/apps/erp/app/modules/inventory/lineage.server.tsindex 724f5cae94..39dbc146e5 100644--- a/apps/erp/app/modules/inventory/lineage.server.ts+++ b/apps/erp/app/modules/inventory/lineage.server.ts@@ -33,6 +33,7 @@ export type LineagePayload = {const MAX_ENTITIES = 500;type LineageState = {+ companyId: string;entities: Map<string, TrackedEntity>;activities: Map<string, Activity>;inputs: Map<string, ActivityInput>;@@ -40,8 +41,9 @@ type LineageState = {visited: Set<string>;};-function newLineageState(): LineageState {+function newLineageState(companyId: string): LineageState {return {+ companyId,entities: new Map(),activities: new Map(),inputs: new Map(),@@ -55,13 +57,14 @@ async function expandActivitySiblings(state: LineageState,activityIds: string[]): Promise<void> {- const { entities, activities, inputs, outputs } = state;+ const { companyId, entities, activities, inputs, outputs } = state;const newActivityIds = activityIds.filter((id) => !activities.has(id));if (newActivityIds.length > 0) {const fetched = await client.from("trackedActivity").select("*")- .in("id", newActivityIds);+ .in("id", newActivityIds)+ .eq("companyId", companyId);for (const row of fetched.data ?? []) {activities.set(row.id, row as unknown as Activity);}@@ -73,11 +76,13 @@ async function expandActivitySiblings(client.from("trackedActivityInput").select("*")- .in("trackedActivityId", activityIds),+ .in("trackedActivityId", activityIds)+ .eq("companyId", companyId),client.from("trackedActivityOutput").select("*").in("trackedActivityId", activityIds)+ .eq("companyId", companyId)]);// These rows are the AUTHORITATIVE edge quantities — how much actually flowed@@ -143,11 +148,13 @@ async function expandEntityActivities(client.from("trackedActivityInput").select("trackedActivityId")- .in("trackedEntityId", entityIds),+ .in("trackedEntityId", entityIds)+ .eq("companyId", state.companyId),client.from("trackedActivityOutput").select("trackedActivityId").in("trackedEntityId", entityIds)+ .eq("companyId", state.companyId)]);const activityIds = new Set<string>();@@ -172,7 +179,7 @@ async function runLineageBfs(direction: LineageDirection,safeDepth: number): Promise<void> {- const { entities, inputs, outputs, visited } = state;+ const { companyId, entities, inputs, outputs, visited } = state;let frontier = initialFrontier.filter((id) => {if (visited.has(id)) return true;visited.add(id);@@ -199,7 +206,7 @@ async function runLineageBfs((async () => {const res = await client.rpc("get_direct_descendants_of_tracked_entities_strict",- { p_tracked_entity_ids: frontier }+ { p_tracked_entity_ids: frontier, p_company_id: companyId });descendantsBatch = (res.data ?? []) as BatchRow[];})()@@ -210,7 +217,7 @@ async function runLineageBfs((async () => {const res = await client.rpc("get_direct_ancestors_of_tracked_entities_strict",- { p_tracked_entity_ids: frontier }+ { p_tracked_entity_ids: frontier, p_company_id: companyId });ancestorsBatch = (res.data ?? []) as BatchRow[];})()@@ -283,7 +290,8 @@ async function runLineageBfs(const fetched = await client.from("trackedEntity").select("*")- .in("id", idsToFetch);+ .in("id", idsToFetch)+ .eq("companyId", companyId);for (const row of fetched.data ?? []) {entities.set(row.id, row as TrackedEntity);}@@ -300,6 +308,7 @@ async function runLineageBfs(export async function fetchLineageSubgraph(client: SupabaseClient<Database>,rootEntityId: string,+ companyId: string,depth: number,direction: LineageDirection = "both"): Promise<LineagePayload> {@@ -309,9 +318,10 @@ export async function fetchLineageSubgraph(.from("trackedEntity").select("*").eq("id", rootEntityId)+ .eq("companyId", companyId).maybeSingle();- const state = newLineageState();+ const state = newLineageState(companyId);if (rootEntity.data)state.entities.set(rootEntity.data.id, rootEntity.data as TrackedEntity);@@ -331,10 +341,12 @@ export async function fetchLineageSubgraph(export async function fetchJobStepRecords(client: SupabaseClient<Database>,- jobId: string+ jobId: string,+ companyId: string): Promise<StepRecord[]> {const res = await client.rpc("get_job_operation_step_records", {- p_job_id: jobId+ p_job_id: jobId,+ p_company_id: companyId});if (!res.data) return [];return (res.data as any[]).map((r) => ({@@ -361,7 +373,8 @@ export async function fetchJobStepRecords(export async function fetchContainmentsForEntities(client: SupabaseClient<Database>,- entityIds: string[]+ entityIds: string[],+ companyId: string): Promise<IssueContainment[]> {if (entityIds.length === 0) return [];@@ -375,6 +388,7 @@ export async function fetchContainmentsForEntities(issue:issues!inner(id, status, priority, containmentStatus)`).in("trackedEntityId", entityIds)+ .eq("companyId", companyId).in("issue.containmentStatus", ["Contained", "Uncontained"]);const containments: IssueContainment[] = [];@@ -421,7 +435,7 @@ export async function fetchJobScopedLineage(.eq("companyId", companyId)]);- const state = newLineageState();+ const state = newLineageState(companyId);for (const row of (seedEntitiesRes.data ?? []) as TrackedEntity[]) {state.entities.set(row.id, row);}@@ -449,7 +463,8 @@ export async function fetchJobScopedLineage(const containments = await fetchContainmentsForEntities(client,- Array.from(state.entities.keys())+ Array.from(state.entities.keys()),+ companyId);return {@@ -531,7 +546,8 @@ export function toGraphData(payload: LineagePayload): GraphData {*/export async function enrichActivityBinNames(client: SupabaseClient<Database>,- payload: LineagePayload+ payload: LineagePayload,+ companyId: string): Promise<LineagePayload> {const binIds = new Set<string>();for (const activity of payload.activities) {@@ -546,7 +562,8 @@ export async function enrichActivityBinNames(const storageUnits = await client.from("storageUnit").select("id, name")- .in("id", Array.from(binIds));+ .in("id", Array.from(binIds))+ .eq("companyId", companyId);if (storageUnits.error || !storageUnits.data?.length) return payload;const nameById = indexByMapped(diff --git a/apps/erp/app/modules/production/production.service.ts b/apps/erp/app/modules/production/production.service.tsindex 5bcc5720ae..f840c43940 100644--- a/apps/erp/app/modules/production/production.service.ts+++ b/apps/erp/app/modules/production/production.service.ts@@ -1942,12 +1942,14 @@ export async function getJobOperationsByMethodId(export async function getJobOperationStepRecords(client: SupabaseClient<Database>,jobId: string,+ companyId: string,args: GenericQueryFilters & {search: string | null;}) {let query = client.rpc("get_job_operation_step_records", {- p_job_id: jobId+ p_job_id: jobId,+ p_company_id: companyId});if (args.search) {diff --git a/apps/erp/app/routes/api+/settings.backup-archive.$file.ts b/apps/erp/app/routes/api+/settings.backup-archive.$file.tsindex 0374125fb0..f1e92b162e 100644--- a/apps/erp/app/routes/api+/settings.backup-archive.$file.ts+++ b/apps/erp/app/routes/api+/settings.backup-archive.$file.ts@@ -1,5 +1,6 @@import { createGzip } from "node:zlib";import { requirePermissions } from "@carbon/auth/auth.server";+import { getCarbonServiceRole } from "@carbon/auth/client.server";import type { SupabaseClient } from "@supabase/supabase-js";import type { LoaderFunctionArgs } from "react-router";import { pack as tarPack } from "tar-stream";@@ -52,8 +53,10 @@ export async function loader({ request, params }: LoaderFunctionArgs) {throw new Response("Invalid backup", { status: 400 });}const dir = `exports/${name}`;+ // Backup objects are service-role only; the checks above gate this route.+ const serviceRole = getCarbonServiceRole();- const relPaths = await listRelative(client, companyId, dir);+ const relPaths = await listRelative(serviceRole, companyId, dir);if (relPaths.length === 0) {throw new Response("Backup not found", { status: 404 });}@@ -67,7 +70,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {});const downloadAt = (i: number): Promise<Buffer | null> =>- client.storage+ serviceRole.storage.from(companyId).download(`${dir}/${relPaths[i]}`).then((f) =>diff --git a/apps/erp/app/routes/api+/settings.backup-upload.ts b/apps/erp/app/routes/api+/settings.backup-upload.tsindex cdb94ba246..5a310bbd3a 100644--- a/apps/erp/app/routes/api+/settings.backup-upload.ts+++ b/apps/erp/app/routes/api+/settings.backup-upload.ts@@ -32,11 +32,11 @@ export async function action({ request }: ActionFunctionArgs) {const formData = await request.formData();const intent = formData.get("intent");- // Service role: `temp-staging` RLS only admits `${companyId}/models/...`; the- // permission checks above gate this route.- const staging = (await getCarbonServiceRole()).storage.from(- TEMP_STAGING_BUCKET- );+ // Service role: `temp-staging` RLS only admits `${companyId}/models/...` and+ // backup objects are service-role only; the permission checks above gate+ // this route.+ const serviceRole = getCarbonServiceRole();+ const staging = serviceRole.storage.from(TEMP_STAGING_BUCKET);if (intent === "sign") {const path = `${companyId}/backups/${nanoid()}.tar.gz`;@@ -78,7 +78,7 @@ export async function action({ request }: ActionFunctionArgs) {const source = Readable.fromWeb(res.body as Parameters<typeof Readable.fromWeb>[0]);- return await unpackBackupArchive(client, companyId, source);+ return await unpackBackupArchive(serviceRole, companyId, source);} catch (err) {logger.error("Failed to unpack uploaded backup", {companyId,diff --git a/apps/erp/app/routes/api+/traceability.expand.test.ts b/apps/erp/app/routes/api+/traceability.expand.test.tsnew file mode 100644index 0000000000..5bcb2268aa--- /dev/null+++ b/apps/erp/app/routes/api+/traceability.expand.test.ts@@ -0,0 +1,72 @@+import { requirePermissions } from "@carbon/auth/auth.server";+import { beforeEach, describe, expect, it, vi } from "vitest";+import { fetchLineageSubgraph } from "~/modules/inventory/lineage.server";+import { requireCompanyRecord } from "~/modules/shared/shared.server";+import { loader } from "./traceability.expand";++vi.mock("@carbon/auth/auth.server", () => ({+ requirePermissions: vi.fn()+}));+vi.mock("~/modules/inventory/lineage.server", () => ({+ fetchLineageSubgraph: vi.fn(async () => ({ entities: [], activities: [] }))+}));+vi.mock("~/modules/shared/shared.server", () => ({+ requireCompanyRecord: vi.fn(async () => undefined)+}));++const client = { from: vi.fn(), rpc: vi.fn() };++function load(query: string) {+ return loader({+ request: new Request(`http://localhost/api/traceability/expand?${query}`)+ } as any);+}++describe("traceability expand loader", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ vi.mocked(requirePermissions).mockResolvedValue({+ client,+ companyId: "company-1"+ } as any);+ });++ it("proves the entity is the caller's company's before traversing", async () => {+ const response = await load("trackedEntityId=entity-1&depth=2");++ expect(response.status).toBe(200);+ expect(requireCompanyRecord).toHaveBeenCalledWith(+ client,+ "trackedEntity",+ "company-1",+ { id: "entity-1" }+ );+ expect(fetchLineageSubgraph).toHaveBeenCalledWith(+ client,+ "entity-1",+ "company-1",+ 2,+ "both"+ );+ });++ it("stops before any traversal when the entity is another company's", async () => {+ vi.mocked(requireCompanyRecord).mockRejectedValueOnce(+ new Response("Not found", { status: 404 })+ );++ await expect(load("trackedEntityId=foreign-entity")).rejects.toMatchObject({+ status: 404+ });+ expect(fetchLineageSubgraph).not.toHaveBeenCalled();+ expect(client.rpc).not.toHaveBeenCalled();+ });++ it("returns 400 without a trackedEntityId", async () => {+ const response = await load("depth=1");++ expect(response.status).toBe(400);+ expect(requireCompanyRecord).not.toHaveBeenCalled();+ expect(fetchLineageSubgraph).not.toHaveBeenCalled();+ });+});diff --git a/apps/erp/app/routes/api+/traceability.expand.ts b/apps/erp/app/routes/api+/traceability.expand.tsindex 5cae1bc6b9..90bebdb688 100644--- a/apps/erp/app/routes/api+/traceability.expand.ts+++ b/apps/erp/app/routes/api+/traceability.expand.ts@@ -4,9 +4,10 @@ import {fetchLineageSubgraph,type LineageDirection} from "~/modules/inventory/lineage.server";+import { requireCompanyRecord } from "~/modules/shared/shared.server";export async function loader({ request }: LoaderFunctionArgs) {- const { client } = await requirePermissions(request, {+ const { client, companyId } = await requirePermissions(request, {view: "inventory",bypassRls: true});@@ -23,6 +24,12 @@ export async function loader({ request }: LoaderFunctionArgs) {);}+ // bypassRls makes `client` the service role and the lineage reads are not+ // company-scoped, so the root id must be proven to be this company's first.+ await requireCompanyRecord(client, "trackedEntity", companyId, {+ id: trackedEntityId+ });+const direction: LineageDirection =directionParam === "up" || directionParam === "down"? directionParam@@ -32,6 +39,7 @@ export async function loader({ request }: LoaderFunctionArgs) {const payload = await fetchLineageSubgraph(client,trackedEntityId,+ companyId,depth,direction);diff --git a/apps/erp/app/routes/api+/traceability.sidebar.test.ts b/apps/erp/app/routes/api+/traceability.sidebar.test.tsnew file mode 100644index 0000000000..fc2257eb3d--- /dev/null+++ b/apps/erp/app/routes/api+/traceability.sidebar.test.ts@@ -0,0 +1,111 @@+import { requirePermissions } from "@carbon/auth/auth.server";+import { beforeEach, describe, expect, it, vi } from "vitest";+import { fetchJobStepRecords } from "~/modules/inventory/lineage.server";+import { loader } from "./traceability.sidebar";++vi.mock("@carbon/auth/auth.server", () => ({+ requirePermissions: vi.fn()+}));+vi.mock("~/modules/inventory/lineage.server", () => ({+ fetchJobStepRecords: vi.fn(async () => [{ id: "step-record-1" }])+}));++type Row = Record<string, unknown> | null;++function createQuery(data: Row) {+ const query = {+ select: vi.fn(() => query),+ eq: vi.fn(() => query),+ maybeSingle: vi.fn(async () => ({ data, error: null }))+ };+ return query;+}++function setup({ activity, job }: { activity: Row; job: Row }) {+ const activityQuery = createQuery(activity);+ const jobQuery = createQuery(job);+ const client = {+ from: vi.fn((table: string) => {+ if (table === "trackedActivity") return activityQuery;+ if (table === "job") return jobQuery;+ throw new Error(`Unexpected table query: ${table}`);+ }),+ rpc: vi.fn()+ };+ vi.mocked(requirePermissions).mockResolvedValue({+ client,+ companyId: "company-1"+ } as any);+ return { client, activityQuery, jobQuery };+}++async function load(query: string) {+ const response = await loader({+ request: new Request(`http://localhost/api/traceability/sidebar?${query}`)+ } as any);+ return { status: response.status, body: await response.json() };+}++describe("traceability sidebar loader", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ });++ it("scopes the activity and its job to the caller's company", async () => {+ const { client, activityQuery, jobQuery } = setup({+ activity: { attributes: { Job: "job-1" } },+ job: { id: "job-1" }+ });++ const { status, body } = await load("activityId=activity-1");++ expect(status).toBe(200);+ expect(body).toEqual({ stepRecords: [{ id: "step-record-1" }] });+ expect(activityQuery.eq).toHaveBeenCalledWith("id", "activity-1");+ expect(activityQuery.eq).toHaveBeenCalledWith("companyId", "company-1");+ expect(jobQuery.eq).toHaveBeenCalledWith("id", "job-1");+ expect(jobQuery.eq).toHaveBeenCalledWith("companyId", "company-1");+ expect(fetchJobStepRecords).toHaveBeenCalledWith(+ client,+ "job-1",+ "company-1"+ );+ });++ it("returns no step records for another company's activity", async () => {+ const { client, jobQuery } = setup({ activity: null, job: null });++ const { status, body } = await load("activityId=foreign-activity");++ expect(status).toBe(200);+ expect(body).toEqual({ stepRecords: [] });+ expect(jobQuery.maybeSingle).not.toHaveBeenCalled();+ expect(fetchJobStepRecords).not.toHaveBeenCalled();+ expect(client.rpc).not.toHaveBeenCalled();+ });++ it("returns no step records when the activity names another company's job", async () => {+ const { client } = setup({+ activity: { attributes: { Job: "foreign-job" } },+ job: null+ });++ const { status, body } = await load("activityId=activity-1");++ expect(status).toBe(200);+ expect(body).toEqual({ stepRecords: [] });+ expect(fetchJobStepRecords).not.toHaveBeenCalled();+ expect(client.rpc).not.toHaveBeenCalled();+ });++ it("returns no step records without an activityId", async () => {+ const { client } = setup({ activity: null, job: null });++ const { status, body } = await load("");++ expect(status).toBe(200);+ expect(body).toEqual({ stepRecords: [] });+ expect(client.from).not.toHaveBeenCalled();+ expect(fetchJobStepRecords).not.toHaveBeenCalled();+ });+});diff --git a/apps/erp/app/routes/api+/traceability.sidebar.ts b/apps/erp/app/routes/api+/traceability.sidebar.tsindex b9d9bf07ec..fdb794023b 100644--- a/apps/erp/app/routes/api+/traceability.sidebar.ts+++ b/apps/erp/app/routes/api+/traceability.sidebar.ts@@ -4,7 +4,7 @@ import { fetchJobStepRecords } from "~/modules/inventory/lineage.server";import type { StepRecord } from "~/modules/inventory/ui/Traceability/utils";export async function loader({ request }: LoaderFunctionArgs) {- const { client } = await requirePermissions(request, {+ const { client, companyId } = await requirePermissions(request, {view: "inventory",bypassRls: true});@@ -20,6 +20,7 @@ export async function loader({ request }: LoaderFunctionArgs) {.from("trackedActivity").select("attributes").eq("id", activityId)+ .eq("companyId", companyId).maybeSingle();const jobId = (activityRes.data?.attributes as Record<string, unknown> | null)@@ -29,6 +30,19 @@ export async function loader({ request }: LoaderFunctionArgs) {return Response.json({ stepRecords: [] as StepRecord[] });}- const stepRecords = await fetchJobStepRecords(client, jobId);+ // The step records RPC filters on the job id alone and `client` is the+ // service role, so the job must be this company's too.+ const jobRes = await client+ .from("job")+ .select("id")+ .eq("id", jobId)+ .eq("companyId", companyId)+ .maybeSingle();++ if (!jobRes.data) {+ return Response.json({ stepRecords: [] as StepRecord[] });+ }++ const stepRecords = await fetchJobStepRecords(client, jobId, companyId);return Response.json({ stepRecords });}diff --git a/apps/erp/app/routes/x+/job+/$jobId.steps.tsx b/apps/erp/app/routes/x+/job+/$jobId.steps.tsxindex 9062a9c24e..9131551aee 100644--- a/apps/erp/app/routes/x+/job+/$jobId.steps.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.steps.tsx@@ -12,7 +12,7 @@ import { path } from "~/utils/path";import { getGenericQueryFilters } from "~/utils/query";export async function loader({ request, params }: LoaderFunctionArgs) {- const { client } = await requirePermissions(request, {+ const { client, companyId } = await requirePermissions(request, {view: "production",role: "employee"});@@ -27,13 +27,18 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const { limit, offset, sorts, filters } =getGenericQueryFilters(searchParams);- const stepRecords = await getJobOperationStepRecords(client, jobId, {- limit,- offset,- sorts,- filters,- search- });+ const stepRecords = await getJobOperationStepRecords(+ client,+ jobId,+ companyId,+ {+ limit,+ offset,+ sorts,+ filters,+ search+ }+ );if (stepRecords.error) {redirect(diff --git a/apps/erp/app/routes/x+/settings+/backups.tsx b/apps/erp/app/routes/x+/settings+/backups.tsxindex cdee5f538a..a11eff0c83 100644--- a/apps/erp/app/routes/x+/settings+/backups.tsx+++ b/apps/erp/app/routes/x+/settings+/backups.tsx@@ -1,6 +1,7 @@// Settings → Backups (company export / in-place restore).import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";+import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { convertKbToString } from "@carbon/files";import {@@ -152,7 +153,8 @@ export async function loader({ request }: LoaderFunctionArgs) {}const [backupsList, restoreRuns, exportRun] = await Promise.all([- getCompanyBackups(client, companyId),+ // Backup objects are service-role only; the checks above gate this route.+ getCompanyBackups(getCarbonServiceRole(), companyId),getCompanyRestoreRuns(client, companyId),getCompanyExportRun(client, companyId)]);@@ -410,7 +412,11 @@ export async function action({ request }: ActionFunctionArgs) {if (!name || name.includes("/"))return data({}, await flash(request, error(null, "Invalid backup")));- const result = await deleteCompanyBackup(client, companyId, name);+ const result = await deleteCompanyBackup(+ getCarbonServiceRole(),+ companyId,+ name+ );if (result.error)return data({},diff --git a/apps/erp/app/routes/x+/traceability+/graph.tsx b/apps/erp/app/routes/x+/traceability+/graph.tsxindex 9e4aaa10f7..a80f9f56a5 100644--- a/apps/erp/app/routes/x+/traceability+/graph.tsx+++ b/apps/erp/app/routes/x+/traceability+/graph.tsx@@ -83,6 +83,7 @@ export async function loader({ request }: LoaderFunctionArgs) {let payload = await fetchLineageSubgraph(client,trackedEntityId,+ companyId,depth,"both");@@ -96,7 +97,11 @@ export async function loader({ request }: LoaderFunctionArgs) {companyId,depth);- const jobReadableId = await getJobReadableId(client, associatedJobId);+ const jobReadableId = await getJobReadableId(+ client,+ associatedJobId,+ companyId+ );payload = mergeLineagePayloads(payload,withJobNode(jobPayload, associatedJobId, jobReadableId)@@ -105,10 +110,11 @@ export async function loader({ request }: LoaderFunctionArgs) {const containments = await fetchContainmentsForEntities(client,- payload.entities.map((e) => e.id)+ payload.entities.map((e) => e.id),+ companyId);return {- ...(await enrichActivityBinNames(client, payload)),+ ...(await enrichActivityBinNames(client, payload, companyId)),containments,rootId: trackedEntityId,rootType: "entity" as const,@@ -117,14 +123,14 @@ export async function loader({ request }: LoaderFunctionArgs) {}if (jobId) {- const jobReadableId = await getJobReadableId(client, jobId);+ const jobReadableId = await getJobReadableId(client, jobId, companyId);const payload = withJobNode(await fetchJobScopedLineage(client, jobId, companyId, depth),jobId,jobReadableId);return {- ...(await enrichActivityBinNames(client, payload)),+ ...(await enrichActivityBinNames(client, payload, companyId)),rootId: jobId,rootType: "job" as const,depth@@ -133,15 +139,21 @@ export async function loader({ request }: LoaderFunctionArgs) {// Legacy 1-hop activity-rooted view.const [activity, directInputs, directOutputs] = await Promise.all([- client.from("trackedActivity").select("*").eq("id", trackedActivityId!),+ client+ .from("trackedActivity")+ .select("*")+ .eq("id", trackedActivityId!)+ .eq("companyId", companyId),client.from("trackedActivityInput").select("*")- .eq("trackedActivityId", trackedActivityId!),+ .eq("trackedActivityId", trackedActivityId!)+ .eq("companyId", companyId),client.from("trackedActivityOutput").select("*").eq("trackedActivityId", trackedActivityId!)+ .eq("companyId", companyId)]);const directEntityIds = Array.from(@@ -154,19 +166,22 @@ export async function loader({ request }: LoaderFunctionArgs) {const directEntities = await client.from("trackedEntity").select("*")- .in("id", directEntityIds);+ .in("id", directEntityIds)+ .eq("companyId", companyId);const [additionalInputs, additionalOutputs] = await Promise.all([client.from("trackedActivityInput").select("*").in("trackedEntityId", directEntityIds)- .neq("trackedActivityId", trackedActivityId!),+ .neq("trackedActivityId", trackedActivityId!)+ .eq("companyId", companyId),client.from("trackedActivityOutput").select("*").in("trackedEntityId", directEntityIds).neq("trackedActivityId", trackedActivityId!)+ .eq("companyId", companyId)]);const additionalActivityIds = Array.from(@@ -181,7 +196,8 @@ export async function loader({ request }: LoaderFunctionArgs) {const additionalActivities = await client.from("trackedActivity").select("*")- .in("id", additionalActivityIds);+ .in("id", additionalActivityIds)+ .eq("companyId", companyId);const allEntities = (directEntities?.data ?? []) as TrackedEntity[];const allActivities = [@@ -191,22 +207,27 @@ export async function loader({ request }: LoaderFunctionArgs) {const containments = await fetchContainmentsForEntities(client,- allEntities.map((e) => e.id)+ allEntities.map((e) => e.id),+ companyId);return {- ...(await enrichActivityBinNames(client, {- entities: allEntities,- inputs: [- ...(directInputs?.data || []),- ...(additionalInputs?.data || [])- ],- outputs: [- ...(directOutputs?.data || []),- ...(additionalOutputs?.data || [])- ],- activities: allActivities- })),+ ...(await enrichActivityBinNames(+ client,+ {+ entities: allEntities,+ inputs: [+ ...(directInputs?.data || []),+ ...(additionalInputs?.data || [])+ ],+ outputs: [+ ...(directOutputs?.data || []),+ ...(additionalOutputs?.data || [])+ ],+ activities: allActivities+ },+ companyId+ )),containments,rootId: trackedActivityId!,rootType: "activity" as const,@@ -216,9 +237,15 @@ export async function loader({ request }: LoaderFunctionArgs) {async function getJobReadableId(client: SupabaseClient<Database>,- jobId: string+ jobId: string,+ companyId: string): Promise<string> {- const job = await client.from("job").select("jobId").eq("id", jobId).single();+ const job = await client+ .from("job")+ .select("jobId")+ .eq("id", jobId)+ .eq("companyId", companyId)+ .maybeSingle();return job.data?.jobId ?? jobId;}diff --git a/packages/database/src/swagger-docs-schema.ts b/packages/database/src/swagger-docs-schema.tsindex 036d401943..cfc8197e1c 100644--- a/packages/database/src/swagger-docs-schema.ts+++ b/packages/database/src/swagger-docs-schema.ts@@ -92424,9 +92424,6 @@ export default {{$ref: "#/parameters/rowFilter.companySettings.returnPickedMaterialTiming"},- {- $ref: "#/parameters/rowFilter.companySettings.salesRuleNotificationGroup"- },{$ref: "#/parameters/rowFilter.companySettings.showCurrencyTrailingZeros"},@@ -92436,6 +92433,9 @@ export default {{$ref: "#/parameters/rowFilter.companySettings.allowLowercaseItemIds"},+ {+ $ref: "#/parameters/rowFilter.companySettings.salesRuleNotificationGroup"+ },{$ref: "#/parameters/rowFilter.companySettings.includeOperationsOnTraveler"},@@ -92639,9 +92639,6 @@ export default {{$ref: "#/parameters/rowFilter.companySettings.returnPickedMaterialTiming"},- {- $ref: "#/parameters/rowFilter.companySettings.salesRuleNotificationGroup"- },{$ref: "#/parameters/rowFilter.companySettings.showCurrencyTrailingZeros"},@@ -92651,6 +92648,9 @@ export default {{$ref: "#/parameters/rowFilter.companySettings.allowLowercaseItemIds"},+ {+ $ref: "#/parameters/rowFilter.companySettings.salesRuleNotificationGroup"+ },{$ref: "#/parameters/rowFilter.companySettings.includeOperationsOnTraveler"},@@ -92808,9 +92808,6 @@ export default {{$ref: "#/parameters/rowFilter.companySettings.returnPickedMaterialTiming"},- {- $ref: "#/parameters/rowFilter.companySettings.salesRuleNotificationGroup"- },{$ref: "#/parameters/rowFilter.companySettings.showCurrencyTrailingZeros"},@@ -92820,6 +92817,9 @@ export default {{$ref: "#/parameters/rowFilter.companySettings.allowLowercaseItemIds"},+ {+ $ref: "#/parameters/rowFilter.companySettings.salesRuleNotificationGroup"+ },{$ref: "#/parameters/rowFilter.companySettings.includeOperationsOnTraveler"},@@ -94762,6 +94762,10 @@ export default {required: true,schema: {properties: {+ p_company_id: {+ format: "text",+ type: "string"+ },p_tracked_entity_ids: {format: "text[]",items: {@@ -94770,7 +94774,7 @@ export default {type: "array"}},- required: ["p_tracked_entity_ids"],+ required: ["p_tracked_entity_ids", "p_company_id"],type: "object"}},@@ -97780,6 +97784,10 @@ export default {required: true,schema: {properties: {+ p_company_id: {+ format: "text",+ type: "string"+ },p_tracked_entity_ids: {format: "text[]",items: {@@ -97788,7 +97796,7 @@ export default {type: "array"}},- required: ["p_tracked_entity_ids"],+ required: ["p_tracked_entity_ids", "p_company_id"],type: "object"}},@@ -105955,12 +105963,16 @@ export default {required: true,schema: {properties: {+ p_company_id: {+ format: "text",+ type: "string"+ },p_job_id: {format: "text",type: "string"}},- required: ["p_job_id"],+ required: ["p_job_id", "p_company_id"],type: "object"}},@@ -150346,10 +150358,10 @@ export default {"incompletePickingListPolicy","includeMaterialsOnTraveler","returnPickedMaterialTiming",- "salesRuleNotificationGroup","showCurrencyTrailingZeros","requireMfa","allowLowercaseItemIds",+ "salesRuleNotificationGroup","includeOperationsOnTraveler","requireSupplierContactAndLocation","requireCustomerContactAndLocation"@@ -150599,13 +150611,6 @@ export default {format: "text",type: "string"},- salesRuleNotificationGroup: {- format: "text[]",- items: {- type: "string"- },- type: "array"- },showCurrencyTrailingZeros: {default: true,format: "boolean",@@ -150621,6 +150626,13 @@ export default {format: "boolean",type: "boolean"},+ salesRuleNotificationGroup: {+ format: "text[]",+ items: {+ type: "string"+ },+ type: "array"+ },includeOperationsOnTraveler: {default: true,format: "boolean",@@ -200386,12 +200398,6 @@ export default {in: "query",type: "string"},- "rowFilter.companySettings.salesRuleNotificationGroup": {- name: "salesRuleNotificationGroup",- required: false,- in: "query",- type: "string"- },"rowFilter.companySettings.showCurrencyTrailingZeros": {name: "showCurrencyTrailingZeros",required: false,@@ -200410,6 +200416,12 @@ export default {in: "query",type: "string"},+ "rowFilter.companySettings.salesRuleNotificationGroup": {+ name: "salesRuleNotificationGroup",+ required: false,+ in: "query",+ type: "string"+ },"rowFilter.companySettings.includeOperationsOnTraveler": {name: "includeOperationsOnTraveler",required: false,diff --git a/packages/database/src/types.ts b/packages/database/src/types.tsindex 70147a757b..5e069e4eb5 100644--- a/packages/database/src/types.ts+++ b/packages/database/src/types.ts@@ -83239,7 +83239,7 @@ export type Database = {Returns: string[]}get_direct_ancestors_of_tracked_entities_strict: {- Args: { p_tracked_entity_ids: string[] }+ Args: { p_company_id: string; p_tracked_entity_ids: string[] }Returns: {activityAttributes: Jsonattributes: Json@@ -83285,7 +83285,7 @@ export type Database = {}[]}get_direct_descendants_of_tracked_entities_strict: {- Args: { p_tracked_entity_ids: string[] }+ Args: { p_company_id: string; p_tracked_entity_ids: string[] }Returns: {activityAttributes: Jsonattributes: Json@@ -83621,7 +83621,7 @@ export type Database = {}[]}get_job_operation_step_records: {- Args: { p_job_id: string }+ Args: { p_company_id: string; p_job_id: string }Returns: {booleanValue: booleancompanyId: stringdiff --git a/packages/database/supabase/functions/lib/types.ts b/packages/database/supabase/functions/lib/types.tsindex 70147a757b..5e069e4eb5 100644--- a/packages/database/supabase/functions/lib/types.ts+++ b/packages/database/supabase/functions/lib/types.ts@@ -83239,7 +83239,7 @@ export type Database = {Returns: string[]}get_direct_ancestors_of_tracked_entities_strict: {- Args: { p_tracked_entity_ids: string[] }+ Args: { p_company_id: string; p_tracked_entity_ids: string[] }Returns: {activityAttributes: Jsonattributes: Json@@ -83285,7 +83285,7 @@ export type Database = {}[]}get_direct_descendants_of_tracked_entities_strict: {- Args: { p_tracked_entity_ids: string[] }+ Args: { p_company_id: string; p_tracked_entity_ids: string[] }Returns: {activityAttributes: Jsonattributes: Json@@ -83621,7 +83621,7 @@ export type Database = {}[]}get_job_operation_step_records: {- Args: { p_job_id: string }+ Args: { p_company_id: string; p_job_id: string }Returns: {booleanValue: booleancompanyId: stringdiff --git a/packages/database/supabase/migrations/20260929152451_traceability-company-scope.sql b/packages/database/supabase/migrations/20260929152451_traceability-company-scope.sqlnew file mode 100644index 0000000000..93ab0a81d7--- /dev/null+++ b/packages/database/supabase/migrations/20260929152451_traceability-company-scope.sql@@ -0,0 +1,201 @@+-- Scope the traceability traversal and job step record RPCs to one company.++DROP FUNCTION IF EXISTS get_direct_descendants_of_tracked_entities_strict(TEXT[]);+CREATE OR REPLACE FUNCTION get_direct_descendants_of_tracked_entities_strict(+ p_tracked_entity_ids TEXT[],+ p_company_id TEXT+)+RETURNS TABLE (+ "sourceEntityId" TEXT,+ "trackedActivityId" TEXT,+ "id" TEXT,+ "readableId" TEXT,+ "quantity" NUMERIC,+ "status" "trackedEntityStatus",+ "sourceDocument" TEXT,+ "sourceDocumentId" TEXT,+ "sourceDocumentReadableId" TEXT,+ "activityAttributes" JSONB,+ "attributes" JSONB+) AS $$+BEGIN+ RETURN QUERY+ SELECT+ seed.id AS "sourceEntityId",+ ta."id" AS "trackedActivityId",+ te."id",+ te."readableId",+ te."quantity",+ te."status",+ te."sourceDocument",+ te."sourceDocumentId",+ te."sourceDocumentReadableId",+ ta."attributes" AS "activityAttributes",+ te."attributes" AS "attributes"+ FROM unnest(p_tracked_entity_ids) AS seed(id)+ JOIN "trackedActivityOutput" tao+ ON tao."trackedEntityId" = seed.id+ AND tao."companyId" = p_company_id+ JOIN "trackedActivityInput" tai+ ON tai."trackedActivityId" = tao."trackedActivityId"+ AND tai."companyId" = p_company_id+ LEFT JOIN "trackedActivityInput" tai2+ ON tai2."trackedActivityId" = tao."trackedActivityId"+ AND tai2."trackedEntityId" = seed.id+ JOIN "trackedEntity" te+ ON te."id" = tai."trackedEntityId"+ AND te."companyId" = p_company_id+ JOIN "trackedActivity" ta+ ON ta."id" = tai."trackedActivityId"+ AND ta."companyId" = p_company_id+ WHERE tai2."trackedEntityId" IS NULL;+END;+$$ LANGUAGE plpgsql;++DROP FUNCTION IF EXISTS get_direct_ancestors_of_tracked_entities_strict(TEXT[]);+CREATE OR REPLACE FUNCTION get_direct_ancestors_of_tracked_entities_strict(+ p_tracked_entity_ids TEXT[],+ p_company_id TEXT+)+RETURNS TABLE (+ "sourceEntityId" TEXT,+ "trackedActivityId" TEXT,+ "id" TEXT,+ "readableId" TEXT,+ "quantity" NUMERIC,+ "status" "trackedEntityStatus",+ "sourceDocument" TEXT,+ "sourceDocumentId" TEXT,+ "sourceDocumentReadableId" TEXT,+ "activityAttributes" JSONB,+ "attributes" JSONB+) AS $$+BEGIN+ RETURN QUERY+ SELECT+ seed.id AS "sourceEntityId",+ ta."id" AS "trackedActivityId",+ te."id",+ te."readableId",+ te."quantity",+ te."status",+ te."sourceDocument",+ te."sourceDocumentId",+ te."sourceDocumentReadableId",+ ta."attributes" AS "activityAttributes",+ te."attributes" AS "attributes"+ FROM unnest(p_tracked_entity_ids) AS seed(id)+ JOIN "trackedActivityInput" tai+ ON tai."trackedEntityId" = seed.id+ AND tai."companyId" = p_company_id+ JOIN "trackedActivityOutput" tao+ ON tao."trackedActivityId" = tai."trackedActivityId"+ AND tao."companyId" = p_company_id+ LEFT JOIN "trackedActivityOutput" tao2+ ON tao2."trackedActivityId" = tai."trackedActivityId"+ AND tao2."trackedEntityId" = seed.id+ JOIN "trackedEntity" te+ ON te."id" = tao."trackedEntityId"+ AND te."companyId" = p_company_id+ JOIN "trackedActivity" ta+ ON ta."id" = tao."trackedActivityId"+ AND ta."companyId" = p_company_id+ WHERE tao2."trackedEntityId" IS NULL;+END;+$$ LANGUAGE plpgsql;++DROP FUNCTION IF EXISTS get_job_operation_step_records(TEXT);+CREATE OR REPLACE FUNCTION get_job_operation_step_records(+ p_job_id TEXT,+ p_company_id TEXT+)+RETURNS TABLE (+ "id" TEXT,+ "jobOperationStepId" TEXT,+ "index" INTEGER,+ "type" "procedureStepType",+ "name" TEXT,+ "value" TEXT,+ "numericValue" NUMERIC,+ "booleanValue" BOOLEAN,+ "userValue" TEXT,+ "unitOfMeasureCode" TEXT,+ "minValue" NUMERIC,+ "maxValue" NUMERIC,+ "operationId" TEXT,+ "operationDescription" TEXT,+ "itemId" TEXT,+ "itemReadableId" TEXT,+ "companyId" TEXT,+ "createdAt" TIMESTAMP WITH TIME ZONE,+ "createdBy" TEXT,+ "updatedAt" TIMESTAMP WITH TIME ZONE,+ "updatedBy" TEXT+)+SECURITY INVOKER+AS $$+BEGIN+ RETURN QUERY+ WITH job_operations AS (+ SELECT+ jo."id",+ jo."description",+ jo."order",+ jo."jobMakeMethodId"+ FROM "jobOperation" jo+ WHERE jo."jobId" = p_job_id+ AND jo."companyId" = p_company_id+ ),+ job_operation_steps AS (+ SELECT+ jos."id",+ jos."type",+ jos."name",+ jos."unitOfMeasureCode",+ jos."minValue",+ jos."maxValue",+ jos."operationId",+ jo."description" as "operationDescription",+ jo."jobMakeMethodId"+ FROM "jobOperationStep" jos+ INNER JOIN job_operations jo ON jos."operationId" = jo."id"+ WHERE jos."companyId" = p_company_id+ ),+ job_items AS (+ SELECT+ jmm."id" as "makeMethodId",+ i."id" as "itemId",+ i."readableIdWithRevision" as "itemReadableId"+ FROM "jobMakeMethod" jmm+ LEFT JOIN "item" i ON jmm."parentMaterialId" = i."id" AND i."companyId" = p_company_id+ WHERE jmm."companyId" = p_company_id+ )+ SELECT+ josr."id",+ josr."jobOperationStepId",+ josr."index",+ jos."type",+ jos."name",+ josr."value",+ josr."numericValue",+ josr."booleanValue",+ josr."userValue",+ jos."unitOfMeasureCode",+ jos."minValue",+ jos."maxValue",+ jos."operationId",+ jos."operationDescription",+ ji."itemId",+ ji."itemReadableId",+ josr."companyId",+ josr."createdAt",+ josr."createdBy",+ josr."updatedAt",+ josr."updatedBy"+ FROM "jobOperationStepRecord" josr+ INNER JOIN job_operation_steps jos ON josr."jobOperationStepId" = jos."id"+ LEFT JOIN job_items ji ON jos."jobMakeMethodId" = ji."makeMethodId"+ WHERE josr."companyId" = p_company_id+ ORDER BY josr."jobOperationStepId", josr."index";+END;+$$ LANGUAGE plpgsql;diff --git a/packages/database/supabase/migrations/20260929153242_storage-private-prefixes.sql b/packages/database/supabase/migrations/20260929153242_storage-private-prefixes.sqlnew file mode 100644index 0000000000..2cc3b6f9a7--- /dev/null+++ b/packages/database/supabase/migrations/20260929153242_storage-private-prefixes.sql@@ -0,0 +1,19 @@+-- Company buckets: company backups (`exports/`) and audit-log archives+-- (`<companyId>/audit-logs/`) are read and written with the service role only.+DROP POLICY IF EXISTS "Company bucket access" ON storage.objects;+CREATE POLICY "Company bucket access" ON storage.objects+FOR ALL USING (+ bucket_id = ANY (+ (+ SELECT+ get_companies_with_employee_role()+ )::text[]+ )+ AND NOT starts_with(name, 'exports/')+ AND NOT starts_with(name, bucket_id || '/audit-logs/')+);++-- The feedback bucket has no readers or writers in the app.+UPDATE storage.buckets SET public = false WHERE id = 'feedback';+DROP POLICY IF EXISTS "Anyone can read the feedback buckets" ON storage.objects;+DROP POLICY IF EXISTS "Anyone with settings_create can insert into the feedback bucket" ON storage.objects;diff --git a/packages/database/supabase/tests/storage-private-prefixes.test.sql b/packages/database/supabase/tests/storage-private-prefixes.test.sqlnew file mode 100644index 0000000000..72da13ba64--- /dev/null+++ b/packages/database/supabase/tests/storage-private-prefixes.test.sql@@ -0,0 +1,65 @@+-- Company bucket prefixes and the feedback bucket.+-- Run from the repository root against an existing local database:+-- pnpm exec tsx scripts/run-local-accounting-check.ts psql -X -v ON_ERROR_STOP=1 -f packages/database/supabase/tests/storage-private-prefixes.test.sql+-- All fixtures and role changes are confined to the rolled-back transaction.+\set ON_ERROR_STOP on+BEGIN;+SET LOCAL "app.sync_in_progress" = 'true';+SET LOCAL statement_timeout = '30s';++DO $proof$+DECLARE+ group_a text; company_a text;+ w text := gen_random_uuid()::text; -- plain employee of A+ n int;+BEGIN+ INSERT INTO "companyGroup" (name, "createdBy") VALUES ('Storage A ' || id(), 'system') RETURNING id INTO group_a;+ INSERT INTO company (name, "companyGroupId", "baseCurrencyCode", timezone)+ VALUES ('Storage A', group_a, 'USD', 'America/New_York') RETURNING id INTO company_a;+ INSERT INTO "user" (id, email) VALUES (w, w || '@storage.invalid');+ INSERT INTO "userToCompany" ("userId", "companyId", role) VALUES (w, company_a, 'employee');++ INSERT INTO storage.objects (bucket_id, name) VALUES+ (company_a, 'readme.txt'),+ (company_a, 'parts/drawing.pdf'),+ (company_a, 'exports/backup-1/manifest.json'),+ (company_a, company_a || '/audit-logs/2026/09/2026-09-29.jsonl.gz'),+ ('feedback', 'screenshot-' || id() || '.png');++ ASSERT NOT (SELECT public FROM storage.buckets WHERE id = 'feedback'),+ 'the feedback bucket is private';++ PERFORM set_config('request.jwt.claims', jsonb_build_object('sub', w, 'role', 'authenticated')::text, true);+ PERFORM set_config('request.path', '/test', true);+ SET LOCAL ROLE authenticated;++ SELECT count(*) INTO n FROM storage.objects+ WHERE bucket_id = company_a AND name IN ('readme.txt', 'parts/drawing.pdf');+ ASSERT n = 2, 'an employee still reads ordinary company files';++ SELECT count(*) INTO n FROM storage.objects+ WHERE bucket_id = company_a AND (name LIKE 'exports/%' OR name LIKE '%/audit-logs/%');+ ASSERT n = 0, 'an employee cannot see backups or audit-log archives';++ SELECT count(*) INTO n FROM storage.objects WHERE bucket_id = 'feedback';+ ASSERT n = 0, 'an employee cannot see feedback objects';++ BEGIN+ INSERT INTO storage.objects (bucket_id, name) VALUES (company_a, 'exports/forged/manifest.json');+ RAISE EXCEPTION 'an employee wrote into exports/';+ EXCEPTION WHEN insufficient_privilege THEN NULL;+ END;++ BEGIN+ INSERT INTO storage.objects (bucket_id, name) VALUES ('feedback', 'upload-' || id() || '.png');+ RAISE EXCEPTION 'an employee uploaded to the feedback bucket';+ EXCEPTION WHEN insufficient_privilege THEN NULL;+ END;++ INSERT INTO storage.objects (bucket_id, name) VALUES (company_a, 'parts/new.pdf');+ RESET ROLE;+ RAISE NOTICE 'PASS company backups, audit-log archives and feedback are service-role only';+END+$proof$;++ROLLBACK;diff --git a/packages/jobs/src/scripts/check-backups.ts b/packages/jobs/src/scripts/check-backups.tsindex fdf77d6c42..1ec0964497 100644--- a/packages/jobs/src/scripts/check-backups.ts+++ b/packages/jobs/src/scripts/check-backups.ts@@ -45,7 +45,8 @@ import {SCHEMA_REPO_PATH} from "./backup-baseline";-const SCHEMA_FILE = join(import.meta.dirname, "../../manifests/schema.json");+const REPO_ROOT = join(import.meta.dirname, "../../../..");+const SCHEMA_FILE = join(REPO_ROOT, SCHEMA_REPO_PATH);/** A hook that hangs is a hook people bypass. */const FETCH_TIMEOUT_MS = 3000;@@ -173,8 +174,12 @@ function reportBlocking(return true;}+// Run from the repo root: a pre-commit hook in a linked worktree exports GIT_DIR+// without GIT_WORK_TREE, so git takes the current directory (packages/jobs) as+// the worktree top and `git add` would stage the file at the wrong path.function git(args: string[]): string {return execFileSync("git", args, {+ cwd: REPO_ROOT,encoding: "utf8",stdio: ["ignore", "pipe", "pipe"]}).trim();diff --git a/scripts/lib/generate-db-types.test.ts b/scripts/lib/generate-db-types.test.tsindex 8bc25c6d96..09a2d065d0 100644--- a/scripts/lib/generate-db-types.test.ts+++ b/scripts/lib/generate-db-types.test.ts@@ -17,7 +17,10 @@ import { tmpdir } from "node:os";import { dirname, join } from "node:path";import { test } from "node:test";import { fileURLToPath } from "node:url";-import { sortRelationships } from "./generate-db-types";+import {+ sortRelationships,+ stripPerTenantTables+} from "./generate-db-types";const require = createRequire(import.meta.url);const root = fileURLToPath(new URL("../../", import.meta.url));@@ -208,3 +211,19 @@ test("sortRelationships orders each Relationships block deterministically", () =assert.equal(sortRelationships(a), b, "sorted output keeps a trailing comma on every entry but the last");assert.equal(sortRelationships(" Relationships: []\n }"), " Relationships: []\n }");});++test("strips per-tenant tables, including company ids that need quoting", () => {+ const table = (name: string) =>+ [` ${name}: {`, " Row: {}", " }"].join("\n");+ const source = [+ table("searchIndexRegistry"),+ table("searchIndex_dal7910g60gg2egcfj40"),+ table('"searchIndex_accttest-08e7f74786d6-company"'),+ table('"auditLog_accttest-08e7f74786d6-company"'),+ table("auditLogArchive")+ ].join("\n");+ assert.equal(+ stripPerTenantTables(source),+ [table("searchIndexRegistry"), table("auditLogArchive")].join("\n")+ );+});diff --git a/scripts/lib/generate-db-types.ts b/scripts/lib/generate-db-types.tsindex 6571edac8b..db8b4a94d8 100644--- a/scripts/lib/generate-db-types.ts+++ b/scripts/lib/generate-db-types.ts@@ -42,13 +42,13 @@ function validateDatabaseUrl(value: string | undefined): string {// local DB's seeded companies — committing them makes types.ts// machine-dependent. The static `searchIndexRegistry` / `auditLogArchive`// tables (no underscore) are unaffected.-function stripPerTenantTables(source: string): string {+export function stripPerTenantTables(source: string): string {const lines: string[] = [];let skipping = false;for (const line of source.split("\n")) {if (!skipping &&- /^ (searchIndex|auditLog)_[A-Za-z0-9]+: \{$/.test(line)+ /^ "?(searchIndex|auditLog)_[A-Za-z0-9-]+"?: \{$/.test(line)) {skipping = true;continue;