@atscript/db 0.1.84 → 0.1.86

package/dist/{db-readable-DgIxrEVQ.d.cts → db-readable-BtuzT9hI.d.cts}

@@ -526,7 +526,7 @@ interface TMetadataOverrides {
  *
  * Typically provided by the driver/registry (e.g. `DbSpace.getTable`).
  */
-type TTableResolver = (type: TAtscriptAnnotatedType) => Pick<AtscriptDbTableLike, "findMany" | "loadRelations" | "primaryKeys" | "preferredId" | "relations" | "foreignKeys"> | undefined;
+type TTableResolver = (type: TAtscriptAnnotatedType) => Pick<AtscriptDbTableLike, "findMany" | "loadRelations" | "primaryKeys" | "preferredId" | "relations" | "foreignKeys" | "isValidFieldPath"> | undefined;
 /** Minimal table interface used by the table resolver. Avoids circular dependency with AtscriptDbTable. */
 interface AtscriptDbTableLike {
   findMany(query: unknown): Promise<Array<Record<string, unknown>>>;
@@ -536,6 +536,7 @@ interface AtscriptDbTableLike {
   relations: ReadonlyMap<string, TDbRelation>;
   foreignKeys: ReadonlyMap<string, TDbForeignKey>;
   getMetadata(): TableMetadata;
+  isValidFieldPath(path: string, visited?: Set<string>): boolean;
 }
 /** Minimal writable table interface for nested creation/update. */
 interface AtscriptDbWritable {
@@ -1330,6 +1331,17 @@ declare class AtscriptDbReadable<T extends TAtscriptAnnotatedType = TAtscriptAnn
    * Pre-computed field metadata for adapter use.
    */
   get fieldDescriptors(): readonly TDbFieldMeta[];
+  /**
+   * Resolves whether `path` references a real field — directly via `flatMap`
+   * or transitively through a nav relation by recursing into the target
+   * table. Defense-in-depth for query-path validation: `flattenAnnotatedType`
+   * still truncates real self-referential cycles, so paths like
+   * `parent.parent.name` on a self-ref schema would miss `flatMap.has` but
+   * remain valid field references on the target.
+   *
+   * Cycle-safe via a visited set keyed on `<tableName>:<navField>`.
+   */
+  isValidFieldPath(path: string, _visited?: Set<string>): boolean;
   /**
    * Creates a new validator with custom options.
    */

package/dist/{db-readable-BUUVDkLf.d.mts → db-readable-DSFedi60.d.mts}

@@ -526,7 +526,7 @@ interface TMetadataOverrides {
  *
  * Typically provided by the driver/registry (e.g. `DbSpace.getTable`).
  */
-type TTableResolver = (type: TAtscriptAnnotatedType) => Pick<AtscriptDbTableLike, "findMany" | "loadRelations" | "primaryKeys" | "preferredId" | "relations" | "foreignKeys"> | undefined;
+type TTableResolver = (type: TAtscriptAnnotatedType) => Pick<AtscriptDbTableLike, "findMany" | "loadRelations" | "primaryKeys" | "preferredId" | "relations" | "foreignKeys" | "isValidFieldPath"> | undefined;
 /** Minimal table interface used by the table resolver. Avoids circular dependency with AtscriptDbTable. */
 interface AtscriptDbTableLike {
   findMany(query: unknown): Promise<Array<Record<string, unknown>>>;
@@ -536,6 +536,7 @@ interface AtscriptDbTableLike {
   relations: ReadonlyMap<string, TDbRelation>;
   foreignKeys: ReadonlyMap<string, TDbForeignKey>;
   getMetadata(): TableMetadata;
+  isValidFieldPath(path: string, visited?: Set<string>): boolean;
 }
 /** Minimal writable table interface for nested creation/update. */
 interface AtscriptDbWritable {
@@ -1330,6 +1331,17 @@ declare class AtscriptDbReadable<T extends TAtscriptAnnotatedType = TAtscriptAnn
    * Pre-computed field metadata for adapter use.
    */
   get fieldDescriptors(): readonly TDbFieldMeta[];
+  /**
+   * Resolves whether `path` references a real field — directly via `flatMap`
+   * or transitively through a nav relation by recursing into the target
+   * table. Defense-in-depth for query-path validation: `flattenAnnotatedType`
+   * still truncates real self-referential cycles, so paths like
+   * `parent.parent.name` on a self-ref schema would miss `flatMap.has` but
+   * remain valid field references on the target.
+   *
+   * Cycle-safe via a visited set keyed on `<tableName>:<navField>`.
+   */
+  isValidFieldPath(path: string, _visited?: Set<string>): boolean;
   /**
    * Creates a new validator with custom options.
    */

package/dist/{db-space-CZooARt_.d.mts → db-space-Bf6lqUee.d.cts}

@@ -1,6 +1,6 @@
-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-BUUVDkLf.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 { 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-BtuzT9hI.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";
 
 //#region src/strategies/integrity.d.ts
 /**

package/dist/{db-space-DiErv7Q1.d.cts → db-space-FHPios8Z.d.mts}

@@ -1,6 +1,6 @@
-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-DgIxrEVQ.cjs";
-import { FilterExpr } from "@uniqu/core";
+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-DSFedi60.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";
 
 //#region src/strategies/integrity.d.ts
 /**

package/dist/{db-view-da5OTSRH.cjs → db-view-BAUO_elV.cjs}

@@ -1361,6 +1361,35 @@ var AtscriptDbReadable = class {
 		return this._meta.fieldDescriptors;
 	}
 	/**
+	* Resolves whether `path` references a real field — directly via `flatMap`
+	* or transitively through a nav relation by recursing into the target
+	* table. Defense-in-depth for query-path validation: `flattenAnnotatedType`
+	* still truncates real self-referential cycles, so paths like
+	* `parent.parent.name` on a self-ref schema would miss `flatMap.has` but
+	* remain valid field references on the target.
+	*
+	* Cycle-safe via a visited set keyed on `<tableName>:<navField>`.
+	*/
+	isValidFieldPath(path, _visited) {
+		if (this.flatMap.has(path)) return true;
+		const dotIdx = path.indexOf(".");
+		if (dotIdx === -1) return false;
+		const head = path.slice(0, dotIdx);
+		const tail = path.slice(dotIdx + 1);
+		if (!this.navFields.has(head)) return false;
+		const relation = this._meta.relations.get(head);
+		if (!relation) return false;
+		const targetType = relation.targetType();
+		if (!targetType || !this._tableResolver) return false;
+		const targetTable = this._tableResolver(targetType);
+		if (!targetTable || typeof targetTable.isValidFieldPath !== "function") return false;
+		const visited = _visited ?? /* @__PURE__ */ new Set();
+		const cycleKey = `${this.tableName}:${head}`;
+		if (visited.has(cycleKey)) return false;
+		visited.add(cycleKey);
+		return targetTable.isValidFieldPath(tail, visited);
+	}
+	/**
 	* Creates a new validator with custom options.
 	*/
 	createValidator(opts) {
@@ -1676,7 +1705,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-CRC5LcqM.cjs")).then((n) => n.relation_loader_exports);
+		const { loadRelationsImpl } = await Promise.resolve().then(() => require("./relation-loader-B8CmCJOs.cjs")).then((n) => n.relation_loader_exports);
 		return loadRelationsImpl(rows, withRelations, this);
 	}
 	/**

package/dist/{db-view-Dfw-FP5o.mjs → db-view-TUR1vy7k.mjs}

@@ -1361,6 +1361,35 @@ var AtscriptDbReadable = class {
 		return this._meta.fieldDescriptors;
 	}
 	/**
+	* Resolves whether `path` references a real field — directly via `flatMap`
+	* or transitively through a nav relation by recursing into the target
+	* table. Defense-in-depth for query-path validation: `flattenAnnotatedType`
+	* still truncates real self-referential cycles, so paths like
+	* `parent.parent.name` on a self-ref schema would miss `flatMap.has` but
+	* remain valid field references on the target.
+	*
+	* Cycle-safe via a visited set keyed on `<tableName>:<navField>`.
+	*/
+	isValidFieldPath(path, _visited) {
+		if (this.flatMap.has(path)) return true;
+		const dotIdx = path.indexOf(".");
+		if (dotIdx === -1) return false;
+		const head = path.slice(0, dotIdx);
+		const tail = path.slice(dotIdx + 1);
+		if (!this.navFields.has(head)) return false;
+		const relation = this._meta.relations.get(head);
+		if (!relation) return false;
+		const targetType = relation.targetType();
+		if (!targetType || !this._tableResolver) return false;
+		const targetTable = this._tableResolver(targetType);
+		if (!targetTable || typeof targetTable.isValidFieldPath !== "function") return false;
+		const visited = _visited ?? /* @__PURE__ */ new Set();
+		const cycleKey = `${this.tableName}:${head}`;
+		if (visited.has(cycleKey)) return false;
+		visited.add(cycleKey);
+		return targetTable.isValidFieldPath(tail, visited);
+	}
+	/**
 	* Creates a new validator with custom options.
 	*/
 	createValidator(opts) {
@@ -1676,7 +1705,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-BEOTXNcq.mjs").then((n) => n.n);
+		const { loadRelationsImpl } = await import("./relation-loader-BH3AkSnY.mjs").then((n) => n.n);
 		return loadRelationsImpl(rows, withRelations, this);
 	}
 	/**

package/dist/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_db_error = require("./db-error-CrtPzaZ-.cjs");
-const require_db_view = require("./db-view-da5OTSRH.cjs");
+const require_db_view = require("./db-view-BAUO_elV.cjs");
 const require_ops = require("./ops.cjs");
 const require_validator = require("./validator-DrmUaZA3.cjs");
 let _uniqu_core = require("@uniqu/core");

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-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-DgIxrEVQ.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-BtuzT9hI.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-DiErv7Q1.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-Bf6lqUee.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 { AggregateQuery as AggregateQuery$1, FilterExpr as FilterExpr$1, FilterVisitor, Uniquery as Uniquery$1, computeInsights, isPrimitive, walkFilter } from "@uniqu/core";

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-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-BUUVDkLf.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-DSFedi60.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-CZooARt_.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-FHPios8Z.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 { AggregateQuery as AggregateQuery$1, FilterExpr as FilterExpr$1, FilterVisitor, Uniquery as Uniquery$1, computeInsights, isPrimitive, walkFilter } from "@uniqu/core";

package/dist/index.mjs

@@ -1,5 +1,5 @@
 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-Dfw-FP5o.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-TUR1vy7k.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 { computeInsights, isPrimitive, walkFilter } from "@uniqu/core";

package/dist/rel.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_relation_loader = require("./relation-loader-CRC5LcqM.cjs");
+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");
 exports.batchInsertNestedFrom = require_nested_writer.batchInsertNestedFrom;

package/dist/rel.d.cts

@@ -1,4 +1,4 @@
-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-DgIxrEVQ.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-BtuzT9hI.cjs";
 import { t as DbValidationContext } from "./db-validator-plugin-DRGMCEn3.cjs";
 import { FilterExpr, WithRelation } from "@uniqu/core";
 import { Validator } from "@atscript/typescript/utils";

package/dist/rel.d.mts

@@ -1,4 +1,4 @@
-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-BUUVDkLf.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-DSFedi60.mjs";
 import { t as DbValidationContext } from "./db-validator-plugin-DDvYyv5t.mjs";
 import { Validator } from "@atscript/typescript/utils";
 import { FilterExpr, WithRelation } from "@uniqu/core";

package/dist/rel.mjs

@@ -1,4 +1,4 @@
-import { t as loadRelationsImpl } from "./relation-loader-BEOTXNcq.mjs";
+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";
 export { batchInsertNestedFrom, batchInsertNestedTo, batchInsertNestedVia, batchPatchNestedFrom, batchPatchNestedTo, batchPatchNestedVia, batchReplaceNestedFrom, batchReplaceNestedTo, batchReplaceNestedVia, checkDepthOverflow, findFKForRelation, findRemoteFK, loadRelationsImpl, preValidateNestedFrom, resolveRelationTargetTable, validateBatch };

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

@@ -12,7 +12,10 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 const require_relation_helpers = require("./relation-helpers-BYvsE1tR.cjs");
 //#region src/rel/relation-loader.ts
-var relation_loader_exports = /* @__PURE__ */ __exportAll({ loadRelationsImpl: () => loadRelationsImpl });
+var relation_loader_exports = /* @__PURE__ */ __exportAll({
+	ensureSelectIncludesFields: () => ensureSelectIncludesFields,
+	loadRelationsImpl: () => loadRelationsImpl
+});
 /**
 * Loads related data for `$with` relations and attaches them to result rows.
 */
@@ -314,9 +317,10 @@ async function loadViaCompositeKey(rows, opts) {
 	}
 	const targetBaseFilter = targetOrFilters.length === 1 ? targetOrFilters[0] : { $or: targetOrFilters };
 	const finalFilter = relQuery.filter ? { $and: [targetBaseFilter, relQuery.filter] } : targetBaseFilter;
+	const controls = ensureSelectIncludesFields(relQuery.controls, targetPKFields);
 	const targetRows = await targetTable.findMany({
 		filter: finalFilter,
-		controls: relQuery.controls
+		controls
 	});
 	const targetIndex = /* @__PURE__ */ new Map();
 	for (const item of targetRows) targetIndex.set(compositeKey(targetPKFields, item), item);
@@ -339,19 +343,47 @@ async function loadViaCompositeKey(rows, opts) {
 	}
 }
 /**
-* If controls include an array-style $select, ensure the given join fields
-* are present so that FK matching works after the query returns.
+* Ensure the given join fields survive the user's $select on a $with relation
+* read. Without this, the JS-side join would key off undefined and silently
+* return empty relations.
+*
+* - Array $select: append missing FK fields.
+* - Include-mode object $select (any value is 1/true, or empty object): set
+*   missing FK fields to 1.
+* - Exclude-mode object $select: leave alone — FK survives by default. If the
+*   FK is explicitly excluded, throw rather than silently override user intent.
 */
 function ensureSelectIncludesFields(controls, fields) {
 	if (!controls) return controls;
 	const sel = controls.$select;
-	if (!Array.isArray(sel)) return controls;
-	const augmented = [...sel];
-	for (const f of fields) if (!augmented.includes(f)) augmented.push(f);
-	return {
-		...controls,
-		$select: augmented
-	};
+	if (sel === void 0 || sel === null) return controls;
+	if (Array.isArray(sel)) {
+		const augmented = [...sel];
+		for (const f of fields) if (!augmented.includes(f)) augmented.push(f);
+		return {
+			...controls,
+			$select: augmented
+		};
+	}
+	if (typeof sel === "object") {
+		const selObj = sel;
+		const isInclude = Object.keys(selObj).length === 0 || Object.values(selObj).some((v) => v === 1 || v === true);
+		const augmented = { ...selObj };
+		let mutated = false;
+		for (const f of fields) {
+			const v = augmented[f];
+			if (v === 0 || v === false) throw new Error(`Cannot exclude join column "${f}" from $select on $with relation`);
+			if (v === void 0 && isInclude) {
+				augmented[f] = 1;
+				mutated = true;
+			}
+		}
+		return mutated ? {
+			...controls,
+			$select: augmented
+		} : controls;
+	}
+	return controls;
 }
 function compositeKey(fields, obj) {
 	let key = "";
@@ -420,9 +452,10 @@ function queryCompositeFK(rows, opts) {
 	if (orFilters.length === 0) return Promise.resolve([]);
 	const baseFilter = orFilters.length === 1 ? orFilters[0] : { $or: orFilters };
 	const targetFilter = relQuery.filter ? { $and: [baseFilter, relQuery.filter] } : baseFilter;
+	const controls = ensureSelectIncludesFields(relQuery.controls, targetFields);
 	return targetTable.findMany({
 		filter: targetFilter,
-		controls: relQuery.controls
+		controls
 	});
 }
 //#endregion

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

@@ -12,7 +12,10 @@ var __exportAll = (all, no_symbols) => {
 };
 //#endregion
 //#region src/rel/relation-loader.ts
-var relation_loader_exports = /* @__PURE__ */ __exportAll({ loadRelationsImpl: () => loadRelationsImpl });
+var relation_loader_exports = /* @__PURE__ */ __exportAll({
+	ensureSelectIncludesFields: () => ensureSelectIncludesFields,
+	loadRelationsImpl: () => loadRelationsImpl
+});
 /**
 * Loads related data for `$with` relations and attaches them to result rows.
 */
@@ -314,9 +317,10 @@ async function loadViaCompositeKey(rows, opts) {
 	}
 	const targetBaseFilter = targetOrFilters.length === 1 ? targetOrFilters[0] : { $or: targetOrFilters };
 	const finalFilter = relQuery.filter ? { $and: [targetBaseFilter, relQuery.filter] } : targetBaseFilter;
+	const controls = ensureSelectIncludesFields(relQuery.controls, targetPKFields);
 	const targetRows = await targetTable.findMany({
 		filter: finalFilter,
-		controls: relQuery.controls
+		controls
 	});
 	const targetIndex = /* @__PURE__ */ new Map();
 	for (const item of targetRows) targetIndex.set(compositeKey(targetPKFields, item), item);
@@ -339,19 +343,47 @@ async function loadViaCompositeKey(rows, opts) {
 	}
 }
 /**
-* If controls include an array-style $select, ensure the given join fields
-* are present so that FK matching works after the query returns.
+* Ensure the given join fields survive the user's $select on a $with relation
+* read. Without this, the JS-side join would key off undefined and silently
+* return empty relations.
+*
+* - Array $select: append missing FK fields.
+* - Include-mode object $select (any value is 1/true, or empty object): set
+*   missing FK fields to 1.
+* - Exclude-mode object $select: leave alone — FK survives by default. If the
+*   FK is explicitly excluded, throw rather than silently override user intent.
 */
 function ensureSelectIncludesFields(controls, fields) {
 	if (!controls) return controls;
 	const sel = controls.$select;
-	if (!Array.isArray(sel)) return controls;
-	const augmented = [...sel];
-	for (const f of fields) if (!augmented.includes(f)) augmented.push(f);
-	return {
-		...controls,
-		$select: augmented
-	};
+	if (sel === void 0 || sel === null) return controls;
+	if (Array.isArray(sel)) {
+		const augmented = [...sel];
+		for (const f of fields) if (!augmented.includes(f)) augmented.push(f);
+		return {
+			...controls,
+			$select: augmented
+		};
+	}
+	if (typeof sel === "object") {
+		const selObj = sel;
+		const isInclude = Object.keys(selObj).length === 0 || Object.values(selObj).some((v) => v === 1 || v === true);
+		const augmented = { ...selObj };
+		let mutated = false;
+		for (const f of fields) {
+			const v = augmented[f];
+			if (v === 0 || v === false) throw new Error(`Cannot exclude join column "${f}" from $select on $with relation`);
+			if (v === void 0 && isInclude) {
+				augmented[f] = 1;
+				mutated = true;
+			}
+		}
+		return mutated ? {
+			...controls,
+			$select: augmented
+		} : controls;
+	}
+	return controls;
 }
 function compositeKey(fields, obj) {
 	let key = "";
@@ -420,9 +452,10 @@ function queryCompositeFK(rows, opts) {
 	if (orFilters.length === 0) return Promise.resolve([]);
 	const baseFilter = orFilters.length === 1 ? orFilters[0] : { $or: orFilters };
 	const targetFilter = relQuery.filter ? { $and: [baseFilter, relQuery.filter] } : baseFilter;
+	const controls = ensureSelectIncludesFields(relQuery.controls, targetFields);
 	return targetTable.findMany({
 		filter: targetFilter,
-		controls: relQuery.controls
+		controls
 	});
 }
 //#endregion

package/dist/sync.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_db_view = require("./db-view-da5OTSRH.cjs");
+const require_db_view = require("./db-view-BAUO_elV.cjs");
 //#region src/schema/schema-hash.ts
 /** Extracts sorted field snapshots from a readable's field descriptors. */
 function extractFieldSnapshots(fields, typeMapper) {

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-DgIxrEVQ.cjs";
-import { r as AtscriptDbView, t as DbSpace } from "./db-space-DiErv7Q1.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-BtuzT9hI.cjs";
+import { r as AtscriptDbView, t as DbSpace } from "./db-space-Bf6lqUee.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-BUUVDkLf.mjs";
-import { r as AtscriptDbView, t as DbSpace } from "./db-space-CZooARt_.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-DSFedi60.mjs";
+import { r as AtscriptDbView, t as DbSpace } from "./db-space-FHPios8Z.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-Dfw-FP5o.mjs";
+import { g as NoopLogger } from "./db-view-TUR1vy7k.mjs";
 //#region src/schema/schema-hash.ts
 /** Extracts sorted field snapshots from a readable's field descriptors. */
 function extractFieldSnapshots(fields, typeMapper) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.84",
+  "version": "0.1.86",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",
@@ -71,14 +71,14 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.59",
-    "@atscript/typescript": "^0.1.59",
+    "@atscript/core": "^0.1.60",
+    "@atscript/typescript": "^0.1.60",
     "@uniqu/core": "^0.1.6",
-    "unplugin-atscript": "^0.1.59"
+    "unplugin-atscript": "^0.1.60"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.59",
-    "@atscript/typescript": "^0.1.59",
+    "@atscript/core": "^0.1.60",
+    "@atscript/typescript": "^0.1.60",
     "@uniqu/core": "^0.1.6"
   },
   "scripts": {