@atscript/moost-db 0.1.161 → 0.1.162

package/dist/index.cjs

@@ -88,7 +88,9 @@ const dbErrorCodeToStatus = {
 	DEADLOCK: 503,
 	LOCK_TIMEOUT: 503,
 	SERIALIZATION_FAILURE: 503,
-	BUCKET_TZ_UNAVAILABLE: 501
+	BUCKET_TZ_UNAVAILABLE: 501,
+	LOCK_NOT_SUPPORTED: 501,
+	ISOLATION_NOT_SUPPORTED: 501
 };
 function transformValidationError(error, reply) {
 	const validation = validatorErrorToHttp(error);
@@ -2087,14 +2089,6 @@ function readRequestContext(endpoint, controls, filter) {
 }
 //#endregion
 //#region src/meta/terminal-ref.ts
-const NAV_KEYS = [
-	"db.rel.to",
-	"db.rel.from",
-	"db.rel.via"
-];
-function isNav(metadata) {
-	return NAV_KEYS.some((key) => metadata.has(key));
-}
 /**
 * Resolves a (possibly dotted) prop path against an object type by walking
 * `type.props` one segment at a time. Bails with `undefined` as soon as a hop
@@ -2184,7 +2178,7 @@ function walk(node, def, shallow) {
 		for (const [name, prop] of def.type.props) {
 			const sProp = sType.props[name];
 			if (!sProp) continue;
-			if (isNav(prop.metadata)) continue;
+			if ((0, _atscript_db.isNavRelation)(prop)) continue;
 			if (prop.ref?.field && sProp.ref && !("type" in sProp.ref.type)) {
 				const terminal = resolveTerminalRef(prop);
 				if (terminal) {
@@ -2877,7 +2871,7 @@ let AsReadableController = _AsReadableController = class AsReadableController {
 	*
 	* Annotation whitelist: keeps `meta.*`, `expect.*`, `db.rel.*`, the `db.*`
 	* keys the shared db validator plugin reads in db-client (`db.json`,
-	* `db.patch.strategy`, `db.default*`, `db.onUpdate.now`, `db.column.version`,
+	* `db.patch.strategy`, `db.default*`, `db.onUpdate.now` / `.inc`, `db.column.version`,
 	* `db.column.derived`) and the client-facing `db.http.path` /
 	* `db.writeOnly` / `db.sort.nulls`; strips every other `db.*` (table, column, index, etc.).
 	* Override in subclass to customise — keep the validator keys, or client
@@ -2891,7 +2885,7 @@ let AsReadableController = _AsReadableController = class AsReadableController {
 					key,
 					value
 				};
-				if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default") || key === "db.onUpdate.now" || key === "db.http.path" || key === "db.writeOnly" || key === "db.column.version" || key === "db.column.derived" || key === "db.sort.nulls") return {
+				if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default") || key === "db.onUpdate.now" || key === "db.onUpdate.inc" || key === "db.http.path" || key === "db.writeOnly" || key === "db.column.version" || key === "db.column.derived" || key === "db.sort.nulls") return {
 					key,
 					value
 				};
@@ -7827,10 +7821,13 @@ let AsDbController = _AsDbController = class AsDbController extends AsDbReadable
 	/**
 	* Runs `fn` inside the bound table's adapter transaction (nested calls
 	* join it). For custom actions and routes that need one transaction across
-	* several table operations.
+	* several table operations. `opts.isolation` (since 0.1.162) sets the
+	* level of the transaction this call opens — see `TTransactionOptions`.
+	* Inside it, `this.table.findOne(q, { lock: 'update' })` is a locking read
+	* (never reachable from a URL — it is a server-side option only).
 	*/
-	withTransaction(fn) {
-		return this.table.getAdapter().withTransaction(fn);
+	withTransaction(fn, opts) {
+		return this.table.getAdapter().withTransaction(fn, opts);
 	}
 	/** The table write call's trailing options — see {@link _hookArgs}. */
 	_writeArgs;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { a as resolveDbSpace, i as provideDbSpace, n as clearDbSpaces, r as closeDbSpaces, t as DEFAULT_DB_SPACE } from "./db-space-registry-fXB8LnGe.cjs";
 import { TAtscriptAnnotatedType, TAtscriptDataType, TSerializeOptions, TSerializedAnnotatedType, TValidatorOptions, Validator } from "@atscript/typescript/utils";
-import { AggregateFn, AtscriptDbReadable, AtscriptDbTable, BucketUnit, FilterExpr, FlatOf, NullsPlacement, TCrudOp, TCrudOp as TCrudOp$1, TCrudPermissions, TCrudPermissions as TCrudPermissions$1, TDbActionInfo, TDbActionInfo as TDbActionInfo$1, TDbActionIntent, TDbActionIntent as TDbActionIntent$1, TDbActionLevel, TDbActionLevel as TDbActionLevel$1, TDbActionProcessor, TDbActionTargetSummary, TDbActionTargetSummary as TDbActionTargetSummary$1, TDbAvailableActions, TDbAvailableActions as TDbAvailableActions$1, TDbFieldMeta, TDbRemoveGuardContext, TDbRemoveGuardContext as TDbRemoveGuardContext$1, TDbWriteAction, TDbWriteAction as TDbWriteAction$1, TDbWriteCheckContext, TDbWriteCheckContext as TDbWriteCheckContext$1, TDbWriteGuardContext, TDbWriteGuardContext as TDbWriteGuardContext$1, TFilterPredicate, TIdResolveOptions, TIdentification, TMetaResponse, TQueryPathOp, TQueryPathOp as TQueryPathOp$1, TQueryPathRefs, TQueryPathSource, Uniquery, UniqueryControls, collectQueryPaths } from "@atscript/db";
+import { AggregateFn, AtscriptDbReadable, AtscriptDbTable, BucketUnit, FilterExpr, FlatOf, NullsPlacement, TCrudOp, TCrudOp as TCrudOp$1, TCrudPermissions, TCrudPermissions as TCrudPermissions$1, TDbActionInfo, TDbActionInfo as TDbActionInfo$1, TDbActionIntent, TDbActionIntent as TDbActionIntent$1, TDbActionLevel, TDbActionLevel as TDbActionLevel$1, TDbActionProcessor, TDbActionTargetSummary, TDbActionTargetSummary as TDbActionTargetSummary$1, TDbAvailableActions, TDbAvailableActions as TDbAvailableActions$1, TDbFieldMeta, TDbRemoveGuardContext, TDbRemoveGuardContext as TDbRemoveGuardContext$1, TDbWriteAction, TDbWriteAction as TDbWriteAction$1, TDbWriteCheckContext, TDbWriteCheckContext as TDbWriteCheckContext$1, TDbWriteGuardContext, TDbWriteGuardContext as TDbWriteGuardContext$1, TFilterPredicate, TIdResolveOptions, TIdentification, TMetaResponse, TQueryPathOp, TQueryPathOp as TQueryPathOp$1, TQueryPathRefs, TQueryPathSource, TTransactionOptions, Uniquery, UniqueryControls, collectQueryPaths } from "@atscript/db";
 import { HttpError } from "@moostjs/event-http";
 import { Mate, Moost, TConsoleBase, TMateParamMeta, TMoostMetadata } from "moost";
 import { parseUrl } from "@uniqu/url";
@@ -241,7 +241,7 @@ declare abstract class AsReadableController<T extends TAtscriptAnnotatedType = T
    *
    * Annotation whitelist: keeps `meta.*`, `expect.*`, `db.rel.*`, the `db.*`
    * keys the shared db validator plugin reads in db-client (`db.json`,
-   * `db.patch.strategy`, `db.default*`, `db.onUpdate.now`, `db.column.version`,
+   * `db.patch.strategy`, `db.default*`, `db.onUpdate.now` / `.inc`, `db.column.version`,
    * `db.column.derived`) and the client-facing `db.http.path` /
    * `db.writeOnly` / `db.sort.nulls`; strips every other `db.*` (table, column, index, etc.).
    * Override in subclass to customise — keep the validator keys, or client
@@ -2358,9 +2358,12 @@ declare class AsDbController<T extends TAtscriptAnnotatedType = TAtscriptAnnotat
   /**
    * Runs `fn` inside the bound table's adapter transaction (nested calls
    * join it). For custom actions and routes that need one transaction across
-   * several table operations.
+   * several table operations. `opts.isolation` (since 0.1.162) sets the
+   * level of the transaction this call opens — see `TTransactionOptions`.
+   * Inside it, `this.table.findOne(q, { lock: 'update' })` is a locking read
+   * (never reachable from a URL — it is a server-side option only).
    */
-  protected withTransaction<R>(fn: () => Promise<R>): Promise<R>;
+  protected withTransaction<R>(fn: () => Promise<R>, opts?: TTransactionOptions): Promise<R>;
   /** The table write call's trailing options — see {@link _hookArgs}. */
   private readonly _writeArgs;
   /** `deleteOne`'s trailing options — see {@link _hookArgs}. */

package/dist/index.d.mts

@@ -3,7 +3,7 @@ import { TAtscriptAnnotatedType, TAtscriptDataType, TSerializeOptions, TSerializ
 import { HttpError, MoostHttp } from "@moostjs/event-http";
 import { Mate, Moost, TConsoleBase, TMateParamMeta, TMoostMetadata } from "moost";
 import { parseUrl } from "@uniqu/url";
-import { AggregateFn, AtscriptDbReadable, AtscriptDbTable, BucketUnit, FilterExpr, FlatOf, NullsPlacement, TCrudOp, TCrudOp as TCrudOp$1, TCrudPermissions, TCrudPermissions as TCrudPermissions$1, TDbActionInfo, TDbActionInfo as TDbActionInfo$1, TDbActionIntent, TDbActionIntent as TDbActionIntent$1, TDbActionLevel, TDbActionLevel as TDbActionLevel$1, TDbActionProcessor, TDbActionTargetSummary, TDbActionTargetSummary as TDbActionTargetSummary$1, TDbAvailableActions, TDbAvailableActions as TDbAvailableActions$1, TDbFieldMeta, TDbRemoveGuardContext, TDbRemoveGuardContext as TDbRemoveGuardContext$1, TDbWriteAction, TDbWriteAction as TDbWriteAction$1, TDbWriteCheckContext, TDbWriteCheckContext as TDbWriteCheckContext$1, TDbWriteGuardContext, TDbWriteGuardContext as TDbWriteGuardContext$1, TFilterPredicate, TIdResolveOptions, TIdentification, TMetaResponse, TQueryPathOp, TQueryPathOp as TQueryPathOp$1, TQueryPathRefs, TQueryPathSource, Uniquery, UniqueryControls, collectQueryPaths } from "@atscript/db";
+import { AggregateFn, AtscriptDbReadable, AtscriptDbTable, BucketUnit, FilterExpr, FlatOf, NullsPlacement, TCrudOp, TCrudOp as TCrudOp$1, TCrudPermissions, TCrudPermissions as TCrudPermissions$1, TDbActionInfo, TDbActionInfo as TDbActionInfo$1, TDbActionIntent, TDbActionIntent as TDbActionIntent$1, TDbActionLevel, TDbActionLevel as TDbActionLevel$1, TDbActionProcessor, TDbActionTargetSummary, TDbActionTargetSummary as TDbActionTargetSummary$1, TDbAvailableActions, TDbAvailableActions as TDbAvailableActions$1, TDbFieldMeta, TDbRemoveGuardContext, TDbRemoveGuardContext as TDbRemoveGuardContext$1, TDbWriteAction, TDbWriteAction as TDbWriteAction$1, TDbWriteCheckContext, TDbWriteCheckContext as TDbWriteCheckContext$1, TDbWriteGuardContext, TDbWriteGuardContext as TDbWriteGuardContext$1, TFilterPredicate, TIdResolveOptions, TIdentification, TMetaResponse, TQueryPathOp, TQueryPathOp as TQueryPathOp$1, TQueryPathRefs, TQueryPathSource, TTransactionOptions, Uniquery, UniqueryControls, collectQueryPaths } from "@atscript/db";
 import { EventContext } from "@wooksjs/event-core";
 
 //#region src/meta/meta-cache.d.ts
@@ -241,7 +241,7 @@ declare abstract class AsReadableController<T extends TAtscriptAnnotatedType = T
    *
    * Annotation whitelist: keeps `meta.*`, `expect.*`, `db.rel.*`, the `db.*`
    * keys the shared db validator plugin reads in db-client (`db.json`,
-   * `db.patch.strategy`, `db.default*`, `db.onUpdate.now`, `db.column.version`,
+   * `db.patch.strategy`, `db.default*`, `db.onUpdate.now` / `.inc`, `db.column.version`,
    * `db.column.derived`) and the client-facing `db.http.path` /
    * `db.writeOnly` / `db.sort.nulls`; strips every other `db.*` (table, column, index, etc.).
    * Override in subclass to customise — keep the validator keys, or client
@@ -2358,9 +2358,12 @@ declare class AsDbController<T extends TAtscriptAnnotatedType = TAtscriptAnnotat
   /**
    * Runs `fn` inside the bound table's adapter transaction (nested calls
    * join it). For custom actions and routes that need one transaction across
-   * several table operations.
+   * several table operations. `opts.isolation` (since 0.1.162) sets the
+   * level of the transaction this call opens — see `TTransactionOptions`.
+   * Inside it, `this.table.findOne(q, { lock: 'update' })` is a locking read
+   * (never reachable from a URL — it is a server-side option only).
    */
-  protected withTransaction<R>(fn: () => Promise<R>): Promise<R>;
+  protected withTransaction<R>(fn: () => Promise<R>, opts?: TTransactionOptions): Promise<R>;
   /** The table write call's trailing options — see {@link _hookArgs}. */
   private readonly _writeArgs;
   /** `deleteOne`'s trailing options — see {@link _hookArgs}. */

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { ValidatorError, defineAnnotatedType, isAnnotatedType, serializeAnnotate
 import { Body, Delete, Get, HttpError, MoostHttp, Patch, Post, Put, Query, Url, httpKind, prerenderJson } from "@moostjs/event-http";
 import { ApplyDecorators, Controller, Inherit, Inject, Intercept, Moost, Optional, Param, Pipe, Provide, Resolve, TInterceptorPriority, TPipePriority, current, defineBeforeInterceptor, defineInterceptor, definePipeFn, getMoostMate, useControllerContext, withControllerContext } from "moost";
 import { parseUrl } from "@uniqu/url";
-import { ADAPTER_FILTER_REASON, ALL_AGGREGATE_FNS, DbError, ENCRYPTED_REASON, acceptedOperatorsHint, aliasTargetOf, andFilters, bucketSourceVerdict, canFilterLeaf, checkHavingKeys, classifyQueryPath, collectQueryPaths, collectQueryPaths as collectQueryPaths$1, containsRelationFilter, findAncestorInSet, geoIndexNotFoundMessage, groupSourceVerdict, hasRelationOp, isEmptyObject, isJsonValueField, isPlainObject, isRelationOp, narrowerFilterOps, normalizeComputedSelect, numericOperandProblem, reconcileCas, resolveDesignType, searchIndexNotFoundMessage, searchMemberKind, selfOrAncestor, unsupportedOperatorMessage, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ADAPTER_FILTER_REASON, ALL_AGGREGATE_FNS, DbError, ENCRYPTED_REASON, acceptedOperatorsHint, aliasTargetOf, andFilters, bucketSourceVerdict, canFilterLeaf, checkHavingKeys, classifyQueryPath, collectQueryPaths, collectQueryPaths as collectQueryPaths$1, containsRelationFilter, findAncestorInSet, geoIndexNotFoundMessage, groupSourceVerdict, hasRelationOp, isEmptyObject, isJsonValueField, isNavRelation, isPlainObject, isRelationOp, narrowerFilterOps, normalizeComputedSelect, numericOperandProblem, reconcileCas, resolveDesignType, searchIndexNotFoundMessage, searchMemberKind, selfOrAncestor, unsupportedOperatorMessage, vectorIndexNotFoundMessage } from "@atscript/db";
 import { cached, current as current$1, defineWook, key, routeParamsKey, useRouteParams } from "@wooksjs/event-core";
 import { useBody } from "@wooksjs/http-body";
 import { BUCKET_UNITS } from "@uniqu/core";
@@ -87,7 +87,9 @@ const dbErrorCodeToStatus = {
 	DEADLOCK: 503,
 	LOCK_TIMEOUT: 503,
 	SERIALIZATION_FAILURE: 503,
-	BUCKET_TZ_UNAVAILABLE: 501
+	BUCKET_TZ_UNAVAILABLE: 501,
+	LOCK_NOT_SUPPORTED: 501,
+	ISOLATION_NOT_SUPPORTED: 501
 };
 function transformValidationError(error, reply) {
 	const validation = validatorErrorToHttp(error);
@@ -2086,14 +2088,6 @@ function readRequestContext(endpoint, controls, filter) {
 }
 //#endregion
 //#region src/meta/terminal-ref.ts
-const NAV_KEYS = [
-	"db.rel.to",
-	"db.rel.from",
-	"db.rel.via"
-];
-function isNav(metadata) {
-	return NAV_KEYS.some((key) => metadata.has(key));
-}
 /**
 * Resolves a (possibly dotted) prop path against an object type by walking
 * `type.props` one segment at a time. Bails with `undefined` as soon as a hop
@@ -2183,7 +2177,7 @@ function walk(node, def, shallow) {
 		for (const [name, prop] of def.type.props) {
 			const sProp = sType.props[name];
 			if (!sProp) continue;
-			if (isNav(prop.metadata)) continue;
+			if (isNavRelation(prop)) continue;
 			if (prop.ref?.field && sProp.ref && !("type" in sProp.ref.type)) {
 				const terminal = resolveTerminalRef(prop);
 				if (terminal) {
@@ -2876,7 +2870,7 @@ let AsReadableController = _AsReadableController = class AsReadableController {
 	*
 	* Annotation whitelist: keeps `meta.*`, `expect.*`, `db.rel.*`, the `db.*`
 	* keys the shared db validator plugin reads in db-client (`db.json`,
-	* `db.patch.strategy`, `db.default*`, `db.onUpdate.now`, `db.column.version`,
+	* `db.patch.strategy`, `db.default*`, `db.onUpdate.now` / `.inc`, `db.column.version`,
 	* `db.column.derived`) and the client-facing `db.http.path` /
 	* `db.writeOnly` / `db.sort.nulls`; strips every other `db.*` (table, column, index, etc.).
 	* Override in subclass to customise — keep the validator keys, or client
@@ -2890,7 +2884,7 @@ let AsReadableController = _AsReadableController = class AsReadableController {
 					key,
 					value
 				};
-				if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default") || key === "db.onUpdate.now" || key === "db.http.path" || key === "db.writeOnly" || key === "db.column.version" || key === "db.column.derived" || key === "db.sort.nulls") return {
+				if (key === "db.json" || key === "db.patch.strategy" || key.startsWith("db.default") || key === "db.onUpdate.now" || key === "db.onUpdate.inc" || key === "db.http.path" || key === "db.writeOnly" || key === "db.column.version" || key === "db.column.derived" || key === "db.sort.nulls") return {
 					key,
 					value
 				};
@@ -7824,10 +7818,13 @@ let AsDbController = _AsDbController = class AsDbController extends AsDbReadable
 	/**
 	* Runs `fn` inside the bound table's adapter transaction (nested calls
 	* join it). For custom actions and routes that need one transaction across
-	* several table operations.
+	* several table operations. `opts.isolation` (since 0.1.162) sets the
+	* level of the transaction this call opens — see `TTransactionOptions`.
+	* Inside it, `this.table.findOne(q, { lock: 'update' })` is a locking read
+	* (never reachable from a URL — it is a server-side option only).
 	*/
-	withTransaction(fn) {
-		return this.table.getAdapter().withTransaction(fn);
+	withTransaction(fn, opts) {
+		return this.table.getAdapter().withTransaction(fn, opts);
 	}
 	/** The table write call's trailing options — see {@link _hookArgs}. */
 	_writeArgs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.161",
+  "version": "0.1.162",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@uniqu/url": "^0.1.15",
-    "@atscript/db-memory": "^0.1.161"
+    "@atscript/db-memory": "^0.1.162"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.108",
-    "@atscript/typescript": "^0.1.108",
-    "@moostjs/event-http": "^0.6.52",
+    "@atscript/core": "^0.1.109",
+    "@atscript/typescript": "^0.1.109",
+    "@moostjs/event-http": "^0.6.53",
     "@uniqu/core": "^0.1.15",
-    "@wooksjs/event-core": "^0.7.30",
-    "@wooksjs/event-http": "^0.7.30",
-    "@wooksjs/http-body": "^0.7.30",
+    "@wooksjs/event-core": "^0.7.31",
+    "@wooksjs/event-http": "^0.7.31",
+    "@wooksjs/http-body": "^0.7.31",
     "better-sqlite3": "^12.6.2",
-    "moost": "^0.6.52",
-    "unplugin-atscript": "^0.1.108",
-    "@atscript/db-sqlite": "^0.1.161"
+    "moost": "^0.6.53",
+    "unplugin-atscript": "^0.1.109",
+    "@atscript/db-sqlite": "^0.1.162"
   },
   "peerDependencies": {
-    "@atscript/typescript": "^0.1.108",
-    "@moostjs/event-http": "^0.6.52",
+    "@atscript/typescript": "^0.1.109",
+    "@moostjs/event-http": "^0.6.53",
     "@uniqu/core": "^0.1.15",
-    "@wooksjs/event-core": "^0.7.30",
-    "@wooksjs/http-body": "^0.7.30",
-    "moost": "^0.6.52",
-    "@atscript/db": "^0.1.161"
+    "@wooksjs/event-core": "^0.7.31",
+    "@wooksjs/http-body": "^0.7.31",
+    "moost": "^0.6.53",
+    "@atscript/db": "^0.1.162"
   },
   "scripts": {
     "build": "vp pack",