@atscript/db 0.1.154 → 0.1.155

package/dist/{validator-BACewoRj.mjs → validator-BC3nwFi4.mjs}

@@ -1,6 +1,110 @@
 import { i as DepthLimitExceededError } from "./db-error-eSsQX7rt.mjs";
 import { getDbFieldOp } from "./ops.mjs";
 import { createAnnotatedTypeNode, flattenAnnotatedType } from "@atscript/typescript/utils";
+//#region src/shared/union-shape.ts
+/** `null` / `undefined` as a type: a union member that only adds NULL. */
+function isNullishType(type) {
+	const def = type.type;
+	return def.kind === "" && (def.designType === "null" || def.designType === "undefined");
+}
+/**
+* The value members of a union — nested unions expanded (a flat-union entry
+* of `flattenAnnotatedType` holds the prop's own union besides its members,
+* an alias member may be a union itself), `null` / `undefined` left out,
+* each member once. `nullable`: a `null` / `undefined` member was left out.
+*/
+function unionValueMembers(type) {
+	const members = /* @__PURE__ */ new Set();
+	let nullable = false;
+	const visit = (t, depth) => {
+		if (t.type.kind === "union" && depth < 8) for (const item of t.type.items) visit(item, depth + 1);
+		else if (isNullishType(t)) nullable = true;
+		else members.add(t);
+	};
+	visit(type, 0);
+	return {
+		members: [...members],
+		nullable
+	};
+}
+/**
+* The one value member of a union (`T | null` → `T`), or `undefined` when
+* `type` is no union or has several value members. A column of a nullable
+* union is the column `T` alone would get (its type tags, size, precision).
+*/
+function soleUnionMember(type) {
+	if (type.type.kind !== "union") return void 0;
+	const { members } = unionValueMembers(type);
+	return members.length === 1 ? members[0] : void 0;
+}
+/**
+* The `T` of a field typed `T | null` whose db annotations (`@db.default.now`
+* of `number.timestamp.created`) describe the field's column like those of a
+* field typed `T` — {@link soleUnionMember}, except for a reference to another
+* field (`closedAt: Order.closedAt`): it shares that field's union, whose db
+* annotations stay with the referenced field.
+*/
+function columnUnionBase(type) {
+	return type.ref?.field ? void 0 : soleUnionMember(type);
+}
+const RANK = {
+	required: 0,
+	nullable: 1,
+	partial: 2
+};
+function weaker(a, b) {
+	return RANK[a] >= RANK[b] ? a : b;
+}
+/**
+* The {@link TPathPresence} of the dot-path `path` below the object type
+* `root`, or `undefined` when the path crosses an array or a tuple (its
+* elements' fields are no columns of their own on relational storage;
+* callers keep the field's own `optional` there).
+*/
+function pathPresence(root, path) {
+	return presenceAt(root, path.split("."), 0);
+}
+function presenceAt(type, segs, i) {
+	const def = type.type;
+	switch (def.kind) {
+		case "union": {
+			let result = "required";
+			for (const item of def.items) {
+				if (isNullishType(item)) {
+					result = weaker(result, "nullable");
+					continue;
+				}
+				const member = presenceAt(item, segs, i);
+				if (member === void 0) return void 0;
+				result = weaker(result, member);
+			}
+			return result;
+		}
+		case "intersection": {
+			let result = "partial";
+			for (const item of def.items) {
+				const member = presenceAt(item, segs, i);
+				if (member === void 0) return void 0;
+				if (RANK[member] < RANK[result]) result = member;
+			}
+			return result;
+		}
+		case "object": {
+			if (i === segs.length) return "required";
+			const prop = def.props.get(segs[i]);
+			if (!prop) return "partial";
+			const rest = presenceAt(prop, segs, i + 1);
+			if (rest === void 0) return void 0;
+			return prop.optional ? weaker(rest, "nullable") : rest;
+		}
+		case "array":
+		case "tuple": return i === segs.length ? "required" : void 0;
+		default:
+			if (i < segs.length) return "partial";
+			return isNullishType(type) ? "nullable" : "required";
+	}
+}
+//#endregion
 //#region src/patch/patch-types.ts
 /**
 * Extracts `@expect.array.key` properties from an array-of-objects type.
@@ -50,6 +154,73 @@ function markComplexItems(def) {
 	if (kind === "union" || kind === "tuple" || kind === "intersection") for (const item of def.type.items) complexItems.add(item);
 }
 /**
+* Per validation context: the paths (array indices as `*`) of the tuples and
+* the unions of several types the validator visited. Which item a field
+* below one belongs to is not known when defaults are applied, so its
+* default is not filled (`AtscriptDbTable._applyDefaults`) — and the field
+* is not optional on insert either.
+*/
+const ambiguousPaths = /* @__PURE__ */ new WeakMap();
+/** `items.3.at` → `items.*.at` */
+function schemaPath(path) {
+	return path.replace(/(^|\.)\d+(?=\.|$)/g, "$1*");
+}
+function markAmbiguous(dbCtx, def, path) {
+	const kind = def.type.kind;
+	if (kind === "tuple" || kind === "union" && !soleUnionMember(def)) {
+		let paths = ambiguousPaths.get(dbCtx);
+		if (!paths) ambiguousPaths.set(dbCtx, paths = /* @__PURE__ */ new Set());
+		paths.add(schemaPath(path));
+	}
+}
+/** Whether `path` lies below a tuple or a union of several types (see {@link ambiguousPaths}). */
+function belowAmbiguous(dbCtx, path) {
+	const paths = ambiguousPaths.get(dbCtx);
+	if (!paths) return false;
+	const schema = schemaPath(path);
+	for (let dot = schema.lastIndexOf("."); dot !== -1; dot = schema.lastIndexOf(".", dot - 1)) if (paths.has(schema.slice(0, dot))) return true;
+	return false;
+}
+/** Per validated root type: schema path → whether it lies below a tuple / union of several types. */
+const ambiguousByRoot = /* @__PURE__ */ new WeakMap();
+/**
+* {@link belowAmbiguous} read from the type itself: walks `path` from `root`
+* (the validator's own type) and answers whether a tuple or a union of
+* several types lies on the way. The visit-based answer misses a union the
+* plugin was not consulted for — a caller that runs this plugin only for
+* absent values (a form's server-managed check) never shows it the union
+* holding the value.
+*/
+function pathBelowAmbiguous(root, path) {
+	let cache = ambiguousByRoot.get(root);
+	if (!cache) ambiguousByRoot.set(root, cache = /* @__PURE__ */ new Map());
+	const schema = schemaPath(path);
+	let answer = cache.get(schema);
+	if (answer === void 0) {
+		answer = false;
+		let type = root;
+		for (const seg of schema.split(".")) {
+			if (type.type.kind === "union") {
+				const member = soleUnionMember(type);
+				if (!member) {
+					answer = true;
+					break;
+				}
+				type = member;
+			}
+			const kind = type.type.kind;
+			if (kind === "tuple") {
+				answer = true;
+				break;
+			}
+			type = kind === "array" ? seg === "*" ? type.type.of : void 0 : kind === "object" ? type.type.props.get(seg) : void 0;
+			if (!type) break;
+		}
+		cache.set(schema, answer);
+	}
+	return answer;
+}
+/**
 * Validator plugin for database operations.
 *
 * Handles navigation field constraints and delegates to the standard validator
@@ -65,6 +236,7 @@ function createDbValidatorPlugin() {
 		const dbCtx = ctx.context;
 		if (!dbCtx) return;
 		markComplexItems(def);
+		markAmbiguous(dbCtx, def, ctx.path);
 		if (def.type.tags?.has("geoPoint") && value !== void 0 && value !== null) {
 			if (!Array.isArray(value) || value.length !== 2 || typeof value[0] !== "number" || typeof value[1] !== "number" || !Number.isFinite(value[0]) || !Number.isFinite(value[1])) {
 				ctx.error("Expected a [lng, lat] tuple of two finite numbers (GeoJSON order)");
@@ -86,10 +258,13 @@ function createDbValidatorPlugin() {
 		if (isTo || isFrom || isVia) return handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia);
 		if (value === void 0 && (dbCtx.mode === "insert" || dbCtx.mode === "replace") && !complexItems.has(def)) {
 			const meta = def.metadata;
-			const serverManaged = meta.has("db.default") || meta.has("db.default.increment") || meta.has("db.default.uuid") || meta.has("db.default.now") || meta.has("db.column.version") || meta.has("db.column.derived");
+			const baseMeta = columnUnionBase(def)?.metadata;
+			const defaulted = !(belowAmbiguous(dbCtx, ctx.path) || pathBelowAmbiguous(ctx.root, ctx.path));
+			const has = (key) => defaulted && (meta.has(key) || baseMeta?.has(key) === true);
+			const serverManaged = has("db.default") || has("db.default.increment") || has("db.default.uuid") || has("db.default.now") || meta.has("db.column.version") || meta.has("db.column.derived");
 			const hasFK = meta.has("db.rel.FK");
 			if (serverManaged || hasFK) {
-				if (dbCtx.mode === "replace" && meta.has("meta.id") && !isInsideNavField(ctx.path, dbCtx.navFields)) return;
+				if (dbCtx.mode === "replace" && meta.has("meta.id") && !ctx.path.includes(".")) return;
 				return true;
 			}
 		}
@@ -149,13 +324,6 @@ function isFieldOpAllowed(path, flatMap, navFields) {
 	}
 	return true;
 }
-/** Returns true if the given path is nested inside a navigation field. */
-function isInsideNavField(path, navFields) {
-	if (!navFields) return false;
-	let pos = path.length;
-	while ((pos = path.lastIndexOf(".", pos - 1)) !== -1) if (navFields.has(path.slice(0, pos))) return true;
-	return false;
-}
 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);
@@ -437,4 +605,4 @@ function buildValidationContext(type) {
 	};
 }
 //#endregion
-export { forceNavNonOptional as a, getKeyProps as c, dbPlugin as i, buildPatchPartial as n, isNavRelation as o, buildValidationContext as r, createDbValidatorPlugin as s, buildDbValidator as t };
+export { forceNavNonOptional as a, getKeyProps as c, soleUnionMember as d, unionValueMembers as f, dbPlugin as i, columnUnionBase as l, buildPatchPartial as n, isNavRelation as o, buildValidationContext as r, createDbValidatorPlugin as s, buildDbValidator as t, pathPresence as u };

package/dist/{validator-BxWwh3wf.cjs → validator-DHwSyBej.cjs}

@@ -1,6 +1,110 @@
 const require_db_error = require("./db-error-JcfJqqpk.cjs");
 const require_ops = require("./ops.cjs");
 let _atscript_typescript_utils = require("@atscript/typescript/utils");
+//#region src/shared/union-shape.ts
+/** `null` / `undefined` as a type: a union member that only adds NULL. */
+function isNullishType(type) {
+	const def = type.type;
+	return def.kind === "" && (def.designType === "null" || def.designType === "undefined");
+}
+/**
+* The value members of a union — nested unions expanded (a flat-union entry
+* of `flattenAnnotatedType` holds the prop's own union besides its members,
+* an alias member may be a union itself), `null` / `undefined` left out,
+* each member once. `nullable`: a `null` / `undefined` member was left out.
+*/
+function unionValueMembers(type) {
+	const members = /* @__PURE__ */ new Set();
+	let nullable = false;
+	const visit = (t, depth) => {
+		if (t.type.kind === "union" && depth < 8) for (const item of t.type.items) visit(item, depth + 1);
+		else if (isNullishType(t)) nullable = true;
+		else members.add(t);
+	};
+	visit(type, 0);
+	return {
+		members: [...members],
+		nullable
+	};
+}
+/**
+* The one value member of a union (`T | null` → `T`), or `undefined` when
+* `type` is no union or has several value members. A column of a nullable
+* union is the column `T` alone would get (its type tags, size, precision).
+*/
+function soleUnionMember(type) {
+	if (type.type.kind !== "union") return void 0;
+	const { members } = unionValueMembers(type);
+	return members.length === 1 ? members[0] : void 0;
+}
+/**
+* The `T` of a field typed `T | null` whose db annotations (`@db.default.now`
+* of `number.timestamp.created`) describe the field's column like those of a
+* field typed `T` — {@link soleUnionMember}, except for a reference to another
+* field (`closedAt: Order.closedAt`): it shares that field's union, whose db
+* annotations stay with the referenced field.
+*/
+function columnUnionBase(type) {
+	return type.ref?.field ? void 0 : soleUnionMember(type);
+}
+const RANK = {
+	required: 0,
+	nullable: 1,
+	partial: 2
+};
+function weaker(a, b) {
+	return RANK[a] >= RANK[b] ? a : b;
+}
+/**
+* The {@link TPathPresence} of the dot-path `path` below the object type
+* `root`, or `undefined` when the path crosses an array or a tuple (its
+* elements' fields are no columns of their own on relational storage;
+* callers keep the field's own `optional` there).
+*/
+function pathPresence(root, path) {
+	return presenceAt(root, path.split("."), 0);
+}
+function presenceAt(type, segs, i) {
+	const def = type.type;
+	switch (def.kind) {
+		case "union": {
+			let result = "required";
+			for (const item of def.items) {
+				if (isNullishType(item)) {
+					result = weaker(result, "nullable");
+					continue;
+				}
+				const member = presenceAt(item, segs, i);
+				if (member === void 0) return void 0;
+				result = weaker(result, member);
+			}
+			return result;
+		}
+		case "intersection": {
+			let result = "partial";
+			for (const item of def.items) {
+				const member = presenceAt(item, segs, i);
+				if (member === void 0) return void 0;
+				if (RANK[member] < RANK[result]) result = member;
+			}
+			return result;
+		}
+		case "object": {
+			if (i === segs.length) return "required";
+			const prop = def.props.get(segs[i]);
+			if (!prop) return "partial";
+			const rest = presenceAt(prop, segs, i + 1);
+			if (rest === void 0) return void 0;
+			return prop.optional ? weaker(rest, "nullable") : rest;
+		}
+		case "array":
+		case "tuple": return i === segs.length ? "required" : void 0;
+		default:
+			if (i < segs.length) return "partial";
+			return isNullishType(type) ? "nullable" : "required";
+	}
+}
+//#endregion
 //#region src/patch/patch-types.ts
 /**
 * Extracts `@expect.array.key` properties from an array-of-objects type.
@@ -50,6 +154,73 @@ function markComplexItems(def) {
 	if (kind === "union" || kind === "tuple" || kind === "intersection") for (const item of def.type.items) complexItems.add(item);
 }
 /**
+* Per validation context: the paths (array indices as `*`) of the tuples and
+* the unions of several types the validator visited. Which item a field
+* below one belongs to is not known when defaults are applied, so its
+* default is not filled (`AtscriptDbTable._applyDefaults`) — and the field
+* is not optional on insert either.
+*/
+const ambiguousPaths = /* @__PURE__ */ new WeakMap();
+/** `items.3.at` → `items.*.at` */
+function schemaPath(path) {
+	return path.replace(/(^|\.)\d+(?=\.|$)/g, "$1*");
+}
+function markAmbiguous(dbCtx, def, path) {
+	const kind = def.type.kind;
+	if (kind === "tuple" || kind === "union" && !soleUnionMember(def)) {
+		let paths = ambiguousPaths.get(dbCtx);
+		if (!paths) ambiguousPaths.set(dbCtx, paths = /* @__PURE__ */ new Set());
+		paths.add(schemaPath(path));
+	}
+}
+/** Whether `path` lies below a tuple or a union of several types (see {@link ambiguousPaths}). */
+function belowAmbiguous(dbCtx, path) {
+	const paths = ambiguousPaths.get(dbCtx);
+	if (!paths) return false;
+	const schema = schemaPath(path);
+	for (let dot = schema.lastIndexOf("."); dot !== -1; dot = schema.lastIndexOf(".", dot - 1)) if (paths.has(schema.slice(0, dot))) return true;
+	return false;
+}
+/** Per validated root type: schema path → whether it lies below a tuple / union of several types. */
+const ambiguousByRoot = /* @__PURE__ */ new WeakMap();
+/**
+* {@link belowAmbiguous} read from the type itself: walks `path` from `root`
+* (the validator's own type) and answers whether a tuple or a union of
+* several types lies on the way. The visit-based answer misses a union the
+* plugin was not consulted for — a caller that runs this plugin only for
+* absent values (a form's server-managed check) never shows it the union
+* holding the value.
+*/
+function pathBelowAmbiguous(root, path) {
+	let cache = ambiguousByRoot.get(root);
+	if (!cache) ambiguousByRoot.set(root, cache = /* @__PURE__ */ new Map());
+	const schema = schemaPath(path);
+	let answer = cache.get(schema);
+	if (answer === void 0) {
+		answer = false;
+		let type = root;
+		for (const seg of schema.split(".")) {
+			if (type.type.kind === "union") {
+				const member = soleUnionMember(type);
+				if (!member) {
+					answer = true;
+					break;
+				}
+				type = member;
+			}
+			const kind = type.type.kind;
+			if (kind === "tuple") {
+				answer = true;
+				break;
+			}
+			type = kind === "array" ? seg === "*" ? type.type.of : void 0 : kind === "object" ? type.type.props.get(seg) : void 0;
+			if (!type) break;
+		}
+		cache.set(schema, answer);
+	}
+	return answer;
+}
+/**
 * Validator plugin for database operations.
 *
 * Handles navigation field constraints and delegates to the standard validator
@@ -65,6 +236,7 @@ function createDbValidatorPlugin() {
 		const dbCtx = ctx.context;
 		if (!dbCtx) return;
 		markComplexItems(def);
+		markAmbiguous(dbCtx, def, ctx.path);
 		if (def.type.tags?.has("geoPoint") && value !== void 0 && value !== null) {
 			if (!Array.isArray(value) || value.length !== 2 || typeof value[0] !== "number" || typeof value[1] !== "number" || !Number.isFinite(value[0]) || !Number.isFinite(value[1])) {
 				ctx.error("Expected a [lng, lat] tuple of two finite numbers (GeoJSON order)");
@@ -86,10 +258,13 @@ function createDbValidatorPlugin() {
 		if (isTo || isFrom || isVia) return handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia);
 		if (value === void 0 && (dbCtx.mode === "insert" || dbCtx.mode === "replace") && !complexItems.has(def)) {
 			const meta = def.metadata;
-			const serverManaged = meta.has("db.default") || meta.has("db.default.increment") || meta.has("db.default.uuid") || meta.has("db.default.now") || meta.has("db.column.version") || meta.has("db.column.derived");
+			const baseMeta = columnUnionBase(def)?.metadata;
+			const defaulted = !(belowAmbiguous(dbCtx, ctx.path) || pathBelowAmbiguous(ctx.root, ctx.path));
+			const has = (key) => defaulted && (meta.has(key) || baseMeta?.has(key) === true);
+			const serverManaged = has("db.default") || has("db.default.increment") || has("db.default.uuid") || has("db.default.now") || meta.has("db.column.version") || meta.has("db.column.derived");
 			const hasFK = meta.has("db.rel.FK");
 			if (serverManaged || hasFK) {
-				if (dbCtx.mode === "replace" && meta.has("meta.id") && !isInsideNavField(ctx.path, dbCtx.navFields)) return;
+				if (dbCtx.mode === "replace" && meta.has("meta.id") && !ctx.path.includes(".")) return;
 				return true;
 			}
 		}
@@ -149,13 +324,6 @@ function isFieldOpAllowed(path, flatMap, navFields) {
 	}
 	return true;
 }
-/** Returns true if the given path is nested inside a navigation field. */
-function isInsideNavField(path, navFields) {
-	if (!navFields) return false;
-	let pos = path.length;
-	while ((pos = path.lastIndexOf(".", pos - 1)) !== -1) if (navFields.has(path.slice(0, pos))) return true;
-	return false;
-}
 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);
@@ -455,6 +623,12 @@ Object.defineProperty(exports, "buildValidationContext", {
 		return buildValidationContext;
 	}
 });
+Object.defineProperty(exports, "columnUnionBase", {
+	enumerable: true,
+	get: function() {
+		return columnUnionBase;
+	}
+});
 Object.defineProperty(exports, "createDbValidatorPlugin", {
 	enumerable: true,
 	get: function() {
@@ -485,3 +659,21 @@ Object.defineProperty(exports, "isNavRelation", {
 		return isNavRelation;
 	}
 });
+Object.defineProperty(exports, "pathPresence", {
+	enumerable: true,
+	get: function() {
+		return pathPresence;
+	}
+});
+Object.defineProperty(exports, "soleUnionMember", {
+	enumerable: true,
+	get: function() {
+		return soleUnionMember;
+	}
+});
+Object.defineProperty(exports, "unionValueMembers", {
+	enumerable: true,
+	get: function() {
+		return unionValueMembers;
+	}
+});

package/dist/validator.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_db_error = require("./db-error-JcfJqqpk.cjs");
+const require_validator = require("./validator-DHwSyBej.cjs");
 const require_object = require("./object-Djg28csK.cjs");
 const require_ops = require("./ops.cjs");
-const require_validator = require("./validator-BxWwh3wf.cjs");
 exports.$cas = require_ops.$cas;
 exports.$dec = require_ops.$dec;
 exports.$inc = require_ops.$inc;

package/dist/validator.mjs

@@ -1,5 +1,5 @@
 import { r as DbError } from "./db-error-eSsQX7rt.mjs";
+import { a as forceNavNonOptional, c as getKeyProps, i as dbPlugin, n as buildPatchPartial, o as isNavRelation, r as buildValidationContext, s as createDbValidatorPlugin, t as buildDbValidator } from "./validator-BC3nwFi4.mjs";
 import { a as isPlainObject, i as isEmptyObject } from "./object-TkiJQ-Dp.mjs";
 import { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, isDbFieldOp, reconcileCas, separateCas } from "./ops.mjs";
-import { a as forceNavNonOptional, c as getKeyProps, i as dbPlugin, n as buildPatchPartial, o as isNavRelation, r as buildValidationContext, s as createDbValidatorPlugin, t as buildDbValidator } from "./validator-BACewoRj.mjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, DbError, buildDbValidator, buildPatchPartial, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isEmptyObject, isNavRelation, isPlainObject, reconcileCas, separateCas };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.154",
+  "version": "0.1.155",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",
@@ -71,14 +71,14 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.103",
-    "@atscript/typescript": "^0.1.103",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
     "@uniqu/core": "^0.1.15",
-    "unplugin-atscript": "^0.1.103"
+    "unplugin-atscript": "^0.1.105"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.103",
-    "@atscript/typescript": "^0.1.103",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
     "@uniqu/core": "^0.1.15"
   },
   "scripts": {