@stacksjs/orm 0.69.2 → 0.70.0

package/dist/subquery.d.ts

@@ -1,43 +1,55 @@
-declare interface WhereCondition {
+export declare type Operator = '=' | '<' | '>' | '<=' | '>=' | '<>' | '!=' | 'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not'
+
+interface WhereCondition<T, V = any> {
   type: 'and' | 'or'
   method: 'where' | 'whereIn' | 'whereNull' | 'whereNotNull' | 'whereBetween' | 'whereExists'
-  column: string
-  operator?: string
-  value?: any
-  values?: any[]
-  callback?: (query: SubqueryBuilder) => void
+  column: keyof T
+  operator?: Operator
+  value?: V
+  values?: V[] | [V, V]
+  range?: [V, V]
+  callback?: (query: SubqueryBuilder<T>) => void
 }
-export declare class SubqueryBuilder {
-  private conditions: WhereCondition[] = []
 
-  where(...args: (string | number | boolean | undefined | null)[]): void {
-    this.addCondition('and', 'where', ...args)
+export class SubqueryBuilder<T> {
+  private conditions: WhereCondition<T>[] = []
+
+  where<V>(column: keyof T, ...args: [V] | [Operator, V]): void {
+    const [operatorOrValue, value] = args
+    const operator = value === undefined ? '=' : operatorOrValue as Operator
+    const actualValue: V = value === undefined ? operatorOrValue as V : value
+
+    this.addCondition('and', 'where', column, operator, actualValue)
   }
 
-  orWhere(...args: (string | number | boolean | undefined | null)[]): void {
-    this.addCondition('or', 'where', ...args)
+  orWhere<V>(column: keyof T, ...args: [V] | [Operator, V]): void {
+    const [operatorOrValue, value] = args
+    const operator = value === undefined ? '=' : operatorOrValue as Operator
+    const actualValue: V = value === undefined ? operatorOrValue as V : value
+
+    this.addCondition('or', 'where', column, operator, actualValue)
   }
 
-  whereIn(column: string, values: any[]): void {
+  whereIn<V>(column: keyof T, values: V[]): void {
     this.conditions.push({
       type: 'and',
       method: 'whereIn',
       column,
       values,
-    })
+    } as WhereCondition<T, V>)
   }
 
-  whereNotIn(column: string, values: any[]): void {
+  whereNotIn<V>(column: keyof T, values: V[]): void {
     this.conditions.push({
       type: 'and',
       method: 'whereIn',
       column,
       values,
-      operator: 'not',
-    })
+      operator: 'not in',
+    } as WhereCondition<T, V>)
   }
 
-  whereNull(column: string): void {
+  whereNull(column: keyof T): void {
     this.conditions.push({
       type: 'and',
       method: 'whereNull',
@@ -45,7 +57,7 @@ export declare class SubqueryBuilder {
     })
   }
 
-  whereNotNull(column: string): void {
+  whereNotNull(column: keyof T): void {
     this.conditions.push({
       type: 'and',
       method: 'whereNotNull',
@@ -53,44 +65,29 @@ export declare class SubqueryBuilder {
     })
   }
 
-  whereBetween(column: string, range: [any, any]): void {
+  whereBetween<V>(column: keyof T, range: [V, V]): void {
     this.conditions.push({
       type: 'and',
       method: 'whereBetween',
       column,
-      values: range,
+      range,
     })
   }
 
-  whereExists(callback: (query: SubqueryBuilder) => void): void {
+  whereExists(callback: (query: SubqueryBuilder<T>) => void): void {
     this.conditions.push({
       type: 'and',
       method: 'whereExists',
-      column: '',
+      column: '' as keyof T,
       callback,
     })
   }
 
-  private addCondition(type: 'and' | 'or', method: 'where', ...args: (string | number | boolean | undefined | null)[]): void {
-    let column: any
-    let operator: any
-    let value: any
-
-    if (args.length === 2) {
-      [column, value] = args
-      operator = '='
-    }
-    else if (args.length === 3) {
-      [column, operator, value] = args
-    }
-    else {
-      throw new HttpError(500, 'Invalid number of arguments')
-    }
-
+  private addCondition<V>(type: 'and' | 'or', method: 'where', column: keyof T, operator: Operator, value: V): void {
     this.conditions.push({ type, method, column, operator, value })
   }
 
-  getConditions(): WhereCondition[] {
+  getConditions(): WhereCondition<T>[] {
     return this.conditions
   }
 }

package/dist/utils.d.ts

@@ -8,7 +8,7 @@ export async function modelTableName(model: Model | ModelPath): Promise<string>
   return model.table ?? snakeCase(plural(model?.name || ''))
 }
 export declare function getModelName(model: Model, modelPath: string): string;
-export declare function getTableName(model: Model, modelPath: string): string;
+export declare function getTableName(model: Model, modelPath: string): TableNames;
 export declare function getPivotTableName(formattedModelName: string, modelRelationTable: string): string;
 export declare function hasRelations(obj: any, key: string): boolean;
 export declare function getRelationType(relation: string): string;
@@ -17,4 +17,6 @@ export declare function getHiddenAttributes(attributes: AttributesElements | und
 export declare function getGuardedAttributes(model: Model): string[];
 export declare function getFillableAttributes(model: Model, otherModelRelations: RelationConfig[]): string[];
 declare function parseRule(rule: string): FieldArrayElement | null;
-export declare function mapEntity(attribute: ModelElement): string | undefined;
+export declare function mapEntity(attribute: ModelElement): string | undefined;
+export declare function findCoreModel(modelName: string): string;
+export declare function findUserModel(modelName: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/orm",
   "type": "module",
-  "version": "0.69.2",
+  "version": "0.70.0",
   "description": "The Stacks ORM integration",
   "author": "Chris Breuer",
   "contributors": ["Chris Breuer <chris@stacksjs.org>"],
@@ -34,10 +34,10 @@
     "prepublishOnly": "bun run build"
   },
   "devDependencies": {
-    "@stacksjs/build": "0.69.2",
-    "@stacksjs/config": "0.69.2",
-    "@stacksjs/development": "0.69.2",
-    "@stacksjs/query-builder": "0.69.2",
-    "@stacksjs/types": "0.69.2"
+    "@stacksjs/build": "0.70.0",
+    "@stacksjs/config": "0.70.0",
+    "@stacksjs/development": "0.70.0",
+    "@stacksjs/query-builder": "0.70.0",
+    "@stacksjs/types": "0.70.0"
   }
 }