better-supabase 0.13.0 → 0.15.0

package/dist/blocks/templates/index.d.ts

@@ -1,16 +1,16 @@
 /// <reference lib="esnext.temporal" />
-import { T as ErrorMapper, b as DbError, t as AsyncResult } from "../../result-mijqfoJN.js";
-import { t as StandardSchemaV1 } from "../../standard-16AIDny5.js";
-import { n as ExtraFields, r as FieldsOf } from "../../block-fields-DnXkMney.js";
-import { dt as TemplateEventData, ut as TemplateApplicationEventData, wt as Events } from "../../events-DhGgwqQA.js";
+import { T as ErrorMapper, b as DbError, t as AsyncResult } from "../../result-DZeA5KS6.js";
+import { t as StandardSchemaV1 } from "../../standard-DBV730sF.js";
+import { n as ExtraFields, r as FieldsOf } from "../../block-fields-BE7pInWZ.js";
+import { Ct as Events, dt as TemplateEventData, ut as TemplateApplicationEventData } from "../../events-vcqenSYU.js";
 import { n as Logger } from "../../logger-DWVYUmwi.js";
-import { a as dbTransport, o as rpcTransport, s as sqlTransport, t as BlockTransport } from "../../block-transport-DBPhgF3W.js";
-import { r as BlockTemporalOptions } from "../../block-helpers-DyA5BAW4.js";
-import { n as BlockHooks } from "../../block-hooks-BadAniNI.js";
-import { s as BlockOf } from "../../define-block-MyM4lH42.js";
+import { r as BlockTemporalOptions } from "../../block-helpers-CRpAHrp_.js";
+import { a as dbTransport, o as rpcTransport, s as sqlTransport, t as BlockTransport } from "../../block-transport-DWZSJrwN.js";
+import { n as BlockHooks } from "../../block-hooks-DZN2w69m.js";
+import { c as BlockOf } from "../../define-block-BVcLQ3DF.js";
 import { t as ComposedEmail } from "../../email-tt2QqiSc.js";
-import { O as WorkflowStepInfo, _ as WorkflowBuilder } from "../../types-vVsLvOUJ.js";
-import { i as GraphStepCall } from "../../executor-Cy1nk4MZ.js";
+import { E as WorkflowStepInfo, x as WorkflowEditor } from "../../types-BBQLbui9.js";
+import { i as GraphStepCall } from "../../executor-_2ekNofh.js";
 //#region src/blocks/templates/merge-fields.d.ts
 /** How a rendered value is escaped: for HTML markup, or left as it is. */
 type MergeEscape = "html" | "text";
@@ -169,7 +169,7 @@ interface TemplateVersion {
   readonly publishedAt: Temporal.Instant | undefined;
   readonly createdBy: string | undefined;
   readonly createdAt: Temporal.Instant;
-  /** Set by `get`, `versions.save` and `versions.publish`; lists leave it out. */
+  /** Set by `get`, `versions.upsert` and `versions.publish`; lists leave it out. */
   readonly body?: unknown;
 }
 interface TemplateDetail<F extends object = Record<never, never>> extends Template<F> {
@@ -247,7 +247,7 @@ interface TemplateApplyResult {
   readonly runs: readonly TemplateRunStart[];
 }
 interface Templates<F extends object = Record<never, never>> {
-  save(input: TemplateInput<F>): AsyncResult<Template<F>>;
+  upsert(input: TemplateInput<F>): AsyncResult<Template<F>>;
   /**
    * The organization's templates and the system ones (only those with `null`),
    * defaults first.
@@ -280,12 +280,12 @@ interface Templates<F extends object = Record<never, never>> {
   sync(starters: readonly TemplateStarter[]): AsyncResult<number>;
   readonly versions: {
     /** Saves the draft: updates the open one, or opens the next version. */
-    save(template: string, body: unknown): AsyncResult<TemplateVersion>;
+    upsert(template: string, body: unknown): AsyncResult<TemplateVersion>;
     publish(template: string): AsyncResult<TemplateVersion>;
     /** Newest first, without bodies. */
     list(template: string): AsyncResult<readonly TemplateVersion[]>;
   };
-  /** Needs the workflow-builder module. */
+  /** Needs the workflow-editor module. */
   readonly workflows: {
     attach(input: TemplateWorkflowInput): AsyncResult<TemplateWorkflow>;
     detach(template: string, definition: string): AsyncResult<boolean>;
@@ -315,13 +315,13 @@ interface TemplatesOptions<S extends StandardSchemaV1 | undefined = undefined> e
   /**
    * A Standard Schema for the template's extra columns
    * (`blocks.templates.options.extraColumns`), keyed by database name. It types
-   * and parses them on reads, and validates them on `save`.
+   * and parses them on reads, and validates them on `upsert`.
    */
   readonly fields?: S;
   /** The template types, by name. A type without `apply` can't be applied. */
   readonly types?: Readonly<Record<string, TemplateType>>;
-  /** Starts the attached workflows; `createWorkflowBuilder` as the caller. */
-  readonly workflows?: Pick<WorkflowBuilder, "run">;
+  /** Starts the attached workflows; `createWorkflowEditor` as the caller. */
+  readonly workflows?: Pick<WorkflowEditor, "run">;
   /** `withBlockHooks` hooks around the client's methods. */
   readonly hooks?: NoInfer<BlockHooks<Templates<FieldsOf<S>>>>;
   /** Receives the errors `after` hooks throw. Default: `console`. */
@@ -336,7 +336,7 @@ interface TemplatesOptions<S extends StandardSchemaV1 | undefined = undefined> e
 export declare function createTemplates<S extends StandardSchemaV1 | undefined = undefined>(options: TemplatesOptions<S>): Templates<FieldsOf<S>>;
 //#endregion
 //#region src/blocks/templates/step.d.ts
-/** The `templates.apply` step for the workflow-builder step library. */
+/** The `templates.apply` step for the workflow-editor step library. */
 export declare const TEMPLATES_APPLY_STEP: WorkflowStepInfo;
 /** What a `templates.apply` node returns: plain data, so it serializes. */
 interface TemplatesApplyOutput {

package/dist/blocks/templates/index.js

@@ -1,15 +1,14 @@
-import { t as DbException } from "../../db-exception-CnWcYPxL.js";
-import { n as dbError } from "../../errors-D7u24ZJH.js";
-import { a as ok, r as err, t as AsyncResult } from "../../result-DIT_qp4G.js";
+import { t as DbException } from "../../db-exception-Lngc1W49.js";
+import { n as dbError } from "../../errors-BVFgt8BZ.js";
 import { n as isRecord } from "../../guards-6F2bCtQR.js";
-import { n as validate } from "../../standard-l10kE0yS.js";
+import { a as ok, r as err, t as AsyncResult } from "../../result-ntFBW2p2.js";
+import { n as validate } from "../../standard-BA3mLh6w.js";
 import { t as templatesSqlOptions } from "../../options-Fz6xqu-b.js";
+import { A as requiredInstant, B as dbTransport, C as optionalText, D as recordOf, H as rpcTransport, I as textOf, O as recordOrEmpty, S as optionalInstant, U as sqlTransport, d as enumOrThrow, k as recordsOf, n as applyTemporal, o as blockCall, r as asDbError } from "../../block-helpers-CtBdjgO4.js";
+import { r as withBlockHooks } from "../../block-hooks-BfxX3682.js";
 import { n as event, t as defineEvents } from "../../event-map-CtPFhcOp.js";
-import { i as sqlTransport, r as rpcTransport, t as dbTransport } from "../../block-transport-Ds0C2mUf.js";
-import { A as requiredInstant, C as optionalText, D as recordOf, I as textOf, O as recordOrEmpty, S as optionalInstant, d as enumOrThrow, k as recordsOf, n as applyTemporal, o as blockCall, r as asDbError } from "../../block-helpers-DwE32_gT.js";
-import { r as withBlockHooks } from "../../block-hooks-C1r-R2r0.js";
-import { n as blockFields } from "../../block-fields-Cwd4c8m-.js";
-import { n as defineBlock } from "../../define-block-B6Gjs57G.js";
+import { n as blockFields } from "../../block-fields-DE_FgpOU.js";
+import { n as defineBlock } from "../../define-block-BGqOO8B3.js";
 //#region src/blocks/templates/templates.ts
 const SCOPES = ["tenant", "system"];
 /** Declares a template type with its schemas typed. */
@@ -138,7 +137,7 @@ function createTemplates(options) {
 		return runs;
 	};
 	return withBlockHooks({
-		save: (input) => AsyncResult.from(async () => {
+		upsert: (input) => AsyncResult.from(async () => {
 			const extra = await fields.args(input.fields);
 			if (!extra.ok) return extra;
 			const type = typeOf(input.type);
@@ -193,7 +192,7 @@ function createTemplates(options) {
 			return call("sync_templates", { starters: rows }, Number);
 		}),
 		versions: {
-			save: (template, body) => AsyncResult.from(async () => {
+			upsert: (template, body) => AsyncResult.from(async () => {
 				if (!Object.values(types).some((type) => type.body !== void 0)) return saveVersion(template, body);
 				const found = await get(template);
 				if (!found.ok) return found;
@@ -389,7 +388,7 @@ function composeTemplateEmail(body, values, options = {}) {
 }
 //#endregion
 //#region src/blocks/templates/step.ts
-/** The `templates.apply` step for the workflow-builder step library. */
+/** The `templates.apply` step for the workflow-editor step library. */
 const TEMPLATES_APPLY_STEP = {
 	name: "templates.apply",
 	title: "Create from template",

package/dist/blocks/time-tracking/index.d.ts

@@ -1,18 +1,19 @@
 /// <reference lib="esnext.temporal" />
-import { T as ErrorMapper, t as AsyncResult } from "../../result-mijqfoJN.js";
-import { t as StandardSchemaV1 } from "../../standard-16AIDny5.js";
-import { n as ExtraFields, r as FieldsOf } from "../../block-fields-DnXkMney.js";
-import { ft as TimeEntryEventData, pt as TimesheetEventData, wt as Events } from "../../events-DhGgwqQA.js";
+import { T as ErrorMapper, t as AsyncResult } from "../../result-DZeA5KS6.js";
+import { t as StandardSchemaV1 } from "../../standard-DBV730sF.js";
+import { n as ExtraFields, r as FieldsOf } from "../../block-fields-BE7pInWZ.js";
+import { $ as RecordRef } from "../../types-DFdg_4yN.js";
+import { Ct as Events, ft as TimeEntryEventData, pt as TimesheetEventData } from "../../events-vcqenSYU.js";
 import { n as Logger } from "../../logger-DWVYUmwi.js";
-import { a as dbTransport, o as rpcTransport, s as sqlTransport, t as BlockTransport } from "../../block-transport-DBPhgF3W.js";
-import { r as BlockTemporalOptions } from "../../block-helpers-DyA5BAW4.js";
-import { n as BlockHooks } from "../../block-hooks-BadAniNI.js";
-import { t as CloudEvent } from "../../cloud-event-CidL9jiw.js";
-import { s as BlockOf } from "../../define-block-MyM4lH42.js";
+import { a as BlockTenantOptions, r as BlockTemporalOptions } from "../../block-helpers-CRpAHrp_.js";
+import { a as dbTransport, o as rpcTransport, s as sqlTransport, t as BlockTransport } from "../../block-transport-DWZSJrwN.js";
+import { n as BlockHooks } from "../../block-hooks-DZN2w69m.js";
+import { c as BlockOf } from "../../define-block-BVcLQ3DF.js";
 import { n as Money } from "../../money-BNRdJQzA.js";
+import { t as CloudEvent } from "../../cloud-event-CzZTJkXv.js";
 import { n as MetricDefinition } from "../../metric-definition-EAYI1r2n.js";
 //#region src/blocks/time-tracking/time-tracking.d.ts
-interface TimeTrackingOptions<S extends StandardSchemaV1 | undefined = undefined> extends BlockTemporalOptions {
+interface TimeTrackingOptions<S extends StandardSchemaV1 | undefined = undefined> extends BlockTemporalOptions, BlockTenantOptions {
   readonly transport: BlockTransport;
   /**
    * The module schema, or its API schema: `defineBlocks` passes it from
@@ -37,8 +38,8 @@ interface TimeEntry<F extends object = Record<never, never>> {
   readonly id: string;
   readonly organizationId: string;
   readonly userId: string;
-  readonly subjectType?: string;
-  readonly subjectId?: string;
+  /** The record the time is tracked on; `undefined` for an unattached entry. */
+  readonly subject: RecordRef | undefined;
   readonly startedAt: Temporal.Instant;
   /** Missing while the timer runs. */
   readonly endedAt?: Temporal.Instant;
@@ -55,8 +56,8 @@ interface TimeEntry<F extends object = Record<never, never>> {
 }
 /** The record time is tracked on, how it bills, and the extra columns. */
 interface TimeEntryFields<F extends object = Record<never, never>> {
-  readonly subjectType?: string;
-  readonly subjectId?: string;
+  /** The record the time is on. Default: none. */
+  readonly subject?: RecordRef;
   readonly billable?: boolean;
   /** The hourly rate, in minor units of its currency. */
   readonly rate?: Money;
@@ -74,10 +75,7 @@ interface LogTimeInput<F extends object = Record<never, never>> extends TimeEntr
 interface TimeEntryPatch<F extends object = Record<never, never>> {
   readonly startedAt?: Temporal.Instant;
   readonly endedAt?: Temporal.Instant;
-  readonly subject?: {
-    readonly subjectType: string;
-    readonly subjectId: string;
-  } | null;
+  readonly subject?: RecordRef | null;
   readonly billable?: boolean;
   readonly rate?: Money | null;
   readonly note?: string | null;
@@ -93,8 +91,8 @@ interface TimeEntryListOptions {
   readonly from?: Temporal.Instant;
   /** Entries that start before this instant. */
   readonly to?: Temporal.Instant;
-  readonly subjectType?: string;
-  readonly subjectId?: string;
+  /** Entries on this record only. */
+  readonly subject?: RecordRef;
   readonly pageSize?: number;
 }
 type TimesheetStatus = "open" | "submitted" | "approved" | "rejected";
@@ -134,25 +132,33 @@ interface TimesheetListOptions {
   /** Weeks before this one, for the next page. */
   readonly before?: Temporal.PlainDate;
 }
+/**
+ * `F` is the extra fields `options.fields` describes. The methods that don't
+ * take an entry or timesheet id act in the block's `tenant`.
+ */
 interface TimeTracking<F extends object = Record<never, never>> {
-  /** Starts a timer for the caller and stops the one that runs. */
-  start(organizationId: string, fields?: TimeEntryFields<F>): AsyncResult<TimeEntry<F>>;
-  stop(organizationId: string): AsyncResult<TimeEntry<F>>;
+  /**
+   * Starts a timer for the caller, on `fields.subject` when set, and stops the
+   * one that runs.
+   */
+  start(fields?: TimeEntryFields<F>): AsyncResult<TimeEntry<F>>;
+  stop(): AsyncResult<TimeEntry<F>>;
   /** The caller's running timer. */
-  running(organizationId: string): AsyncResult<TimeEntry<F> | undefined>;
-  log(organizationId: string, input: LogTimeInput<F>): AsyncResult<TimeEntry<F>>;
+  running(): AsyncResult<TimeEntry<F> | undefined>;
+  /** Records a finished entry, on `input.subject` when set. */
+  log(input: LogTimeInput<F>): AsyncResult<TimeEntry<F>>;
   update(entryId: string, patch: TimeEntryPatch<F>): AsyncResult<TimeEntry<F>>;
   remove(entryId: string): AsyncResult<TimeEntry<F>>;
   /** Newest first. */
-  list(organizationId: string, options?: TimeEntryListOptions): AsyncResult<readonly TimeEntry<F>[]>;
+  list(options?: TimeEntryListOptions): AsyncResult<readonly TimeEntry<F>[]>;
   /** A member's week (the caller's by default) with its entries and totals. */
-  timesheet(organizationId: string, week: Temporal.PlainDate, userId?: string): AsyncResult<TimesheetDetail<F>>;
+  timesheet(week: Temporal.PlainDate, userId?: string): AsyncResult<TimesheetDetail<F>>;
   /** Sends the caller's week for approval; it locks until a rejection. */
-  submit(organizationId: string, week: Temporal.PlainDate, note?: string): AsyncResult<Timesheet>;
+  submit(week: Temporal.PlainDate, note?: string): AsyncResult<Timesheet>;
   /** Unlocks an approved week; needs `time_tracking.manage`. */
   reopen(timesheetId: string): AsyncResult<Timesheet>;
   /** Newest week first. */
-  timesheets(organizationId: string, options?: TimesheetListOptions): AsyncResult<readonly Timesheet[]>;
+  timesheets(options?: TimesheetListOptions): AsyncResult<readonly Timesheet[]>;
 }
 /** The `time-tracking` SQL module as typed calls. */
 export declare function createTimeTracking<S extends StandardSchemaV1 | undefined = undefined>(options: TimeTrackingOptions<S>): TimeTracking<FieldsOf<S>>;
@@ -191,7 +197,9 @@ export declare function timeEntryMetricTime(event: CloudEvent): string | readonl
 //#endregion
 //#region src/blocks/time-tracking/weekly-grid.d.ts
 /** The fields `toWeeklyGrid` reads from an entry. */
-type WeeklyGridEntry = Pick<TimeEntry, "id" | "subjectType" | "subjectId" | "startedAt" | "endedAt" | "billable">;
+type WeeklyGridEntry = Pick<TimeEntry, "id" | "startedAt" | "endedAt" | "billable"> & {
+  readonly subject?: RecordRef | undefined;
+};
 interface WeeklyGridOptions<E extends WeeklyGridEntry> {
   /** Any day of the week; the grid starts on its Monday. */
   readonly week: Temporal.PlainDate;
@@ -217,8 +225,8 @@ interface WeeklyGridDay {
 /** One row of the grid: the time one record (or key) took each day. */
 interface WeeklyGridRow {
   readonly id: string;
-  readonly subjectType?: string;
-  readonly subjectId?: string;
+  /** The record of the row's first entry; `undefined` when it has none. */
+  readonly subject: RecordRef | undefined;
   readonly billable: boolean;
   /** Seconds per day, Monday first. */
   readonly days: readonly number[];

package/dist/blocks/time-tracking/index.js

@@ -1,17 +1,18 @@
-import { s as nowInstant } from "../../temporal-DLZlWbOi.js";
-import { t as temporal } from "../../temporal-required-Dt4mcPsi.js";
-import { t as AsyncResult } from "../../result-DIT_qp4G.js";
 import { n as isRecord } from "../../guards-6F2bCtQR.js";
-import { t as timeTrackingSqlOptions } from "../../options-HSv8R6h5.js";
+import { s as nowInstant } from "../../temporal-DLZlWbOi.js";
+import { t as temporal } from "../../temporal-required-Dy0GGD8E.js";
+import { t as AsyncResult } from "../../result-ntFBW2p2.js";
+import { t as timeTrackingSqlOptions } from "../../options-BbnPv6p7.js";
 import { r as defineMetric } from "../../metric-definition-BjxVn4R5.js";
+import { A as requiredInstant, B as dbTransport, C as optionalText, D as recordOf, H as rpcTransport, I as textOf, S as optionalInstant, U as sqlTransport, d as enumOrThrow, k as recordsOf, m as instantArg, n as applyTemporal, o as blockCall } from "../../block-helpers-CtBdjgO4.js";
+import { r as withBlockHooks } from "../../block-hooks-BfxX3682.js";
 import { n as event, t as defineEvents } from "../../event-map-CtPFhcOp.js";
-import { i as sqlTransport, r as rpcTransport, t as dbTransport } from "../../block-transport-Ds0C2mUf.js";
-import { A as requiredInstant, C as optionalText, D as recordOf, I as textOf, S as optionalInstant, d as enumOrThrow, k as recordsOf, m as instantArg, n as applyTemporal, o as blockCall } from "../../block-helpers-DwE32_gT.js";
-import { r as withBlockHooks } from "../../block-hooks-C1r-R2r0.js";
-import { n as blockFields } from "../../block-fields-Cwd4c8m-.js";
-import { n as defineBlock } from "../../define-block-B6Gjs57G.js";
+import { n as blockFields } from "../../block-fields-DE_FgpOU.js";
+import { n as defineBlock } from "../../define-block-BGqOO8B3.js";
+import { n as optionalRecordRefOf } from "../../block-subjects-BhDKK_j7.js";
+import { t as requireOrganization } from "../../block-tenant-DHp7subc.js";
 import { s as isCurrency } from "../../money-BZl985O-.js";
-import { i as moneyOf, o as optionalMoneyOf, s as unknownCurrency, t as amountText } from "../../money-codec-BdnIiFFX.js";
+import { i as moneyOf, o as optionalMoneyOf, s as unknownCurrency, t as amountText } from "../../money-codec-BzddguAQ.js";
 //#region src/blocks/time-tracking/time-tracking.ts
 const STATUSES = [
 	"open",
@@ -29,12 +30,11 @@ function entryOf(value, fn) {
 		id: textOf(row["id"]),
 		organizationId: textOf(row["organizationId"]),
 		userId: textOf(row["userId"]),
+		subject: optionalRecordRefOf(row["subjectType"], row["subjectId"]),
 		startedAt: requiredInstant(row["startedAt"], "startedAt"),
 		billable: row["billable"] === true,
 		createdAt: requiredInstant(row["createdAt"], "createdAt"),
 		updatedAt: requiredInstant(row["updatedAt"], "updatedAt"),
-		...optional("subjectType", optionalText(row["subjectType"])),
-		...optional("subjectId", optionalText(row["subjectId"])),
 		...optional("endedAt", optionalInstant(row["endedAt"])),
 		...optional("seconds", numberOf(row["seconds"])),
 		...optional("rate", optionalMoneyOf(row["rate"], row["rateCurrency"], "rate")),
@@ -74,8 +74,8 @@ function patchOf(patch) {
 	if (patch.startedAt !== void 0) out["startedAt"] = patch.startedAt.toString();
 	if (patch.endedAt !== void 0) out["endedAt"] = patch.endedAt.toString();
 	if (patch.subject !== void 0) {
-		out["subjectType"] = patch.subject?.subjectType ?? null;
-		out["subjectId"] = patch.subject?.subjectId ?? null;
+		out["subjectType"] = patch.subject?.type ?? null;
+		out["subjectId"] = patch.subject?.id ?? null;
 	}
 	if (patch.billable !== void 0) out["billable"] = patch.billable;
 	if (patch.rate !== void 0) {
@@ -90,39 +90,40 @@ function createTimeTracking(options) {
 	applyTemporal(options);
 	const call = blockCall(options.transport, options.schema, options.mappers);
 	const fields = blockFields(options.fields, "time entry fields");
+	const tenant = () => requireOrganization(options.tenant);
 	return withBlockHooks({
-		start: (organizationId, entry = {}) => {
+		start: (entry = {}) => {
 			const invalid = rateError(entry.rate);
 			if (invalid !== void 0) return AsyncResult.err(invalid);
-			return fields.args(entry.fields).andThen((checked) => call("start_timer", {
+			return tenant().andThen((organizationId) => fields.args(entry.fields).andThen((checked) => call("start_timer", {
 				tenant: organizationId,
-				subject_type: entry.subjectType ?? null,
-				subject_id: entry.subjectId ?? null,
+				subject_type: entry.subject?.type ?? null,
+				subject_id: entry.subject?.id ?? null,
 				billable: entry.billable ?? false,
 				rate: entry.rate === void 0 ? null : amountText(entry.rate),
 				rate_currency: entry.rate?.currency ?? null,
 				note: entry.note ?? null,
 				fields: checked
-			}, (value) => entryOf(value, "start_timer")).andThen(fields.row));
+			}, (value) => entryOf(value, "start_timer")).andThen(fields.row)));
 		},
-		stop: (organizationId) => call("stop_timer", { tenant: organizationId }, (value) => entryOf(value, "stop_timer")).andThen(fields.row),
-		running: (organizationId) => call("running_timer", { tenant: organizationId }, (value) => value === null || value === void 0 ? void 0 : entryOf(value, "running_timer")).andThen((entry) => entry === void 0 ? AsyncResult.ok(void 0) : fields.row(entry)),
-		log: (organizationId, input) => {
+		stop: () => tenant().andThen((organizationId) => call("stop_timer", { tenant: organizationId }, (value) => entryOf(value, "stop_timer")).andThen(fields.row)),
+		running: () => tenant().andThen((organizationId) => call("running_timer", { tenant: organizationId }, (value) => value === null || value === void 0 ? void 0 : entryOf(value, "running_timer")).andThen((entry) => entry === void 0 ? AsyncResult.ok(void 0) : fields.row(entry))),
+		log: (input) => {
 			const invalid = rateError(input.rate);
 			if (invalid !== void 0) return AsyncResult.err(invalid);
-			return fields.args(input.fields).andThen((checked) => call("log_time", {
+			return tenant().andThen((organizationId) => fields.args(input.fields).andThen((checked) => call("log_time", {
 				tenant: organizationId,
 				started_at: instantArg(input.startedAt),
 				ended_at: instantArg(input.endedAt),
-				subject_type: input.subjectType ?? null,
-				subject_id: input.subjectId ?? null,
+				subject_type: input.subject?.type ?? null,
+				subject_id: input.subject?.id ?? null,
 				billable: input.billable ?? false,
 				rate: input.rate === void 0 ? null : amountText(input.rate),
 				rate_currency: input.rate?.currency ?? null,
 				note: input.note ?? null,
 				user_id: input.userId ?? null,
 				fields: checked
-			}, (value) => entryOf(value, "log_time")).andThen(fields.row));
+			}, (value) => entryOf(value, "log_time")).andThen(fields.row)));
 		},
 		update: (entryId, patch) => {
 			const invalid = rateError(patch.rate);
@@ -136,17 +137,17 @@ function createTimeTracking(options) {
 			}, (value) => entryOf(value, "update_time_entry")).andThen(fields.row));
 		},
 		remove: (entryId) => call("delete_time_entry", { entry_id: entryId }, (value) => entryOf(value, "delete_time_entry")).andThen(fields.row),
-		list: (organizationId, list = {}) => call("list_time_entries", {
+		list: (list = {}) => tenant().andThen((organizationId) => call("list_time_entries", {
 			tenant: organizationId,
 			user_id: list.userId ?? null,
 			starts: instantArg(list.from) ?? null,
 			ends: instantArg(list.to) ?? null,
-			subject_type: list.subjectType ?? null,
-			subject_id: list.subjectId ?? null,
+			subject_type: list.subject?.type ?? null,
+			subject_id: list.subject?.id ?? null,
 			everyone: list.everyone ?? false,
 			page_size: list.pageSize ?? null
-		}, (value) => recordsOf(value, "list_time_entries").map((row) => entryOf(row, "list_time_entries"))).andThen(fields.rows),
-		timesheet: (organizationId, week, userId) => call("get_timesheet", {
+		}, (value) => recordsOf(value, "list_time_entries").map((row) => entryOf(row, "list_time_entries"))).andThen(fields.rows)),
+		timesheet: (week, userId) => tenant().andThen((organizationId) => call("get_timesheet", {
 			tenant: organizationId,
 			week: week.toString(),
 			user_id: userId ?? null
@@ -160,20 +161,20 @@ function createTimeTracking(options) {
 		}).andThen((detail) => fields.rows(detail.entries).map((entries) => ({
 			...detail,
 			entries
-		}))),
-		submit: (organizationId, week, note) => call("submit_timesheet", {
+		})))),
+		submit: (week, note) => tenant().andThen((organizationId) => call("submit_timesheet", {
 			tenant: organizationId,
 			week: week.toString(),
 			note: note ?? null
-		}, (value) => timesheetOf(value, "submit_timesheet")),
+		}, (value) => timesheetOf(value, "submit_timesheet"))),
 		reopen: (timesheetId) => call("reopen_timesheet", { timesheet_id: timesheetId }, (value) => timesheetOf(value, "reopen_timesheet")),
-		timesheets: (organizationId, list = {}) => call("list_timesheets", {
+		timesheets: (list = {}) => tenant().andThen((organizationId) => call("list_timesheets", {
 			tenant: organizationId,
 			user_id: list.userId ?? null,
 			status: list.status ?? null,
 			page_size: list.pageSize ?? null,
 			before: list.before?.toString() ?? null
-		}, (value) => recordsOf(value, "list_timesheets").map((row) => timesheetOf(row, "list_timesheets")))
+		}, (value) => recordsOf(value, "list_timesheets").map((row) => timesheetOf(row, "list_timesheets"))))
 	}, options.hooks, {
 		block: "time-tracking",
 		...options.logger ? { logger: options.logger } : {}
@@ -228,7 +229,7 @@ function timeEntryMetricTime(event) {
 }
 //#endregion
 //#region src/blocks/time-tracking/weekly-grid.ts
-const defaultKey = (entry) => `${entry.subjectType ?? ""}:${entry.subjectId ?? ""}:${String(entry.billable)}`;
+const defaultKey = (entry) => `${entry.subject?.type ?? ""}:${entry.subject?.id ?? ""}:${String(entry.billable)}`;
 /**
 * Time entries as a weekly grid: one row per record (or `rowKey`) with the
 * seconds of each day, the shape of a weekly timesheet Data Grid. An entry that
@@ -275,12 +276,11 @@ function toWeeklyGrid(entries, options) {
 		})),
 		rows: [...rows.values()].map((row) => ({
 			id: row.id,
+			subject: row.entry.subject,
 			billable: row.entry.billable,
 			days: row.days,
 			seconds: row.days.reduce((sum, value) => sum + value, 0),
-			entryIds: row.entryIds,
-			...row.entry.subjectType === void 0 ? {} : { subjectType: row.entry.subjectType },
-			...row.entry.subjectId === void 0 ? {} : { subjectId: row.entry.subjectId }
+			entryIds: row.entryIds
 		})),
 		seconds: totals.reduce((sum, value) => sum + value, 0),
 		billableSeconds: billable

package/dist/blocks/timeline/index.d.ts

@@ -0,0 +1,116 @@
+/// <reference lib="esnext.temporal" />
+import { T as ErrorMapper, t as AsyncResult } from "../../result-DZeA5KS6.js";
+import { $ as RecordRef, O as AnyFunctions, k as AnyModels, ut as TableKey } from "../../types-DFdg_4yN.js";
+import { n as Logger } from "../../logger-DWVYUmwi.js";
+import { a as BlockTenantOptions, i as CursorPageOptions, r as BlockTemporalOptions } from "../../block-helpers-CRpAHrp_.js";
+import { a as dbTransport, o as rpcTransport, s as sqlTransport, t as BlockTransport } from "../../block-transport-DWZSJrwN.js";
+import { n as BlockHooks } from "../../block-hooks-DZN2w69m.js";
+import { t as BetterSupabase } from "../../define-DFBnQyYg.js";
+import { c as BlockOf } from "../../define-block-BVcLQ3DF.js";
+import { i as EventSink, t as CloudEvent } from "../../cloud-event-CzZTJkXv.js";
+import { i as ListDefinition } from "../../list-query-BDVutLFr.js";
+//#region src/blocks/timeline/timeline.d.ts
+/**
+ * Where a timeline entry comes from: `event` for an `activity_entries` row that
+ * `activitySink()` wrote, `audit` for an audit log entry on the subject's row
+ * (with the `audit` and `subjects` modules), `delivery` for a notification
+ * delivery about the subject (with `notifications`) and `run` for a workflow
+ * run on it (with `workflows`).
+ */
+type ActivitySource = "event" | "audit" | "delivery" | "run";
+interface ActivityEntry {
+  /** An `activity_entries` id, or the audit entry's, delivery's or run's id. */
+  readonly id: string;
+  readonly source: ActivitySource;
+  readonly organizationId: string;
+  readonly type: string;
+  readonly actorId: string | undefined;
+  readonly subject: RecordRef | undefined;
+  readonly summary: string | undefined;
+  readonly data: Readonly<Record<string, unknown>>;
+  readonly occurredAt: Temporal.Instant;
+}
+interface ActivityListOptions extends CursorPageOptions<Temporal.Instant> {
+  /** Entries before this instant, for paging back. */
+  readonly cursor?: Temporal.Instant;
+  /** Default 50, at most 500. */
+  readonly limit?: number;
+  /** The kinds of entry to return; all of them when left out. */
+  readonly sources?: readonly ActivitySource[];
+}
+interface TimelineOptions extends BlockTemporalOptions, BlockTenantOptions {
+  readonly transport: BlockTransport;
+  /** The module schema, or its API schema. Default `better_supabase`. */
+  readonly schema?: string;
+  readonly mappers?: readonly ErrorMapper[];
+  readonly hooks?: BlockHooks<Timeline>;
+  /** Receives the errors `after` hooks throw. Default: `console`. */
+  readonly logger?: Logger;
+}
+/** Every method acts in the block's `tenant`. */
+interface Timeline {
+  /**
+   * The activity feed of a tenant, newest first, or one subject's timeline with
+   * `subject`. Members with `activity.read` see it. With the `subjects` module,
+   * an entry on a registered subject type needs `can_subject` read, and a
+   * subject's timeline also lists its audit log entries (`source: "audit"`)
+   * when `audit` is installed with its read policy, the deliveries of
+   * notifications about it (`source: "delivery"`, for members who also hold
+   * `notifications.send`) and its workflow runs (`source: "run"`, as the runs'
+   * read policy allows).
+   */
+  list(subject?: RecordRef | null, options?: ActivityListOptions): AsyncResult<readonly ActivityEntry[]>;
+}
+/** The activity feed over the `activity` module's functions, as the caller. */
+export declare function createTimeline(options: TimelineOptions): Timeline;
+/** What an activity entry says about an event; `null` skips the event. */
+interface ActivityDescription {
+  readonly summary?: string;
+  readonly actorId?: string;
+  readonly subjectType?: string;
+  readonly subjectId?: string;
+  readonly data?: Readonly<Record<string, unknown>>;
+}
+interface ActivitySinkOptions {
+  /**
+   * A service-role transport: `record_activity()` is granted to `service_role`
+   * only.
+   */
+  readonly transport: BlockTransport;
+  readonly schema?: string;
+  /**
+   * The outbox `typePrefix`, stripped from the stored type. Default
+   * `dev.better-supabase`.
+   */
+  readonly typePrefix?: string;
+  /** Types to keep, exact or ending in `.*`. Default every event with a tenant. */
+  readonly types?: readonly string[];
+  /** Summarizes an event, or returns `null` to skip it. */
+  readonly describe?: (event: CloudEvent, type: string) => ActivityDescription | null | undefined;
+}
+/**
+ * An outbox sink that writes events into the activity feed:
+ * `outbox.relay('activity', activitySink({ transport }))`. Events without a
+ * tenant (`partitionkey`) are skipped, and a replayed event writes nothing.
+ */
+export declare function activitySink(options: ActivitySinkOptions): EventSink;
+type ActivitySort = "newest" | "oldest";
+type ActivityFacet = "type" | "actor" | "subjectType" | "subjectId";
+/**
+ * A cursor-paged list over `activity_entries` (generate types for the
+ * `better_supabase` schema to get it in your models), newest first, filtered by
+ * type, actor and subject. Members with `activity.read` see their tenants'
+ * entries, less those on a registered subject that `can_subject` doesn't let
+ * them read (with the `subjects` module). It reads the table, so it lists no
+ * audit entries; `list()` does.
+ */
+export declare function activityListQuery<M extends AnyModels, D, Fn extends AnyFunctions, E, T extends TableKey<M>>(betterSupabase: BetterSupabase<M, D, Fn, E>, table: T, options?: {
+  readonly pageSize?: number;
+  readonly maxPageSize?: number;
+}): ListDefinition<M, T, E, ActivitySort, ActivityFacet>;
+//#endregion
+//#region src/blocks/timeline/manifest.d.ts
+/** The `activity` block's manifest (ADR 0029, ADR 0063). */
+export declare const timelineBlock: BlockOf<"timeline", typeof createTimeline>;
+//#endregion
+export { type ActivityDescription, type ActivityEntry, type ActivityFacet, type ActivityListOptions, type ActivitySinkOptions, type ActivitySort, type ActivitySource, type BlockTransport, type Timeline, type TimelineOptions, dbTransport, rpcTransport, sqlTransport };