@ragestudio/scylla-odm 0.16.0 → 0.17.0

package/model/index.d.ts

@@ -2,7 +2,7 @@ import { mapping } from "../driver/lib/mapping/index.js";
 import { Schema } from "../schema/index.js";
 import export_default from "../operations/tableExists.js";
 import syncOP from "../operations/sync.js";
-import { Doc, InferDoc, Query, QueryOptions } from "../types.js";
+import { Doc, FindQueryOptions, InferDoc, Query } from "../types.js";
 import { Client } from "../client.js";
 
 //#region src/model/index.d.ts
@@ -15,16 +15,16 @@ declare class Model<TSchema extends Schema<any> = Schema<any>, TDoc = InferDoc<T
   create: (data: Partial<TDoc>) => Doc<TDoc>;
   obj: (data: Partial<TDoc>) => Doc<TDoc>;
   find: {
-    (query: Query<TDoc>, options: QueryOptions & {
+    (query: Query<TDoc>, options: FindQueryOptions<TDoc> & {
       raw: true;
     }): Promise<TDoc[]>;
-    (query?: Query<TDoc>, options?: QueryOptions): Promise<Doc<TDoc>[]>;
+    (query?: Query<TDoc>, options?: FindQueryOptions<TDoc>): Promise<Doc<TDoc>[]>;
   };
   findOne: {
-    (query: Query<TDoc>, options: QueryOptions & {
+    (query: Query<TDoc>, options: FindQueryOptions<TDoc> & {
       raw: true;
     }): Promise<TDoc | null>;
-    (query?: Query<TDoc>, options?: QueryOptions): Promise<Doc<TDoc> | null>;
+    (query?: Query<TDoc>, options?: FindQueryOptions<TDoc>): Promise<Doc<TDoc> | null>;
   };
   update: (query: Query<TDoc>) => Promise<Doc<TDoc>>;
   delete: (query: Query<TDoc>) => Promise<mapping.Result>;

package/operations/find.d.ts

@@ -1,7 +1,7 @@
 import { Model } from "../model/index.js";
-import { Query, QueryOptions } from "../types.js";
+import { FindQueryOptions, Query } from "../types.js";
 
 //#region src/operations/find.d.ts
-declare function findOP<TDoc>(this: Model<any, TDoc>, query?: Query<TDoc>, options?: QueryOptions): Promise<any[]>;
+declare function findOP<TDoc>(this: Model<any, TDoc>, query?: Query<TDoc>, options?: FindQueryOptions<TDoc>): Promise<any[]>;
 //#endregion
 export { findOP as default };

package/operations/find.js

@@ -1 +1 @@
-import e from"../utils/queryParser.js";async function t(t={},n){let{$limit:r,$orderby:i,...a}=t,o=e(this,a),s={};if(r!==void 0){if(typeof r!=`number`||r<=0)throw TypeError(`{$limit} operator must be a number greater than 0`);s.limit=r}return i!==void 0&&(s.orderBy=i),this.client.executeWithRetry(async()=>{let e=(await this.mapper.find(o,s)).toArray();return n?.raw===!0?e:e.map(e=>this._wrap(e))},`find on ${this.name}`)}export{t as default};
+import e from"../utils/queryParser.js";async function t(t={},n){return t=e(this,t),this.client.executeWithRetry(async()=>{let e=(await this.mapper.find(t,n)).toArray();return n?.raw===!0?e:e.map(e=>this._wrap(e))},`find on ${this.name}`)}export{t as default};

package/operations/findOne.d.ts

@@ -1,7 +1,7 @@
 import { Model } from "../model/index.js";
-import { QueryOptions } from "../types.js";
+import { FindQueryOptions, Query } from "../types.js";
 
 //#region src/operations/findOne.d.ts
-declare function findOneOP<TDoc>(this: Model<any, TDoc>, query: any, options?: QueryOptions): Promise<any>;
+declare function findOneOP<TDoc>(this: Model<any, TDoc>, query?: Query<TDoc>, options?: FindQueryOptions<TDoc>): Promise<any>;
 //#endregion
 export { findOneOP as default };

package/operations/findOne.js

@@ -1 +1 @@
-import e from"../utils/queryParser.js";async function t(t,n){return t=e(this,t),this.client.executeWithRetry(async()=>{let e=await this.mapper.get(t);return e?(e=this._wrap(e),n?.raw===!0?e.toRaw():e):null},`findOne on ${this.name}`)}export{t as default};
+import e from"../utils/queryParser.js";async function t(t={},n){return t=e(this,t),this.client.executeWithRetry(async()=>{let e=await this.mapper.get(t,n);return e?n?.raw===!0?e.toRaw():this._wrap(e):null},`findOne on ${this.name}`)}export{t as default};

package/package.js

@@ -1 +1 @@
-var e=`0.16.0`,t=`An ODM for ScyllaDB/Cassandra`;export{t as description,e as version};
+var e=`0.17.0`,t=`An ODM for ScyllaDB/Cassandra`;export{t as description,e as version};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ragestudio/scylla-odm",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "An ODM for ScyllaDB/Cassandra",
   "repository": {
     "url": "https://git.ragestudio.net/ragestudio/scylla-odm"

package/types.d.ts

@@ -1,3 +1,4 @@
+import { mapping } from "./driver/lib/mapping/index.js";
 import { ClientOptions } from "./driver/index.js";
 import { Schema } from "./schema/index.js";
 import { Document } from "./document/index.js";
@@ -44,29 +45,27 @@ declare enum ColumnTypes {
   Varchar = "varchar",
   Varint = "varint"
 }
-type QueryOperators<TValue> = {
-  $eq?: TValue;
-  $ne?: TValue;
-  $in?: TValue[];
-  $gt?: TValue;
-  $gte?: TValue;
-  $lt?: TValue;
-  $lte?: TValue;
-};
 type TableKeys = (string | TableKeys)[];
 interface Column<T> {
   type?: ColumnTypes | string;
   required?: boolean;
 }
-type Query<TDoc> = { [K in keyof TDoc]?: TDoc[K] | QueryOperators<TDoc[K]> } & {
-  $and?: Query<TDoc>[];
-  $limit?: number;
-  $orderby?: { [K in keyof TDoc]?: "asc" | "desc" };
+type QueryOperators<T> = {
+  $eq?: T;
+  $ne?: T;
+  $in?: T[];
+  $gt?: T;
+  $gte?: T;
+  $lt?: T;
+  $lte?: T;
+  $and?: Query<T>[];
 };
-type QueryOptions = {
+type Query<T> = { [K in keyof T]?: T[K] | QueryOperators<T[K]> };
+type FindQueryOptions<T> = {
   raw?: boolean;
-};
+  orderBy?: { [K in keyof T]?: "asc" | "desc" };
+} & mapping.FindDocInfo;
 type Doc<TDoc = any> = Document<TDoc> & TDoc;
 type InferDoc<S> = S extends Schema<infer T> ? { [K in keyof T as K extends `$${string}` ? never : K]: T[K] extends Column<infer U> ? U : T[K] } : any;
 //#endregion
-export { ClientConfig, Column, ColumnTypes, Doc, InferDoc, Query, QueryOperators, QueryOptions, TableKeys };
+export { ClientConfig, Column, ColumnTypes, Doc, FindQueryOptions, InferDoc, Query, QueryOperators, TableKeys };