@open-mercato/shared 0.6.7 → 0.6.8-canary.320.1.bf889f49e4

package/dist/lib/crud/factory.js

@@ -5,6 +5,7 @@ import { getAuthFromCookies, getAuthFromRequest } from "@open-mercato/shared/lib
 import { SortDir } from "@open-mercato/shared/lib/query/types";
 import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/directory/utils/organizationScope";
 import { serializeOperationMetadata } from "@open-mercato/shared/lib/commands/operationMetadata";
+import { getCommandInterceptorHttpRejection } from "@open-mercato/shared/lib/commands/errors";
 import { parseBooleanToken } from "@open-mercato/shared/lib/boolean";
 import {
   runMutationGuards,
@@ -38,6 +39,7 @@ import {
   isCrudCacheEnabled,
   normalizeIdentifierValue,
   normalizeTagSegment,
+  pickFirstIdentifier,
   resolveCrudCache
 } from "./cache.js";
 import { deriveCrudSegmentTag } from "./cache-stats.js";
@@ -51,11 +53,13 @@ import { parseExtensionHeaders } from "../umes/extension-headers.js";
 import { createGenericOptimisticLockReader } from "./optimistic-lock.js";
 import { registerOptimisticLockReaderIfAbsent } from "./optimistic-lock-store.js";
 import { createLogger } from "../logger/index.js";
+import { isTransientDbError } from "../db/pg-errors.js";
 const logger = createLogger("shared").child({ component: "crud" });
-function resolveSortParams(queryParams) {
-  const rawSortField = queryParams.sortField ?? queryParams.sort ?? "id";
-  const rawSortDir = queryParams.sortDir ?? queryParams.order ?? "asc";
-  const sortField = typeof rawSortField === "string" && rawSortField.trim().length > 0 ? rawSortField.trim() : "id";
+function resolveSortParams(queryParams, defaultSort) {
+  const rawSortField = queryParams.sortField ?? queryParams.sort;
+  const requestedSortField = typeof rawSortField === "string" && rawSortField.trim().length > 0 ? rawSortField.trim() : null;
+  const sortField = requestedSortField ?? defaultSort?.field ?? "id";
+  const rawSortDir = queryParams.sortDir ?? queryParams.order ?? (requestedSortField ? "asc" : defaultSort?.dir ?? "asc");
   const normalizedDir = typeof rawSortDir === "string" ? rawSortDir.trim().toLowerCase() : "asc";
   const sortDir = normalizedDir === "desc" ? SortDir.Desc : SortDir.Asc;
   return { sortField, sortDir };
@@ -95,6 +99,7 @@ const DEFAULT_EXPORT_FORMATS = ["csv", "json", "xml", "markdown"];
 const DEFAULT_EXPORT_BATCH_SIZE = 1e3;
 const MIN_EXPORT_BATCH_SIZE = 100;
 const MAX_EXPORT_BATCH_SIZE = 1e4;
+const EXPORT_MAX_PAGES = 1e3;
 function resolveAvailableExportFormats(list) {
   if (!list) return [];
   if (list.export?.enabled === false) return [];
@@ -143,14 +148,15 @@ function buildExportFromColumns(items, columnsConfig) {
     rows
   };
 }
-function buildExportFromCsv(items, csv) {
+function buildExportFromCsv(items, csv, query, ctx) {
   const used = /* @__PURE__ */ new Set();
-  const columns = csv.headers.map((header, idx) => ({
+  const resolvedHeaders = typeof csv.headers === "function" ? csv.headers(query, ctx) : csv.headers;
+  const columns = resolvedHeaders.map((header, idx) => ({
     field: sanitizeFieldName(header || `column_${idx + 1}`, used, idx),
     header: header || `Column ${idx + 1}`
   }));
   const rows = items.map((item) => {
-    const values = csv.row(item) || [];
+    const values = csv.row(item, ctx) || [];
     const row = {};
     columns.forEach((column, idx) => {
       row[column.field] = values[idx];
@@ -171,12 +177,12 @@ function buildDefaultExport(items) {
     rows
   };
 }
-function prepareExportData(items, list) {
+function prepareExportData(items, list, query, ctx) {
   if (list.export?.columns && list.export.columns.length > 0) {
     return buildExportFromColumns(items, list.export.columns);
   }
   if (list.csv) {
-    return buildExportFromCsv(items, list.csv);
+    return buildExportFromCsv(items, list.csv, query, ctx);
   }
   const prepared = buildDefaultExport(items);
   return {
@@ -295,7 +301,20 @@ function attachOperationHeader(res, logEntry) {
 function handleError(err) {
   if (err instanceof Response) return err;
   if (isCrudHttpError(err)) return json(err.body, { status: err.status });
+  const interceptorRejection = getCommandInterceptorHttpRejection(err);
+  if (interceptorRejection) {
+    return json(interceptorRejection.body, { status: interceptorRejection.status });
+  }
   if (err instanceof z.ZodError) return json({ error: "Invalid input", details: err.issues }, { status: 400 });
+  if (isTransientDbError(err)) {
+    logger.warn("Transient DB failure during CRUD handler", {
+      message: err instanceof Error ? err.message : void 0
+    });
+    return json(
+      { error: "Service temporarily unavailable" },
+      { status: 503, headers: { "Retry-After": "2" } }
+    );
+  }
   const message = err instanceof Error ? err.message : void 0;
   const stack = err instanceof Error ? err.stack : void 0;
   logger.error("Unexpected CRUD error", { message, stack, err });
@@ -560,6 +579,12 @@ function buildCrudCacheKey(resource, request, ctx, enricherSignature = "") {
     `tenant:${normalizeTagSegment(ctx.auth?.tenantId ?? null)}`,
     `selectedOrg:${normalizeTagSegment(ctx.selectedOrganizationId ?? null)}`,
     `scope:${scopeSegment}`,
+    // List payloads can vary per caller identity beyond tenant/org scope:
+    // buildFilters may narrow by ctx.auth (e.g. ?mine=true), before-interceptor
+    // query rewrites are feature-gated per user, and afterList/after-interceptor
+    // output is embedded in the stored payload — so entries MUST be partitioned
+    // per actor (API key or user), never shared across identities.
+    `user:${normalizeTagSegment(ctx.auth?.keyId ?? ctx.auth?.sub ?? null)}`,
     `query:${serializeSearchParams(url.searchParams)}`
   ];
   if (enricherSignature) {
@@ -1149,10 +1174,21 @@ function makeCrudRoute(opts) {
         profiler.mark("query_engine_prepare");
         const qe = ctx.container.resolve("queryEngine");
         profiler.mark("query_engine_resolved");
-        const { sortField: sortFieldRaw, sortDir: sortDirRaw } = resolveSortParams(queryParams);
-        const mappedSortField = opts.list.sortFieldMap && opts.list.sortFieldMap[sortFieldRaw] || sortFieldRaw;
-        const sortField = typeof mappedSortField === "string" ? normalizeSortFieldSelector(mappedSortField) : mappedSortField;
+        const sortFieldMap = opts.list.sortFieldMap;
+        const resolveSortSelector = (field) => {
+          const mapped = sortFieldMap && sortFieldMap[field] || field;
+          return typeof mapped === "string" ? normalizeSortFieldSelector(mapped) : mapped;
+        };
+        const { sortField: sortFieldRaw, sortDir: sortDirRaw } = resolveSortParams(
+          queryParams,
+          opts.list.defaultSort
+        );
+        const sortField = resolveSortSelector(sortFieldRaw);
         const sort = [{ field: sortField, dir: sortDirRaw }];
+        if (opts.list.tiebreakSortField) {
+          const tiebreakField = resolveSortSelector(opts.list.tiebreakSortField);
+          if (tiebreakField !== sortField) sort.push({ field: tiebreakField, dir: SortDir.Asc });
+        }
         const page = exportRequested ? { page: 1, pageSize: exportPageSize } : { page: requestedPage, pageSize: requestedPageSize };
         const baseFilters = exportFullRequested ? {} : opts.list.buildFilters ? await opts.list.buildFilters(validated, ctx) : {};
         const filters = exportFullRequested ? baseFilters : mergeAdvancedFilters(baseFilters, validated);
@@ -1262,13 +1298,13 @@ function makeCrudRoute(opts) {
         if (exportRequested && requestedExport) {
           const total = typeof res.total === "number" ? res.total : rawItems.length;
           const initialExportItems = exportFullRequested ? rawItems.map(normalizeFullRecordForExport) : transformedItems;
-          let exportItems = [...initialExportItems];
-          if (total > exportItems.length) {
-            const exportPageSizeNumber = typeof page.pageSize === "number" ? page.pageSize : exportPageSize;
+          const exportItems = [...initialExportItems];
+          const exportPageSizeNumber = typeof page.pageSize === "number" ? page.pageSize : exportPageSize;
+          if (rawItems.length >= exportPageSizeNumber) {
             const queryBase = { ...queryOpts };
             delete queryBase.page;
             let nextPage = 2;
-            while (exportItems.length < total) {
+            for (; ; ) {
               profiler.mark("export_next_page_request", { page: nextPage });
               const nextRes = await qe.query(opts.list.entityId, {
                 ...queryBase,
@@ -1281,11 +1317,14 @@ function makeCrudRoute(opts) {
               nextTransformed = await decorateItemsWithCustomFields(nextTransformed, ctx, nextRes.customFieldDefinitions);
               const nextExportItems = exportFullRequested ? nextItemsRaw.map(normalizeFullRecordForExport) : nextTransformed;
               exportItems.push(...nextExportItems);
-              if (nextExportItems.length < exportPageSizeNumber) break;
+              if (nextItemsRaw.length < exportPageSizeNumber) break;
+              if (nextPage >= EXPORT_MAX_PAGES) {
+                throw new Error(`[internal] export exceeded ${EXPORT_MAX_PAGES} pages; refusing to return a partial export`);
+              }
               nextPage += 1;
             }
           }
-          const prepared = exportFullRequested ? { columns: ensureColumns(exportItems), rows: exportItems } : prepareExportData(exportItems, opts.list);
+          const prepared = exportFullRequested ? { columns: ensureColumns(exportItems), rows: exportItems } : prepareExportData(exportItems, opts.list, validated, ctx);
           const fallbackBase = `${opts.events?.entity || resourceKind || "list"}${exportFullRequested ? "_full" : ""}`;
           const filename = finalizeExportFilename(opts.list, requestedExport, fallbackBase);
           const serialized = serializeExport(prepared, requestedExport);
@@ -1469,7 +1508,7 @@ function makeCrudRoute(opts) {
       profiler.mark("access_logged", accessLogResult);
       if (exportRequested && requestedExport) {
         const exportItems = exportFullRequested ? list.map(normalizeFullRecordForExport) : list;
-        const prepared = exportFullRequested ? { columns: ensureColumns(exportItems), rows: exportItems } : prepareExportData(exportItems, opts.list);
+        const prepared = exportFullRequested ? { columns: ensureColumns(exportItems), rows: exportItems } : prepareExportData(exportItems, opts.list, validated, ctx);
         const fallbackBase = `${opts.events?.entity || resourceKind || "list"}${exportFullRequested ? "_full" : ""}`;
         const filename = finalizeExportFilename(opts.list, requestedExport, fallbackBase);
         const serialized = serializeExport(prepared, requestedExport);
@@ -1589,6 +1628,29 @@ function makeCrudRoute(opts) {
             }
           }
         }
+        const createCmdUserFeatures = await resolveUserFeatures(ctx);
+        const { allGuards: createCmdAllGuards } = collectAndRunGuards(ctx.container);
+        let createCmdGuardAfterCallbacks = [];
+        if (createCmdAllGuards.length && ctx.auth.tenantId) {
+          const guardResult = await runMutationGuards(createCmdAllGuards, {
+            tenantId: ctx.auth.tenantId,
+            organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null,
+            userId: ctx.auth.sub,
+            resourceKind,
+            resourceId: null,
+            operation: "create",
+            requestMethod: request.method,
+            requestHeaders: request.headers,
+            mutationPayload: input2 && typeof input2 === "object" ? input2 : null
+          }, { userFeatures: createCmdUserFeatures ?? [] });
+          if (!guardResult.ok) {
+            return json(guardResult.errorBody ?? { error: "Operation blocked by guard" }, { status: guardResult.errorStatus ?? 422 });
+          }
+          if (guardResult.modifiedPayload && typeof input2 === "object" && input2) {
+            input2 = { ...input2, ...guardResult.modifiedPayload };
+          }
+          createCmdGuardAfterCallbacks = guardResult.afterSuccessCallbacks;
+        }
         const baseMetadata = {
           tenantId: ctx.auth?.tenantId ?? null,
           organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null,
@@ -1628,6 +1690,22 @@ function makeCrudRoute(opts) {
         const status = action.status ?? 201;
         const response = json(resolvedPayload, { status });
         attachOperationHeader(response, logEntry);
+        const commandResultId = pickFirstIdentifier(
+          result?.id,
+          resolvedPayload?.id
+        );
+        if (createCmdGuardAfterCallbacks.length && ctx.auth.tenantId && commandResultId) {
+          await runGuardAfterSuccessCallbacks(createCmdGuardAfterCallbacks, {
+            tenantId: ctx.auth.tenantId,
+            organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null,
+            userId: ctx.auth.sub,
+            resourceKind,
+            resourceId: commandResultId,
+            operation: "create",
+            requestMethod: request.method,
+            requestHeaders: request.headers
+          });
+        }
         return response;
       }
       const createConfig = opts.create;
@@ -1714,7 +1792,8 @@ function makeCrudRoute(opts) {
               recordId: String(created[ormCfg.idField]),
               organizationId: targetOrgId,
               tenantId: writeTenantId,
-              values
+              values,
+              notify: false
             });
           }
         }
@@ -2017,7 +2096,8 @@ function makeCrudRoute(opts) {
               recordId: String(updated[ormCfg.idField]),
               organizationId: targetOrgId,
               tenantId: writeTenantId,
-              values
+              values,
+              notify: false
             });
           }
         }
@@ -2113,7 +2193,8 @@ function makeCrudRoute(opts) {
           ctx,
           request,
           method: "DELETE",
-          body: interceptorInput
+          body: interceptorInput,
+          query: raw.query
         });
         if (beforeInterceptors2.errorResponse) return beforeInterceptors2.errorResponse;
         interceptorRequestPayload = beforeInterceptors2.requestPayload;
@@ -2224,7 +2305,7 @@ function makeCrudRoute(opts) {
         request,
         method: "DELETE",
         body: idFrom === "query" ? void 0 : { id },
-        query: idFrom === "query" ? { id } : void 0
+        query: idFrom === "query" ? Object.fromEntries(url.searchParams.entries()) : void 0
       });
       if (beforeInterceptors.errorResponse) return beforeInterceptors.errorResponse;
       interceptorRequestPayload = beforeInterceptors.requestPayload;