@atscript/db 0.1.135 → 0.1.137

package/dist/sync.d.mts

@@ -1,5 +1,5 @@
-import { E as TColumnDiff, F as TDbDefaultValue, Ht as TGenericLogger, L as TDbFieldMeta, Pt as AtscriptDbReadable, R as TDbForeignKey, W as TDbObjectKind, Y as TDbStorageType, it as TExistingTableOption, mt as TReferencingForeignKey, nt as TExistingColumn, pt as TPrimaryKeyChange, rt as TExistingForeignKey, tt as TEnsureTableOptions, vt as TTableOptionDiff } from "./buckets-GruoVxH5.mjs";
-import { c as AtscriptQueryFieldRef$1, i as AtscriptDbView, l as AtscriptQueryNode$1, t as DbSpace } from "./db-space-9CH5neN7.mjs";
+import { $t as AtscriptDbReadable, Ft as DbSpace, G as TDbObjectKind, I as TDbDefaultValue, R as TDbFieldMeta, Rt as AtscriptDbView, Ut as AtscriptQueryFieldRef$1, Wt as AtscriptQueryNode$1, X as TDbStorageType, at as TExistingTableOption, ht as TReferencingForeignKey, it as TExistingForeignKey, mt as TPrimaryKeyChange, nt as TEnsureTableOptions, rt as TExistingColumn, sn as TGenericLogger, yt as TTableOptionDiff, z as TDbForeignKey } from "./buckets-BFG2RYRW.mjs";
+import { t as computeColumnDiff } from "./column-diff-DPkbZIVE.mjs";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/schema/sync-entry.d.ts
@@ -269,9 +269,27 @@ interface TViewJoinSnapshot {
   targetTable: string;
   /** Canonical JSON of the join condition (see {@link canonicalizeQueryNode}). */
   condition: string;
-  /** Reserved for optional joins; absent today so it does not perturb the hash. */
+  /** Emitted only for `"left"` — an inner join (the default) carries no key. @since 0.1.136 */
   kind?: "inner" | "left";
 }
+/**
+ * One column of a managed view as stored in its snapshot — the PHYSICAL
+ * source it reads, so a source rename (`@db.column`, flattening, a moved
+ * JSON leaf) or an aggregate change recreates the view.
+ * @since 0.1.136
+ */
+interface TViewColumnSnapshot {
+  column: string;
+  sourceTable: string;
+  sourceColumn: string;
+  /** JSON array of the path segments inside a JSON source column. */
+  jsonPath?: string;
+  jsonType?: string;
+  aggFn?: string;
+  aggField?: string;
+  /** Canonical JSON of a conditional aggregate's predicate. */
+  aggFilter?: string;
+}
 interface TViewSnapshot {
   tableName: string;
   viewType: "V" | "M" | "E";
@@ -281,10 +299,17 @@ interface TViewSnapshot {
    * join-less view (`[]`) serializes byte-identically to older snapshots.
    */
   joinTables?: TViewJoinSnapshot[];
+  /** @since 0.1.136 — view columns and their physical sources, sorted by `column`. */
+  columns?: TViewColumnSnapshot[];
   filterHash?: string;
   /** @since 0.1.128 — hash of the canonical `@db.view.having` predicate. */
   havingHash?: string;
   materialized?: boolean;
+  /**
+   * @since 0.1.137 — the adapter's `viewRenderRevision()`, present only when
+   * the adapter defines one (managed views only).
+   */
+  renderRevision?: string;
   fields: TFieldSnapshot[];
 }
 /**
@@ -534,19 +559,6 @@ declare class SchemaSync {
   private buildExecutorDeps;
 }
 //#endregion
-//#region src/schema/column-diff.d.ts
-/**
- * Computes the difference between desired schema fields and existing database columns.
- *
- * @param desired - Field descriptors from the Atscript type (after flattening).
- * @param existing - Columns currently in the database (from introspection).
- * @param typeMapper - Optional function to map field metadata to DB-native type strings.
- *                     Receives the full field meta (design type, annotations, PK status, etc.)
- *                     so adapters can produce context-aware types (e.g., `VARCHAR(255)` from maxLength).
- *                     Required for type change detection.
- */
-declare function computeColumnDiff(desired: readonly TDbFieldMeta[], existing: TExistingColumn[], typeMapper?: (field: TDbFieldMeta) => string): TColumnDiff;
-//#endregion
 //#region src/schema/table-option-diff.d.ts
 /**
  * Computes the difference between desired and existing table options.
@@ -649,4 +661,4 @@ declare function syncSchema(space: DbSpace, types: readonly TAtscriptAnnotatedTy
  */
 declare function planSchema(space: DbSpace, types: readonly TAtscriptAnnotatedType[], opts?: Pick<TSyncOptions, "force" | "safe">): Promise<TSyncPlan>;
 //#endregion
-export { SchemaSync, SyncEntry, type TDbObjectKind, type TDependencyEdge, type TEnsureTableOptions, type TExistingForeignKey, type TFieldSnapshot, type TForeignKeyDiff, type TForeignKeySnapshot, type TPrimaryKeyChange, type TReferencingForeignKey, type TSyncColors, type TSyncEntryInit, type TSyncEntryStatus, type TSyncOptions, type TSyncPlan, type TSyncResult, type TSyncSkippedWork, type TTableSnapshot, type TViewJoinSnapshot, type TViewSnapshot, canonicalizeQueryNode, computeColumnDiff, computeForeignKeyDiff, computeSchemaHash, computeTableHash, computeTableOptionDiff, computeTableSnapshot, computeViewSnapshot, fkKey, hasForeignKeyChanges, planSchema, readStoredSnapshot, snapshotToExistingColumns, snapshotToExistingTableOptions, syncSchema, topoOrder };
+export { SchemaSync, SyncEntry, type TDbObjectKind, type TDependencyEdge, type TEnsureTableOptions, type TExistingForeignKey, type TFieldSnapshot, type TForeignKeyDiff, type TForeignKeySnapshot, type TPrimaryKeyChange, type TReferencingForeignKey, type TSyncColors, type TSyncEntryInit, type TSyncEntryStatus, type TSyncOptions, type TSyncPlan, type TSyncResult, type TSyncSkippedWork, type TTableSnapshot, type TViewColumnSnapshot, type TViewJoinSnapshot, type TViewSnapshot, canonicalizeQueryNode, computeColumnDiff, computeForeignKeyDiff, computeSchemaHash, computeTableHash, computeTableOptionDiff, computeTableSnapshot, computeViewSnapshot, fkKey, hasForeignKeyChanges, planSchema, readStoredSnapshot, snapshotToExistingColumns, snapshotToExistingTableOptions, syncSchema, topoOrder };

package/dist/sync.mjs

@@ -1,291 +1,4 @@
-import { U as NoopLogger } from "./db-view-Doh8vPg3.mjs";
-//#region src/schema/schema-hash.ts
-/** Extracts sorted field snapshots from a readable's field descriptors. */
-function extractFieldSnapshots(fields, typeMapper) {
-	return fields.filter((f) => !f.ignored).map((f) => {
-		const snap = {
-			physicalName: f.physicalName,
-			designType: f.designType,
-			optional: f.optional,
-			isPrimaryKey: f.isPrimaryKey,
-			storage: f.storage
-		};
-		if (f.defaultValue) snap.defaultValue = f.defaultValue;
-		if (typeMapper) snap.mappedType = typeMapper(f);
-		if (f.encrypted) snap.encrypted = true;
-		return snap;
-	}).toSorted((a, b) => a.physicalName.localeCompare(b.physicalName));
-}
-/**
-* Extracts a canonical, serializable snapshot from a readable's metadata.
-* Sorted deterministically so the hash is stable across runs.
-*
-* @param readable - The table/view readable.
-* @param typeMapper - Optional adapter-specific type mapper. When provided,
-*   each field's mapped type (e.g., "VARCHAR(255)") is stored in the snapshot
-*   for precise type change detection.
-*/
-function computeTableSnapshot(readable, typeMapper, tableOptions) {
-	const fields = extractFieldSnapshots(readable.fieldDescriptors, typeMapper);
-	const indexes = [...readable.indexes.values()].map((idx) => ({
-		key: idx.key,
-		type: idx.type,
-		fields: idx.fields.map((f) => ({
-			name: f.name,
-			sort: f.sort
-		}))
-	})).toSorted((a, b) => a.key.localeCompare(b.key));
-	const foreignKeys = [...readable.foreignKeys.values()].map((fk) => ({
-		fields: [...fk.fields].toSorted(),
-		targetTable: fk.targetTable,
-		targetFields: [...fk.targetFields].toSorted(),
-		onDelete: fk.onDelete,
-		onUpdate: fk.onUpdate
-	})).toSorted((a, b) => a.fields.join(",").localeCompare(b.fields.join(",")));
-	const snapshot = {
-		tableName: readable.tableName,
-		fields,
-		indexes,
-		foreignKeys
-	};
-	if (tableOptions?.length) snapshot.tableOptions = [...tableOptions].toSorted((a, b) => a.key.localeCompare(b.key));
-	return snapshot;
-}
-/**
-* Extracts a canonical, serializable snapshot from a view's metadata.
-* Captures view plan (entry table, joins, filter, materialization) for
-* detecting view definition changes.
-*/
-function computeViewSnapshot(view) {
-	const fields = extractFieldSnapshots(view.fieldDescriptors);
-	if (view.isExternal) return {
-		tableName: view.tableName,
-		viewType: "E",
-		fields
-	};
-	const plan = view.viewPlan;
-	const qualify = (ref) => view.resolveFieldRef(ref, (n) => n);
-	const result = {
-		tableName: view.tableName,
-		viewType: plan.materialized ? "M" : "V",
-		entryTable: plan.entryTable,
-		joinTables: plan.joins.map((j) => ({
-			targetTable: j.targetTable,
-			condition: JSON.stringify(canonicalizeQueryNode(j.condition, qualify))
-		})),
-		materialized: plan.materialized || void 0,
-		fields
-	};
-	if (plan.filter) result.filterHash = fnv1a(JSON.stringify(canonicalizeQueryNode(plan.filter, qualify)));
-	if (plan.having) result.havingHash = fnv1a(JSON.stringify(canonicalizeQueryNode(plan.having, qualify)));
-	return result;
-}
-/**
-* Converts a view predicate (join condition, `@db.view.filter`,
-* `@db.view.having`) into a serializable structure whose JSON is a stable
-* function of its MEANING: field refs become `qualify(ref)` — the view's
-* `resolveFieldRef(ref, (n) => n)`, i.e. `"<table>.<field>"`, so a predicate
-* retargeted to another table with the same field name changes — operators
-* and literal values are kept as-is, `$and`/`$or` keep declaration order, and
-* no function references survive. Two identical models produce byte-identical
-* JSON.
-* @since 0.1.128
-*/
-function canonicalizeQueryNode(node, qualify) {
-	if ("$and" in node) return { and: node.$and.map((n) => canonicalizeQueryNode(n, qualify)) };
-	if ("$or" in node) return { or: node.$or.map((n) => canonicalizeQueryNode(n, qualify)) };
-	if ("$not" in node) return { not: canonicalizeQueryNode(node.$not, qualify) };
-	const comp = node;
-	const out = {
-		l: qualify(comp.left),
-		op: comp.op
-	};
-	if (comp.right !== void 0) out.r = comp.right !== null && typeof comp.right === "object" && "field" in comp.right ? { f: qualify(comp.right) } : comp.right;
-	return out;
-}
-/**
-* Computes a deterministic hash string from multiple table snapshots.
-* Uses FNV-1a for speed — not cryptographic, just needs stability + collision resistance.
-*/
-function computeSchemaHash(snapshots) {
-	const sorted = [...snapshots].toSorted((a, b) => a.tableName.localeCompare(b.tableName));
-	return fnv1a(JSON.stringify(sorted));
-}
-/**
-* Computes a hash for a single table/view snapshot.
-* Used for per-table change detection via stored snapshots.
-*/
-function computeTableHash(snapshot) {
-	return fnv1a(JSON.stringify(snapshot));
-}
-/**
-* Converts stored snapshot fields to `TExistingColumn[]` format
-* for use with `computeColumnDiff`. Used by adapters that lack
-* native column introspection (e.g., MongoDB).
-*
-* The `type` field uses `mappedType` when available (adapter-specific),
-* falling back to `designType`.
-*/
-function snapshotToExistingColumns(snapshot) {
-	return snapshot.fields.map((f) => ({
-		name: f.physicalName,
-		type: f.mappedType ?? f.designType,
-		notnull: !f.optional,
-		pk: f.isPrimaryKey,
-		dflt_value: serializeDefaultValue(f.defaultValue)
-	}));
-}
-/**
-* Extracts table options from a stored snapshot for diff comparison.
-* Used as fallback when an adapter lacks native table option introspection.
-*/
-function snapshotToExistingTableOptions(snapshot) {
-	return snapshot.tableOptions ?? [];
-}
-/** Serializes a TDbDefaultValue to a comparable string. */
-function serializeDefaultValue(dv) {
-	if (!dv) return;
-	if (dv.kind === "value") return dv.value;
-	return `fn:${dv.fn}`;
-}
-/** FNV-1a 32-bit hash → hex string */
-function fnv1a(str) {
-	let hash = 2166136261;
-	for (let i = 0; i < str.length; i++) {
-		hash ^= str.codePointAt(i);
-		hash = Math.imul(hash, 16777619);
-	}
-	return Math.trunc(hash).toString(16).padStart(8, "0");
-}
-//#endregion
-//#region src/schema/fk-diff.ts
-/** Canonical key for an FK: sorted local field names, comma-joined. */
-function fkKey(fields) {
-	return [...fields].toSorted().join(",");
-}
-/**
-* Compares desired FK constraints against stored snapshot to detect
-* additions, removals, and property changes (target table, target fields,
-* onDelete, onUpdate).
-*/
-function computeForeignKeyDiff(desired, existingSnapshot) {
-	const added = [];
-	const removed = [];
-	const changed = [];
-	const existingByKey = /* @__PURE__ */ new Map();
-	for (const fk of existingSnapshot) existingByKey.set(fkKey(fk.fields), fk);
-	const desiredKeys = /* @__PURE__ */ new Set();
-	for (const fk of desired.values()) {
-		const key = fkKey(fk.fields);
-		desiredKeys.add(key);
-		const existing = existingByKey.get(key);
-		if (!existing) added.push(fk);
-		else if (fkPropertiesDiffer(fk, existing)) changed.push({
-			desired: fk,
-			existing
-		});
-	}
-	for (const [key, fk] of existingByKey) if (!desiredKeys.has(key)) removed.push(fk);
-	return {
-		added,
-		removed,
-		changed
-	};
-}
-/** Whether the FK diff contains any changes. */
-function hasForeignKeyChanges(diff) {
-	return diff.added.length > 0 || diff.removed.length > 0 || diff.changed.length > 0;
-}
-function fkPropertiesDiffer(desired, existing) {
-	if (desired.targetTable !== existing.targetTable) return true;
-	if (fkKey(desired.targetFields) !== fkKey(existing.targetFields)) return true;
-	if ((desired.onDelete ?? void 0) !== (existing.onDelete ?? void 0)) return true;
-	if ((desired.onUpdate ?? void 0) !== (existing.onUpdate ?? void 0)) return true;
-	return false;
-}
-//#endregion
-//#region src/schema/column-diff.ts
-/**
-* Computes the difference between desired schema fields and existing database columns.
-*
-* @param desired - Field descriptors from the Atscript type (after flattening).
-* @param existing - Columns currently in the database (from introspection).
-* @param typeMapper - Optional function to map field metadata to DB-native type strings.
-*                     Receives the full field meta (design type, annotations, PK status, etc.)
-*                     so adapters can produce context-aware types (e.g., `VARCHAR(255)` from maxLength).
-*                     Required for type change detection.
-*/
-function computeColumnDiff(desired, existing, typeMapper) {
-	const existingByName = new Map(existing.map((c) => [c.name, c]));
-	const desiredByName = /* @__PURE__ */ new Map();
-	const renamedOldNames = /* @__PURE__ */ new Set();
-	const added = [];
-	const renamed = [];
-	const typeChanged = [];
-	const nullableChanged = [];
-	const defaultChanged = [];
-	const conflicts = [];
-	for (const field of desired) {
-		if (field.ignored) continue;
-		desiredByName.set(field.physicalName, field);
-		const existingCol = existingByName.get(field.physicalName);
-		if (existingCol) if (field.renamedFrom && existingByName.has(field.renamedFrom)) {
-			conflicts.push({
-				field,
-				oldName: field.renamedFrom,
-				conflictsWith: field.physicalName
-			});
-			renamedOldNames.add(field.renamedFrom);
-		} else {
-			if (typeMapper) {
-				if (typeMapper(field).toUpperCase() !== existingCol.type.toUpperCase()) typeChanged.push({
-					field,
-					existingType: existingCol.type
-				});
-			}
-			if (!field.isPrimaryKey && !existingCol.pk) {
-				const desiredNotNull = !field.optional;
-				if (existingCol.notnull !== desiredNotNull) nullableChanged.push({
-					field,
-					wasNullable: !existingCol.notnull
-				});
-			}
-			const desiredDefault = serializeDefaultValue(field.defaultValue);
-			if (existingCol.dflt_value !== void 0 && existingCol.dflt_value !== desiredDefault) defaultChanged.push({
-				field,
-				oldDefault: existingCol.dflt_value,
-				newDefault: desiredDefault
-			});
-		}
-		else if (field.renamedFrom && existingByName.has(field.renamedFrom)) {
-			renamed.push({
-				field,
-				oldName: field.renamedFrom
-			});
-			renamedOldNames.add(field.renamedFrom);
-		} else added.push(field);
-	}
-	const diff = {
-		added,
-		removed: existing.filter((c) => !desiredByName.has(c.name) && !renamedOldNames.has(c.name)),
-		renamed,
-		typeChanged,
-		nullableChanged,
-		defaultChanged,
-		conflicts
-	};
-	if (existing.length > 0) {
-		const newNameByOld = new Map(renamed.map((r) => [r.oldName, r.field.physicalName]));
-		const from = existing.filter((c) => c.pk).map((c) => newNameByOld.get(c.name) ?? c.name);
-		const to = desired.filter((f) => !f.ignored && f.isPrimaryKey).map((f) => f.physicalName);
-		if (fkKey(from) !== fkKey(to)) diff.primaryKeyChanged = {
-			from,
-			to
-		};
-	}
-	return diff;
-}
-//#endregion
+import { a as hasForeignKeyChanges, c as computeTableHash, d as snapshotToExistingColumns, f as snapshotToExistingTableOptions, i as fkKey, l as computeTableSnapshot, nt as NoopLogger, o as canonicalizeQueryNode, r as computeForeignKeyDiff, s as computeSchemaHash, t as computeColumnDiff, u as computeViewSnapshot } from "./column-diff-BwOA5101.mjs";
 //#region src/schema/table-option-diff.ts
 /**
 * Computes the difference between desired and existing table options.
@@ -1746,7 +1459,11 @@ var SchemaSync = class {
 				if (d.externalTargets.get(fk.targetTable) === false) addRefusal(refusals, t.name, `FK ${t.name}.${fk.fields.join(",")} references "${fk.targetTable}" which is neither in the sync inventory nor present in the database`);
 			}
 		}
-		for (const view of d.views) if (d.viewObjectKinds.get(view.tableName) === "table") addRefusal(refusals, view.tableName, `A physical table "${view.tableName}" exists where managed view "${view.tableName}" is declared — drop or rename it`);
+		for (const view of d.views) {
+			if (d.viewObjectKinds.get(view.tableName) === "table") addRefusal(refusals, view.tableName, `A physical table "${view.tableName}" exists where managed view "${view.tableName}" is declared — drop or rename it`);
+			const fns = view.dbAdapter.aggregateFns();
+			for (const col of view.getViewColumnMappings()) if (col.aggFn && !fns.has(col.aggFn)) addRefusal(refusals, view.tableName, `View "${view.tableName}" field "${col.viewPath}": aggregate "${col.aggFn}" is not supported by this adapter (aggregateFns())`);
+		}
 		if (!safe) for (const r of d.removed) {
 			if (r.isView) continue;
 			const referencers = [];

package/dist/{validation-utils-MWOP1Ts4.mjs → validation-utils-B4h-GW4d.mjs}

@@ -11,14 +11,17 @@ function validateExclusiveWith(token, selfName, others) {
 	});
 	return errors;
 }
+/** Primitive base type (`string`, `number`, `decimal`, …) of a resolved definition, if it is a primitive. */
+function primitiveBaseType(def) {
+	if (!def || !isPrimitive(def)) return void 0;
+	const ct = def.config.type;
+	return typeof ct === "object" ? ct.kind === "final" ? ct.value : ct.kind : ct;
+}
 /** Resolves a field/prop's primitive base type, or `undefined` if it isn't a ref-to-primitive. */
 function getPrimitiveBaseType(node, doc) {
 	const def = node.getDefinition();
 	if (!def || !isRef(def)) return void 0;
-	const unwound = doc.unwindType(def.id, def.chain);
-	if (!unwound || !isPrimitive(unwound.def)) return void 0;
-	const ct = unwound.def.config.type;
-	return typeof ct === "object" ? ct.kind === "final" ? ct.value : ct.kind : ct;
+	return primitiveBaseType(doc.unwindType(def.id, def.chain)?.def);
 }
 /** Asserts `args[0]` names a sibling property whose primitive base type is `string`. */
 function validateSiblingStringField(token, args, doc, selfName) {
@@ -253,6 +256,24 @@ const viewAnnotationNames = [
 	"db.view.filter",
 	"db.view.materialized"
 ];
+/** The `@db.view.joins` annotations of a view interface, in declaration order. */
+function viewJoins(owner) {
+	return owner.annotations?.filter((a) => a.name === "db.view.joins") ?? [];
+}
+/** The target type names of `@db.view.joins` annotations. */
+function joinTargets(joins) {
+	return joins.map((a) => a.args[0]?.text).filter((t) => !!t);
+}
+/**
+* The type names a view predicate (`@db.view.filter`, a conditional
+* `@db.agg.*`) may reference: the `@db.view.for` entry table, then every
+* `@db.view.joins` target.
+*/
+function viewScopeTypes(owner) {
+	const entry = getAnnotationAlias(owner, "db.view.for");
+	const targets = joinTargets(viewJoins(owner));
+	return entry ? [entry, ...targets] : targets;
+}
 /**
 * Check if a node has any @db.view.* annotation.
 */
@@ -266,8 +287,9 @@ function hasAnyViewAnnotation(node) {
 * @param allowedTypes - Type names allowed as qualified refs
 * @param unqualifiedTarget - Type name for resolving unqualified refs, or null to disallow them
 * @param doc - The document for type lookups
+* @param scopeHint - Replaces the default "expected 'A' or 'B'" tail of the out-of-scope message
 */
-function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc) {
+function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc, scopeHint) {
 	const errors = [];
 	const queryNode = queryToken.queryNode;
 	if (!queryNode) return errors;
@@ -275,7 +297,7 @@ function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc) {
 		if (ref.typeRef) {
 			const typeName = ref.typeRef.text;
 			if (!allowedTypes.includes(typeName)) errors.push({
-				message: `Query references '${typeName}' which is not in scope — expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`,
+				message: `Query references '${typeName}' which is not in scope — ${scopeHint ?? `expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`}`,
 				severity: 1,
 				range: ref.typeRef.range
 			});
@@ -310,4 +332,4 @@ function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc) {
 	return errors;
 }
 //#endregion
-export { getAnnotationAlias as a, getParentStruct as c, validateExclusiveWith as d, validateFieldBaseType as f, validateRefArgument as i, getParentTypeName as l, hasAnyViewAnnotation as n, getDbTableOwner as o, validateSiblingStringField as p, validateQueryScope as r, getNavTargetTypeName as s, findFKFieldsPointingTo as t, refActionAnnotation as u };
+export { validateSiblingStringField as _, validateRefArgument as a, getAnnotationAlias as c, getParentStruct as d, getParentTypeName as f, validateFieldBaseType as g, validateExclusiveWith as h, validateQueryScope as i, getDbTableOwner as l, refActionAnnotation as m, hasAnyViewAnnotation as n, viewJoins as o, primitiveBaseType as p, joinTargets as r, viewScopeTypes as s, findFKFieldsPointingTo as t, getNavTargetTypeName as u };

package/dist/{validation-utils-B7SXPkm7.cjs → validation-utils-Dg0hW6dn.cjs}

@@ -11,14 +11,17 @@ function validateExclusiveWith(token, selfName, others) {
 	});
 	return errors;
 }
+/** Primitive base type (`string`, `number`, `decimal`, …) of a resolved definition, if it is a primitive. */
+function primitiveBaseType(def) {
+	if (!def || !(0, _atscript_core.isPrimitive)(def)) return void 0;
+	const ct = def.config.type;
+	return typeof ct === "object" ? ct.kind === "final" ? ct.value : ct.kind : ct;
+}
 /** Resolves a field/prop's primitive base type, or `undefined` if it isn't a ref-to-primitive. */
 function getPrimitiveBaseType(node, doc) {
 	const def = node.getDefinition();
 	if (!def || !(0, _atscript_core.isRef)(def)) return void 0;
-	const unwound = doc.unwindType(def.id, def.chain);
-	if (!unwound || !(0, _atscript_core.isPrimitive)(unwound.def)) return void 0;
-	const ct = unwound.def.config.type;
-	return typeof ct === "object" ? ct.kind === "final" ? ct.value : ct.kind : ct;
+	return primitiveBaseType(doc.unwindType(def.id, def.chain)?.def);
 }
 /** Asserts `args[0]` names a sibling property whose primitive base type is `string`. */
 function validateSiblingStringField(token, args, doc, selfName) {
@@ -253,6 +256,24 @@ const viewAnnotationNames = [
 	"db.view.filter",
 	"db.view.materialized"
 ];
+/** The `@db.view.joins` annotations of a view interface, in declaration order. */
+function viewJoins(owner) {
+	return owner.annotations?.filter((a) => a.name === "db.view.joins") ?? [];
+}
+/** The target type names of `@db.view.joins` annotations. */
+function joinTargets(joins) {
+	return joins.map((a) => a.args[0]?.text).filter((t) => !!t);
+}
+/**
+* The type names a view predicate (`@db.view.filter`, a conditional
+* `@db.agg.*`) may reference: the `@db.view.for` entry table, then every
+* `@db.view.joins` target.
+*/
+function viewScopeTypes(owner) {
+	const entry = getAnnotationAlias(owner, "db.view.for");
+	const targets = joinTargets(viewJoins(owner));
+	return entry ? [entry, ...targets] : targets;
+}
 /**
 * Check if a node has any @db.view.* annotation.
 */
@@ -266,8 +287,9 @@ function hasAnyViewAnnotation(node) {
 * @param allowedTypes - Type names allowed as qualified refs
 * @param unqualifiedTarget - Type name for resolving unqualified refs, or null to disallow them
 * @param doc - The document for type lookups
+* @param scopeHint - Replaces the default "expected 'A' or 'B'" tail of the out-of-scope message
 */
-function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc) {
+function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc, scopeHint) {
 	const errors = [];
 	const queryNode = queryToken.queryNode;
 	if (!queryNode) return errors;
@@ -275,7 +297,7 @@ function validateQueryScope(queryToken, allowedTypes, unqualifiedTarget, doc) {
 		if (ref.typeRef) {
 			const typeName = ref.typeRef.text;
 			if (!allowedTypes.includes(typeName)) errors.push({
-				message: `Query references '${typeName}' which is not in scope — expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`,
+				message: `Query references '${typeName}' which is not in scope — ${scopeHint ?? `expected ${allowedTypes.map((t) => `'${t}'`).join(" or ")}`}`,
 				severity: 1,
 				range: ref.typeRef.range
 			});
@@ -352,6 +374,18 @@ Object.defineProperty(exports, "hasAnyViewAnnotation", {
 		return hasAnyViewAnnotation;
 	}
 });
+Object.defineProperty(exports, "joinTargets", {
+	enumerable: true,
+	get: function() {
+		return joinTargets;
+	}
+});
+Object.defineProperty(exports, "primitiveBaseType", {
+	enumerable: true,
+	get: function() {
+		return primitiveBaseType;
+	}
+});
 Object.defineProperty(exports, "refActionAnnotation", {
 	enumerable: true,
 	get: function() {
@@ -388,3 +422,15 @@ Object.defineProperty(exports, "validateSiblingStringField", {
 		return validateSiblingStringField;
 	}
 });
+Object.defineProperty(exports, "viewJoins", {
+	enumerable: true,
+	get: function() {
+		return viewJoins;
+	}
+});
+Object.defineProperty(exports, "viewScopeTypes", {
+	enumerable: true,
+	get: function() {
+		return viewScopeTypes;
+	}
+});

package/dist/{validator-CewfnGZj.d.mts → validator-Drb2N-YL.d.cts}

@@ -1,7 +1,7 @@
 import { TAtscriptAnnotatedType, TAtscriptTypeArray, TAtscriptTypeObject, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 
 //#region src/db-error.d.ts
-type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" | "TX_WAIT_TIMEOUT";
+type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" /** A known aggregate function the adapter's `aggregateFns()` lacks (moost-db: 400). @since 0.1.136 */ | "AGG_FN_NOT_SUPPORTED" | "TX_WAIT_TIMEOUT";
 declare class DbError extends Error {
   readonly code: DbErrorCode;
   readonly errors: Array<{

package/dist/{validator-CewfnGZj.d.cts → validator-Drb2N-YL.d.mts}

@@ -1,7 +1,7 @@
 import { TAtscriptAnnotatedType, TAtscriptTypeArray, TAtscriptTypeObject, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 
 //#region src/db-error.d.ts
-type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" | "TX_WAIT_TIMEOUT";
+type DbErrorCode = "CONFLICT" | "FK_VIOLATION" | "NOT_FOUND" | "CASCADE_CYCLE" | "INVALID_QUERY" | "DEPTH_EXCEEDED" | "VERSION_COLUMN_WRITE" | "CAS_EXHAUSTED" | "CAS_MISMATCH" | "ENC_CONFIG_MISSING" | "ENC_KEY_INVALID" | "ENC_NOT_ENCRYPTED" | "ENC_DECRYPT_FAILED" | "ENC_FIELD_FILTER" | "ENC_FIELD_SORT" | "ENC_FIELD_AGG" | "ENC_FIELD_PATCH_OP" | "GEO_INDEX_MISSING" | "GEO_NOT_SUPPORTED" | "FILTER_TYPE_MISMATCH" /** The adapter's `calendarBucketUnits()` lacks the requested unit (moost-db: 400). */ | "BUCKET_NOT_SUPPORTED" /** The engine cannot resolve the bucket's time zone — a store-configuration condition (moost-db: 501). */ | "BUCKET_TZ_UNAVAILABLE" /** A known aggregate function the adapter's `aggregateFns()` lacks (moost-db: 400). @since 0.1.136 */ | "AGG_FN_NOT_SUPPORTED" | "TX_WAIT_TIMEOUT";
 declare class DbError extends Error {
   readonly code: DbErrorCode;
   readonly errors: Array<{

package/dist/validator.d.cts

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

package/dist/validator.d.mts

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

package/package.json

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