rads-db 3.1.6 → 3.1.8

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { g as RadsConfig, T as TypeDefinition } from './types-1bda441b.js';
+import { g as RadsConfig, T as TypeDefinition } from './types-5bfcdf8f.js';
 import '_rads-db';
 
 declare function defineRadsConfig(config: RadsConfig): RadsConfig;

package/dist/index.cjs

@@ -156,6 +156,20 @@ const operatorFns = {
     return true;
   },
   arrayContains: (x, w) => x?.includes(w),
+  isEmpty: (x, w) => {
+    if (!x) {
+      if (w === true)
+        return true;
+      if (w === false)
+        return false;
+      return true;
+    }
+    if (w === true)
+      return x?.length === 0;
+    if (w === false)
+      return x?.length > 0;
+    return true;
+  },
   isNull: (x, w) => {
     if (w === true)
       return x == null;
@@ -276,7 +290,18 @@ function getFilter(where, namePrefix = "") {
   }
   if (andClauses.length === 0)
     return null;
-  return (x) => andClauses.every((ac) => ac(x));
+  return (x) => resolveAndClauses(andClauses, x);
+}
+function resolveAndClauses(andClauses, x) {
+  let result = true;
+  for (const ac of andClauses) {
+    const clauseResult = ac(x);
+    if (clauseResult === false)
+      return false;
+    if (clauseResult == null)
+      result = void 0;
+  }
+  return result;
 }
 function getWhereNameOperatorPair(whereKey) {
   if (whereKey.startsWith("_type")) {
@@ -290,14 +315,14 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
     return getFilter(whereVal, name);
   }
   if (operator === "some") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && ((x) => {
       const val = ___default.get(x, name);
-      return val === void 0 || val?.some(f);
+      return val?.some(f);
     });
   }
   if (operator === "none") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && ((x) => !___default.get(x, name)?.some(f));
   }
   if (operator === "and") {
@@ -310,7 +335,7 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
   }
   if (operator === "not") {
     const f = getFilter(whereVal, namePrefix);
-    return f && ((x) => !f(x));
+    return f && ((x) => f(x) === false);
   }
   if (operator === "or") {
     if (!___default.isArray(whereVal))

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-1bda441b.js';
-export { N as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, aj as DeepKeys, ae as DeepPartial, ac as DeepPartialWithNulls, ad as DeepPartialWithNullsItem, ak as EntityMethods, w as EnumDefinition, v as FieldDefinition, I as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, B as GenerateClientNormalizedOptions, A as GenerateClientOptions, a8 as Get, _ as GetAggArgs, $ as GetAggArgsAgg, a2 as GetAggArgsAny, a5 as GetAggResponse, Z as GetArgs, a1 as GetArgsAny, a4 as GetArgsInclude, O as GetManyArgs, a0 as GetManyArgsAny, a6 as GetManyResponse, a7 as GetResponse, a9 as GetResponseInclude, aa as GetResponseIncludeSelect, ab as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ag as InverseRelation, M as MinimalDriver, ai as Put, ah as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, L as RadsFeature, y as RadsHookDoc, K as RadsUiSlotDefinition, J as RadsUiSlotName, H as RadsVitePluginOptions, af as Relation, i as RequiredFields, l as RestDriverOptions, z as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, T as TypeDefinition, j as ValidateStringDecoratorArgs, Q as VerifyManyArgs, a3 as VerifyManyArgsAny, X as VerifyManyResponse, Y as Where, W as WhereJsonContains } from './types-1bda441b.js';
+import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-5bfcdf8f.js';
+export { N as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, aj as DeepKeys, ae as DeepPartial, ac as DeepPartialWithNulls, ad as DeepPartialWithNullsItem, ak as EntityMethods, w as EnumDefinition, v as FieldDefinition, I as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, B as GenerateClientNormalizedOptions, A as GenerateClientOptions, a8 as Get, _ as GetAggArgs, $ as GetAggArgsAgg, a2 as GetAggArgsAny, a5 as GetAggResponse, Z as GetArgs, a1 as GetArgsAny, a4 as GetArgsInclude, O as GetManyArgs, a0 as GetManyArgsAny, a6 as GetManyResponse, a7 as GetResponse, a9 as GetResponseInclude, aa as GetResponseIncludeSelect, ab as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ag as InverseRelation, M as MinimalDriver, ai as Put, ah as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, L as RadsFeature, y as RadsHookDoc, K as RadsUiSlotDefinition, J as RadsUiSlotName, H as RadsVitePluginOptions, af as Relation, i as RequiredFields, l as RestDriverOptions, z as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, T as TypeDefinition, j as ValidateStringDecoratorArgs, Q as VerifyManyArgs, a3 as VerifyManyArgsAny, X as VerifyManyResponse, Y as Where, W as WhereJsonContains } from './types-5bfcdf8f.js';
 import { RadsDb } from '_rads-db';
 export { RadsDb } from '_rads-db';
 

package/dist/index.mjs

@@ -149,6 +149,20 @@ const operatorFns = {
     return true;
   },
   arrayContains: (x, w) => x?.includes(w),
+  isEmpty: (x, w) => {
+    if (!x) {
+      if (w === true)
+        return true;
+      if (w === false)
+        return false;
+      return true;
+    }
+    if (w === true)
+      return x?.length === 0;
+    if (w === false)
+      return x?.length > 0;
+    return true;
+  },
   isNull: (x, w) => {
     if (w === true)
       return x == null;
@@ -269,7 +283,18 @@ function getFilter(where, namePrefix = "") {
   }
   if (andClauses.length === 0)
     return null;
-  return (x) => andClauses.every((ac) => ac(x));
+  return (x) => resolveAndClauses(andClauses, x);
+}
+function resolveAndClauses(andClauses, x) {
+  let result = true;
+  for (const ac of andClauses) {
+    const clauseResult = ac(x);
+    if (clauseResult === false)
+      return false;
+    if (clauseResult == null)
+      result = void 0;
+  }
+  return result;
 }
 function getWhereNameOperatorPair(whereKey) {
   if (whereKey.startsWith("_type")) {
@@ -283,14 +308,14 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
     return getFilter(whereVal, name);
   }
   if (operator === "some") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && ((x) => {
       const val = _.get(x, name);
-      return val === void 0 || val?.some(f);
+      return val?.some(f);
     });
   }
   if (operator === "none") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && ((x) => !_.get(x, name)?.some(f));
   }
   if (operator === "and") {
@@ -303,7 +328,7 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
   }
   if (operator === "not") {
     const f = getFilter(whereVal, namePrefix);
-    return f && ((x) => !f(x));
+    return f && ((x) => f(x) === false);
   }
   if (operator === "or") {
     if (!_.isArray(whereVal))

package/dist/{types-1bda441b.d.ts → types-5bfcdf8f.d.ts}

@@ -146,6 +146,7 @@ interface ValidateStringDecoratorArgs {
     regex?: RegExp | string;
     minLength?: number;
     maxLength?: number;
+    maxSizeKb?: number;
 }
 interface UiFieldDecoratorArgs {
     /** User-friendly name of the entity (singular).

package/drivers/azureCosmos.cjs

@@ -101,11 +101,16 @@ var _default = options => (schema, entity) => {
         nodes,
         cursor
       } = await getMany(args, ctx);
-      for (const r of nodes) {
-        const resp = await client.item(r.id, r._partition).delete();
+      for (const chunk of _lodash.default.chunk(nodes, 100)) {
+        const chunkToSend = chunk.map(x => ({
+          operationType: "Delete",
+          partitionKey: x._partition,
+          id: x.id
+        }));
+        const responses = await bulkSendWithRetry(client, chunkToSend);
         ctx?.log?.({
-          charge: resp.requestCharge,
-          request: `delete#${r._partition}|${r.id}`
+          charge: _lodash.default.sumBy(responses, r => r.requestCharge),
+          request: `delete#${chunk[0]._partition}[${chunk.length}]`
         });
       }
       return {
@@ -125,32 +130,11 @@ var _default = options => (schema, entity) => {
         });
       }
       for (const chunk of _lodash.default.chunk(itemsToPut, 100)) {
-        let chunkToSend = chunk.map(x => ({
+        const chunkToSend = chunk.map(x => ({
           operationType: "Upsert",
           resourceBody: x
         }));
-        const responses = [];
-        for (let i = 0; i < 20; i++) {
-          const response = await client.items.bulk(chunkToSend);
-          const newChunkToSend = [];
-          for (let i2 = 0; i2 < chunkToSend.length; i2++) {
-            if (response[i2].statusCode !== 429) {
-              responses.push(response[i2]);
-            } else {
-              newChunkToSend.push(chunkToSend[i2]);
-            }
-          }
-          chunkToSend = newChunkToSend;
-          if (chunkToSend.length === 0) break;
-          const delay = 50 + i * 100;
-          console.warn(`Db overloaded. Retrying after ${delay}ms...`);
-          await new Promise(resolve => setTimeout(resolve, delay));
-        }
-        if (chunkToSend.length !== 0) {
-          throw new _cosmos.RestError("Db oveloaded. Too many retries. Consider increasing database RU setting.", {
-            code: "429"
-          });
-        }
+        const responses = await bulkSendWithRetry(client, chunkToSend);
         ctx?.log?.({
           charge: _lodash.default.sumBy(responses, r => r.requestCharge),
           request: `put#${chunk[0]._partition}[${chunk.length}]`
@@ -192,11 +176,7 @@ const operatorHandlers = {
       paramName,
       whereVal
     } = whereArgs;
-    const newCtx = {
-      ...ctx,
-      entity: ctx.schema[ctx.entity].fields[ctx.field].type
-    };
-    const subClause = getCosmosQueryWhere(newCtx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
+    const subClause = getCosmosQueryWhere(ctx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
     if (subClause) {
       if (simpleSubclauseRegex.test(subClause)) {
         const parts = subClause.split(" ");
@@ -216,11 +196,7 @@ const operatorHandlers = {
       paramName,
       whereVal
     } = whereArgs;
-    const newCtx = {
-      ...ctx,
-      entity: ctx.schema[ctx.entity].fields[ctx.field].type
-    };
-    const subClause = getCosmosQueryWhere(newCtx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
+    const subClause = getCosmosQueryWhere(ctx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
     if (subClause) return `not exists (select ${name} from ${name} in ${namePrefix}${name} where ${subClause})`;
     return `array_length(${namePrefix}${name}) = 0`;
   },
@@ -383,6 +359,16 @@ const operatorHandlers = {
     parameters[pn] = whereVal;
     return `array_contains(${namePrefix}${name}, @${pn})`;
   },
+  isEmpty: (ctx, parameters, whereArgs) => {
+    const {
+      name,
+      namePrefix,
+      whereVal
+    } = whereArgs;
+    const n = `${namePrefix}${name}`;
+    if (whereVal) return `(not (is_defined(${n})) or ${n} = null or array_length(${n}) = 0)`;
+    return `(is_defined(${n}) and ${n} != null and array_length(${n}) > 0)`;
+  },
   jsonContains: (ctx, parameters, whereArgs) => {
     const {
       name,
@@ -578,4 +564,29 @@ async function createDatabaseIfNotExists(options, client) {
   } catch (e) {
     console.error("Error initializing CosmosDb: ", e);
   }
+}
+async function bulkSendWithRetry(client, chunkToSend) {
+  const responses = [];
+  for (let i = 0; i < 20; i++) {
+    const response = await client.items.bulk(chunkToSend);
+    const newChunkToSend = [];
+    for (let i2 = 0; i2 < chunkToSend.length; i2++) {
+      if (response[i2].statusCode !== 429) {
+        responses.push(response[i2]);
+      } else {
+        newChunkToSend.push(chunkToSend[i2]);
+      }
+    }
+    chunkToSend = newChunkToSend;
+    if (chunkToSend.length === 0) break;
+    const delay = 50 + i * 100;
+    console.warn(`Db overloaded. Retrying after ${delay}ms...`);
+    await new Promise(resolve => setTimeout(resolve, delay));
+  }
+  if (chunkToSend.length !== 0) {
+    throw new _cosmos.RestError("Db oveloaded. Too many retries. Consider increasing database RU setting.", {
+      code: "429"
+    });
+  }
+  return responses;
 }

package/drivers/azureCosmos.mjs

@@ -66,9 +66,17 @@ export default (options) => (schema, entity) => {
     getMany,
     async deleteMany(args, ctx) {
       const { nodes, cursor } = await getMany(args, ctx);
-      for (const r of nodes) {
-        const resp = await client.item(r.id, r._partition).delete();
-        ctx?.log?.({ charge: resp.requestCharge, request: `delete#${r._partition}|${r.id}` });
+      for (const chunk of _.chunk(nodes, 100)) {
+        const chunkToSend = chunk.map((x) => ({
+          operationType: "Delete",
+          partitionKey: x._partition,
+          id: x.id
+        }));
+        const responses = await bulkSendWithRetry(client, chunkToSend);
+        ctx?.log?.({
+          charge: _.sumBy(responses, (r) => r.requestCharge),
+          request: `delete#${chunk[0]._partition}[${chunk.length}]`
+        });
       }
       return { nodes, cursor };
     },
@@ -81,33 +89,11 @@ export default (options) => (schema, entity) => {
         itemsToPut.push({ _partition: entity, id, ...item });
       }
       for (const chunk of _.chunk(itemsToPut, 100)) {
-        let chunkToSend = chunk.map((x) => ({
+        const chunkToSend = chunk.map((x) => ({
           operationType: "Upsert",
           resourceBody: x
         }));
-        const responses = [];
-        for (let i = 0; i < 20; i++) {
-          const response = await client.items.bulk(chunkToSend);
-          const newChunkToSend = [];
-          for (let i2 = 0; i2 < chunkToSend.length; i2++) {
-            if (response[i2].statusCode !== 429) {
-              responses.push(response[i2]);
-            } else {
-              newChunkToSend.push(chunkToSend[i2]);
-            }
-          }
-          chunkToSend = newChunkToSend;
-          if (chunkToSend.length === 0)
-            break;
-          const delay = 50 + i * 100;
-          console.warn(`Db overloaded. Retrying after ${delay}ms...`);
-          await new Promise((resolve) => setTimeout(resolve, delay));
-        }
-        if (chunkToSend.length !== 0) {
-          throw new RestError("Db oveloaded. Too many retries. Consider increasing database RU setting.", {
-            code: "429"
-          });
-        }
+        const responses = await bulkSendWithRetry(client, chunkToSend);
         ctx?.log?.({
           charge: _.sumBy(responses, (r) => r.requestCharge),
           request: `put#${chunk[0]._partition}[${chunk.length}]`
@@ -139,8 +125,7 @@ function getCosmosQuery(schema, entity, args) {
 const operatorHandlers = {
   some: (ctx, parameters, whereArgs) => {
     const { name, namePrefix, paramNamePrefix, paramName, whereVal } = whereArgs;
-    const newCtx = { ...ctx, entity: ctx.schema[ctx.entity].fields[ctx.field].type };
-    const subClause = getCosmosQueryWhere(newCtx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
+    const subClause = getCosmosQueryWhere(ctx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
     if (subClause) {
       if (simpleSubclauseRegex.test(subClause)) {
         const parts = subClause.split(" ");
@@ -154,8 +139,7 @@ const operatorHandlers = {
   },
   none: (ctx, parameters, whereArgs) => {
     const { name, namePrefix, paramNamePrefix, paramName, whereVal } = whereArgs;
-    const newCtx = { ...ctx, entity: ctx.schema[ctx.entity].fields[ctx.field].type };
-    const subClause = getCosmosQueryWhere(newCtx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
+    const subClause = getCosmosQueryWhere(ctx, parameters, whereVal, `${name}.`, `${paramNamePrefix}${paramName}_`);
     if (subClause)
       return `not exists (select ${name} from ${name} in ${namePrefix}${name} where ${subClause})`;
     return `array_length(${namePrefix}${name}) = 0`;
@@ -254,6 +238,13 @@ const operatorHandlers = {
     parameters[pn] = whereVal;
     return `array_contains(${namePrefix}${name}, @${pn})`;
   },
+  isEmpty: (ctx, parameters, whereArgs) => {
+    const { name, namePrefix, whereVal } = whereArgs;
+    const n = `${namePrefix}${name}`;
+    if (whereVal)
+      return `(not (is_defined(${n})) or ${n} = null or array_length(${n}) = 0)`;
+    return `(is_defined(${n}) and ${n} != null and array_length(${n}) > 0)`;
+  },
   jsonContains: (ctx, parameters, whereArgs) => {
     const { name, namePrefix, paramName, paramNamePrefix, whereVal } = whereArgs;
     const { path, isNull, value } = whereVal;
@@ -385,3 +376,29 @@ async function createDatabaseIfNotExists(options, client) {
     console.error("Error initializing CosmosDb: ", e);
   }
 }
+async function bulkSendWithRetry(client, chunkToSend) {
+  const responses = [];
+  for (let i = 0; i < 20; i++) {
+    const response = await client.items.bulk(chunkToSend);
+    const newChunkToSend = [];
+    for (let i2 = 0; i2 < chunkToSend.length; i2++) {
+      if (response[i2].statusCode !== 429) {
+        responses.push(response[i2]);
+      } else {
+        newChunkToSend.push(chunkToSend[i2]);
+      }
+    }
+    chunkToSend = newChunkToSend;
+    if (chunkToSend.length === 0)
+      break;
+    const delay = 50 + i * 100;
+    console.warn(`Db overloaded. Retrying after ${delay}ms...`);
+    await new Promise((resolve) => setTimeout(resolve, delay));
+  }
+  if (chunkToSend.length !== 0) {
+    throw new RestError("Db oveloaded. Too many retries. Consider increasing database RU setting.", {
+      code: "429"
+    });
+  }
+  return responses;
+}

package/drivers/indexedDb.cjs

@@ -31,36 +31,50 @@ var _default = options => {
     const handle = schema[entity]?.handle;
     if (!handle) throw new Error(`Entity ${entity} not found`);
     dbWrapper.entities[handle] = true;
-    return {
-      driverName: "indexedDb",
-      async getMany(args, ctx) {
-        await initDbIfNeeded(dbName);
-        const normalizedArgs = normalizeArgs(args);
-        const dexieResult = applyArgsToDexieTable(dbWrapper.db.table(handle), normalizedArgs);
-        let resultCursor;
-        const newCursor = normalizedArgs.cursor + dexieResult.maxItemCount;
-        let result = await dexieResult.collection.toArray();
-        if (dexieResult.orderByProp) {
-          result = _lodash.default.orderBy(result, [dexieResult.orderByProp], [dexieResult.orderByDirection.toLowerCase()]);
-          if (dexieResult.maxItemCount) {
-            if (result.length > newCursor) {
-              resultCursor = newCursor;
-            }
-            result = result.slice(normalizedArgs.cursor, newCursor);
+    async function getMany(args, ctx) {
+      await initDbIfNeeded(dbName);
+      const normalizedArgs = normalizeArgs(args);
+      const dexieResult = applyArgsToDexieTable(dbWrapper.db.table(handle), normalizedArgs);
+      let resultCursor;
+      const newCursor = normalizedArgs.cursor + dexieResult.maxItemCount;
+      let result = await dexieResult.collection.toArray();
+      if (dexieResult.orderByProp) {
+        result = _lodash.default.orderBy(result, [dexieResult.orderByProp], [dexieResult.orderByDirection.toLowerCase()]);
+        if (dexieResult.maxItemCount) {
+          if (result.length > newCursor) {
+            resultCursor = newCursor;
           }
-          return {
-            nodes: result,
-            cursor: resultCursor ? _lodash.default.toString(resultCursor) : null
-          };
-        }
-        if (dexieResult.maxItemCount && result.length >= dexieResult.maxItemCount) {
-          resultCursor = newCursor;
+          result = result.slice(normalizedArgs.cursor, newCursor);
         }
         return {
           nodes: result,
           cursor: resultCursor ? _lodash.default.toString(resultCursor) : null
         };
+      }
+      if (dexieResult.maxItemCount && result.length >= dexieResult.maxItemCount) {
+        resultCursor = newCursor;
+      }
+      return {
+        nodes: result,
+        cursor: resultCursor ? _lodash.default.toString(resultCursor) : null
+      };
+    }
+    return {
+      driverName: "indexedDb",
+      async deleteMany(args, ctx) {
+        await initDbIfNeeded(dbName);
+        const {
+          nodes,
+          cursor
+        } = await getMany(args, ctx);
+        const table = dbWrapper.db.table(handle);
+        await table.bulkDelete(nodes.map(x => x.id));
+        return {
+          nodes,
+          cursor
+        };
       },
+      getMany,
       async putMany(items, ctx) {
         await initDbIfNeeded(dbName);
         const table = dbWrapper.db.table(handle);
@@ -98,7 +112,7 @@ function applyArgsToDexieTable(table, args) {
   }
   const f = (0, _memory.getFilter)(where);
   if (f) {
-    collection = collection.filter(f);
+    collection = collection.filter(x => f(x) || false);
   }
   if (maxItemCount && !orderByProp) {
     if (args.cursor) collection = collection.offset(_lodash.default.toNumber(args.cursor));

package/drivers/indexedDb.mjs

@@ -25,30 +25,38 @@ export default (options) => {
     if (!handle)
       throw new Error(`Entity ${entity} not found`);
     dbWrapper.entities[handle] = true;
-    return {
-      driverName: "indexedDb",
-      async getMany(args, ctx) {
-        await initDbIfNeeded(dbName);
-        const normalizedArgs = normalizeArgs(args);
-        const dexieResult = applyArgsToDexieTable(dbWrapper.db.table(handle), normalizedArgs);
-        let resultCursor;
-        const newCursor = normalizedArgs.cursor + dexieResult.maxItemCount;
-        let result = await dexieResult.collection.toArray();
-        if (dexieResult.orderByProp) {
-          result = _.orderBy(result, [dexieResult.orderByProp], [dexieResult.orderByDirection.toLowerCase()]);
-          if (dexieResult.maxItemCount) {
-            if (result.length > newCursor) {
-              resultCursor = newCursor;
-            }
-            result = result.slice(normalizedArgs.cursor, newCursor);
+    async function getMany(args, ctx) {
+      await initDbIfNeeded(dbName);
+      const normalizedArgs = normalizeArgs(args);
+      const dexieResult = applyArgsToDexieTable(dbWrapper.db.table(handle), normalizedArgs);
+      let resultCursor;
+      const newCursor = normalizedArgs.cursor + dexieResult.maxItemCount;
+      let result = await dexieResult.collection.toArray();
+      if (dexieResult.orderByProp) {
+        result = _.orderBy(result, [dexieResult.orderByProp], [dexieResult.orderByDirection.toLowerCase()]);
+        if (dexieResult.maxItemCount) {
+          if (result.length > newCursor) {
+            resultCursor = newCursor;
           }
-          return { nodes: result, cursor: resultCursor ? _.toString(resultCursor) : null };
-        }
-        if (dexieResult.maxItemCount && result.length >= dexieResult.maxItemCount) {
-          resultCursor = newCursor;
+          result = result.slice(normalizedArgs.cursor, newCursor);
         }
         return { nodes: result, cursor: resultCursor ? _.toString(resultCursor) : null };
+      }
+      if (dexieResult.maxItemCount && result.length >= dexieResult.maxItemCount) {
+        resultCursor = newCursor;
+      }
+      return { nodes: result, cursor: resultCursor ? _.toString(resultCursor) : null };
+    }
+    return {
+      driverName: "indexedDb",
+      async deleteMany(args, ctx) {
+        await initDbIfNeeded(dbName);
+        const { nodes, cursor } = await getMany(args, ctx);
+        const table = dbWrapper.db.table(handle);
+        await table.bulkDelete(nodes.map((x) => x.id));
+        return { nodes, cursor };
       },
+      getMany,
       async putMany(items, ctx) {
         await initDbIfNeeded(dbName);
         const table = dbWrapper.db.table(handle);
@@ -81,7 +89,7 @@ function applyArgsToDexieTable(table, args) {
   }
   const f = getFilter(where);
   if (f) {
-    collection = collection.filter(f);
+    collection = collection.filter((x) => f(x) || false);
   }
   if (maxItemCount && !orderByProp) {
     if (args.cursor)

package/drivers/memory.cjs

@@ -33,6 +33,16 @@ const operatorFns = {
     return true;
   },
   arrayContains: (x, w) => x?.includes(w),
+  isEmpty: (x, w) => {
+    if (!x) {
+      if (w === true) return true;
+      if (w === false) return false;
+      return true;
+    }
+    if (w === true) return x?.length === 0;
+    if (w === false) return x?.length > 0;
+    return true;
+  },
   isNull: (x, w) => {
     if (w === true) return x == null;
     if (w === false) return x != null;
@@ -154,7 +164,16 @@ function getFilter(where, namePrefix = "") {
     if (f) andClauses.push(f);
   }
   if (andClauses.length === 0) return null;
-  return x => andClauses.every(ac => ac(x));
+  return x => resolveAndClauses(andClauses, x);
+}
+function resolveAndClauses(andClauses, x) {
+  let result = true;
+  for (const ac of andClauses) {
+    const clauseResult = ac(x);
+    if (clauseResult === false) return false;
+    if (clauseResult == null) result = void 0;
+  }
+  return result;
 }
 function getWhereNameOperatorPair(whereKey) {
   if (whereKey.startsWith("_type")) {
@@ -168,14 +187,14 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
     return getFilter(whereVal, name);
   }
   if (operator === "some") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && (x => {
       const val = _lodash.default.get(x, name);
-      return val === void 0 || val?.some(f);
+      return val?.some(f);
     });
   }
   if (operator === "none") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && (x => !_lodash.default.get(x, name)?.some(f));
   }
   if (operator === "and") {
@@ -186,7 +205,7 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
   }
   if (operator === "not") {
     const f = getFilter(whereVal, namePrefix);
-    return f && (x => !f(x));
+    return f && (x => f(x) === false);
   }
   if (operator === "or") {
     if (!_lodash.default.isArray(whereVal)) throw new Error(`Value for where._or must be an array`);

package/drivers/memory.d.ts

@@ -8,4 +8,4 @@ export declare function queryArray(array: any[], args: GetManyArgsAny): {
     nodes: any;
     cursor: any;
 };
-export declare function getFilter(where: Record<string, any>, namePrefix?: string): ((x: any) => boolean) | null;
+export declare function getFilter(where: Record<string, any>, namePrefix?: string): ((x: any) => boolean | undefined) | null;

package/drivers/memory.mjs

@@ -23,6 +23,20 @@ const operatorFns = {
     return true;
   },
   arrayContains: (x, w) => x?.includes(w),
+  isEmpty: (x, w) => {
+    if (!x) {
+      if (w === true)
+        return true;
+      if (w === false)
+        return false;
+      return true;
+    }
+    if (w === true)
+      return x?.length === 0;
+    if (w === false)
+      return x?.length > 0;
+    return true;
+  },
   isNull: (x, w) => {
     if (w === true)
       return x == null;
@@ -143,7 +157,18 @@ export function getFilter(where, namePrefix = "") {
   }
   if (andClauses.length === 0)
     return null;
-  return (x) => andClauses.every((ac) => ac(x));
+  return (x) => resolveAndClauses(andClauses, x);
+}
+function resolveAndClauses(andClauses, x) {
+  let result = true;
+  for (const ac of andClauses) {
+    const clauseResult = ac(x);
+    if (clauseResult === false)
+      return false;
+    if (clauseResult == null)
+      result = void 0;
+  }
+  return result;
 }
 function getWhereNameOperatorPair(whereKey) {
   if (whereKey.startsWith("_type")) {
@@ -157,14 +182,14 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
     return getFilter(whereVal, name);
   }
   if (operator === "some") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && ((x) => {
       const val = _.get(x, name);
-      return val === void 0 || val?.some(f);
+      return val?.some(f);
     });
   }
   if (operator === "none") {
-    const f = getFilter(whereVal, namePrefix);
+    const f = getFilter(whereVal);
     return f && ((x) => !_.get(x, name)?.some(f));
   }
   if (operator === "and") {
@@ -177,7 +202,7 @@ function getFilterInner(operator, whereVal, name, namePrefix) {
   }
   if (operator === "not") {
     const f = getFilter(whereVal, namePrefix);
-    return f && ((x) => !f(x));
+    return f && ((x) => f(x) === false);
   }
   if (operator === "or") {
     if (!_.isArray(whereVal))

package/integrations/node.cjs

@@ -205,9 +205,12 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   const isPrimitive = !fieldType;
   const isEnum = !!fieldType?.enumValues;
   const isObject = !!fieldType?.fields;
-  const isRelation = field.isRelation;
-  const isRequired = field.isRequired;
-  const isArray = field.isArray;
+  const {
+    isRelation,
+    isRequired,
+    isArray,
+    isChange
+  } = field;
   if (isArray) {
     const arrayWhereFields = [`${name}_isEmpty?: boolean`];
     if (!isRequired) arrayWhereFields.push(`${name}_isNull?: boolean`);
@@ -228,6 +231,9 @@ function getWhereFieldsFor(schema, type, fieldKey) {
     return [`${name}?: ${getRelationWhereType()}`, ...commonWhereFields];
   }
   if (isObject) {
+    if (isChange) {
+      return [`${name}?: Omit<${fieldTypeName}_Where, 'id'>`, `${name}_jsonContains?: WhereJsonContains`, ...commonWhereFields];
+    }
     return [`${name}?: ${fieldTypeName}_Where`, ...commonWhereFields];
   }
   if (isEnum) {

package/integrations/node.mjs

@@ -223,9 +223,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   const isPrimitive = !fieldType;
   const isEnum = !!fieldType?.enumValues;
   const isObject = !!fieldType?.fields;
-  const isRelation = field.isRelation;
-  const isRequired = field.isRequired;
-  const isArray = field.isArray;
+  const { isRelation, isRequired, isArray, isChange } = field;
   if (isArray) {
     const arrayWhereFields = [`${name}_isEmpty?: boolean`];
     if (!isRequired)
@@ -248,6 +246,13 @@ function getWhereFieldsFor(schema, type, fieldKey) {
     return [`${name}?: ${getRelationWhereType()}`, ...commonWhereFields];
   }
   if (isObject) {
+    if (isChange) {
+      return [
+        `${name}?: Omit<${fieldTypeName}_Where, 'id'>`,
+        `${name}_jsonContains?: WhereJsonContains`,
+        ...commonWhereFields
+      ];
+    }
     return [`${name}?: ${fieldTypeName}_Where`, ...commonWhereFields];
   }
   if (isEnum) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.1.6",
+  "version": "3.1.8",
   "packageManager": "pnpm@8.6.1",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",