@atscript/db 0.1.146 → 0.1.147

package/dist/{validation-utils-DOsB4e6G.cjs → validation-utils-Da2GjobR.cjs}

@@ -344,44 +344,55 @@ function hasAnyViewAnnotation(node) {
 	return viewAnnotationNames.some((name) => node.countAnnotations(name) > 0);
 }
 /**
-* Validate that all field refs in a query expression are within `scope` —
-* the same {@link TQueryScope} the editor completes (`lsp-scopes`):
+* Every field ref of a backtick argument — a predicate (`queryNode`), an
+* arithmetic expression (`exprNode`) or an ordering (`orderNode`) — in source
+* order. `[]` when the argument did not parse.
+* @since 0.1.147
+*/
+function backtickFieldRefs(token) {
+	if (token.queryNode) {
+		const refs = [];
+		forEachFieldRef(token.queryNode.expression, (ref) => refs.push(ref));
+		return refs;
+	}
+	return (token.exprNode ?? token.orderNode)?.fieldRefs() ?? [];
+}
+/**
+* Validate that all field refs in a backtick argument (a query, an `expr` or
+* an `order`) are within `scope` — the same {@link TQueryScope} the editor
+* completes (`lsp-scopes`):
 * qualified refs must name one of `scope.allowedTypes`; an unqualified ref
 * (a dotted path included) must be a field of `scope.unqualifiedTarget`, or
 * is rejected outright when that is `null`.
 *
-* @param queryToken - The query arg token (must have .queryNode)
+* @param queryToken - The backtick arg token (with `.queryNode`, `.exprNode` or `.orderNode`)
 * @param scope - The scope of the argument
 * @param doc - The document for type lookups
 * @param scopeHint - Replaces the default "expected 'A' or 'B'" tail of the out-of-scope message
 */
 function validateQueryScope(queryToken, scope, doc, scopeHint) {
 	const errors = [];
-	const queryNode = queryToken.queryNode;
-	if (!queryNode) return errors;
 	const { allowedTypes, unqualifiedTarget } = scope;
-	forEachFieldRef(queryNode.expression, (ref) => {
-		if (ref.typeRef) {
-			const typeName = ref.typeRef.text;
-			if (!allowedTypes.includes(typeName)) errors.push({
-				message: `Query references '${typeName}' which is not in scope — ${scopeHint ?? `expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`}`,
-				severity: 1,
-				range: ref.typeRef.range
-			});
-		} else if (unqualifiedTarget === null) errors.push({
-			message: `Unqualified field reference '${ref.fieldRef.text}' — use qualified form (e.g., Type.${ref.fieldRef.text})`,
+	for (const ref of backtickFieldRefs(queryToken)) if (ref.typeRef) {
+		const typeName = ref.typeRef.text;
+		if (!allowedTypes.includes(typeName)) errors.push({
+			message: `Query references '${typeName}' which is not in scope — ${scopeHint ?? `expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`}`,
 			severity: 1,
-			range: ref.fieldRef.range
+			range: ref.typeRef.range
 		});
-		else {
-			const targetDef = doc.unwindType(unqualifiedTarget)?.def;
-			if (targetDef && ((0, _atscript_core.isInterface)(targetDef) || (0, _atscript_core.isStructure)(targetDef)) && !doc.unwindType(unqualifiedTarget, ref.fieldRef.text.split("."))) errors.push({
-				message: `Field '${ref.fieldRef.text}' does not exist on '${unqualifiedTarget}'`,
-				severity: 1,
-				range: ref.fieldRef.range
-			});
-		}
+	} else if (unqualifiedTarget === null) errors.push({
+		message: `Unqualified field reference '${ref.fieldRef.text}' — use qualified form (e.g., Type.${ref.fieldRef.text})`,
+		severity: 1,
+		range: ref.fieldRef.range
 	});
+	else {
+		const targetDef = doc.unwindType(unqualifiedTarget)?.def;
+		if (targetDef && ((0, _atscript_core.isInterface)(targetDef) || (0, _atscript_core.isStructure)(targetDef)) && !doc.unwindType(unqualifiedTarget, ref.fieldRef.text.split("."))) errors.push({
+			message: `Field '${ref.fieldRef.text}' does not exist on '${unqualifiedTarget}'`,
+			severity: 1,
+			range: ref.fieldRef.range
+		});
+	}
 	return errors;
 }
 /**

package/dist/{validation-utils-CMR4fe2M.mjs → validation-utils-Dq0uZ7ef.mjs}

@@ -344,44 +344,55 @@ function hasAnyViewAnnotation(node) {
 	return viewAnnotationNames.some((name) => node.countAnnotations(name) > 0);
 }
 /**
-* Validate that all field refs in a query expression are within `scope` —
-* the same {@link TQueryScope} the editor completes (`lsp-scopes`):
+* Every field ref of a backtick argument — a predicate (`queryNode`), an
+* arithmetic expression (`exprNode`) or an ordering (`orderNode`) — in source
+* order. `[]` when the argument did not parse.
+* @since 0.1.147
+*/
+function backtickFieldRefs(token) {
+	if (token.queryNode) {
+		const refs = [];
+		forEachFieldRef(token.queryNode.expression, (ref) => refs.push(ref));
+		return refs;
+	}
+	return (token.exprNode ?? token.orderNode)?.fieldRefs() ?? [];
+}
+/**
+* Validate that all field refs in a backtick argument (a query, an `expr` or
+* an `order`) are within `scope` — the same {@link TQueryScope} the editor
+* completes (`lsp-scopes`):
 * qualified refs must name one of `scope.allowedTypes`; an unqualified ref
 * (a dotted path included) must be a field of `scope.unqualifiedTarget`, or
 * is rejected outright when that is `null`.
 *
-* @param queryToken - The query arg token (must have .queryNode)
+* @param queryToken - The backtick arg token (with `.queryNode`, `.exprNode` or `.orderNode`)
 * @param scope - The scope of the argument
 * @param doc - The document for type lookups
 * @param scopeHint - Replaces the default "expected 'A' or 'B'" tail of the out-of-scope message
 */
 function validateQueryScope(queryToken, scope, doc, scopeHint) {
 	const errors = [];
-	const queryNode = queryToken.queryNode;
-	if (!queryNode) return errors;
 	const { allowedTypes, unqualifiedTarget } = scope;
-	forEachFieldRef(queryNode.expression, (ref) => {
-		if (ref.typeRef) {
-			const typeName = ref.typeRef.text;
-			if (!allowedTypes.includes(typeName)) errors.push({
-				message: `Query references '${typeName}' which is not in scope — ${scopeHint ?? `expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`}`,
-				severity: 1,
-				range: ref.typeRef.range
-			});
-		} else if (unqualifiedTarget === null) errors.push({
-			message: `Unqualified field reference '${ref.fieldRef.text}' — use qualified form (e.g., Type.${ref.fieldRef.text})`,
+	for (const ref of backtickFieldRefs(queryToken)) if (ref.typeRef) {
+		const typeName = ref.typeRef.text;
+		if (!allowedTypes.includes(typeName)) errors.push({
+			message: `Query references '${typeName}' which is not in scope — ${scopeHint ?? `expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`}`,
 			severity: 1,
-			range: ref.fieldRef.range
+			range: ref.typeRef.range
 		});
-		else {
-			const targetDef = doc.unwindType(unqualifiedTarget)?.def;
-			if (targetDef && (isInterface(targetDef) || isStructure(targetDef)) && !doc.unwindType(unqualifiedTarget, ref.fieldRef.text.split("."))) errors.push({
-				message: `Field '${ref.fieldRef.text}' does not exist on '${unqualifiedTarget}'`,
-				severity: 1,
-				range: ref.fieldRef.range
-			});
-		}
+	} else if (unqualifiedTarget === null) errors.push({
+		message: `Unqualified field reference '${ref.fieldRef.text}' — use qualified form (e.g., Type.${ref.fieldRef.text})`,
+		severity: 1,
+		range: ref.fieldRef.range
 	});
+	else {
+		const targetDef = doc.unwindType(unqualifiedTarget)?.def;
+		if (targetDef && (isInterface(targetDef) || isStructure(targetDef)) && !doc.unwindType(unqualifiedTarget, ref.fieldRef.text.split("."))) errors.push({
+			message: `Field '${ref.fieldRef.text}' does not exist on '${unqualifiedTarget}'`,
+			severity: 1,
+			range: ref.fieldRef.range
+		});
+	}
 	return errors;
 }
 /**

package/dist/{validator-Bw6ks9Hy.d.mts → validator-CMnTI6r7.d.cts}

@@ -1,7 +1,14 @@
 import { TAtscriptAnnotatedType, TAtscriptTypeArray, TAtscriptTypeObject, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 
 //#region src/db-error.d.ts
-type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" /** A known aggregate function the adapter's `aggregateFns()` lacks (moost-db: 400). @since 0.1.136 */ | "AGG_FN_NOT_SUPPORTED" | "TX_WAIT_TIMEOUT";
+type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" /** A known aggregate function the adapter's `aggregateFns()` lacks (moost-db: 400). @since 0.1.136 */ | "AGG_FN_NOT_SUPPORTED"
+/**
+ * The adapter (or the table's wiring) cannot run a relational predicate:
+ * `supportsRelationFilters()` is false for the read/write mode, the related
+ * table lives on a different adapter, or the table was built without a
+ * `DbSpace` (moost-db: 400). @since 0.1.147
+ */
+| "REL_FILTER_NOT_SUPPORTED" | "TX_WAIT_TIMEOUT";
 declare class DbError extends Error {
   readonly code: DbErrorCode;
   readonly errors: Array<{
@@ -39,11 +46,7 @@ declare class CasMismatchError extends DbError {
   /** Keys passed to `touchMany`. */
   readonly expected: number;
   name: string;
-  constructor(/** Rows whose primary key + version matched. */
-
-  matched: number, /** Keys passed to `touchMany`. */
-
-  expected: number);
+  constructor(/** Rows whose primary key + version matched. */matched: number, /** Keys passed to `touchMany`. */expected: number);
 }
 /**
  * The engine cannot resolve a calendar bucket's time zone (`BUCKET_TZ_UNAVAILABLE`,

package/dist/{validator-Bw6ks9Hy.d.cts → validator-CMnTI6r7.d.mts}

@@ -1,7 +1,14 @@
 import { TAtscriptAnnotatedType, TAtscriptTypeArray, TAtscriptTypeObject, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 
 //#region src/db-error.d.ts
-type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" /** A known aggregate function the adapter's `aggregateFns()` lacks (moost-db: 400). @since 0.1.136 */ | "AGG_FN_NOT_SUPPORTED" | "TX_WAIT_TIMEOUT";
+type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" /** A known aggregate function the adapter's `aggregateFns()` lacks (moost-db: 400). @since 0.1.136 */ | "AGG_FN_NOT_SUPPORTED"
+/**
+ * The adapter (or the table's wiring) cannot run a relational predicate:
+ * `supportsRelationFilters()` is false for the read/write mode, the related
+ * table lives on a different adapter, or the table was built without a
+ * `DbSpace` (moost-db: 400). @since 0.1.147
+ */
+| "REL_FILTER_NOT_SUPPORTED" | "TX_WAIT_TIMEOUT";
 declare class DbError extends Error {
   readonly code: DbErrorCode;
   readonly errors: Array<{
@@ -39,11 +46,7 @@ declare class CasMismatchError extends DbError {
   /** Keys passed to `touchMany`. */
   readonly expected: number;
   name: string;
-  constructor(/** Rows whose primary key + version matched. */
-
-  matched: number, /** Keys passed to `touchMany`. */
-
-  expected: number);
+  constructor(/** Rows whose primary key + version matched. */matched: number, /** Keys passed to `touchMany`. */expected: number);
 }
 /**
  * The engine cannot resolve a calendar bucket's time zone (`BUCKET_TZ_UNAVAILABLE`,

package/dist/validator.d.cts

@@ -1,5 +1,5 @@
 import { a as $mul, c as $update, d as TDbFieldOp, g as separateCas, h as reconcileCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-AqhV7s9o.cjs";
 import { a as isPlainObject, i as isEmptyObject } from "./object-CtPYTIvy.cjs";
-import { a as buildValidationContext, c as isNavRelation, d as getKeyProps, i as buildPatchPartial, l as TArrayPatch, m as DbError, n as ValidatorMode, o as dbPlugin, r as buildDbValidator, s as forceNavNonOptional, t as ValidationContext, u as TDbPatch } from "./validator-Bw6ks9Hy.cjs";
+import { a as buildValidationContext, c as isNavRelation, d as getKeyProps, i as buildPatchPartial, l as TArrayPatch, m as DbError, n as ValidatorMode, o as dbPlugin, r as buildDbValidator, s as forceNavNonOptional, t as ValidationContext, u as TDbPatch } from "./validator-CMnTI6r7.cjs";
 import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.cjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, DbError, type DbValidationContext, type TArrayPatch, type TDbCas, type TDbFieldOp, type TDbPatch, ValidationContext, ValidatorMode, buildDbValidator, buildPatchPartial, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isEmptyObject, isNavRelation, isPlainObject, reconcileCas, separateCas };

package/dist/validator.d.mts

@@ -1,5 +1,5 @@
 import { a as $mul, c as $update, d as TDbFieldOp, g as separateCas, h as reconcileCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-AqhV7s9o.mjs";
 import { a as isPlainObject, i as isEmptyObject } from "./object-CtPYTIvy.mjs";
-import { a as buildValidationContext, c as isNavRelation, d as getKeyProps, i as buildPatchPartial, l as TArrayPatch, m as DbError, n as ValidatorMode, o as dbPlugin, r as buildDbValidator, s as forceNavNonOptional, t as ValidationContext, u as TDbPatch } from "./validator-Bw6ks9Hy.mjs";
+import { a as buildValidationContext, c as isNavRelation, d as getKeyProps, i as buildPatchPartial, l as TArrayPatch, m as DbError, n as ValidatorMode, o as dbPlugin, r as buildDbValidator, s as forceNavNonOptional, t as ValidationContext, u as TDbPatch } from "./validator-CMnTI6r7.mjs";
 import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.mjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, DbError, type DbValidationContext, type TArrayPatch, type TDbCas, type TDbFieldOp, type TDbPatch, ValidationContext, ValidatorMode, buildDbValidator, buildPatchPartial, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isEmptyObject, isNavRelation, isPlainObject, reconcileCas, separateCas };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.146",
+  "version": "0.1.147",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",
@@ -71,15 +71,15 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.98",
-    "@atscript/typescript": "^0.1.98",
-    "@uniqu/core": "^0.1.11",
-    "unplugin-atscript": "^0.1.98"
+    "@atscript/core": "^0.1.99",
+    "@atscript/typescript": "^0.1.99",
+    "@uniqu/core": "^0.1.12",
+    "unplugin-atscript": "^0.1.99"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.98",
-    "@atscript/typescript": "^0.1.98",
-    "@uniqu/core": "^0.1.11"
+    "@atscript/core": "^0.1.99",
+    "@atscript/typescript": "^0.1.99",
+    "@uniqu/core": "^0.1.12"
   },
   "scripts": {
     "postinstall": "asc -f dts",