@atscript/db 0.1.101 → 0.1.102

package/dist/{db-error-yx2jdg8B.mjs → db-error-BHPXOKzc.mjs}

@@ -1,5 +1,7 @@
 //#region src/db-error.ts
 var DbError = class extends Error {
+	code;
+	errors;
 	name = "DbError";
 	constructor(code, errors, message) {
 		super(message ?? errors[0]?.message ?? "Database error");
@@ -13,6 +15,9 @@ var DbError = class extends Error {
 * declared `@db.depth.limit N`. Surfaced as HTTP 400 in moost-db.
 */
 var DepthLimitExceededError = class extends DbError {
+	field;
+	declared;
+	actual;
 	name = "DepthLimitExceededError";
 	constructor(field, declared, actual) {
 		const message = `Nested write depth ${actual} exceeds declared @db.depth.limit ${declared} at '${field}'`;
@@ -32,6 +37,8 @@ var DepthLimitExceededError = class extends DbError {
 * last-observed version so callers can log/report the contention.
 */
 var CasExhaustedError = class extends DbError {
+	attempts;
+	lastSeenVersion;
 	name = "CasExhaustedError";
 	constructor(attempts, lastSeenVersion) {
 		const message = `Optimistic concurrency: exhausted ${attempts} attempts; row kept changing under us (last seen version: ${lastSeenVersion ?? "unknown"})`;

package/dist/{db-error-CrtPzaZ-.cjs → db-error-DXwEzmYJ.cjs}

@@ -1,5 +1,7 @@
 //#region src/db-error.ts
 var DbError = class extends Error {
+	code;
+	errors;
 	name = "DbError";
 	constructor(code, errors, message) {
 		super(message ?? errors[0]?.message ?? "Database error");
@@ -13,6 +15,9 @@ var DbError = class extends Error {
 * declared `@db.depth.limit N`. Surfaced as HTTP 400 in moost-db.
 */
 var DepthLimitExceededError = class extends DbError {
+	field;
+	declared;
+	actual;
 	name = "DepthLimitExceededError";
 	constructor(field, declared, actual) {
 		const message = `Nested write depth ${actual} exceeds declared @db.depth.limit ${declared} at '${field}'`;
@@ -32,6 +37,8 @@ var DepthLimitExceededError = class extends DbError {
 * last-observed version so callers can log/report the contention.
 */
 var CasExhaustedError = class extends DbError {
+	attempts;
+	lastSeenVersion;
 	name = "CasExhaustedError";
 	constructor(attempts, lastSeenVersion) {
 		const message = `Optimistic concurrency: exhausted ${attempts} attempts; row kept changing under us (last seen version: ${lastSeenVersion ?? "unknown"})`;

package/dist/{db-readable-Cs1-gchT.d.mts → db-readable-CXdHBtF6.d.mts}

@@ -1,4 +1,4 @@
-import { f as TFieldOps } from "./ops-Blqr0ipy.mjs";
+import { f as TFieldOps } from "./ops-DJRnNTVo.mjs";
 import { FlatOf, FlatOf as FlatOf$1, NavPropsOf, NavPropsOf as NavPropsOf$1, OwnPropsOf, OwnPropsOf as OwnPropsOf$1, PrimaryKeyOf, PrimaryKeyOf as PrimaryKeyOf$1, TAtscriptAnnotatedType, TAtscriptDataType, TAtscriptTypeObject, TMetadataMap, TSerializedAnnotatedType, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 import { AggregateControls, AggregateExpr, AggregateExpr as AggregateExpr$1, AggregateFn, AggregateQuery, AggregateQuery as AggregateQuery$1, AggregateResult, FieldOpsFor, FilterExpr, FilterExpr as FilterExpr$1, TypedWithRelation, Uniquery, Uniquery as Uniquery$1, UniqueryControls, UniqueryControls as UniqueryControls$1, UniqueryInsights, WithRelation, WithRelation as WithRelation$1 } from "@uniqu/core";
 

package/dist/{db-readable-DdY7oFnY.d.cts → db-readable-mhPp-MPv.d.cts}

@@ -1,4 +1,4 @@
-import { f as TFieldOps } from "./ops-lzmfzuY9.cjs";
+import { f as TFieldOps } from "./ops-DJRnNTVo.cjs";
 import { AggregateControls, AggregateExpr, AggregateExpr as AggregateExpr$1, AggregateFn, AggregateQuery, AggregateQuery as AggregateQuery$1, AggregateResult, FieldOpsFor, FilterExpr, FilterExpr as FilterExpr$1, TypedWithRelation, Uniquery, Uniquery as Uniquery$1, UniqueryControls, UniqueryControls as UniqueryControls$1, UniqueryInsights, WithRelation, WithRelation as WithRelation$1 } from "@uniqu/core";
 import { FlatOf, FlatOf as FlatOf$1, NavPropsOf, NavPropsOf as NavPropsOf$1, OwnPropsOf, OwnPropsOf as OwnPropsOf$1, PrimaryKeyOf, PrimaryKeyOf as PrimaryKeyOf$1, TAtscriptAnnotatedType, TAtscriptDataType, TAtscriptTypeObject, TMetadataMap, TSerializedAnnotatedType, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 

package/dist/{db-space-Bcu7ZzYd.d.mts → db-space-BYyVZnL1.d.mts}

@@ -1,4 +1,4 @@
-import { B as TDbInsertResult, J as TFkLookupResolver, N as TDbDeleteResult, W as TDbUpdateResult, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger, t as AtscriptDbReadable, x as TCascadeResolver, z as TDbInsertManyResult } from "./db-readable-Cs1-gchT.mjs";
+import { B as TDbInsertResult, J as TFkLookupResolver, N as TDbDeleteResult, W as TDbUpdateResult, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger, t as AtscriptDbReadable, x as TCascadeResolver, z as TDbInsertManyResult } from "./db-readable-CXdHBtF6.mjs";
 import { AtscriptQueryComparison, AtscriptQueryFieldRef, AtscriptQueryFieldRef as AtscriptQueryFieldRef$1, AtscriptQueryNode, AtscriptQueryNode as AtscriptQueryNode$1, AtscriptRef, FlatOf, NavPropsOf, OwnPropsOf, PrimaryKeyOf, TAtscriptAnnotatedType, TAtscriptDataType, Validator } from "@atscript/typescript/utils";
 import { FilterExpr } from "@uniqu/core";
 

package/dist/{db-space-CybVrQAX.d.cts → db-space-BhOc9_OO.d.cts}

@@ -1,4 +1,4 @@
-import { B as TDbInsertResult, J as TFkLookupResolver, N as TDbDeleteResult, W as TDbUpdateResult, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger, t as AtscriptDbReadable, x as TCascadeResolver, z as TDbInsertManyResult } from "./db-readable-DdY7oFnY.cjs";
+import { B as TDbInsertResult, J as TFkLookupResolver, N as TDbDeleteResult, W as TDbUpdateResult, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger, t as AtscriptDbReadable, x as TCascadeResolver, z as TDbInsertManyResult } from "./db-readable-mhPp-MPv.cjs";
 import { FilterExpr } from "@uniqu/core";
 import { AtscriptQueryComparison, AtscriptQueryFieldRef, AtscriptQueryFieldRef as AtscriptQueryFieldRef$1, AtscriptQueryNode, AtscriptQueryNode as AtscriptQueryNode$1, AtscriptRef, FlatOf, NavPropsOf, OwnPropsOf, PrimaryKeyOf, TAtscriptAnnotatedType, TAtscriptDataType, Validator } from "@atscript/typescript/utils";
 

package/dist/{db-view-BAuda9Rm.cjs → db-view-GcbegVBD.cjs}

@@ -1,9 +1,8 @@
-const require_db_error = require("./db-error-CrtPzaZ-.cjs");
+const require_db_error = require("./db-error-DXwEzmYJ.cjs");
 const require_agg = require("./agg.cjs");
-const require_relation_helpers = require("./relation-helpers-BYvsE1tR.cjs");
+const require_nested_writer = require("./nested-writer-DoDhl3X3.cjs");
 const require_ops = require("./ops.cjs");
-const require_validator = require("./validator-DrmUaZA3.cjs");
-const require_nested_writer = require("./nested-writer-Chl_zySG.cjs");
+const require_validator = require("./validator-f43UcYiY.cjs");
 let _atscript_typescript_utils = require("@atscript/typescript/utils");
 let node_async_hooks = require("node:async_hooks");
 //#region src/logger.ts
@@ -1158,6 +1157,10 @@ function isIdCompatible(id, fieldType) {
 * (adds view plan/DDL).
 */
 var AtscriptDbReadable = class {
+	_type;
+	adapter;
+	logger;
+	_tableResolver;
 	/** Resolved table/collection/view name. */
 	tableName;
 	/** Database schema/namespace from `@db.schema` (if set). */
@@ -1712,7 +1715,7 @@ var AtscriptDbReadable = class {
 	* Public entry point for relation loading. Used by adapters for nested $with delegation.
 	*/
 	async loadRelations(rows, withRelations) {
-		const { loadRelationsImpl } = await Promise.resolve().then(() => require("./relation-loader-B8CmCJOs.cjs")).then((n) => n.relation_loader_exports);
+		const { loadRelationsImpl } = await Promise.resolve().then(() => require("./relation-loader-Desvk9Ql.cjs")).then((n) => n.relation_loader_exports);
 		return loadRelationsImpl(rows, withRelations, this);
 	}
 	/**
@@ -1720,14 +1723,14 @@ var AtscriptDbReadable = class {
 	* Thin wrapper — delegates to relation-loader for shared use with db-table.ts write path.
 	*/
 	_findFKForRelation(relation) {
-		return require_relation_helpers.findFKForRelation(relation, this._meta.foreignKeys);
+		return require_nested_writer.findFKForRelation(relation, this._meta.foreignKeys);
 	}
 	/**
 	* Finds a FK on a remote table that points back to this table.
 	* Thin wrapper — delegates to relation-loader for shared use with db-table.ts write path.
 	*/
 	_findRemoteFK(targetTable, thisTableName, alias) {
-		return require_relation_helpers.findRemoteFK(targetTable, thisTableName, alias);
+		return require_nested_writer.findRemoteFK(targetTable, thisTableName, alias);
 	}
 };
 //#endregion

package/dist/{db-view-D80PwcW5.mjs → db-view-Sq4wCceR.mjs}

@@ -1,9 +1,8 @@
-import { n as DbError } from "./db-error-yx2jdg8B.mjs";
+import { n as DbError } from "./db-error-BHPXOKzc.mjs";
 import { resolveAlias } from "./agg.mjs";
-import { n as findRemoteFK, t as findFKForRelation } from "./relation-helpers-CLasawQq.mjs";
+import { a as batchPatchNestedTo, c as batchReplaceNestedTo, d as preValidateNestedFrom, f as validateBatch, g as findRemoteFK, h as findFKForRelation, i as batchPatchNestedFrom, l as batchReplaceNestedVia, m as remapDeleteFkViolation, n as batchInsertNestedTo, o as batchPatchNestedVia, p as enrichFkViolation, r as batchInsertNestedVia, s as batchReplaceNestedFrom, t as batchInsertNestedFrom, u as checkDepthOverflow } from "./nested-writer-DI-HeTky.mjs";
 import { separateCas, separateFieldOps } from "./ops.mjs";
-import { i as forceNavNonOptional, r as dbPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-DTDf9yWe.mjs";
-import { a as batchPatchNestedTo, c as batchReplaceNestedTo, d as preValidateNestedFrom, f as validateBatch, i as batchPatchNestedFrom, l as batchReplaceNestedVia, m as remapDeleteFkViolation, n as batchInsertNestedTo, o as batchPatchNestedVia, p as enrichFkViolation, r as batchInsertNestedVia, s as batchReplaceNestedFrom, t as batchInsertNestedFrom, u as checkDepthOverflow } from "./nested-writer-CVMRAPoF.mjs";
+import { i as forceNavNonOptional, r as dbPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-bLsSgi0N.mjs";
 import { flattenAnnotatedType, isAnnotatedType } from "@atscript/typescript/utils";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/logger.ts
@@ -1158,6 +1157,10 @@ function isIdCompatible(id, fieldType) {
 * (adds view plan/DDL).
 */
 var AtscriptDbReadable = class {
+	_type;
+	adapter;
+	logger;
+	_tableResolver;
 	/** Resolved table/collection/view name. */
 	tableName;
 	/** Database schema/namespace from `@db.schema` (if set). */
@@ -1712,7 +1715,7 @@ var AtscriptDbReadable = class {
 	* Public entry point for relation loading. Used by adapters for nested $with delegation.
 	*/
 	async loadRelations(rows, withRelations) {
-		const { loadRelationsImpl } = await import("./relation-loader-BH3AkSnY.mjs").then((n) => n.n);
+		const { loadRelationsImpl } = await import("./relation-loader-BmeOMj0b.mjs").then((n) => n.n);
 		return loadRelationsImpl(rows, withRelations, this);
 	}
 	/**

package/dist/index.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_db_error = require("./db-error-CrtPzaZ-.cjs");
-const require_db_view = require("./db-view-BAuda9Rm.cjs");
+const require_db_error = require("./db-error-DXwEzmYJ.cjs");
+const require_db_view = require("./db-view-GcbegVBD.cjs");
 const require_ops = require("./ops.cjs");
-const require_validator = require("./validator-DrmUaZA3.cjs");
+const require_validator = require("./validator-f43UcYiY.cjs");
 let _uniqu_core = require("@uniqu/core");
 //#region src/with-optimistic-retry.ts
 /**
@@ -73,6 +73,8 @@ async function withOptimisticRetry(table, filter, mutator, opts) {
 * ```
 */
 var DbSpace = class {
+	adapterFactory;
+	logger;
 	_readables = /* @__PURE__ */ new WeakMap();
 	/** All tables created in this space — used for reverse FK lookup during cascade. */
 	_allTables = /* @__PURE__ */ new Set();

package/dist/index.d.cts

@@ -1,8 +1,8 @@
-import { $ as TMetadataOverrides, A as TDbCollation, B as TDbInsertResult, C as TColumnDiff, D as TDbActionIntent, E as TDbActionInfo, F as TDbForeignKey, G as TExistingColumn, H as TDbRelation, I as TDbIndex, J as TFkLookupResolver, K as TExistingTableOption, L as TDbIndexField, M as TDbDefaultValue, N as TDbDeleteResult, O as TDbActionLevel, P as TDbFieldMeta, Q as TMetaResponse, R as TDbIndexType, S as TCascadeTarget, T as TCrudPermissions, U as TDbStorageType, V as TDbReferentialAction, W as TDbUpdateResult, X as TIdDescriptor, Y as TFkLookupTarget, Z as TIdentification, _ as FlatOf, a as FieldMappingStrategy, at as TValueFormatterPair, b as PrimaryKeyOf, c as AggregateExpr, ct as Uniquery, d as AggregateResult, dt as TableMetadata, et as TRelationInfo, f as AtscriptDbWritable, ft as NoopLogger, g as FilterExpr, h as FieldOpsFor, i as DocumentFieldMapper, it as TTableResolver, j as TDbDefaultFn, k as TDbActionProcessor, l as AggregateFn, lt as UniqueryControls, m as DbQuery, mt as UniquSelect, n as DbResponse, nt as TSyncColumnResult, o as BaseDbAdapter, ot as TWriteTableResolver, p as DbControls, pt as TGenericLogger, q as TFieldMeta, r as resolveDesignType, rt as TTableOptionDiff, s as AggregateControls, st as TypedWithRelation, t as AtscriptDbReadable, tt as TSearchIndexInfo, u as AggregateQuery, ut as WithRelation, v as NavPropsOf, w as TCrudOp, x as TCascadeResolver, y as OwnPropsOf, z as TDbInsertManyResult } from "./db-readable-DdY7oFnY.cjs";
-import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-lzmfzuY9.cjs";
-import { a as AtscriptQueryComparison, c as AtscriptRef, d as translateQueryTree, f as AtscriptDbTable, i as TViewColumnMapping, l as TViewJoin, m as NativeIntegrity, n as TAdapterFactory, o as AtscriptQueryFieldRef, p as IntegrityStrategy, r as AtscriptDbView, s as AtscriptQueryNode, t as DbSpace, u as TViewPlan } from "./db-space-CybVrQAX.cjs";
-import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-DRGMCEn3.cjs";
-import { c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-_z_A3cKa.cjs";
+import { $ as TMetadataOverrides, A as TDbCollation, B as TDbInsertResult, C as TColumnDiff, D as TDbActionIntent, E as TDbActionInfo, F as TDbForeignKey, G as TExistingColumn, H as TDbRelation, I as TDbIndex, J as TFkLookupResolver, K as TExistingTableOption, L as TDbIndexField, M as TDbDefaultValue, N as TDbDeleteResult, O as TDbActionLevel, P as TDbFieldMeta, Q as TMetaResponse, R as TDbIndexType, S as TCascadeTarget, T as TCrudPermissions, U as TDbStorageType, V as TDbReferentialAction, W as TDbUpdateResult, X as TIdDescriptor, Y as TFkLookupTarget, Z as TIdentification, _ as FlatOf, a as FieldMappingStrategy, at as TValueFormatterPair, b as PrimaryKeyOf, c as AggregateExpr, ct as Uniquery, d as AggregateResult, dt as TableMetadata, et as TRelationInfo, f as AtscriptDbWritable, ft as NoopLogger, g as FilterExpr, h as FieldOpsFor, i as DocumentFieldMapper, it as TTableResolver, j as TDbDefaultFn, k as TDbActionProcessor, l as AggregateFn, lt as UniqueryControls, m as DbQuery, mt as UniquSelect, n as DbResponse, nt as TSyncColumnResult, o as BaseDbAdapter, ot as TWriteTableResolver, p as DbControls, pt as TGenericLogger, q as TFieldMeta, r as resolveDesignType, rt as TTableOptionDiff, s as AggregateControls, st as TypedWithRelation, t as AtscriptDbReadable, tt as TSearchIndexInfo, u as AggregateQuery, ut as WithRelation, v as NavPropsOf, w as TCrudOp, x as TCascadeResolver, y as OwnPropsOf, z as TDbInsertManyResult } from "./db-readable-mhPp-MPv.cjs";
+import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-DJRnNTVo.cjs";
+import { a as AtscriptQueryComparison, c as AtscriptRef, d as translateQueryTree, f as AtscriptDbTable, i as TViewColumnMapping, l as TViewJoin, m as NativeIntegrity, n as TAdapterFactory, o as AtscriptQueryFieldRef, p as IntegrityStrategy, r as AtscriptDbView, s as AtscriptQueryNode, t as DbSpace, u as TViewPlan } from "./db-space-BhOc9_OO.cjs";
+import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.cjs";
+import { c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-Crqe6vRW.cjs";
 import { AggregateQuery as AggregateQuery$1, FilterExpr as FilterExpr$1, FilterVisitor, Uniquery as Uniquery$1, computeInsights, isPrimitive, walkFilter } from "@uniqu/core";
 
 //#region src/strategies/relational-field-mapper.d.ts

package/dist/index.d.mts

@@ -1,8 +1,8 @@
-import { $ as TMetadataOverrides, A as TDbCollation, B as TDbInsertResult, C as TColumnDiff, D as TDbActionIntent, E as TDbActionInfo, F as TDbForeignKey, G as TExistingColumn, H as TDbRelation, I as TDbIndex, J as TFkLookupResolver, K as TExistingTableOption, L as TDbIndexField, M as TDbDefaultValue, N as TDbDeleteResult, O as TDbActionLevel, P as TDbFieldMeta, Q as TMetaResponse, R as TDbIndexType, S as TCascadeTarget, T as TCrudPermissions, U as TDbStorageType, V as TDbReferentialAction, W as TDbUpdateResult, X as TIdDescriptor, Y as TFkLookupTarget, Z as TIdentification, _ as FlatOf, a as FieldMappingStrategy, at as TValueFormatterPair, b as PrimaryKeyOf, c as AggregateExpr, ct as Uniquery, d as AggregateResult, dt as TableMetadata, et as TRelationInfo, f as AtscriptDbWritable, ft as NoopLogger, g as FilterExpr, h as FieldOpsFor, i as DocumentFieldMapper, it as TTableResolver, j as TDbDefaultFn, k as TDbActionProcessor, l as AggregateFn, lt as UniqueryControls, m as DbQuery, mt as UniquSelect, n as DbResponse, nt as TSyncColumnResult, o as BaseDbAdapter, ot as TWriteTableResolver, p as DbControls, pt as TGenericLogger, q as TFieldMeta, r as resolveDesignType, rt as TTableOptionDiff, s as AggregateControls, st as TypedWithRelation, t as AtscriptDbReadable, tt as TSearchIndexInfo, u as AggregateQuery, ut as WithRelation, v as NavPropsOf, w as TCrudOp, x as TCascadeResolver, y as OwnPropsOf, z as TDbInsertManyResult } from "./db-readable-Cs1-gchT.mjs";
-import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-Blqr0ipy.mjs";
-import { a as AtscriptQueryComparison, c as AtscriptRef, d as translateQueryTree, f as AtscriptDbTable, i as TViewColumnMapping, l as TViewJoin, m as NativeIntegrity, n as TAdapterFactory, o as AtscriptQueryFieldRef, p as IntegrityStrategy, r as AtscriptDbView, s as AtscriptQueryNode, t as DbSpace, u as TViewPlan } from "./db-space-Bcu7ZzYd.mjs";
-import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-DDvYyv5t.mjs";
-import { c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-DttN2e5_.mjs";
+import { $ as TMetadataOverrides, A as TDbCollation, B as TDbInsertResult, C as TColumnDiff, D as TDbActionIntent, E as TDbActionInfo, F as TDbForeignKey, G as TExistingColumn, H as TDbRelation, I as TDbIndex, J as TFkLookupResolver, K as TExistingTableOption, L as TDbIndexField, M as TDbDefaultValue, N as TDbDeleteResult, O as TDbActionLevel, P as TDbFieldMeta, Q as TMetaResponse, R as TDbIndexType, S as TCascadeTarget, T as TCrudPermissions, U as TDbStorageType, V as TDbReferentialAction, W as TDbUpdateResult, X as TIdDescriptor, Y as TFkLookupTarget, Z as TIdentification, _ as FlatOf, a as FieldMappingStrategy, at as TValueFormatterPair, b as PrimaryKeyOf, c as AggregateExpr, ct as Uniquery, d as AggregateResult, dt as TableMetadata, et as TRelationInfo, f as AtscriptDbWritable, ft as NoopLogger, g as FilterExpr, h as FieldOpsFor, i as DocumentFieldMapper, it as TTableResolver, j as TDbDefaultFn, k as TDbActionProcessor, l as AggregateFn, lt as UniqueryControls, m as DbQuery, mt as UniquSelect, n as DbResponse, nt as TSyncColumnResult, o as BaseDbAdapter, ot as TWriteTableResolver, p as DbControls, pt as TGenericLogger, q as TFieldMeta, r as resolveDesignType, rt as TTableOptionDiff, s as AggregateControls, st as TypedWithRelation, t as AtscriptDbReadable, tt as TSearchIndexInfo, u as AggregateQuery, ut as WithRelation, v as NavPropsOf, w as TCrudOp, x as TCascadeResolver, y as OwnPropsOf, z as TDbInsertManyResult } from "./db-readable-CXdHBtF6.mjs";
+import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-DJRnNTVo.mjs";
+import { a as AtscriptQueryComparison, c as AtscriptRef, d as translateQueryTree, f as AtscriptDbTable, i as TViewColumnMapping, l as TViewJoin, m as NativeIntegrity, n as TAdapterFactory, o as AtscriptQueryFieldRef, p as IntegrityStrategy, r as AtscriptDbView, s as AtscriptQueryNode, t as DbSpace, u as TViewPlan } from "./db-space-BYyVZnL1.mjs";
+import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.mjs";
+import { c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-Crqe6vRW.mjs";
 import { AggregateQuery as AggregateQuery$1, FilterExpr as FilterExpr$1, FilterVisitor, Uniquery as Uniquery$1, computeInsights, isPrimitive, walkFilter } from "@uniqu/core";
 
 //#region src/strategies/relational-field-mapper.d.ts

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { n as DbError, t as CasExhaustedError } from "./db-error-yx2jdg8B.mjs";
-import { a as ApplicationIntegrity, c as NativeIntegrity, d as RelationalFieldMapper, f as DocumentFieldMapper, g as NoopLogger, h as TableMetadata, i as decomposePatch, l as AtscriptDbReadable, m as UniquSelect, n as AtscriptDbTable, o as BaseDbAdapter, p as FieldMappingStrategy, r as assertNoVersionWrites, s as IntegrityStrategy, t as AtscriptDbView, u as resolveDesignType } from "./db-view-D80PwcW5.mjs";
+import { n as DbError, t as CasExhaustedError } from "./db-error-BHPXOKzc.mjs";
+import { a as ApplicationIntegrity, c as NativeIntegrity, d as RelationalFieldMapper, f as DocumentFieldMapper, g as NoopLogger, h as TableMetadata, i as decomposePatch, l as AtscriptDbReadable, m as UniquSelect, n as AtscriptDbTable, o as BaseDbAdapter, p as FieldMappingStrategy, r as assertNoVersionWrites, s as IntegrityStrategy, t as AtscriptDbView, u as resolveDesignType } from "./db-view-Sq4wCceR.mjs";
 import { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, getDbFieldOp, isDbFieldOp, separateCas, separateFieldOps } from "./ops.mjs";
-import { a as isNavRelation, i as forceNavNonOptional, n as buildValidationContext, o as createDbValidatorPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-DTDf9yWe.mjs";
+import { a as isNavRelation, i as forceNavNonOptional, n as buildValidationContext, o as createDbValidatorPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-bLsSgi0N.mjs";
 import { computeInsights, isPrimitive, walkFilter } from "@uniqu/core";
 //#region src/with-optimistic-retry.ts
 /**
@@ -72,6 +72,8 @@ async function withOptimisticRetry(table, filter, mutator, opts) {
 * ```
 */
 var DbSpace = class {
+	adapterFactory;
+	logger;
 	_readables = /* @__PURE__ */ new WeakMap();
 	/** All tables created in this space — used for reverse FK lookup during cascade. */
 	_allTables = /* @__PURE__ */ new Set();

package/dist/{nested-writer-CVMRAPoF.mjs → nested-writer-DI-HeTky.mjs}

@@ -1,6 +1,38 @@
-import { n as DbError, r as DepthLimitExceededError } from "./db-error-yx2jdg8B.mjs";
-import { r as resolveRelationTargetTable } from "./relation-helpers-CLasawQq.mjs";
+import { n as DbError, r as DepthLimitExceededError } from "./db-error-BHPXOKzc.mjs";
 import { ValidatorError } from "@atscript/typescript/utils";
+//#region src/rel/relation-helpers.ts
+/**
+* Finds the FK entry that connects a `@db.rel.to` relation to its target.
+*/
+function findFKForRelation(relation, foreignKeys) {
+	const targetTable = resolveRelationTargetTable(relation);
+	for (const fk of foreignKeys.values()) if (relation.alias) {
+		if (fk.alias === relation.alias) return {
+			localFields: fk.fields,
+			targetFields: fk.targetFields
+		};
+	} else if (fk.targetTable === targetTable) return {
+		localFields: fk.fields,
+		targetFields: fk.targetFields
+	};
+}
+/**
+* Finds a FK on a remote table that points back to a given table name.
+*/
+function findRemoteFK(targetTable, thisTableName, alias) {
+	for (const fk of targetTable.foreignKeys.values()) {
+		if (alias && fk.alias === alias && fk.targetTable === thisTableName) return fk;
+		if (!alias && fk.targetTable === thisTableName) return fk;
+	}
+}
+/**
+* Resolves the target table name from a relation's target type metadata.
+*/
+function resolveRelationTargetTable(relation) {
+	const targetType = relation.targetType();
+	return targetType?.metadata?.get("db.table") || targetType?.id || "";
+}
+//#endregion
 //#region src/table/error-utils.ts
 /**
 * Prefixes error paths with a nav field context.
@@ -614,4 +646,4 @@ async function viaReplace(targetTable, junctionTable, targets, parentPK, targetP
 	}
 }
 //#endregion
-export { batchPatchNestedTo as a, batchReplaceNestedTo as c, preValidateNestedFrom as d, validateBatch as f, batchPatchNestedFrom as i, batchReplaceNestedVia as l, remapDeleteFkViolation as m, batchInsertNestedTo as n, batchPatchNestedVia as o, enrichFkViolation as p, batchInsertNestedVia as r, batchReplaceNestedFrom as s, batchInsertNestedFrom as t, checkDepthOverflow as u };
+export { resolveRelationTargetTable as _, batchPatchNestedTo as a, batchReplaceNestedTo as c, preValidateNestedFrom as d, validateBatch as f, findRemoteFK as g, findFKForRelation as h, batchPatchNestedFrom as i, batchReplaceNestedVia as l, remapDeleteFkViolation as m, batchInsertNestedTo as n, batchPatchNestedVia as o, enrichFkViolation as p, batchInsertNestedVia as r, batchReplaceNestedFrom as s, batchInsertNestedFrom as t, checkDepthOverflow as u };

package/dist/{nested-writer-Chl_zySG.cjs → nested-writer-DoDhl3X3.cjs}

@@ -1,6 +1,38 @@
-const require_db_error = require("./db-error-CrtPzaZ-.cjs");
-const require_relation_helpers = require("./relation-helpers-BYvsE1tR.cjs");
+const require_db_error = require("./db-error-DXwEzmYJ.cjs");
 let _atscript_typescript_utils = require("@atscript/typescript/utils");
+//#region src/rel/relation-helpers.ts
+/**
+* Finds the FK entry that connects a `@db.rel.to` relation to its target.
+*/
+function findFKForRelation(relation, foreignKeys) {
+	const targetTable = resolveRelationTargetTable(relation);
+	for (const fk of foreignKeys.values()) if (relation.alias) {
+		if (fk.alias === relation.alias) return {
+			localFields: fk.fields,
+			targetFields: fk.targetFields
+		};
+	} else if (fk.targetTable === targetTable) return {
+		localFields: fk.fields,
+		targetFields: fk.targetFields
+	};
+}
+/**
+* Finds a FK on a remote table that points back to a given table name.
+*/
+function findRemoteFK(targetTable, thisTableName, alias) {
+	for (const fk of targetTable.foreignKeys.values()) {
+		if (alias && fk.alias === alias && fk.targetTable === thisTableName) return fk;
+		if (!alias && fk.targetTable === thisTableName) return fk;
+	}
+}
+/**
+* Resolves the target table name from a relation's target type metadata.
+*/
+function resolveRelationTargetTable(relation) {
+	const targetType = relation.targetType();
+	return targetType?.metadata?.get("db.table") || targetType?.id || "";
+}
+//#endregion
 //#region src/table/error-utils.ts
 /**
 * Prefixes error paths with a nav field context.
@@ -180,7 +212,7 @@ async function batchInsertNestedVia(host, originals, parentIds, maxDepth, depth)
 		if (!targetTable) continue;
 		const junctionTable = host._writeTableResolver(relation.viaType());
 		if (!junctionTable) continue;
-		const targetTableName = require_relation_helpers.resolveRelationTargetTable(relation);
+		const targetTableName = resolveRelationTargetTable(relation);
 		const fkToThis = host._findRemoteFK(junctionTable, host.tableName);
 		if (!fkToThis) continue;
 		const fkToTarget = host._findRemoteFK(junctionTable, targetTableName);
@@ -275,7 +307,7 @@ async function batchReplaceNestedVia(host, originals, maxDepth, depth) {
 		if (!targetTable) continue;
 		const junctionTable = host._writeTableResolver(relation.viaType());
 		if (!junctionTable) continue;
-		const targetTableName = require_relation_helpers.resolveRelationTargetTable(relation);
+		const targetTableName = resolveRelationTargetTable(relation);
 		const fkToThis = host._findRemoteFK(junctionTable, host.tableName);
 		if (!fkToThis) continue;
 		const fkToTarget = host._findRemoteFK(junctionTable, targetTableName);
@@ -420,7 +452,7 @@ async function batchPatchNestedVia(host, originals, maxDepth, depth) {
 		if (!targetTable) continue;
 		const junctionTable = host._writeTableResolver(relation.viaType());
 		if (!junctionTable) continue;
-		const targetTableName = require_relation_helpers.resolveRelationTargetTable(relation);
+		const targetTableName = resolveRelationTargetTable(relation);
 		const fkToThis = host._findRemoteFK(junctionTable, host.tableName);
 		if (!fkToThis) continue;
 		const fkToTarget = host._findRemoteFK(junctionTable, targetTableName);
@@ -680,6 +712,18 @@ Object.defineProperty(exports, "enrichFkViolation", {
 		return enrichFkViolation;
 	}
 });
+Object.defineProperty(exports, "findFKForRelation", {
+	enumerable: true,
+	get: function() {
+		return findFKForRelation;
+	}
+});
+Object.defineProperty(exports, "findRemoteFK", {
+	enumerable: true,
+	get: function() {
+		return findRemoteFK;
+	}
+});
 Object.defineProperty(exports, "preValidateNestedFrom", {
 	enumerable: true,
 	get: function() {
@@ -692,6 +736,12 @@ Object.defineProperty(exports, "remapDeleteFkViolation", {
 		return remapDeleteFkViolation;
 	}
 });
+Object.defineProperty(exports, "resolveRelationTargetTable", {
+	enumerable: true,
+	get: function() {
+		return resolveRelationTargetTable;
+	}
+});
 Object.defineProperty(exports, "validateBatch", {
 	enumerable: true,
 	get: function() {

package/dist/ops.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_db_error = require("./db-error-CrtPzaZ-.cjs");
+const require_db_error = require("./db-error-DXwEzmYJ.cjs");
 //#region src/ops.ts
 /** Increment a numeric field by `value` (default 1). */
 function $inc(value = 1) {

package/dist/ops.d.cts

@@ -1,2 +1,2 @@
-import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-lzmfzuY9.cjs";
+import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-DJRnNTVo.cjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, TDbCas, TDbFieldOp, TFieldOps, getDbFieldOp, isDbFieldOp, separateCas, separateFieldOps };

package/dist/ops.d.mts

@@ -1,2 +1,2 @@
-import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-Blqr0ipy.mjs";
+import { a as $mul, c as $update, d as TDbFieldOp, f as TFieldOps, g as separateFieldOps, h as separateCas, i as $insert, l as $upsert, m as isDbFieldOp, n as $dec, o as $remove, p as getDbFieldOp, r as $inc, s as $replace, t as $cas, u as TDbCas } from "./ops-DJRnNTVo.mjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, TDbCas, TDbFieldOp, TFieldOps, getDbFieldOp, isDbFieldOp, separateCas, separateFieldOps };

package/dist/ops.mjs

@@ -1,4 +1,4 @@
-import { n as DbError } from "./db-error-yx2jdg8B.mjs";
+import { n as DbError } from "./db-error-BHPXOKzc.mjs";
 //#region src/ops.ts
 /** Increment a numeric field by `value` (default 1). */
 function $inc(value = 1) {

package/dist/plugin.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_validation_utils = require("./validation-utils-Bs1yOXNx.cjs");
+const require_validation_utils = require("./validation-utils-CR4H3_nc.cjs");
 let _atscript_core = require("@atscript/core");
 //#region src/plugin/annotations/agg.ts
 const dbAggAnnotations = { agg: {

package/dist/plugin.mjs

@@ -1,4 +1,4 @@
-import { a as getAnnotationAlias, c as getParentStruct, d as validateExclusiveWith, f as validateFieldBaseType, i as validateRefArgument, l as getParentTypeName, n as hasAnyViewAnnotation, o as getDbTableOwner, p as validateSiblingStringField, r as validateQueryScope, s as getNavTargetTypeName, t as findFKFieldsPointingTo, u as refActionAnnotation } from "./validation-utils-eaBuT39W.mjs";
+import { a as getAnnotationAlias, c as getParentStruct, d as validateExclusiveWith, f as validateFieldBaseType, i as validateRefArgument, l as getParentTypeName, n as hasAnyViewAnnotation, o as getDbTableOwner, p as validateSiblingStringField, r as validateQueryScope, s as getNavTargetTypeName, t as findFKFieldsPointingTo, u as refActionAnnotation } from "./validation-utils-D4R08oed.mjs";
 import { AnnotationSpec, isArray, isInterface, isPrimitive, isRef, isStructure } from "@atscript/core";
 //#region src/plugin/annotations/agg.ts
 const dbAggAnnotations = { agg: {

package/dist/rel.cjs

@@ -1,7 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_relation_loader = require("./relation-loader-B8CmCJOs.cjs");
-const require_relation_helpers = require("./relation-helpers-BYvsE1tR.cjs");
-const require_nested_writer = require("./nested-writer-Chl_zySG.cjs");
+const require_relation_loader = require("./relation-loader-Desvk9Ql.cjs");
+const require_nested_writer = require("./nested-writer-DoDhl3X3.cjs");
 exports.batchInsertNestedFrom = require_nested_writer.batchInsertNestedFrom;
 exports.batchInsertNestedTo = require_nested_writer.batchInsertNestedTo;
 exports.batchInsertNestedVia = require_nested_writer.batchInsertNestedVia;
@@ -12,9 +11,9 @@ exports.batchReplaceNestedFrom = require_nested_writer.batchReplaceNestedFrom;
 exports.batchReplaceNestedTo = require_nested_writer.batchReplaceNestedTo;
 exports.batchReplaceNestedVia = require_nested_writer.batchReplaceNestedVia;
 exports.checkDepthOverflow = require_nested_writer.checkDepthOverflow;
-exports.findFKForRelation = require_relation_helpers.findFKForRelation;
-exports.findRemoteFK = require_relation_helpers.findRemoteFK;
+exports.findFKForRelation = require_nested_writer.findFKForRelation;
+exports.findRemoteFK = require_nested_writer.findRemoteFK;
 exports.loadRelationsImpl = require_relation_loader.loadRelationsImpl;
 exports.preValidateNestedFrom = require_nested_writer.preValidateNestedFrom;
-exports.resolveRelationTargetTable = require_relation_helpers.resolveRelationTargetTable;
+exports.resolveRelationTargetTable = require_nested_writer.resolveRelationTargetTable;
 exports.validateBatch = require_nested_writer.validateBatch;

package/dist/rel.d.cts

@@ -1,5 +1,5 @@
-import { F as TDbForeignKey, H as TDbRelation, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger } from "./db-readable-DdY7oFnY.cjs";
-import { t as DbValidationContext } from "./db-validator-plugin-DRGMCEn3.cjs";
+import { F as TDbForeignKey, H as TDbRelation, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger } from "./db-readable-mhPp-MPv.cjs";
+import { t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.cjs";
 import { FilterExpr, WithRelation } from "@uniqu/core";
 import { Validator } from "@atscript/typescript/utils";
 

package/dist/rel.d.mts

@@ -1,5 +1,5 @@
-import { F as TDbForeignKey, H as TDbRelation, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger } from "./db-readable-Cs1-gchT.mjs";
-import { t as DbValidationContext } from "./db-validator-plugin-DDvYyv5t.mjs";
+import { F as TDbForeignKey, H as TDbRelation, dt as TableMetadata, it as TTableResolver, o as BaseDbAdapter, ot as TWriteTableResolver, pt as TGenericLogger } from "./db-readable-CXdHBtF6.mjs";
+import { t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.mjs";
 import { Validator } from "@atscript/typescript/utils";
 import { FilterExpr, WithRelation } from "@uniqu/core";
 

package/dist/rel.mjs

@@ -1,4 +1,3 @@
-import { t as loadRelationsImpl } from "./relation-loader-BH3AkSnY.mjs";
-import { n as findRemoteFK, r as resolveRelationTargetTable, t as findFKForRelation } from "./relation-helpers-CLasawQq.mjs";
-import { a as batchPatchNestedTo, c as batchReplaceNestedTo, d as preValidateNestedFrom, f as validateBatch, i as batchPatchNestedFrom, l as batchReplaceNestedVia, n as batchInsertNestedTo, o as batchPatchNestedVia, r as batchInsertNestedVia, s as batchReplaceNestedFrom, t as batchInsertNestedFrom, u as checkDepthOverflow } from "./nested-writer-CVMRAPoF.mjs";
+import { t as loadRelationsImpl } from "./relation-loader-BmeOMj0b.mjs";
+import { _ as resolveRelationTargetTable, a as batchPatchNestedTo, c as batchReplaceNestedTo, d as preValidateNestedFrom, f as validateBatch, g as findRemoteFK, h as findFKForRelation, i as batchPatchNestedFrom, l as batchReplaceNestedVia, n as batchInsertNestedTo, o as batchPatchNestedVia, r as batchInsertNestedVia, s as batchReplaceNestedFrom, t as batchInsertNestedFrom, u as checkDepthOverflow } from "./nested-writer-DI-HeTky.mjs";
 export { batchInsertNestedFrom, batchInsertNestedTo, batchInsertNestedVia, batchPatchNestedFrom, batchPatchNestedTo, batchPatchNestedVia, batchReplaceNestedFrom, batchReplaceNestedTo, batchReplaceNestedVia, checkDepthOverflow, findFKForRelation, findRemoteFK, loadRelationsImpl, preValidateNestedFrom, resolveRelationTargetTable, validateBatch };

package/dist/{relation-loader-BH3AkSnY.mjs → relation-loader-BmeOMj0b.mjs}

@@ -1,4 +1,4 @@
-import { n as findRemoteFK, r as resolveRelationTargetTable, t as findFKForRelation } from "./relation-helpers-CLasawQq.mjs";
+import { _ as resolveRelationTargetTable, g as findRemoteFK, h as findFKForRelation } from "./nested-writer-DI-HeTky.mjs";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {

package/dist/{relation-loader-B8CmCJOs.cjs → relation-loader-Desvk9Ql.cjs}

@@ -10,7 +10,7 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 //#endregion
-const require_relation_helpers = require("./relation-helpers-BYvsE1tR.cjs");
+const require_nested_writer = require("./nested-writer-DoDhl3X3.cjs");
 //#region src/rel/relation-loader.ts
 var relation_loader_exports = /* @__PURE__ */ __exportAll({
 	ensureSelectIncludesFields: () => ensureSelectIncludesFields,
@@ -74,7 +74,7 @@ async function loadRelationsImpl(rows, withRelations, host) {
 */
 async function loadToRelation(rows, opts, host) {
 	const { relName, relation, targetTable, relQuery } = opts;
-	const fkEntry = require_relation_helpers.findFKForRelation(relation, host._meta.foreignKeys);
+	const fkEntry = require_nested_writer.findFKForRelation(relation, host._meta.foreignKeys);
 	if (!fkEntry) return;
 	const { localFields, targetFields } = fkEntry;
 	if (localFields.length === 1) {
@@ -115,7 +115,7 @@ async function loadToRelation(rows, opts, host) {
 */
 async function loadFromRelation(rows, opts, host) {
 	const { relName, relation, targetTable, relQuery } = opts;
-	const remoteFK = require_relation_helpers.findRemoteFK(targetTable, host.tableName, relation.alias);
+	const remoteFK = require_nested_writer.findRemoteFK(targetTable, host.tableName, relation.alias);
 	if (!remoteFK) {
 		host.logger.warn(`Could not find FK on target table for relation "${relName}"`);
 		return;
@@ -190,13 +190,13 @@ async function loadViaRelation(rows, opts, host) {
 		host.logger.warn(`Could not resolve junction table for via relation "${relName}"`);
 		return;
 	}
-	const fkToThis = require_relation_helpers.findRemoteFK(junctionTable, host.tableName);
+	const fkToThis = require_nested_writer.findRemoteFK(junctionTable, host.tableName);
 	if (!fkToThis) {
 		host.logger.warn(`Could not find FK on junction table pointing to "${host.tableName}" for via relation "${relName}"`);
 		return;
 	}
-	const targetTableName = require_relation_helpers.resolveRelationTargetTable(relation);
-	const fkToTarget = require_relation_helpers.findRemoteFK(junctionTable, targetTableName);
+	const targetTableName = require_nested_writer.resolveRelationTargetTable(relation);
+	const fkToTarget = require_nested_writer.findRemoteFK(junctionTable, targetTableName);
 	if (!fkToTarget) {
 		host.logger.warn(`Could not find FK on junction table pointing to target "${targetTableName}" for via relation "${relName}"`);
 		return;

package/dist/shared.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_validation_utils = require("./validation-utils-Bs1yOXNx.cjs");
+const require_validation_utils = require("./validation-utils-CR4H3_nc.cjs");
 exports.findFKFieldsPointingTo = require_validation_utils.findFKFieldsPointingTo;
 exports.getAnnotationAlias = require_validation_utils.getAnnotationAlias;
 exports.getDbTableOwner = require_validation_utils.getDbTableOwner;

package/dist/shared.mjs

@@ -1,2 +1,2 @@
-import { a as getAnnotationAlias, c as getParentStruct, d as validateExclusiveWith, f as validateFieldBaseType, i as validateRefArgument, l as getParentTypeName, n as hasAnyViewAnnotation, o as getDbTableOwner, p as validateSiblingStringField, r as validateQueryScope, s as getNavTargetTypeName, t as findFKFieldsPointingTo, u as refActionAnnotation } from "./validation-utils-eaBuT39W.mjs";
+import { a as getAnnotationAlias, c as getParentStruct, d as validateExclusiveWith, f as validateFieldBaseType, i as validateRefArgument, l as getParentTypeName, n as hasAnyViewAnnotation, o as getDbTableOwner, p as validateSiblingStringField, r as validateQueryScope, s as getNavTargetTypeName, t as findFKFieldsPointingTo, u as refActionAnnotation } from "./validation-utils-D4R08oed.mjs";
 export { findFKFieldsPointingTo, getAnnotationAlias, getDbTableOwner, getNavTargetTypeName, getParentStruct, getParentTypeName, hasAnyViewAnnotation, refActionAnnotation, validateExclusiveWith, validateFieldBaseType, validateQueryScope, validateRefArgument, validateSiblingStringField };

package/dist/sync.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_db_view = require("./db-view-BAuda9Rm.cjs");
+const require_db_view = require("./db-view-GcbegVBD.cjs");
 //#region src/schema/schema-hash.ts
 /** Extracts sorted field snapshots from a readable's field descriptors. */
 function extractFieldSnapshots(fields, typeMapper) {
@@ -277,13 +277,14 @@ function computeTableOptionDiff(desired, existing, destructiveKeys) {
 //#endregion
 //#region src/schema/sync-store.ts
 var SyncStore = class {
+	space;
 	controlTable;
 	constructor(space) {
 		this.space = space;
 	}
 	async ensureControlTable() {
 		if (!this.controlTable) {
-			const { AtscriptControl } = await Promise.resolve().then(() => require("./control-CDnwVj4q.cjs"));
+			const { AtscriptControl } = await Promise.resolve().then(() => require("./control-jIVU2hkf.cjs"));
 			this.controlTable = this.space.getTable(AtscriptControl);
 		}
 		await this.controlTable.ensureTable();
@@ -419,7 +420,7 @@ var SyncStore = class {
 	}
 };
 async function readStoredSnapshot(space, tableName, _asView) {
-	const { AtscriptControl } = await Promise.resolve().then(() => require("./control-CDnwVj4q.cjs"));
+	const { AtscriptControl } = await Promise.resolve().then(() => require("./control-jIVU2hkf.cjs"));
 	const table = space.getTable(AtscriptControl);
 	await table.ensureTable();
 	const value = (await table.findOne({
@@ -765,6 +766,7 @@ function buildFkChangeDetails(desired, existing) {
 	return parts.join(", ");
 }
 var SchemaSync = class {
+	space;
 	store;
 	logger;
 	constructor(space, logger) {

package/dist/sync.d.cts

@@ -1,5 +1,5 @@
-import { C as TColumnDiff, F as TDbForeignKey, G as TExistingColumn, K as TExistingTableOption, M as TDbDefaultValue, P as TDbFieldMeta, U as TDbStorageType, pt as TGenericLogger, rt as TTableOptionDiff, t as AtscriptDbReadable } from "./db-readable-DdY7oFnY.cjs";
-import { r as AtscriptDbView, t as DbSpace } from "./db-space-CybVrQAX.cjs";
+import { C as TColumnDiff, F as TDbForeignKey, G as TExistingColumn, K as TExistingTableOption, M as TDbDefaultValue, P as TDbFieldMeta, U as TDbStorageType, pt as TGenericLogger, rt as TTableOptionDiff, t as AtscriptDbReadable } from "./db-readable-mhPp-MPv.cjs";
+import { r as AtscriptDbView, t as DbSpace } from "./db-space-BhOc9_OO.cjs";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/schema/sync-entry.d.ts

package/dist/sync.d.mts

@@ -1,5 +1,5 @@
-import { C as TColumnDiff, F as TDbForeignKey, G as TExistingColumn, K as TExistingTableOption, M as TDbDefaultValue, P as TDbFieldMeta, U as TDbStorageType, pt as TGenericLogger, rt as TTableOptionDiff, t as AtscriptDbReadable } from "./db-readable-Cs1-gchT.mjs";
-import { r as AtscriptDbView, t as DbSpace } from "./db-space-Bcu7ZzYd.mjs";
+import { C as TColumnDiff, F as TDbForeignKey, G as TExistingColumn, K as TExistingTableOption, M as TDbDefaultValue, P as TDbFieldMeta, U as TDbStorageType, pt as TGenericLogger, rt as TTableOptionDiff, t as AtscriptDbReadable } from "./db-readable-CXdHBtF6.mjs";
+import { r as AtscriptDbView, t as DbSpace } from "./db-space-BYyVZnL1.mjs";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/schema/sync-entry.d.ts

package/dist/sync.mjs

@@ -1,4 +1,4 @@
-import { g as NoopLogger } from "./db-view-D80PwcW5.mjs";
+import { g as NoopLogger } from "./db-view-Sq4wCceR.mjs";
 //#region src/schema/schema-hash.ts
 /** Extracts sorted field snapshots from a readable's field descriptors. */
 function extractFieldSnapshots(fields, typeMapper) {
@@ -276,13 +276,14 @@ function computeTableOptionDiff(desired, existing, destructiveKeys) {
 //#endregion
 //#region src/schema/sync-store.ts
 var SyncStore = class {
+	space;
 	controlTable;
 	constructor(space) {
 		this.space = space;
 	}
 	async ensureControlTable() {
 		if (!this.controlTable) {
-			const { AtscriptControl } = await import("./control-ExEKWYBE.mjs");
+			const { AtscriptControl } = await import("./control-D5cQmzFj.mjs");
 			this.controlTable = this.space.getTable(AtscriptControl);
 		}
 		await this.controlTable.ensureTable();
@@ -418,7 +419,7 @@ var SyncStore = class {
 	}
 };
 async function readStoredSnapshot(space, tableName, _asView) {
-	const { AtscriptControl } = await import("./control-ExEKWYBE.mjs");
+	const { AtscriptControl } = await import("./control-D5cQmzFj.mjs");
 	const table = space.getTable(AtscriptControl);
 	await table.ensureTable();
 	const value = (await table.findOne({
@@ -764,6 +765,7 @@ function buildFkChangeDetails(desired, existing) {
 	return parts.join(", ");
 }
 var SchemaSync = class {
+	space;
 	store;
 	logger;
 	constructor(space, logger) {

package/dist/{validator-DTDf9yWe.mjs → validator-bLsSgi0N.mjs}

@@ -1,4 +1,4 @@
-import { r as DepthLimitExceededError } from "./db-error-yx2jdg8B.mjs";
+import { r as DepthLimitExceededError } from "./db-error-BHPXOKzc.mjs";
 import { isDbFieldOp } from "./ops.mjs";
 import { flattenAnnotatedType } from "@atscript/typescript/utils";
 //#region src/patch/patch-types.ts

package/dist/{validator-DrmUaZA3.cjs → validator-f43UcYiY.cjs}

@@ -1,4 +1,4 @@
-const require_db_error = require("./db-error-CrtPzaZ-.cjs");
+const require_db_error = require("./db-error-DXwEzmYJ.cjs");
 const require_ops = require("./ops.cjs");
 let _atscript_typescript_utils = require("@atscript/typescript/utils");
 //#region src/patch/patch-types.ts

package/dist/validator.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_ops = require("./ops.cjs");
-const require_validator = require("./validator-DrmUaZA3.cjs");
+const require_validator = require("./validator-f43UcYiY.cjs");
 exports.$cas = require_ops.$cas;
 exports.$dec = require_ops.$dec;
 exports.$inc = require_ops.$inc;

package/dist/validator.d.cts

@@ -1,4 +1,4 @@
-import { a as $mul, c as $update, d as TDbFieldOp, 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-lzmfzuY9.cjs";
-import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-DRGMCEn3.cjs";
-import { a as dbPlugin, c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-_z_A3cKa.cjs";
-export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, DbValidationContext, TArrayPatch, TDbCas, TDbFieldOp, TDbPatch, ValidationContext, ValidatorMode, buildDbValidator, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isNavRelation };
+import { a as $mul, c as $update, d as TDbFieldOp, 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-DJRnNTVo.cjs";
+import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.cjs";
+import { a as dbPlugin, c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-Crqe6vRW.cjs";
+export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, type DbValidationContext, type TArrayPatch, type TDbCas, type TDbFieldOp, type TDbPatch, ValidationContext, ValidatorMode, buildDbValidator, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isNavRelation };

package/dist/validator.d.mts

@@ -1,4 +1,4 @@
-import { a as $mul, c as $update, d as TDbFieldOp, 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-Blqr0ipy.mjs";
-import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-DDvYyv5t.mjs";
-import { a as dbPlugin, c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-DttN2e5_.mjs";
-export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, DbValidationContext, TArrayPatch, TDbCas, TDbFieldOp, TDbPatch, ValidationContext, ValidatorMode, buildDbValidator, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isNavRelation };
+import { a as $mul, c as $update, d as TDbFieldOp, 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-DJRnNTVo.mjs";
+import { n as createDbValidatorPlugin, t as DbValidationContext } from "./db-validator-plugin-BWy60OvG.mjs";
+import { a as dbPlugin, c as TArrayPatch, i as buildValidationContext, l as TDbPatch, n as ValidatorMode, o as forceNavNonOptional, r as buildDbValidator, s as isNavRelation, t as ValidationContext, u as getKeyProps } from "./validator-Crqe6vRW.mjs";
+export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, type DbValidationContext, type TArrayPatch, type TDbCas, type TDbFieldOp, type TDbPatch, ValidationContext, ValidatorMode, buildDbValidator, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isNavRelation };

package/dist/validator.mjs

@@ -1,3 +1,3 @@
 import { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, isDbFieldOp } from "./ops.mjs";
-import { a as isNavRelation, i as forceNavNonOptional, n as buildValidationContext, o as createDbValidatorPlugin, r as dbPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-DTDf9yWe.mjs";
+import { a as isNavRelation, i as forceNavNonOptional, n as buildValidationContext, o as createDbValidatorPlugin, r as dbPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-bLsSgi0N.mjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, buildDbValidator, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isNavRelation };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.101",
+  "version": "0.1.102",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",

package/dist/relation-helpers-BYvsE1tR.cjs

@@ -1,51 +0,0 @@
-//#region src/rel/relation-helpers.ts
-/**
-* Finds the FK entry that connects a `@db.rel.to` relation to its target.
-*/
-function findFKForRelation(relation, foreignKeys) {
-	const targetTable = resolveRelationTargetTable(relation);
-	for (const fk of foreignKeys.values()) if (relation.alias) {
-		if (fk.alias === relation.alias) return {
-			localFields: fk.fields,
-			targetFields: fk.targetFields
-		};
-	} else if (fk.targetTable === targetTable) return {
-		localFields: fk.fields,
-		targetFields: fk.targetFields
-	};
-}
-/**
-* Finds a FK on a remote table that points back to a given table name.
-*/
-function findRemoteFK(targetTable, thisTableName, alias) {
-	for (const fk of targetTable.foreignKeys.values()) {
-		if (alias && fk.alias === alias && fk.targetTable === thisTableName) return fk;
-		if (!alias && fk.targetTable === thisTableName) return fk;
-	}
-}
-/**
-* Resolves the target table name from a relation's target type metadata.
-*/
-function resolveRelationTargetTable(relation) {
-	const targetType = relation.targetType();
-	return targetType?.metadata?.get("db.table") || targetType?.id || "";
-}
-//#endregion
-Object.defineProperty(exports, "findFKForRelation", {
-	enumerable: true,
-	get: function() {
-		return findFKForRelation;
-	}
-});
-Object.defineProperty(exports, "findRemoteFK", {
-	enumerable: true,
-	get: function() {
-		return findRemoteFK;
-	}
-});
-Object.defineProperty(exports, "resolveRelationTargetTable", {
-	enumerable: true,
-	get: function() {
-		return resolveRelationTargetTable;
-	}
-});

package/dist/relation-helpers-CLasawQq.mjs

@@ -1,34 +0,0 @@
-//#region src/rel/relation-helpers.ts
-/**
-* Finds the FK entry that connects a `@db.rel.to` relation to its target.
-*/
-function findFKForRelation(relation, foreignKeys) {
-	const targetTable = resolveRelationTargetTable(relation);
-	for (const fk of foreignKeys.values()) if (relation.alias) {
-		if (fk.alias === relation.alias) return {
-			localFields: fk.fields,
-			targetFields: fk.targetFields
-		};
-	} else if (fk.targetTable === targetTable) return {
-		localFields: fk.fields,
-		targetFields: fk.targetFields
-	};
-}
-/**
-* Finds a FK on a remote table that points back to a given table name.
-*/
-function findRemoteFK(targetTable, thisTableName, alias) {
-	for (const fk of targetTable.foreignKeys.values()) {
-		if (alias && fk.alias === alias && fk.targetTable === thisTableName) return fk;
-		if (!alias && fk.targetTable === thisTableName) return fk;
-	}
-}
-/**
-* Resolves the target table name from a relation's target type metadata.
-*/
-function resolveRelationTargetTable(relation) {
-	const targetType = relation.targetType();
-	return targetType?.metadata?.get("db.table") || targetType?.id || "";
-}
-//#endregion
-export { findRemoteFK as n, resolveRelationTargetTable as r, findFKForRelation as t };