@classytic/arc 2.6.2 → 2.7.1

package/dist/plugins/tracing-entry.mjs

@@ -44,7 +44,7 @@ try {
 function createTracerProvider(options) {
 	if (!isAvailable) return null;
 	const { serviceName = "@classytic/arc", serviceVersion, exporterUrl = "http://localhost:4318/v1/traces" } = options;
-	const resolvedVersion = serviceVersion ?? "2.6.2";
+	const resolvedVersion = serviceVersion ?? "2.7.1";
 	const exporter = new OTLPTraceExporter({ url: exporterUrl });
 	const provider = new NodeTracerProvider({ resource: { attributes: {
 		"service.name": serviceName,

package/dist/policies/index.d.mts

@@ -1,4 +1,4 @@
-import { t as PermissionCheck } from "../types-BNUccdcf.mjs";
+import { t as PermissionCheck } from "../types-DPsC0taJ.mjs";
 import { FastifyReply, FastifyRequest } from "fastify";
 
 //#region src/policies/PolicyInterface.d.ts

package/dist/presets/index.d.mts

@@ -1,5 +1,5 @@
-import { Ft as IControllerResponse, It as IRequestContext, Wt as PaginatedResult, X as PresetResult, at as ResourceConfig, l as AnyRecord } from "../interface-CrN45qz1.mjs";
-import { MultiTenantOptions, multiTenantPreset } from "./multiTenant.mjs";
+import { Gt as PaginatedResult, It as IControllerResponse, Lt as IRequestContext, Z as PresetResult, ot as ResourceConfig, u as AnyRecord } from "../interface-Dwzqt4mn.mjs";
+import { MultiTenantOptions, TenantFieldSpec, multiTenantPreset } from "./multiTenant.mjs";
 
 //#region src/presets/ownedByUser.d.ts
 interface OwnedByUserOptions {
@@ -271,4 +271,4 @@ type PresetInput = string | PresetResult | {
  */
 declare function applyPresets<TDoc = AnyRecord>(config: ResourceConfig<TDoc>, presets?: PresetInput[]): ResourceConfig<TDoc>;
 //#endregion
-export { type AuditedPresetOptions, type BulkOperation, type BulkPresetOptions, type IAuditedPreset, type IMultiTenantPreset, type IOwnedByUserPreset, type IPresetController, type ISlugLookupController, type ISoftDeleteController, type ITreeController, type MultiTenantOptions, type OwnedByUserOptions, type SlugLookupOptions, type TreeOptions, applyPresets, auditedPreset, bulkPreset, flexibleMultiTenantPreset, getAvailablePresets, getPreset, multiTenantPreset, ownedByUserPreset, registerPreset, slugLookupPreset, softDeletePreset, treePreset };
+export { type AuditedPresetOptions, type BulkOperation, type BulkPresetOptions, type IAuditedPreset, type IMultiTenantPreset, type IOwnedByUserPreset, type IPresetController, type ISlugLookupController, type ISoftDeleteController, type ITreeController, type MultiTenantOptions, type OwnedByUserOptions, type SlugLookupOptions, type TenantFieldSpec, type TreeOptions, applyPresets, auditedPreset, bulkPreset, flexibleMultiTenantPreset, getAvailablePresets, getPreset, multiTenantPreset, ownedByUserPreset, registerPreset, slugLookupPreset, softDeletePreset, treePreset };

package/dist/presets/index.mjs

@@ -1,3 +1,3 @@
 import { multiTenantPreset } from "./multiTenant.mjs";
-import { a as registerPreset, c as auditedPreset, d as ownedByUserPreset, i as getPreset, l as softDeletePreset, n as flexibleMultiTenantPreset, o as treePreset, r as getAvailablePresets, s as bulkPreset, t as applyPresets, u as slugLookupPreset } from "../presets-BMfdy34e.mjs";
+import { a as registerPreset, c as auditedPreset, d as ownedByUserPreset, i as getPreset, l as softDeletePreset, n as flexibleMultiTenantPreset, o as treePreset, r as getAvailablePresets, s as bulkPreset, t as applyPresets, u as slugLookupPreset } from "../presets-BFrGvvjL.mjs";
 export { applyPresets, auditedPreset, bulkPreset, flexibleMultiTenantPreset, getAvailablePresets, getPreset, multiTenantPreset, ownedByUserPreset, registerPreset, slugLookupPreset, softDeletePreset, treePreset };

package/dist/presets/multiTenant.d.mts

@@ -1,9 +1,59 @@
-import { X as PresetResult, x as CrudRouteKey } from "../interface-CrN45qz1.mjs";
+import { S as CrudRouteKey, Z as PresetResult } from "../interface-Dwzqt4mn.mjs";
 
 //#region src/presets/multiTenant.d.ts
+/**
+ * One tenant dimension for multi-field filtering. Discriminated by source:
+ * - `type: 'org'`  → reads `getOrgId(scope)`
+ * - `type: 'team'` → reads `getTeamId(scope)`
+ * - `contextKey`   → reads `getScopeContext(scope, contextKey)` (any custom dimension)
+ */
+type TenantFieldSpec = {
+  field: string;
+  type: "org";
+} | {
+  field: string;
+  type: "team";
+} | {
+  field: string;
+  contextKey: string;
+};
 interface MultiTenantOptions {
-  /** Field name in database (default: 'organizationId') */
+  /**
+   * Single-field form: name of the database field to filter by.
+   * Reads `getOrgId(scope)` as the value source.
+   *
+   * Mutually exclusive with `tenantFields` — pass one or the other, not both.
+   *
+   * @default 'organizationId'
+   */
   tenantField?: string;
+  /**
+   * Multi-field form (2.7.1+): list of tenant dimensions to filter by in
+   * lockstep. Use this when a resource is scoped by more than just
+   * organization — e.g. organization + branch, organization + project,
+   * or organization + team + workspace.
+   *
+   * Each entry is a discriminated `TenantFieldSpec` declaring where the
+   * value comes from. Use `type: 'org'` / `type: 'team'` for built-in scope
+   * fields, or `contextKey: '...'` to read from `scope.context` (set by
+   * your auth function).
+   *
+   * Fail-closed: if any required dimension is missing, the request is
+   * rejected. Elevated scopes apply whatever resolves and skip the rest.
+   *
+   * Mutually exclusive with `tenantField`.
+   *
+   * @example
+   * ```typescript
+   * multiTenantPreset({
+   *   tenantFields: [
+   *     { field: 'organizationId', type: 'org' },
+   *     { field: 'branchId',       contextKey: 'branchId' },
+   *   ],
+   * })
+   * ```
+   */
+  tenantFields?: readonly TenantFieldSpec[];
   /**
    * Routes that allow public access (no auth required)
    * When a route is in this array:
@@ -18,4 +68,4 @@ interface MultiTenantOptions {
 }
 declare function multiTenantPreset(options?: MultiTenantOptions): PresetResult;
 //#endregion
-export { MultiTenantOptions, multiTenantPreset };
+export { MultiTenantOptions, TenantFieldSpec, multiTenantPreset };

package/dist/presets/multiTenant.mjs

@@ -1,31 +1,59 @@
-import { o as DEFAULT_TENANT_FIELD } from "../constants-Cxde4rpC.mjs";
-import { d as isElevated, f as isMember, i as getOrgId, n as PUBLIC_SCOPE } from "../types-BhtYdxZU.mjs";
+import "../constants-Cxde4rpC.mjs";
+import { _ as isElevated, c as getRequestScope, f as getTeamId, h as hasOrgAccess, l as getScopeContext, o as getOrgId } from "../types-AOD8fxIw.mjs";
 //#region src/presets/multiTenant.ts
-/** Read request.scope safely */
-function getScope(request) {
-	return request.scope ?? PUBLIC_SCOPE;
+/**
+* Resolve a single TenantFieldSpec against the current scope.
+* Returns `undefined` if the source value isn't present on the scope.
+*/
+function resolveSpec(scope, spec) {
+	if ("contextKey" in spec) return getScopeContext(scope, spec.contextKey);
+	if (spec.type === "org") return getOrgId(scope);
+	if (spec.type === "team") return getTeamId(scope);
+}
+/** Resolve every spec — returns the partial map of fields that have a value. */
+function resolveAll(scope, specs) {
+	const resolved = {};
+	const missing = [];
+	for (const spec of specs) {
+		const value = resolveSpec(scope, spec);
+		if (value !== void 0) resolved[spec.field] = value;
+		else missing.push(spec.field);
+	}
+	return {
+		resolved,
+		missing
+	};
 }
 /**
-* Create tenant filter middleware
-* Adds tenant filter to query for list/get operations.
-* Reads `request.scope` for org context and elevation bypass.
+* Create tenant filter middleware (strict).
+* Walks the configured tenant fields and applies all of them in lockstep.
+* Fails closed if any non-elevated caller is missing a required dimension.
 */
-function createTenantFilter(tenantField) {
+function createTenantFilter(specs) {
 	return async (request, reply) => {
-		const scope = getScope(request);
+		const scope = getRequestScope(request);
 		if (isElevated(scope)) {
-			const orgId = getOrgId(scope);
-			if (orgId) request._policyFilters = {
+			const { resolved } = resolveAll(scope, specs);
+			if (Object.keys(resolved).length > 0) request._policyFilters = {
 				...request._policyFilters ?? {},
-				[tenantField]: orgId
+				...resolved
 			};
 			return;
 		}
-		if (isMember(scope)) {
-			request._policyFilters = {
-				...request._policyFilters ?? {},
-				[tenantField]: scope.organizationId
-			};
+		if (hasOrgAccess(scope)) {
+			const { resolved, missing } = resolveAll(scope, specs);
+			if (missing.length === 0) {
+				request._policyFilters = {
+					...request._policyFilters ?? {},
+					...resolved
+				};
+				return;
+			}
+			reply.code(403).send({
+				success: false,
+				error: "Forbidden",
+				message: `Tenant context incomplete — missing: ${missing.join(", ")}`
+			});
 			return;
 		}
 		if (scope.kind === "public") {
@@ -44,57 +72,71 @@ function createTenantFilter(tenantField) {
 	};
 }
 /**
-* Create flexible tenant filter middleware
-* For routes in allowPublic: only filter when org context is present
-* No org context = allow through (public data)
-* Org context present = require auth and apply filter
+* Create flexible tenant filter middleware (allowPublic).
+* Same policy as the strict variant for authenticated callers, but
+* allows public/unauthenticated requests through without filtering.
 */
-function createFlexibleTenantFilter(tenantField) {
-	return async (request, _reply) => {
-		const scope = getScope(request);
+function createFlexibleTenantFilter(specs) {
+	return async (request, reply) => {
+		const scope = getRequestScope(request);
 		if (isElevated(scope)) {
-			const orgId = getOrgId(scope);
-			if (orgId) request._policyFilters = {
+			const { resolved } = resolveAll(scope, specs);
+			if (Object.keys(resolved).length > 0) request._policyFilters = {
 				...request._policyFilters ?? {},
-				[tenantField]: orgId
+				...resolved
 			};
 			return;
 		}
-		if (isMember(scope)) {
-			request._policyFilters = {
-				...request._policyFilters ?? {},
-				[tenantField]: scope.organizationId
-			};
+		if (hasOrgAccess(scope)) {
+			const { resolved, missing } = resolveAll(scope, specs);
+			if (missing.length === 0) {
+				request._policyFilters = {
+					...request._policyFilters ?? {},
+					...resolved
+				};
+				return;
+			}
+			reply.code(403).send({
+				success: false,
+				error: "Forbidden",
+				message: `Tenant context incomplete — missing: ${missing.join(", ")}`
+			});
 			return;
 		}
 	};
 }
 /**
-* Create tenant injection middleware
-* Injects tenant ID into request body on create.
-* Reads `request.scope` for org context.
+* Create tenant injection middleware.
+* Walks the configured tenant fields and writes each into the request body.
+* Fails closed if any required dimension is missing for non-elevated callers.
 */
-function createTenantInjection(tenantField) {
+function createTenantInjection(specs) {
 	return async (request, reply) => {
-		const scope = getScope(request);
-		const orgId = getOrgId(scope);
-		if (isElevated(scope) && !orgId) return;
-		if (!orgId) {
+		const scope = getRequestScope(request);
+		if (isElevated(scope) && !getOrgId(scope)) return;
+		const { resolved, missing } = resolveAll(scope, specs);
+		if (missing.length > 0) {
 			reply.code(403).send({
 				success: false,
 				error: "Forbidden",
-				message: "Organization context required to create resources"
+				message: `Tenant context incomplete — missing: ${missing.join(", ")}`
 			});
 			return;
 		}
-		if (request.body) request.body[tenantField] = orgId;
+		if (request.body) Object.assign(request.body, resolved);
 	};
 }
 function multiTenantPreset(options = {}) {
-	const { tenantField = DEFAULT_TENANT_FIELD, allowPublic = [] } = options;
-	const strictTenantFilter = createTenantFilter(tenantField);
-	const flexibleTenantFilter = createFlexibleTenantFilter(tenantField);
-	const tenantInjection = createTenantInjection(tenantField);
+	const { tenantField, tenantFields, allowPublic = [] } = options;
+	if (tenantField !== void 0 && tenantFields !== void 0) throw new Error("multiTenantPreset: pass either `tenantField` (single-field) or `tenantFields` (multi-field), not both");
+	const specs = tenantFields ?? [{
+		field: tenantField ?? "organizationId",
+		type: "org"
+	}];
+	if (specs.length === 0) throw new Error("multiTenantPreset: `tenantFields` must contain at least one entry");
+	const strictTenantFilter = createTenantFilter(specs);
+	const flexibleTenantFilter = createFlexibleTenantFilter(specs);
+	const tenantInjection = createTenantInjection(specs);
 	const getFilter = (route) => allowPublic.includes(route) ? flexibleTenantFilter : strictTenantFilter;
 	return {
 		name: "multiTenant",

package/dist/{presets-BMfdy34e.mjs → presets-BFrGvvjL.mjs}

@@ -1,6 +1,6 @@
-import { d as isElevated, n as PUBLIC_SCOPE } from "./types-BhtYdxZU.mjs";
+import { _ as isElevated, n as PUBLIC_SCOPE } from "./types-AOD8fxIw.mjs";
 import { multiTenantPreset } from "./presets/multiTenant.mjs";
-import { d as requireRoles, n as allowPublic, s as requireAuth } from "./permissions-C8ImI8gC.mjs";
+import { f as requireRoles, n as allowPublic, s as requireAuth } from "./permissions-CH4cNwJi.mjs";
 //#region src/presets/ownedByUser.ts
 /**
 * Create ownership check middleware.

package/dist/{queryCachePlugin-DcmETvcB.d.mts → queryCachePlugin-Bw8XyJpX.d.mts}

@@ -1,4 +1,4 @@
-import { i as CacheStore } from "./interface-D_BWALyZ.mjs";
+import { i as CacheStore } from "./interface-CnluRL4_.mjs";
 import { FastifyPluginAsync } from "fastify";
 
 //#region src/cache/QueryCache.d.ts

package/dist/{queryCachePlugin-XtFplYO9.mjs → queryCachePlugin-CwTpR04-.mjs}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./chunk-BpYLSNr0.mjs";
 import { i as versionKey, r as tagVersionKey } from "./keys-qcD-TVJl.mjs";
-import { t as hasEvents } from "./typeGuards-Cj5Rgvlg.mjs";
-import { t as MemoryCacheStore } from "./memory-BFAYkf8H.mjs";
+import { t as hasEvents } from "./typeGuards-CcFZXgU7.mjs";
+import { t as MemoryCacheStore } from "./memory-Cp7_cAko.mjs";
 import fp from "fastify-plugin";
 //#region src/cache/QueryCache.ts
 var QueryCache = class {

package/dist/{redis-D0Qc-9EW.d.mts → redis-CyCntzTO.d.mts}

@@ -1,4 +1,4 @@
-import { n as IdempotencyResult, r as IdempotencyStore } from "./interface-gr-7qo9j.mjs";
+import { n as IdempotencyResult, r as IdempotencyStore } from "./interface-B9rHWPxD.mjs";
 
 //#region src/idempotency/stores/redis.d.ts
 interface RedisClient {

package/dist/{redis-stream-BW9UKLZM.d.mts → redis-stream-We_Ucl9-.d.mts}

@@ -1,4 +1,4 @@
-import { i as EventTransport, n as EventHandler, r as EventLogger, t as DomainEvent } from "./EventTransport-wc5hSLik.mjs";
+import { i as EventTransport, n as EventHandler, r as EventLogger, t as DomainEvent } from "./EventTransport-CUpRK_Lg.mjs";
 
 //#region src/events/transports/redis-stream.d.ts
 interface RedisStreamLike {

package/dist/registry/index.d.mts

@@ -1,4 +1,4 @@
-import { L as IntrospectionPluginOptions, Rt as RegisterOptions, zt as ResourceRegistry } from "../interface-CrN45qz1.mjs";
+import { Bt as ResourceRegistry, R as IntrospectionPluginOptions, zt as RegisterOptions } from "../interface-Dwzqt4mn.mjs";
 import { FastifyPluginAsync } from "fastify";
 
 //#region src/registry/introspectionPlugin.d.ts

package/dist/registry/index.mjs

@@ -1,3 +1,3 @@
-import { n as introspectionPlugin_default, t as introspectionPlugin } from "../registry-I-ogLgL9.mjs";
-import { t as ResourceRegistry } from "../ResourceRegistry-C6ngvOnn.mjs";
+import { n as introspectionPlugin_default, t as introspectionPlugin } from "../registry-B3lRFBWo.mjs";
+import { t as ResourceRegistry } from "../ResourceRegistry-DsHiG9cL.mjs";
 export { ResourceRegistry, introspectionPlugin_default as introspectionPlugin, introspectionPlugin as introspectionPluginFn };