@protobase/server 0.41.1 → 0.43.0

package/dist/read-service.js

@@ -1,10 +1,11 @@
 import { notFound } from "./problem.js";
 import { requestAccess, requireOperation, visibleFields, writableFields } from "./request-access.js";
-import { presentFiles } from "./files/present.js";
+import { readTransaction } from "./transactions.js";
 import { pickFields } from "./rows.js";
 import { fetchReadable } from "./fetch-readable.js";
+import { presentFiles } from "./files/present.js";
+import { deletedRows } from "./params.js";
 import { rowPermissions } from "./row-permissions.js";
-import { readTransaction } from "./transactions.js";
 //#region src/read-service.ts
 /**
 * `edit` for fields the caller may change on this record, `read` for the rest (sensitive ones included); hidden fields
@@ -18,11 +19,13 @@ const fieldModes = (access, canUpdate) => {
 };
 /**
 * The record with this key as the caller may see it: readable fields only, inside the caller's tenant and row filter.
-* A key outside the tenant, outside the row filter, or failing a record-level read rule is a plain 404.
+* A key outside the tenant, outside the row filter, or failing a record-level read rule is a plain 404. `showDeleted`
+* also finds a soft-deleted record, and is refused on a resource without a soft delete once the caller may read it.
 */
-const readRecord = async (deps, entry, session, key, deleted = "hide") => {
+const readRecord = async (deps, entry, session, key, showDeleted = false) => {
 	const access = await requestAccess(deps, entry, session);
 	requireOperation(access, "read");
+	const deleted = deletedRows(access.full, showDeleted);
 	const names = Object.keys(access.model.fields);
 	const found = await readTransaction(deps.db, deps.statementTimeoutMs, async (trx) => {
 		const current = await fetchReadable(trx, access, key, deleted, {

package/dist/realtime/change-checker.js

@@ -1,5 +1,5 @@
-import { readTransaction } from "../transactions.js";
 import { quoteIdent, tableSql } from "../changes/capture-sql.js";
+import { readTransaction } from "../transactions.js";
 import { callerSettings } from "../rest/caller-settings.js";
 import { filterSql } from "./change-filter.js";
 import { decodeKey, encodeKey } from "@protobase/schema/internal";

package/dist/records.d.ts

@@ -0,0 +1,5 @@
+import "./types.js";
+import "./registry.js";
+import "./sql-parts.js";
+import { FieldModel } from "@protobase/schema";
+import { Db } from "@protobase/query";

package/dist/rest/rest-context.js

@@ -1,5 +1,5 @@
-import { readTransaction, writeTransaction } from "../transactions.js";
 import { wakeDispatch } from "../changes/actor.js";
+import { readTransaction, writeTransaction } from "../transactions.js";
 import { callerSettings } from "./caller-settings.js";
 import { restError } from "./rest-error.js";
 //#region src/rest/rest-context.ts

package/dist/reveal-service.js

@@ -1,9 +1,9 @@
 import { badRequest, notFound } from "./problem.js";
 import { tenantScope } from "./tenant.js";
 import { requestAccess, requireOperation } from "./request-access.js";
+import { readTransaction } from "./transactions.js";
 import { bindingOf } from "./encryption/binding.js";
 import { fetchReadable } from "./fetch-readable.js";
-import { readTransaction } from "./transactions.js";
 import { openText } from "./encryption/envelope-open.js";
 import { encodeKey } from "@protobase/schema/internal";
 //#region src/reveal-service.ts

package/dist/routes/batch.js

@@ -1,6 +1,6 @@
+import { runBatch } from "../batch/run-batch.js";
 import { parseParams } from "../params.js";
 import { batchBody } from "../batch/schema.js";
-import { runBatch } from "../batch/run-batch.js";
 import { Hono } from "hono";
 //#region src/routes/batch.ts
 /**

package/dist/routes/collection.js

@@ -1,5 +1,5 @@
-import { listRecords } from "../list-service.js";
 import { runWrite } from "../write-pipeline.js";
+import { listRecords } from "../list-service.js";
 import { facets, numericHistogram, timeSeries } from "../aggregate-service.js";
 import { aggregate } from "../aggregate-groups.js";
 import { mapRecords } from "../map-service.js";

package/dist/routes/record.js

@@ -1,9 +1,9 @@
 import { notFound } from "../problem.js";
-import { keyFromPath } from "../key.js";
-import { deletedRows, selectedFields } from "../params.js";
 import { pickFields } from "../rows.js";
-import { readRecord } from "../read-service.js";
 import { runWrite } from "../write-pipeline.js";
+import { keyFromPath } from "../key.js";
+import { selectedFields } from "../params.js";
+import { readRecord } from "../read-service.js";
 import { auditOrigin } from "../audit/origin.js";
 import { returnPreference } from "./preferences.js";
 import { resolveTarget } from "./target.js";
@@ -22,8 +22,7 @@ const recordRoutes = (deps) => {
 		if (c.req.param("key").endsWith(":history")) return c.json(await readHistory(deps, entry, c.get("session"), keyFromPath(c, entry, ":history"), c.req.query()));
 		if (c.req.param("key").endsWith(":comments")) return c.json(await readComments(deps, entry, c.get("session"), keyFromPath(c, entry, ":comments"), c.req.query()));
 		if (c.req.param("key").endsWith(":mentionable")) return c.json(await mentionable(deps, entry, c.get("session"), keyFromPath(c, entry, ":mentionable"), c.req.query()));
-		const deleted = deletedRows(entry.model, c.req.query("show_deleted") === "true");
-		const found = await readRecord(deps, entry, c.get("session"), keyFromPath(c, entry), deleted);
+		const found = await readRecord(deps, entry, c.get("session"), keyFromPath(c, entry), c.req.query("show_deleted") === "true");
 		const columns = selectedFields({
 			...entry.model,
 			fields: Object.fromEntries(Object.keys(found.record).map((name) => [name, entry.model.fields[name]]))

package/dist/row-permissions.js

@@ -3,8 +3,8 @@ import { recordDecision } from "./request-access.js";
 import { aliasedColumn, columnId, scopeConditions, tableId, whereClause } from "./sql-parts.js";
 import { fetchRecord } from "./records.js";
 import { parentGuard } from "./parent-access.js";
-import { compileFilter } from "@protobase/query";
 import { sql } from "kysely";
+import { compileFilter } from "@protobase/query";
 //#region src/row-permissions.ts
 const keyOf = (access, row) => JSON.stringify(access.full.primaryKey.map((name) => String(row[name])));
 const matching = async (trx, access, rows, filter) => {

package/dist/sql-parts.d.ts

@@ -0,0 +1,4 @@
+import "./types.js";
+import "./registry.js";
+import { FieldModel, ResourceModel } from "@protobase/schema";
+import "kysely";

package/dist/sql-parts.js

@@ -1,5 +1,5 @@
-import { compileFilter } from "@protobase/query";
 import { sql } from "kysely";
+import { compileFilter } from "@protobase/query";
 //#region src/sql-parts.ts
 const etagAlias = "__pb_etag";
 const tableId = (model) => {

package/dist/write-pipeline.js

@@ -1,16 +1,16 @@
 import { HttpProblem, badRequest } from "./problem.js";
 import { tenantScope } from "./tenant.js";
 import { requestAccess, requireOperation, targetFilter, writableFields } from "./request-access.js";
+import { actorSettings, wakeDispatch } from "./changes/actor.js";
+import { isDatabaseError } from "./error-handler.js";
+import { writeTransaction } from "./transactions.js";
 import { bindingOf, pendingBinding } from "./encryption/binding.js";
 import { deleteRecord, fetchRecord, insertRecord, restoreRecord, updateRecord } from "./records.js";
-import { writeTransaction } from "./transactions.js";
-import { blockedDelete } from "./blocked-delete.js";
-import { isDatabaseError } from "./error-handler.js";
 import { attachFiles } from "./files/attach.js";
+import { assertWritten, checkParents, checkPrecondition, decide, denied, firstKeyField, keyOf, missing, notifier, shown } from "./write-shared.js";
+import { blockedDelete } from "./blocked-delete.js";
 import { encryptedValuesOf, hasEncryptedValues, sealValues } from "./encryption/seal-values.js";
-import { actorSettings, wakeDispatch } from "./changes/actor.js";
 import { validateBody } from "./validate-body.js";
-import { assertWritten, checkParents, checkPrecondition, decide, denied, firstKeyField, keyOf, missing, notifier, shown } from "./write-shared.js";
 import { applyUpdate, planUpdate } from "./write-update.js";
 import { checkRankAfter } from "./rank-after.js";
 //#region src/write-pipeline.ts

package/dist/write-shared.d.ts

@@ -0,0 +1,13 @@
+import { Row } from "./types.js";
+import "./registry.js";
+import "./deps.js";
+import "./records.js";
+import "./request-access.js";
+import "@protobase/schema";
+import { Db } from "@protobase/query";
+//#region src/write-shared.d.ts
+export type WriteResult = {
+  record: Row;
+  etag: string;
+};
+//#endregion

package/dist/write-shared.js

@@ -3,11 +3,11 @@ import { forbidden, notFound, preconditionFailed, preconditionRequired } from ".
 import { tenantScope } from "./tenant.js";
 import { andFilters, recordDecision } from "./request-access.js";
 import { ifMatchSatisfied } from "./etag.js";
-import { presentFiles } from "./files/present.js";
 import { pickFields } from "./rows.js";
 import { fetchRecord } from "./records.js";
-import { parentGuard } from "./parent-access.js";
 import { scheduleRemovedFiles } from "./files/attach.js";
+import { parentGuard } from "./parent-access.js";
+import { presentFiles } from "./files/present.js";
 //#region src/write-shared.ts
 const missing = (entry) => notFound(`No ${entry.name} with this key`);
 const checkPrecondition = (current, ifMatch, required) => {

package/dist/write-update.js

@@ -4,9 +4,9 @@ import { targetFilter } from "./request-access.js";
 import { bindingOf } from "./encryption/binding.js";
 import { fetchRecord, updateRecord } from "./records.js";
 import { attachFiles } from "./files/attach.js";
+import { assertWritten, checkParents, checkPrecondition, decide, denied, firstKeyField, missing, notifier } from "./write-shared.js";
 import { sealValues } from "./encryption/seal-values.js";
 import { validateBody } from "./validate-body.js";
-import { assertWritten, checkParents, checkPrecondition, decide, denied, firstKeyField, missing, notifier } from "./write-shared.js";
 //#region src/write-update.ts
 /**
 * Everything an update needs before it writes: the row (locked, inside the caller's tenant and row filters), the ETag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.41.1",
+  "version": "0.43.0",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -36,9 +36,9 @@
     "@better-auth/passkey": "^1.7.12",
     "@better-auth/sso": "^1.7.12",
     "@modelcontextprotocol/server": "^2.3.1",
-    "@protobase/layout": "0.41.1",
-    "@protobase/query": "0.41.1",
-    "@protobase/schema": "0.41.1",
+    "@protobase/layout": "0.43.0",
+    "@protobase/query": "0.43.0",
+    "@protobase/schema": "0.43.0",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",