@atscript/db 0.1.42 → 0.1.44

package/dist/{db-readable-Cc868K54.d.mts → db-readable-D9odJuSf.d.mts}

@@ -1,4 +1,4 @@
-import { u as TFieldOps } from "./ops-BdRAFLKY.mjs";
+import { u as TFieldOps } from "./ops-DcHDxrjX.mjs";
 import { FlatOf, NavPropsOf, NavPropsOf as NavPropsOf$1, OwnPropsOf, OwnPropsOf as OwnPropsOf$1, PrimaryKeyOf, TAtscriptAnnotatedType, TAtscriptDataType, TAtscriptTypeObject, TMetadataMap, 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-space-crCFv3DF.d.mts → db-space-7bf9_IWC.d.mts}

@@ -1,4 +1,4 @@
-import { F as TDbInsertResult, H as TFkLookupResolver, O as TDbDeleteResult, P as TDbInsertManyResult, S as TCascadeResolver, Y as TTableResolver, Z as TWriteTableResolver, l as TGenericLogger, o as BaseDbAdapter, s as TableMetadata, t as AtscriptDbReadable, z as TDbUpdateResult } from "./db-readable-Cc868K54.mjs";
+import { F as TDbInsertResult, H as TFkLookupResolver, O as TDbDeleteResult, P as TDbInsertManyResult, S as TCascadeResolver, Y as TTableResolver, Z as TWriteTableResolver, l as TGenericLogger, o as BaseDbAdapter, s as TableMetadata, t as AtscriptDbReadable, z as TDbUpdateResult } from "./db-readable-D9odJuSf.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-view-DSK76uc9.mjs → db-view-7Y5N4muD.mjs}

@@ -1,7 +1,8 @@
 import { a as batchPatchNestedTo, c as batchReplaceNestedTo, d as preValidateNestedFrom, f as validateBatch, h as DbError, 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-CNDyhg2L.mjs";
 import { resolveAlias } from "./agg.mjs";
 import { n as findRemoteFK, t as findFKForRelation } from "./relation-helpers-CLasawQq.mjs";
-import { isDbFieldOp, separateFieldOps } from "./ops.mjs";
+import { separateFieldOps } from "./ops.mjs";
+import { i as forceNavNonOptional, r as dbPlugin, s as getKeyProps, t as buildDbValidator } from "./validator-D_7Fqzs4.mjs";
 import { flattenAnnotatedType, isAnnotatedType } from "@atscript/typescript/utils";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/logger.ts
@@ -2106,224 +2107,6 @@ var ApplicationIntegrity = class extends IntegrityStrategy {
 	}
 };
 //#endregion
-//#region src/patch/patch-types.ts
-/**
-* Extracts `@expect.array.key` properties from an array-of-objects type.
-* These keys uniquely identify an element inside the array and are used
-* for `$update`, `$remove`, and `$upsert` operations.
-*
-* @param def - Atscript array type definition.
-* @returns Set of property names marked as keys; empty set if none.
-*/
-function getKeyProps(def) {
-	if (def.type.of.type.kind === "object") {
-		const objType = def.type.of.type;
-		const keyProps = /* @__PURE__ */ new Set();
-		for (const [key, val] of objType.props.entries()) if (val.metadata.get("expect.array.key")) keyProps.add(key);
-		return keyProps;
-	}
-	return /* @__PURE__ */ new Set();
-}
-//#endregion
-//#region src/db-validator-plugin.ts
-/** Set of recognised array‑patch operator keys. */
-const PATCH_OPS = new Set([
-	"$replace",
-	"$insert",
-	"$upsert",
-	"$update",
-	"$remove"
-]);
-/**
-* Returns `true` when `value` looks like a patch‑operator object
-* (at least one key is a recognised operator and no unknown keys).
-*/
-function isPatchOperatorObject(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	const keys = Object.keys(value);
-	if (keys.length === 0) return false;
-	return keys.every((k) => PATCH_OPS.has(k));
-}
-/**
-* Validator plugin for database operations.
-*
-* Handles navigation field constraints and delegates to the standard validator
-* for type checking. The annotated type tree already includes nav fields with
-* their full target types — this plugin controls WHEN recursion is allowed
-* based on the operation mode (insert/replace/patch).
-*
-* Replaces the old `navFieldsValidatorPlugin` (which blindly skipped all nav
-* fields) and `_checkNavProps()` (which validated constraints separately).
-*/
-function createDbValidatorPlugin() {
-	return (ctx, def, value) => {
-		const dbCtx = ctx.context;
-		if (!dbCtx) return;
-		const isTo = def.metadata.has("db.rel.to");
-		const isFrom = def.metadata.has("db.rel.from");
-		const isVia = def.metadata.has("db.rel.via");
-		if (isTo || isFrom || isVia) return handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia);
-		if (dbCtx.mode === "patch") {
-			if (isDbFieldOp(value)) {
-				if (dbCtx.flatMap && !isFieldOpAllowed(ctx.path, dbCtx.flatMap, dbCtx.navFields)) {
-					ctx.error("Field operations ($inc/$dec/$mul) are not supported inside @db.json fields or nested objects without @db.patch.strategy \"merge\"");
-					return false;
-				}
-				if (!(def.type.kind === "" && def.type.designType === "number")) {
-					ctx.error("Field operations ($inc/$dec/$mul) can only be applied to numeric fields");
-					return false;
-				}
-				return true;
-			}
-			if (def.type.kind === "array" && dbCtx.flatMap) {
-				const flatEntry = dbCtx.flatMap.get(ctx.path);
-				if (flatEntry?.metadata?.has("db.__topLevelArray") && !flatEntry.metadata.has("db.json")) return handleArrayPatch(ctx, def, value);
-			}
-		}
-	};
-}
-/**
-* Checks whether a field op is valid at `path`.
-*
-* Rejects when:
-* - The field itself is `@db.json` (ops on opaque blobs are meaningless).
-* - Any ancestor is `@db.json`.
-* - Any ancestor is a nested object without `@db.patch.strategy "merge"`.
-*
-* Accepts immediately when an ancestor is a navigation field (TO/FROM/VIA) —
-* the nested data is extracted and validated against its own table separately.
-*/
-function isFieldOpAllowed(path, flatMap, navFields) {
-	if (flatMap.get(path)?.metadata.has("db.json")) return false;
-	let pos = path.length;
-	while ((pos = path.lastIndexOf(".", pos - 1)) !== -1) {
-		const ancestor = path.slice(0, pos);
-		if (navFields?.has(ancestor)) return true;
-		const entry = flatMap.get(ancestor);
-		if (!entry) continue;
-		if (entry.metadata.has("db.json")) return false;
-		if (entry.type.kind === "object" && entry.metadata.get("db.patch.strategy") !== "merge") return false;
-	}
-	return true;
-}
-function handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia) {
-	const dotIdx = ctx.path.lastIndexOf(".");
-	const fieldName = dotIdx === -1 ? ctx.path : ctx.path.slice(dotIdx + 1);
-	if (value === null) {
-		ctx.error(`Cannot process null navigation property '${fieldName}'`);
-		return false;
-	}
-	if (value === void 0) return true;
-	if (dbCtx.mode === "patch") {
-		if (isFrom || isVia) {
-			if (isPatchOperatorObject(value)) return validateNavPatchOps(ctx, def, value, fieldName);
-			const relType = isFrom ? "1:N" : "M:N";
-			ctx.error(`Cannot patch ${relType} relation '${fieldName}' with a plain value — use patch operators ({ $insert, $remove, $replace, $update, $upsert })`);
-			return false;
-		}
-	}
-	if (isVia) return true;
-}
-/**
-* Validates patch operator values against the nav field's target array type.
-* Each operator's items are validated against the element type.
-*/
-function validateNavPatchOps(ctx, def, ops, fieldName) {
-	if (def.type.kind !== "array") {
-		ctx.error(`Cannot use patch operators on non-array relation '${fieldName}'`);
-		return false;
-	}
-	const arrayDef = def;
-	for (const op of [
-		"$replace",
-		"$insert",
-		"$upsert"
-	]) if (ops[op] !== void 0) {
-		if (!ctx.validateAnnotatedType(arrayDef, ops[op])) return false;
-	}
-	for (const op of ["$update", "$remove"]) if (ops[op] !== void 0) {
-		if (!validatePartialItems(ctx, arrayDef, ops[op], op, true)) return false;
-	}
-	return true;
-}
-/**
-* Handles patch‑mode validation for top‑level embedded arrays.
-*
-* When the incoming value is:
-* - A plain array → falls through to default array validation ($replace semantics)
-* - A patch operator object → validates each operator's payload individually
-*/
-function handleArrayPatch(ctx, def, value) {
-	if (Array.isArray(value)) return;
-	if (typeof value !== "object" || value === null) return;
-	const ops = value;
-	const keys = Object.keys(ops);
-	if (keys.length === 0 || !keys.every((k) => PATCH_OPS.has(k))) {
-		if (keys.some((k) => PATCH_OPS.has(k))) {
-			const unknown = keys.filter((k) => !PATCH_OPS.has(k));
-			ctx.error(`Unknown patch operator(s): ${unknown.join(", ")}. Allowed: $replace, $insert, $upsert, $update, $remove`);
-			return false;
-		}
-		return;
-	}
-	for (const op of [
-		"$replace",
-		"$insert",
-		"$upsert"
-	]) if (ops[op] !== void 0) {
-		if (!ctx.validateAnnotatedType(def, ops[op])) return false;
-	}
-	const isMerge = def.metadata.get("db.patch.strategy") === "merge";
-	for (const op of ["$update", "$remove"]) if (ops[op] !== void 0) {
-		if (!validatePartialItems(ctx, def, ops[op], op, isMerge)) return false;
-	}
-	return true;
-}
-/**
-* Validates `$update` / `$remove` items.
-*
-* Each item must be an object. For object arrays with `@expect.array.key` fields,
-* key properties are required and non‑key properties are validated but optional.
-* For primitive arrays, items are validated directly against the element type.
-*/
-function validatePartialItems(ctx, arrayDef, items, op, isMerge) {
-	if (!Array.isArray(items)) {
-		ctx.error(`${op} must be an array`);
-		return false;
-	}
-	const elementDef = arrayDef.type.of;
-	if (elementDef.type.kind !== "object") return ctx.validateAnnotatedType(arrayDef, items);
-	const keyProps = getKeyProps(arrayDef);
-	for (let i = 0; i < items.length; i++) {
-		const item = items[i];
-		if (typeof item !== "object" || item === null || Array.isArray(item)) {
-			ctx.error(`${op}[${i}]: expected object`);
-			return false;
-		}
-		const rec = item;
-		if (keyProps.size > 0) {
-			for (const kp of keyProps) if (rec[kp] === void 0 || rec[kp] === null) {
-				ctx.error(`${op}[${i}]: key field '${kp}' is required`);
-				return false;
-			}
-		}
-		const objType = elementDef.type;
-		for (const [key, val] of Object.entries(rec)) {
-			const propDef = objType.props.get(key);
-			if (propDef) {
-				if (!ctx.validateAnnotatedType(propDef, val)) return false;
-			}
-		}
-		if (op === "$update" && isMerge !== true) {
-			for (const [propName, propDef] of objType.props) if (!propDef.optional && !keyProps.has(propName) && rec[propName] === void 0) {
-				ctx.error(`${op}[${i}]: field '${propName}' is required (replace strategy)`);
-				return false;
-			}
-		}
-	}
-	return true;
-}
-//#endregion
 //#region src/patch/array-ops-resolver.ts
 /**
 * Resolves array patch operator keys (`__$insert`, `__$remove`, `__$upsert`,
@@ -2562,25 +2345,6 @@ function _translateOpsKeys(ops, meta) {
 		mul: ops.mul ? _translateOpsRecord(ops.mul, meta) : void 0
 	};
 }
-/**
-* Forces nav fields non-optional so the plugin handles null/undefined
-* checks (validator skips optional+null before plugins run).
-*/
-function forceNavNonOptional(type) {
-	if (type.metadata?.has("db.rel.to") || type.metadata?.has("db.rel.from") || type.metadata?.has("db.rel.via")) return type.optional ? {
-		...type,
-		optional: false
-	} : type;
-	return type;
-}
-/** Makes PK, defaulted, and FK fields optional; forces nav fields non-optional. */
-function insertReplace(type) {
-	if (type.metadata?.has("meta.id") || type.metadata?.has("db.default") || type.metadata?.has("db.default.increment") || type.metadata?.has("db.default.uuid") || type.metadata?.has("db.default.now") || type.metadata?.has("db.rel.FK")) return {
-		...type,
-		optional: true
-	};
-	return forceNavNonOptional(type);
-}
 var AtscriptDbTable = class extends AtscriptDbReadable {
 	_cascadeResolver;
 	_fkLookupResolver;
@@ -2939,37 +2703,26 @@ var AtscriptDbTable = class extends AtscriptDbReadable {
 	* (including inside nav field target types).
 	*/
 	_buildValidator(purpose) {
-		const dbPlugin = createDbValidatorPlugin();
-		const plugins = [...this.adapter.getValidatorPlugins(), dbPlugin];
-		switch (purpose) {
-			case "insert": return this.createValidator({
-				plugins,
-				replace: insertReplace
-			});
-			case "patch": return this.createValidator({
+		const adapterPlugins = this.adapter.getValidatorPlugins();
+		if (purpose === "insert" || purpose === "patch" || purpose === "bulkReplace") {
+			const mode = purpose === "bulkReplace" ? "replace" : purpose;
+			return buildDbValidator(this.type, mode, adapterPlugins);
+		}
+		if (purpose === "bulkUpdate") {
+			const plugins = adapterPlugins.length ? [...adapterPlugins, dbPlugin] : [dbPlugin];
+			const navFields = this._meta.navFields;
+			return this.createValidator({
 				plugins,
-				partial: true,
+				partial: (_def, path) => {
+					if (path === "") return true;
+					const root = path.split(".")[0];
+					if (navFields.has(root)) return true;
+					return _def.metadata.get("db.patch.strategy") === "merge";
+				},
 				replace: forceNavNonOptional
 			});
-			case "bulkReplace": return this.createValidator({
-				plugins,
-				replace: insertReplace
-			});
-			case "bulkUpdate": {
-				const navFields = this._meta.navFields;
-				return this.createValidator({
-					plugins,
-					partial: (_def, path) => {
-						if (path === "") return true;
-						const root = path.split(".")[0];
-						if (navFields.has(root)) return true;
-						return _def.metadata.get("db.patch.strategy") === "merge";
-					},
-					replace: forceNavNonOptional
-				});
-			}
-			default: return this.createValidator({ plugins });
 		}
+		return this.createValidator({ plugins: adapterPlugins });
 	}
 };
 //#endregion
@@ -3106,4 +2859,4 @@ var AtscriptDbView = class extends AtscriptDbReadable {
 	}
 };
 //#endregion
-export { NoopLogger as _, getKeyProps as a, IntegrityStrategy as c, resolveDesignType as d, RelationalFieldMapper as f, TableMetadata as g, UniquSelect as h, createDbValidatorPlugin as i, NativeIntegrity as l, FieldMappingStrategy as m, AtscriptDbTable as n, ApplicationIntegrity as o, DocumentFieldMapper as p, decomposePatch as r, BaseDbAdapter as s, AtscriptDbView as t, AtscriptDbReadable as u };
+export { BaseDbAdapter as a, AtscriptDbReadable as c, DocumentFieldMapper as d, FieldMappingStrategy as f, NoopLogger as h, ApplicationIntegrity as i, resolveDesignType as l, TableMetadata as m, AtscriptDbTable as n, IntegrityStrategy as o, UniquSelect as p, decomposePatch as r, NativeIntegrity as s, AtscriptDbView as t, RelationalFieldMapper as u };