workers-qb 1.4.0 → 1.4.2

package/dist/index.d.mts

@@ -1,3 +1,5 @@
+import { SqlStorage } from '@cloudflare/workers-types/experimental';
+
 declare enum OrderTypes {
     ASC = "ASC",
     DESC = "DESC"
@@ -245,4 +247,14 @@ declare class PGQB extends QueryBuilder<PGResult> {
     }>;
 }
 
-export { type ArrayResult, ConflictTypes, type ConflictUpsert, type D1Meta, D1QB, type D1Result, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type Join, JoinTypes, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, type test };
+declare class DurableObjectDatabaseQB extends QueryBuilder<{}> {
+    db: SqlStorage;
+    constructor(db: SqlStorage);
+    execute(query: Query): Promise<{
+        results: Record<string, string | number | ArrayBuffer | null> | undefined;
+    } | {
+        results: Record<string, string | number | ArrayBuffer | null>[];
+    }>;
+}
+
+export { type ArrayResult, ConflictTypes, type ConflictUpsert, type D1Meta, D1QB, type D1Result, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, DurableObjectDatabaseQB, FetchTypes, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type Join, JoinTypes, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, type test };

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { SqlStorage } from '@cloudflare/workers-types/experimental';
+
 declare enum OrderTypes {
     ASC = "ASC",
     DESC = "DESC"
@@ -245,4 +247,14 @@ declare class PGQB extends QueryBuilder<PGResult> {
     }>;
 }
 
-export { type ArrayResult, ConflictTypes, type ConflictUpsert, type D1Meta, D1QB, type D1Result, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type Join, JoinTypes, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, type test };
+declare class DurableObjectDatabaseQB extends QueryBuilder<{}> {
+    db: SqlStorage;
+    constructor(db: SqlStorage);
+    execute(query: Query): Promise<{
+        results: Record<string, string | number | ArrayBuffer | null> | undefined;
+    } | {
+        results: Record<string, string | number | ArrayBuffer | null>[];
+    }>;
+}
+
+export { type ArrayResult, ConflictTypes, type ConflictUpsert, type D1Meta, D1QB, type D1Result, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, DurableObjectDatabaseQB, FetchTypes, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type Join, JoinTypes, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, type test };

package/dist/index.js

@@ -22,6 +22,7 @@ var src_exports = {};
 __export(src_exports, {
   ConflictTypes: () => ConflictTypes,
   D1QB: () => D1QB,
+  DurableObjectDatabaseQB: () => DurableObjectDatabaseQB,
   FetchTypes: () => FetchTypes,
   JoinTypes: () => JoinTypes,
   OrderTypes: () => OrderTypes,
@@ -165,6 +166,8 @@ var SelectBuilder = class _SelectBuilder {
     let val = [];
     if (!Array.isArray(value)) {
       val.push(value);
+    } else {
+      val = value;
     }
     if (option && Array.isArray(option)) {
       val = [...option, ...val];
@@ -596,10 +599,52 @@ var PGQB = class extends QueryBuilder {
     };
   }
 };
+
+// src/databases/do.ts
+var DurableObjectDatabaseQB = class extends QueryBuilder {
+  db;
+  constructor(db) {
+    super();
+    this.db = db;
+  }
+  async execute(query) {
+    if (this._debugger) {
+      console.log({
+        "workers-qb": {
+          query: query.query,
+          arguments: query.arguments,
+          fetchType: query.fetchType
+        }
+      });
+    }
+    if (query.arguments) {
+      let stmt = this.db.prepare(query.query);
+      const result = stmt(...query.arguments);
+      if (query.fetchType == "ONE" /* ONE */) {
+        return {
+          results: Array.from(result)[0]
+        };
+      }
+      return {
+        results: Array.from(result)
+      };
+    }
+    const cursor = this.db.exec(query.query);
+    if (query.fetchType == "ONE" /* ONE */) {
+      return {
+        results: Array.from(cursor)[0]
+      };
+    }
+    return {
+      results: Array.from(cursor)
+    };
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ConflictTypes,
   D1QB,
+  DurableObjectDatabaseQB,
   FetchTypes,
   JoinTypes,
   OrderTypes,

package/dist/index.mjs

@@ -131,6 +131,8 @@ var SelectBuilder = class _SelectBuilder {
     let val = [];
     if (!Array.isArray(value)) {
       val.push(value);
+    } else {
+      val = value;
     }
     if (option && Array.isArray(option)) {
       val = [...option, ...val];
@@ -562,9 +564,51 @@ var PGQB = class extends QueryBuilder {
     };
   }
 };
+
+// src/databases/do.ts
+var DurableObjectDatabaseQB = class extends QueryBuilder {
+  db;
+  constructor(db) {
+    super();
+    this.db = db;
+  }
+  async execute(query) {
+    if (this._debugger) {
+      console.log({
+        "workers-qb": {
+          query: query.query,
+          arguments: query.arguments,
+          fetchType: query.fetchType
+        }
+      });
+    }
+    if (query.arguments) {
+      let stmt = this.db.prepare(query.query);
+      const result = stmt(...query.arguments);
+      if (query.fetchType == "ONE" /* ONE */) {
+        return {
+          results: Array.from(result)[0]
+        };
+      }
+      return {
+        results: Array.from(result)
+      };
+    }
+    const cursor = this.db.exec(query.query);
+    if (query.fetchType == "ONE" /* ONE */) {
+      return {
+        results: Array.from(cursor)[0]
+      };
+    }
+    return {
+      results: Array.from(cursor)
+    };
+  }
+};
 export {
   ConflictTypes,
   D1QB,
+  DurableObjectDatabaseQB,
   FetchTypes,
   JoinTypes,
   OrderTypes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-qb",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -56,6 +56,7 @@
     "url": "https://github.com/G4brym/workers-qb/issues"
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20240815.0",
     "@types/jest": "^29.5.12",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",