@bjornpagen/bumbledb 0.19.2 → 0.20.0

package/src/query/lower.ts

@@ -61,6 +61,7 @@ import type {
 import {
 	fieldAntiJoins,
 	fieldJoins,
+	headFieldJoins,
 	inferred,
 	isTerm,
 	makeParam,
@@ -85,9 +86,6 @@ interface RuleValue<Row, P extends ParamsRecord, Head extends HeadShape = undefi
 
 type AnyRuleValue = RuleValue<unknown, ParamsRecord, HeadShape>
 
-type HeadOf<T> =
-	InferredOf<T> extends { readonly head: infer H extends Readonly<Record<string, ClassedField>> } ? H : undefined
-
 type InteriorBindingOk<V> = V extends AnyVar ? true : false
 
 type CheckInteriorBindings<B> = {
@@ -1307,7 +1305,15 @@ interface RawQuery {
 	reach(name: string, arms: never): never
 }
 
-function assertAlignedHeads(label: string, rules: readonly RuleData[]): void {
+/**
+ * Verifies every rule derives the same head and returns the MERGED head:
+ * the meet of the rules' column slots. A head column joins class-equal
+ * slots, and — the anti-join law's head twin — same-identity u64 wire
+ * with at least one side bare; when the bare arm admits the pair, the
+ * merged column's class claim demotes to bare, so a consumer joining
+ * the head cannot inherit provenance a rule never proved.
+ */
+function alignedHeadOf(label: string, rules: readonly RuleData[]): readonly FindColumn[] {
 	const first = rules[0]
 	if (first === undefined) {
 		throw errors.new(`${label} needs at least one rule`)
@@ -1330,13 +1336,33 @@ function assertAlignedHeads(label: string, rules: readonly RuleData[]): void {
 			if (lead === undefined) {
 				return
 			}
-			if (lead.slot !== undefined && column.slot !== undefined && !fieldJoins(lead.slot, column.slot)) {
+			if (lead.slot !== undefined && column.slot !== undefined && !headFieldJoins(lead.slot, column.slot)) {
 				throw errors.new(
-					`every rule of ${label} derives the same head — the head column ${lead.name} is bound at ${renderFieldKind(lead.slot)} in rule 0 but at ${renderFieldKind(column.slot)} in rule ${index} (a head column joins only class-equal slots; bare pairs only with bare)`
+					`every rule of ${label} derives the same head — the head column ${lead.name} is bound at ${renderFieldKind(lead.slot)} in rule 0 but at ${renderFieldKind(column.slot)} in rule ${index} (a head column joins class-equal slots; same-wire u64 admits a bare side, and the merged head is bare)`
 				)
 			}
 		})
 	})
+	const merged = first.finds.map(function meetColumn(lead, position) {
+		const slot = lead.slot
+		if (slot === undefined || slot.class === undefined) {
+			return lead
+		}
+		const demoted = rules.some(function bareElsewhere(rule) {
+			const column = rule.finds[position]
+			return column !== undefined && column.slot !== undefined && column.slot.class !== slot.class
+		})
+		if (!demoted) {
+			return lead
+		}
+		return Object.freeze({
+			name: lead.name,
+			entry: lead.entry,
+			closed: lead.closed,
+			slot: Object.freeze({ field: slot.field, class: undefined })
+		})
+	})
+	return Object.freeze(merged)
 }
 
 function afterMainError(what: string): Error {
@@ -1351,7 +1377,7 @@ function makeRawQuery(
 	rec: RecData | undefined,
 	rules: readonly RuleData[]
 ): RawQuery {
-	assertAlignedHeads("a query", rules)
+	const mergedFinds = alignedHeadOf("a query", rules)
 	const first = rules[0]
 	if (first === undefined) {
 		throw errors.new("a query needs at least one rule")
@@ -1366,7 +1392,7 @@ function makeRawQuery(
 					kind: "cq" as const,
 					interiors: frozenInteriors,
 					rules: frozenRules,
-					finds: first.finds,
+					finds: mergedFinds,
 					params
 				})
 			: Object.freeze({
@@ -1374,7 +1400,7 @@ function makeRawQuery(
 					interiors: frozenInteriors,
 					rec,
 					rules: frozenRules,
-					finds: first.finds,
+					finds: mergedFinds,
 					params
 				})
 	const value: RawQuery = {
@@ -1416,12 +1442,8 @@ function collectInterior<Rels extends SchemaRelations, Classes extends SchemaCla
 	const rules = builds.map(function buildRule(buildOne) {
 		return buildOne(makeInteriorRuleScope<Rels, Classes>(theory, env, name)).rule
 	})
-	assertAlignedHeads(`interior ${name}`, rules)
-	const first = rules[0]
-	if (first === undefined) {
-		throw errors.new(`query: interior ${name} needs at least one rule`)
-	}
-	return Object.freeze({ name, finds: first.finds, rules: Object.freeze(rules) })
+	const mergedFinds = alignedHeadOf(`interior ${name}`, rules)
+	return Object.freeze({ name, finds: mergedFinds, rules: Object.freeze(rules) })
 }
 
 function collectRec<Rels extends SchemaRelations, Classes extends SchemaClasses>(
@@ -1442,22 +1464,27 @@ function collectRec<Rels extends SchemaRelations, Classes extends SchemaClasses>
 	const base = baseBuilds.map(function buildBase(buildOne) {
 		return buildOne(makeRecRuleScope<Rels, Classes>(theory, baseEnv, handle, "rec-base")).rule
 	})
-	assertAlignedHeads(`rec ${name}`, base)
+	const baseFinds = alignedHeadOf(`rec ${name}`, base)
 	const first = base[0]
 	if (first === undefined) {
 		throw errors.new(`query: rec ${name} has no base arms`)
 	}
-	const firstFind = first.finds[0]
+	const firstFind = baseFinds[0]
 	if (firstFind === undefined) {
 		throw errors.new(`query: rec ${name} has no head`)
 	}
-	const finds: RecHead["finds"] = [firstFind, ...first.finds.slice(1)]
+	const finds: RecHead["finds"] = [firstFind, ...baseFinds.slice(1)]
 	const head: RecHead = Object.freeze({ name, finds })
 	const recEnv: DerivedEnv = { interiors, rec: head }
 	const rec = recBuilds.map(function buildRec(buildOne) {
 		return buildOne(makeRecRuleScope<Rels, Classes>(theory, recEnv, head, "rec-arm")).rule
 	})
-	assertAlignedHeads(`rec ${name}`, [...base, ...rec])
+	const mergedAll = alignedHeadOf(`rec ${name}`, [...base, ...rec])
+	const mergedFirst = mergedAll[0]
+	if (mergedFirst === undefined) {
+		throw errors.new(`query: rec ${name} has no head`)
+	}
+	const sealedFinds: RecHead["finds"] = [mergedFirst, ...mergedAll.slice(1)]
 	const firstRec = rec[0]
 	if (firstRec === undefined) {
 		throw errors.new(`query: rec ${name} has no rec arms`)
@@ -1466,7 +1493,7 @@ function collectRec<Rels extends SchemaRelations, Classes extends SchemaClasses>
 	const sealedRec: RecData["rec"] = [firstRec, ...rec.slice(1)]
 	const recData: RecData = Object.freeze({
 		name,
-		finds,
+		finds: sealedFinds,
 		base: sealedBase,
 		rec: sealedRec
 	})
@@ -1949,11 +1976,6 @@ function lowerQuery(q: AnyQuery): ParsedQuery {
 export type {
 	AnyQuery,
 	AnyRuleValue,
-	HeadOf,
-	HeadShape,
-	InteriorRuleChain,
-	InteriorRuleScope,
-	ParamsOf,
 	Query,
 	QueryData,
 	QueryParams,
@@ -1963,12 +1985,9 @@ export type {
 	QueryRuleChain,
 	QueryRuleScope,
 	QueryStart,
-	RawChain,
-	RawScope,
 	RecRuleChain,
 	RecRuleScope,
-	RowOf,
 	RuleValue,
 	TermOps
 }
-export { lowerQuery, makeRawScope, query, taggedCmpLiteral, taggedLiteral }
+export { lowerQuery, query, taggedCmpLiteral }

package/src/query/scope.ts

@@ -215,11 +215,27 @@ function closedIdAntiJoins(a: AnyField, b: AnyField): boolean {
 	return rosterA !== undefined && rosterB !== undefined && rosterA.handles.length === rosterB.handles.length
 }
 
+function u64BareWirePair(a: ClassedField, b: ClassedField): boolean {
+	return u64Wire(a.field) && u64Wire(b.field) && (a.class === undefined || b.class === undefined)
+}
+
 function fieldAntiJoins(a: ClassedField, b: ClassedField): boolean {
 	if (fieldJoins(a, b) || closedIdAntiJoins(a.field, b.field)) {
 		return true
 	}
-	return u64Wire(a.field) && u64Wire(b.field) && (a.class === undefined || b.class === undefined)
+	return u64BareWirePair(a, b)
+}
+
+/**
+ * Union-head class safety, the anti-join law's head twin: class-equal
+ * slots, plus same-identity u64 wire when one side is bare. A head cell
+ * is a value that flows to the caller either way — the class is
+ * provenance, not wire shape — and the merged head carries the meet:
+ * a bare rule demotes the column's class claim to bare, so downstream
+ * joins cannot inherit provenance a rule never proved.
+ */
+function headFieldJoins(a: ClassedField, b: ClassedField): boolean {
+	return fieldJoins(a, b) || u64BareWirePair(a, b)
 }
 
 function renderFieldKind(slot: ClassedField): string {
@@ -252,7 +268,6 @@ interface ParamEntry {
 
 export type {
 	AntiJoinOk,
-	AnyTerm,
 	AnyVar,
 	ClassedField,
 	ExactVars,
@@ -261,7 +276,6 @@ export type {
 	JoinOk,
 	MatchFields,
 	MatchOwner,
-	MintClassOf,
 	MintSlotOf,
 	Param,
 	ParamEntry,
@@ -269,8 +283,18 @@ export type {
 	ParamValueAt,
 	SetParam,
 	ShapeOf,
-	UnionToIntersection,
 	Var,
 	VarsOf
 }
-export { fieldAntiJoins, fieldJoins, inferred, isTerm, makeParam, makeSetParam, renderFieldKind, term, v }
+export {
+	fieldAntiJoins,
+	fieldJoins,
+	headFieldJoins,
+	inferred,
+	isTerm,
+	makeParam,
+	makeSetParam,
+	renderFieldKind,
+	term,
+	v
+}

package/src/spec.ts

@@ -233,7 +233,6 @@ function renderWeight(weight: WeightSpec): string {
 export type {
 	CapacityBoundSpec,
 	CapacityWindowSpec,
-	ClosedSpec,
 	FieldSpec,
 	LiteralSetSpec,
 	LiteralSpec,

package/src/statements.ts

@@ -312,7 +312,6 @@ export type {
 	ContainmentData,
 	KeyData,
 	KeyStatement,
-	MirrorsData,
 	Statement,
 	StatementData
 }