arkormx 2.0.0-next.21 → 2.0.0-next.23

package/dist/index.cjs

@@ -2384,7 +2384,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		relationLoads: false,
 		relationAggregates: true,
 		relationFilters: true,
-		rawWhere: false
+		rawWhere: true
 	};
 	constructor(db, mapping = {}) {
 		this.db = db;
@@ -2669,6 +2669,18 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		if (condition.operator === "ends-with") return kysely.sql`${column} like ${`%${String(condition.value ?? "")}`}`;
 		return kysely.sql`${column} ${condition.operator === "!=" ? kysely.sql.raw("!=") : kysely.sql.raw(condition.operator)} ${condition.value}`;
 	}
+	buildRawWhereCondition(condition) {
+		const segments = condition.sql.split("?");
+		const bindings = condition.bindings ?? [];
+		if (segments.length !== bindings.length + 1) throw new ArkormException("Raw where bindings do not match the number of placeholders.");
+		const parts = [];
+		segments.forEach((segment, index) => {
+			if (segment.length > 0) parts.push(kysely.sql.raw(segment));
+			if (index < bindings.length) parts.push(kysely.sql`${bindings[index]}`);
+		});
+		if (parts.length === 0) return kysely.sql`1 = 1`;
+		return kysely.sql`${kysely.sql.join(parts, kysely.sql``)}`;
+	}
 	buildWhereCondition(target, condition) {
 		if (!condition) return kysely.sql`1 = 1`;
 		if (condition.type === "comparison") return this.buildComparisonCondition(target, condition);
@@ -2685,13 +2697,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 			const notCondition = condition;
 			return kysely.sql`not (${this.buildWhereCondition(target, notCondition.condition)})`;
 		}
-		throw new UnsupportedAdapterFeatureException("Raw where clauses are not supported by the Kysely adapter.", {
-			operation: "adapter.where",
-			meta: {
-				feature: "rawWhere",
-				sql: condition.sql
-			}
-		});
+		return this.buildRawWhereCondition(condition);
 	}
 	buildWhereClause(target, condition) {
 		if (!condition) return kysely.sql``;
@@ -6004,7 +6010,7 @@ var RelationTableLoader = class {
 * @author Legacy (3m1n3nc3)
 * @since 2.0.0-next.2
 */
-var SetBasedEagerLoader = class {
+var SetBasedEagerLoader = class SetBasedEagerLoader {
 	constructor(models, relations) {
 		this.models = models;
 		this.relations = relations;
@@ -6016,10 +6022,18 @@ var SetBasedEagerLoader = class {
 	*/
 	async load() {
 		if (this.models.length === 0) return;
-		await Promise.all(Object.entries(this.relations).map(async ([name, constraint]) => {
-			await this.loadRelation(name, constraint);
+		const relationTree = this.buildRelationTree(this.relations);
+		await Promise.all(Array.from(relationTree.entries()).map(async ([name, node]) => {
+			await this.loadRelationNode(name, node);
 		}));
 	}
+	async loadRelationNode(name, node) {
+		await this.loadRelation(name, node.constraint);
+		if (node.children.size === 0) return;
+		const relatedModels = this.collectLoadedRelationModels(name);
+		if (relatedModels.length === 0) return;
+		await new SetBasedEagerLoader(relatedModels, this.relationTreeToMap(node.children)).load();
+	}
 	/**
 	* Loads a specific relationship for the set of models based on the relationship name 
 	* and an optional constraint.
@@ -6063,9 +6077,58 @@ var SetBasedEagerLoader = class {
 	*/
 	resolveRelationResolver(name) {
 		const resolver = this.models[0][name];
-		if (typeof resolver !== "function") return null;
+		if (typeof resolver !== "function") {
+			const modelName = this.models[0].constructor?.name ?? "Model";
+			throw new RelationResolutionException(`Relation [${name}] is not defined on the model.`, {
+				operation: "eagerLoad",
+				model: modelName,
+				relation: name
+			});
+		}
 		return resolver;
 	}
+	buildRelationTree(relations) {
+		const tree = /* @__PURE__ */ new Map();
+		Object.entries(relations).forEach(([path, constraint]) => {
+			const segments = path.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
+			if (segments.length === 0) return;
+			let current = tree;
+			segments.forEach((segment, index) => {
+				const existing = current.get(segment) ?? {
+					constraint: void 0,
+					children: /* @__PURE__ */ new Map()
+				};
+				if (index === segments.length - 1 && constraint) existing.constraint = constraint;
+				current.set(segment, existing);
+				current = existing.children;
+			});
+		});
+		return tree;
+	}
+	relationTreeToMap(tree, prefix = "") {
+		return Array.from(tree.entries()).reduce((all, [name, node]) => {
+			const path = prefix ? `${prefix}.${name}` : name;
+			all[path] = node.constraint;
+			Object.assign(all, this.relationTreeToMap(node.children, path));
+			return all;
+		}, {});
+	}
+	collectLoadedRelationModels(name) {
+		return this.models.reduce((all, model) => {
+			const loaded = model.getAttribute(name);
+			if (loaded instanceof ArkormCollection) {
+				loaded.all().forEach((item) => {
+					if (this.isEagerLoadableModel(item)) all.push(item);
+				});
+				return all;
+			}
+			if (this.isEagerLoadableModel(loaded)) all.push(loaded);
+			return all;
+		}, []);
+	}
+	isEagerLoadableModel(value) {
+		return typeof value === "object" && value !== null && typeof value.getAttribute === "function" && typeof value.setLoadedRelation === "function";
+	}
 	/**
 	* Loads a "belongs to" relationship for the set of models.
 	* 
@@ -6701,6 +6764,36 @@ var QueryBuilder = class QueryBuilder {
 		return this.where({ [key]: { notIn: values } });
 	}
 	/**
+	* Adds a string contains clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereLike(key, value) {
+		return this.where({ [key]: { contains: value } });
+	}
+	/**
+	* Adds a string starts-with clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereStartsWith(key, value) {
+		return this.where({ [key]: { startsWith: value } });
+	}
+	/**
+	* Adds a string ends-with clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereEndsWith(key, value) {
+		return this.where({ [key]: { endsWith: value } });
+	}
+	/**
 	* Adds a strongly-typed OR NOT IN where clause for a single attribute key.
 	*
 	* @param key
@@ -8825,6 +8918,36 @@ var Relation = class {
 		return this.constrain((query) => query.whereIn(key, values));
 	}
 	/**
+	* Add a string contains clause to the relationship query.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereLike(key, value) {
+		return this.constrain((query) => query.whereLike(key, value));
+	}
+	/**
+	* Add a string starts-with clause to the relationship query.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereStartsWith(key, value) {
+		return this.constrain((query) => query.whereStartsWith(key, value));
+	}
+	/**
+	* Add a string ends-with clause to the relationship query.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereEndsWith(key, value) {
+		return this.constrain((query) => query.whereEndsWith(key, value));
+	}
+	/**
 	* Add an order by clause to the relationship query.
 	*
 	* @param orderBy

package/dist/index.d.cts

@@ -554,6 +554,30 @@ declare abstract class Relation<TModel> {
    * @returns
    */
   whereIn<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, values: ModelAttributes<TModel>[TKey][]): this;
+  /**
+   * Add a string contains clause to the relationship query.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereLike<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Add a string starts-with clause to the relationship query.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereStartsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Add a string ends-with clause to the relationship query.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereEndsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
   /**
    * Add an order by clause to the relationship query.
    *
@@ -2176,6 +2200,30 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @returns
    */
   whereNotIn<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, values: ModelAttributes<TModel>[TKey][]): this;
+  /**
+   * Adds a string contains clause for a single attribute key.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereLike<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Adds a string starts-with clause for a single attribute key.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereStartsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Adds a string ends-with clause for a single attribute key.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereEndsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
   /**
    * Adds a strongly-typed OR NOT IN where clause for a single attribute key.
    *
@@ -3162,6 +3210,7 @@ declare class KyselyDatabaseAdapter implements DatabaseAdapter {
   private buildOrderBy;
   private buildConditionValueList;
   private buildComparisonCondition;
+  private buildRawWhereCondition;
   private buildWhereCondition;
   private buildWhereClause;
   private buildPaginationClause;

package/dist/index.d.mts

@@ -554,6 +554,30 @@ declare abstract class Relation<TModel> {
    * @returns
    */
   whereIn<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, values: ModelAttributes<TModel>[TKey][]): this;
+  /**
+   * Add a string contains clause to the relationship query.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereLike<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Add a string starts-with clause to the relationship query.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereStartsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Add a string ends-with clause to the relationship query.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereEndsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
   /**
    * Add an order by clause to the relationship query.
    *
@@ -2176,6 +2200,30 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @returns
    */
   whereNotIn<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, values: ModelAttributes<TModel>[TKey][]): this;
+  /**
+   * Adds a string contains clause for a single attribute key.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereLike<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Adds a string starts-with clause for a single attribute key.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereStartsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
+  /**
+   * Adds a string ends-with clause for a single attribute key.
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  whereEndsWith<TKey extends keyof ModelAttributes<TModel> & string>(key: TKey, value: Extract<ModelAttributes<TModel>[TKey], string>): this;
   /**
    * Adds a strongly-typed OR NOT IN where clause for a single attribute key.
    *
@@ -3162,6 +3210,7 @@ declare class KyselyDatabaseAdapter implements DatabaseAdapter {
   private buildOrderBy;
   private buildConditionValueList;
   private buildComparisonCondition;
+  private buildRawWhereCondition;
   private buildWhereCondition;
   private buildWhereClause;
   private buildPaginationClause;

package/dist/index.mjs

@@ -2355,7 +2355,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		relationLoads: false,
 		relationAggregates: true,
 		relationFilters: true,
-		rawWhere: false
+		rawWhere: true
 	};
 	constructor(db, mapping = {}) {
 		this.db = db;
@@ -2640,6 +2640,18 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		if (condition.operator === "ends-with") return sql`${column} like ${`%${String(condition.value ?? "")}`}`;
 		return sql`${column} ${condition.operator === "!=" ? sql.raw("!=") : sql.raw(condition.operator)} ${condition.value}`;
 	}
+	buildRawWhereCondition(condition) {
+		const segments = condition.sql.split("?");
+		const bindings = condition.bindings ?? [];
+		if (segments.length !== bindings.length + 1) throw new ArkormException("Raw where bindings do not match the number of placeholders.");
+		const parts = [];
+		segments.forEach((segment, index) => {
+			if (segment.length > 0) parts.push(sql.raw(segment));
+			if (index < bindings.length) parts.push(sql`${bindings[index]}`);
+		});
+		if (parts.length === 0) return sql`1 = 1`;
+		return sql`${sql.join(parts, sql``)}`;
+	}
 	buildWhereCondition(target, condition) {
 		if (!condition) return sql`1 = 1`;
 		if (condition.type === "comparison") return this.buildComparisonCondition(target, condition);
@@ -2656,13 +2668,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 			const notCondition = condition;
 			return sql`not (${this.buildWhereCondition(target, notCondition.condition)})`;
 		}
-		throw new UnsupportedAdapterFeatureException("Raw where clauses are not supported by the Kysely adapter.", {
-			operation: "adapter.where",
-			meta: {
-				feature: "rawWhere",
-				sql: condition.sql
-			}
-		});
+		return this.buildRawWhereCondition(condition);
 	}
 	buildWhereClause(target, condition) {
 		if (!condition) return sql``;
@@ -5975,7 +5981,7 @@ var RelationTableLoader = class {
 * @author Legacy (3m1n3nc3)
 * @since 2.0.0-next.2
 */
-var SetBasedEagerLoader = class {
+var SetBasedEagerLoader = class SetBasedEagerLoader {
 	constructor(models, relations) {
 		this.models = models;
 		this.relations = relations;
@@ -5987,10 +5993,18 @@ var SetBasedEagerLoader = class {
 	*/
 	async load() {
 		if (this.models.length === 0) return;
-		await Promise.all(Object.entries(this.relations).map(async ([name, constraint]) => {
-			await this.loadRelation(name, constraint);
+		const relationTree = this.buildRelationTree(this.relations);
+		await Promise.all(Array.from(relationTree.entries()).map(async ([name, node]) => {
+			await this.loadRelationNode(name, node);
 		}));
 	}
+	async loadRelationNode(name, node) {
+		await this.loadRelation(name, node.constraint);
+		if (node.children.size === 0) return;
+		const relatedModels = this.collectLoadedRelationModels(name);
+		if (relatedModels.length === 0) return;
+		await new SetBasedEagerLoader(relatedModels, this.relationTreeToMap(node.children)).load();
+	}
 	/**
 	* Loads a specific relationship for the set of models based on the relationship name 
 	* and an optional constraint.
@@ -6034,9 +6048,58 @@ var SetBasedEagerLoader = class {
 	*/
 	resolveRelationResolver(name) {
 		const resolver = this.models[0][name];
-		if (typeof resolver !== "function") return null;
+		if (typeof resolver !== "function") {
+			const modelName = this.models[0].constructor?.name ?? "Model";
+			throw new RelationResolutionException(`Relation [${name}] is not defined on the model.`, {
+				operation: "eagerLoad",
+				model: modelName,
+				relation: name
+			});
+		}
 		return resolver;
 	}
+	buildRelationTree(relations) {
+		const tree = /* @__PURE__ */ new Map();
+		Object.entries(relations).forEach(([path, constraint]) => {
+			const segments = path.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
+			if (segments.length === 0) return;
+			let current = tree;
+			segments.forEach((segment, index) => {
+				const existing = current.get(segment) ?? {
+					constraint: void 0,
+					children: /* @__PURE__ */ new Map()
+				};
+				if (index === segments.length - 1 && constraint) existing.constraint = constraint;
+				current.set(segment, existing);
+				current = existing.children;
+			});
+		});
+		return tree;
+	}
+	relationTreeToMap(tree, prefix = "") {
+		return Array.from(tree.entries()).reduce((all, [name, node]) => {
+			const path = prefix ? `${prefix}.${name}` : name;
+			all[path] = node.constraint;
+			Object.assign(all, this.relationTreeToMap(node.children, path));
+			return all;
+		}, {});
+	}
+	collectLoadedRelationModels(name) {
+		return this.models.reduce((all, model) => {
+			const loaded = model.getAttribute(name);
+			if (loaded instanceof ArkormCollection) {
+				loaded.all().forEach((item) => {
+					if (this.isEagerLoadableModel(item)) all.push(item);
+				});
+				return all;
+			}
+			if (this.isEagerLoadableModel(loaded)) all.push(loaded);
+			return all;
+		}, []);
+	}
+	isEagerLoadableModel(value) {
+		return typeof value === "object" && value !== null && typeof value.getAttribute === "function" && typeof value.setLoadedRelation === "function";
+	}
 	/**
 	* Loads a "belongs to" relationship for the set of models.
 	* 
@@ -6672,6 +6735,36 @@ var QueryBuilder = class QueryBuilder {
 		return this.where({ [key]: { notIn: values } });
 	}
 	/**
+	* Adds a string contains clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereLike(key, value) {
+		return this.where({ [key]: { contains: value } });
+	}
+	/**
+	* Adds a string starts-with clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereStartsWith(key, value) {
+		return this.where({ [key]: { startsWith: value } });
+	}
+	/**
+	* Adds a string ends-with clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereEndsWith(key, value) {
+		return this.where({ [key]: { endsWith: value } });
+	}
+	/**
 	* Adds a strongly-typed OR NOT IN where clause for a single attribute key.
 	*
 	* @param key
@@ -8796,6 +8889,36 @@ var Relation = class {
 		return this.constrain((query) => query.whereIn(key, values));
 	}
 	/**
+	* Add a string contains clause to the relationship query.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereLike(key, value) {
+		return this.constrain((query) => query.whereLike(key, value));
+	}
+	/**
+	* Add a string starts-with clause to the relationship query.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereStartsWith(key, value) {
+		return this.constrain((query) => query.whereStartsWith(key, value));
+	}
+	/**
+	* Add a string ends-with clause to the relationship query.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereEndsWith(key, value) {
+		return this.constrain((query) => query.whereEndsWith(key, value));
+	}
+	/**
 	* Add an order by clause to the relationship query.
 	*
 	* @param orderBy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkormx",
-  "version": "2.0.0-next.21",
+  "version": "2.0.0-next.23",
   "description": "Modern TypeScript-first ORM for Node.js.",
   "keywords": [
     "orm",