@happyvertical/smrt-core 0.47.2 → 0.49.0

package/dist/collection.js

@@ -9,6 +9,7 @@ import { SmrtClass } from "./class.js";
 import { EmbeddingProvider } from "./embeddings/provider.js";
 import { EmbeddingStorage } from "./embeddings/storage.js";
 import { MAX_LIST_LIMIT, QueryBoundsError, QueryOrderByError } from "./query-bounds.js";
+import { resolveOneToManyInverse, resolveRelationshipTargetName } from "./relationship-loader.js";
 import { verifyPersistenceTable } from "./schema/table-verifier.js";
 import { fieldsFromClass, formatDataJs, toCamelCase } from "./utils.js";
 import { ObjectRegistry } from "./registry.js";
@@ -552,7 +553,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		const itemClassName = this.getResolvedItemClassName();
 		const itemQualifiedName = this.getResolvedItemQualifiedName();
 		const schema = ObjectRegistry.getSchema(itemQualifiedName) ?? ObjectRegistry.getSchema(itemClassName);
-		const schemaColumnNames = schema?.columns ? new Set(Object.keys(schema.columns)) : void 0;
+		const schemaColumnNames = schema?.columns && Object.keys(schema.columns).length > 0 ? new Set(Object.keys(schema.columns)) : void 0;
 		const registeredFields = ObjectRegistry.getFields(itemQualifiedName);
 		const explicitFields = registeredFields.size > 0 ? registeredFields : ObjectRegistry.getFields(itemClassName);
 		const explicitFieldNames = new Set(explicitFields.keys());
@@ -626,36 +627,28 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 			return [`CASE WHEN ${column} IS NULL THEN 1 ELSE 0 END ASC`, `${column} ${term.direction}`];
 		}).join(", ");
 	}
-	resolveOneToManyInverseForeignKey(relationship) {
-		const inverseCandidates = ObjectRegistry.getInverseRelationshipsForSelf(this._itemClass.name).filter((candidate) => candidate.sourceClass === relationship.targetClass && candidate.type === "foreignKey");
-		const explicitForeignKey = relationship.options?.foreignKey;
-		const matchedForeignKey = explicitForeignKey ? inverseCandidates.find((candidate) => candidate.fieldName === explicitForeignKey) : void 0;
-		if (explicitForeignKey && !matchedForeignKey) throw new Error(`oneToMany ${relationship.fieldName} specifies foreignKey '${explicitForeignKey}', but ${relationship.targetClass} has no matching inverse foreignKey. Candidates: ${inverseCandidates.map((candidate) => candidate.fieldName).join(", ") || "(none)"}`);
-		const inverseForeignKey = matchedForeignKey ?? inverseCandidates.find((candidate) => candidate.targetClass === this._itemClass.name) ?? inverseCandidates[0];
-		if (!inverseForeignKey) throw new Error(`Could not find inverse foreignKey on ${relationship.targetClass} for oneToMany relationship ${relationship.fieldName}`);
-		return inverseForeignKey;
-	}
 	async listWithLatestRelated(options) {
 		await this.ensureStorageReady();
 		const itemClassName = this.getResolvedItemClassName();
 		const itemQualifiedName = this.getResolvedItemQualifiedName();
-		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name);
+		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name, void 0, itemQualifiedName);
 		const interceptedOptions = await GlobalInterceptors.executeBeforeList(itemClassName, options, interceptorContext) ?? options;
 		let { where, offset, limit, orderBy, stiScope } = interceptedOptions;
 		const latestOptions = interceptedOptions.latestRelated ?? options.latestRelated;
 		const isSTI = ObjectRegistry.getTableStrategy(itemQualifiedName) === "sti";
 		where = this.applyStiReadScope(where, stiScope);
 		where = resolveMetaTypeInWhere(where);
-		const relationship = ObjectRegistry.getRelationships(this._itemClass.name).find((candidate) => candidate.fieldName === latestOptions.relation && candidate.type === "oneToMany");
+		const relationship = ObjectRegistry.getRelationships(itemQualifiedName).find((candidate) => candidate.fieldName === latestOptions.relation && candidate.type === "oneToMany");
 		if (!relationship) throw new Error(`latestRelated.relation '${latestOptions.relation}' is not a declared oneToMany relationship on ${itemClassName}.`);
-		const inverseForeignKey = this.resolveOneToManyInverseForeignKey(relationship);
-		const relatedCollection = await ObjectRegistry.getCollection(relationship.targetClass, this.options);
+		const targetName = await resolveRelationshipTargetName(relationship);
+		const inverseForeignKey = resolveOneToManyInverse(itemQualifiedName, relationship, targetName);
+		const relatedCollection = await ObjectRegistry.getCollection(targetName, this.options);
 		await relatedCollection.ensureStorageReady();
 		const relatedFields = relatedCollection.getFieldsSync();
 		const relatedItemClassName = relatedCollection.getResolvedItemClassName();
 		const relatedQualifiedName = relatedCollection.getResolvedItemQualifiedName();
 		const relatedIsSTI = ObjectRegistry.getTableStrategy(relatedQualifiedName) === "sti";
-		const relatedInterceptorContext = createInterceptorContext(relatedItemClassName, "list", relatedCollection.constructor.name);
+		const relatedInterceptorContext = createInterceptorContext(relatedItemClassName, "list", relatedCollection.constructor.name, void 0, relatedQualifiedName);
 		let relatedWhere = (await GlobalInterceptors.executeBeforeList(relatedItemClassName, { where: {} }, relatedInterceptorContext) ?? { where: {} }).where;
 		if (relatedIsSTI) {
 			const relatedStiBase = ObjectRegistry.getSTIBase(relatedQualifiedName);
@@ -855,7 +848,8 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		const collectionCtor = this.constructor;
 		if (this.constructor !== SmrtCollection && collectionCtor._itemClass) {
 			const itemClass = collectionCtor._itemClass;
-			const itemClassName = ObjectRegistry.getClassByConstructor(itemClass)?.name || itemClass.name;
+			const registeredItem = ObjectRegistry.getClassByConstructor(itemClass);
+			const itemClassName = registeredItem?.qualifiedName ?? registeredItem?.name ?? itemClass.name;
 			ObjectRegistry.registerCollection(itemClassName, collectionCtor);
 		}
 	}
@@ -885,9 +879,11 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	* ```
 	*/
 	static async create(options = {}) {
-		const { _className, db, defaultListLimit, persistence, ai, fs, logging, maxListLimit, metrics, pubsub, sanitization, signals } = options;
+		const { _className, _deferRuntimeInitialization, _reuseInitializedDb, db, defaultListLimit, persistence, ai, fs, logging, maxListLimit, metrics, pubsub, sanitization, signals } = options;
 		const collectionOptions = {
 			_className,
+			_deferRuntimeInitialization,
+			_reuseInitializedDb,
 			db,
 			persistence,
 			ai,
@@ -1120,7 +1116,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		await this.ensureStorageReady();
 		const itemClassName = this.getResolvedItemClassName();
 		const itemQualifiedName = this.getResolvedItemQualifiedName();
-		const interceptorContext = createInterceptorContext(itemClassName, "get", this.constructor.name);
+		const interceptorContext = createInterceptorContext(itemClassName, "get", this.constructor.name, void 0, itemQualifiedName);
 		const interceptedFilter = await GlobalInterceptors.executeBeforeGet(itemClassName, filter, interceptorContext);
 		let where = typeof interceptedFilter === "string" ? resolveGetStringFilter(interceptedFilter) : interceptedFilter;
 		const isSTI = ObjectRegistry.getTableStrategy(itemQualifiedName) === "sti";
@@ -1143,7 +1139,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		await this.ensureStorageReady();
 		const itemClassName = this.getResolvedItemClassName();
 		const itemQualifiedName = this.getResolvedItemQualifiedName();
-		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name);
+		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name, void 0, itemQualifiedName);
 		const interceptedOptions = await GlobalInterceptors.executeBeforeList(itemClassName, options, interceptorContext) ?? options ?? {};
 		let { where, offset, limit, orderBy, select, stiScope } = interceptedOptions;
 		const isSTI = ObjectRegistry.getTableStrategy(itemQualifiedName) === "sti";
@@ -1187,15 +1183,13 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	async eagerLoadRelationships(instances, relationships) {
 		if (instances.length === 0) return;
 		for (const fieldName of relationships) {
-			const relationship = ObjectRegistry.getRelationships(this._itemClass.name).find((r) => r.fieldName === fieldName);
+			const relationship = ObjectRegistry.getRelationships(this.getResolvedItemQualifiedName()).find((r) => r.fieldName === fieldName);
 			if (!relationship) {
 				logger.warn(`Relationship ${fieldName} not found on ${this._itemClass.name}, skipping eager load`);
 				continue;
 			}
-			if (relationship.type === "foreignKey" || relationship.type === "crossPackageRef") {
-				if (relationship.type === "crossPackageRef") await ObjectRegistry.ensureManifestLoaded(relationship.targetClass);
-				await this.batchLoadForeignKeys(instances, fieldName, relationship);
-			} else if (relationship.type === "oneToMany") await this.batchLoadOneToMany(instances, fieldName, relationship);
+			if (relationship.type === "foreignKey" || relationship.type === "crossPackageRef") await this.batchLoadForeignKeys(instances, fieldName, relationship);
+			else if (relationship.type === "oneToMany") await this.batchLoadOneToMany(instances, fieldName, relationship);
 			else if (relationship.type === "manyToMany") await this.batchLoadManyToMany(instances, fieldName, relationship);
 		}
 	}
@@ -1214,9 +1208,10 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 			if (value && typeof value === "string") foreignKeyValues.add(value);
 		}
 		if (foreignKeyValues.size === 0) return;
+		const targetName = await resolveRelationshipTargetName(relationship);
 		let targetCollection;
 		try {
-			targetCollection = await ObjectRegistry.getCollection(relationship.targetClass, this.options);
+			targetCollection = await ObjectRegistry.getCollection(targetName, this.options);
 		} catch (error) {
 			logger.warn(`Could not get collection for ${relationship.targetClass}`, { error });
 			return;
@@ -1246,20 +1241,13 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	* @private
 	*/
 	async batchLoadOneToMany(instances, fieldName, relationship) {
-		const inverseCandidates = ObjectRegistry.getInverseRelationshipsForSelf(this._itemClass.name).filter((r) => r.sourceClass === relationship.targetClass && r.type === "foreignKey");
-		const explicitForeignKey = relationship.options?.foreignKey;
-		const matchedForeignKey = explicitForeignKey ? inverseCandidates.find((r) => r.fieldName === explicitForeignKey) : void 0;
-		if (explicitForeignKey && !matchedForeignKey) throw new Error(`oneToMany ${fieldName} specifies foreignKey '${explicitForeignKey}', but ${relationship.targetClass} has no matching inverse foreignKey. Candidates: ${inverseCandidates.map((r) => r.fieldName).join(", ") || "(none)"}`);
-		const inverseForeignKey = matchedForeignKey ?? inverseCandidates.find((r) => r.targetClass === this._itemClass.name) ?? inverseCandidates[0];
-		if (!inverseForeignKey) {
-			logger.warn(`Could not find inverse foreignKey for oneToMany ${fieldName}`);
-			return;
-		}
+		const targetName = await resolveRelationshipTargetName(relationship);
+		const inverseForeignKey = resolveOneToManyInverse(this.getResolvedItemQualifiedName(), relationship, targetName);
 		const instanceIds = instances.map((i) => i.id).filter((id) => !!id);
 		if (instanceIds.length === 0) return;
 		let targetCollection;
 		try {
-			targetCollection = await ObjectRegistry.getCollection(relationship.targetClass, this.options);
+			targetCollection = await ObjectRegistry.getCollection(targetName, this.options);
 		} catch (error) {
 			logger.warn(`Could not get collection for ${relationship.targetClass}`, { error });
 			return;
@@ -1295,6 +1283,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	async batchLoadManyToMany(instances, fieldName, relationship) {
 		const instanceIds = instances.map((i) => i.id).filter((id) => !!id);
 		if (instanceIds.length === 0) return;
+		await resolveRelationshipTargetName(relationship);
 		let through;
 		let sourceColumn;
 		let targetColumn;
@@ -1311,9 +1300,10 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		}
 		for (const instance of instances) instance._setLoadedRelationship(fieldName, []);
 		const junctionRowsAll = [];
+		const junctionProjection = [sourceColumn, targetColumn].map((column) => this.getDatabaseEngine() === "duckdb" ? `CAST("${column}" AS VARCHAR) AS "${column}"` : `"${column}"`).join(", ");
 		for (const idChunk of chunkArray(instanceIds, 900)) {
 			const placeholders = idChunk.map(() => "?").join(", ");
-			const result = await this.db.query(`SELECT "${sourceColumn}", "${targetColumn}" FROM "${through}" WHERE "${sourceColumn}" IN (${placeholders})`, idChunk);
+			const result = await this.db.query(`SELECT ${junctionProjection} FROM "${through}" WHERE "${sourceColumn}" IN (${placeholders})`, idChunk);
 			junctionRowsAll.push(...result.rows);
 		}
 		if (junctionRowsAll.length === 0) return;
@@ -1607,8 +1597,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	*/
 	getFieldsSync() {
 		if (this._cachedFields) return this._cachedFields;
-		const className = this.getResolvedItemClassName();
-		const fields = ObjectRegistry.getFields(className);
+		const fields = ObjectRegistry.getFields(this.getResolvedItemQualifiedName());
 		return Object.fromEntries(fields);
 	}
 	/**
@@ -1637,15 +1626,15 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 					const baseSchema = ObjectRegistry.getSchema(stiBase);
 					if (baseSchema?.tableName) this._tableName = baseSchema.tableName;
 					else {
-						const ownSchema = ObjectRegistry.getSchema(className);
+						const ownSchema = ObjectRegistry.getSchema(qualifiedName);
 						this._tableName = ownSchema?.tableName || fallbackTableName;
 					}
 				} else {
-					const ownSchema = ObjectRegistry.getSchema(className);
+					const ownSchema = ObjectRegistry.getSchema(qualifiedName);
 					this._tableName = ownSchema?.tableName || fallbackTableName;
 				}
 			} else {
-				const ownSchema = ObjectRegistry.getSchema(className);
+				const ownSchema = ObjectRegistry.getSchema(qualifiedName);
 				this._tableName = ownSchema?.tableName || fallbackTableName;
 			}
 		}
@@ -1710,7 +1699,8 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	async count(options = {}) {
 		await this.ensureStorageReady();
 		const itemClassName = this.getResolvedItemClassName();
-		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name);
+		const itemQualifiedName = this.getResolvedItemQualifiedName();
+		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name, void 0, itemQualifiedName);
 		let { where, stiScope } = await GlobalInterceptors.executeBeforeList(itemClassName, options, interceptorContext) ?? options ?? {};
 		where = this.applyStiReadScope(where, stiScope);
 		where = resolveMetaTypeInWhere(where);
@@ -1756,7 +1746,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		if (options.fields.length > 20) throw new Error(`Invalid facets option: at most 20 fields are allowed.`);
 		const itemClassName = this.getResolvedItemClassName();
 		const itemQualifiedName = this.getResolvedItemQualifiedName();
-		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name);
+		const interceptorContext = createInterceptorContext(itemClassName, "list", this.constructor.name, void 0, itemQualifiedName);
 		const interceptedOptions = await GlobalInterceptors.executeBeforeList(itemClassName, options, interceptorContext) ?? options ?? {};
 		let { where, stiScope } = interceptedOptions;
 		const isSTI = ObjectRegistry.getTableStrategy(itemQualifiedName) === "sti";
@@ -1874,7 +1864,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 	*/
 	async query(sql, params = [], options = {}) {
 		await this.ensureStorageReady();
-		const interceptorContext = createInterceptorContext(this._itemClass.name, "query", this.constructor.name);
+		const interceptorContext = createInterceptorContext(this._itemClass.name, "query", this.constructor.name, void 0, this.getResolvedItemQualifiedName());
 		const interceptedQuery = await GlobalInterceptors.executeBeforeQuery(this._itemClass.name, {
 			sql,
 			params,
@@ -2346,7 +2336,7 @@ var SmrtCollection = class SmrtCollection extends SmrtClass {
 		}, this.ai).getModelName();
 		const vector = (ObjectRegistry.getProjectEmbeddingConfig()?.storage || "json") === "native" ? this.systemDb.vector : void 0;
 		const itemClassName = this.getResolvedItemClassName();
-		const tenantPrefilterContext = createInterceptorContext(itemClassName, "list", this.constructor.name);
+		const tenantPrefilterContext = createInterceptorContext(itemClassName, "list", this.constructor.name, void 0, this.getResolvedItemQualifiedName());
 		const tenantPrefilter = await GlobalInterceptors.executeBeforeList(itemClassName, { where: {} }, tenantPrefilterContext);
 		let candidateObjectIds;
 		if (tenantPrefilter.where && Object.keys(tenantPrefilter.where).length > 0) {