rads-db 3.0.42 → 3.0.43

package/dist/index.cjs

@@ -126,6 +126,20 @@ const operatorFns = {
   iendsWith: (x, w) => x?.toLowerCase()?.endsWith(w.toLowerCase()),
   contains: (x, w) => x?.includes(w),
   icontains: (x, w) => x?.toLowerCase()?.includes(w.toLowerCase()),
+  jsonContains: (x, w) => {
+    const { path, isNull, value } = w;
+    const val = ___default.get(x, path);
+    if (val === void 0)
+      return false;
+    if (isNull === false && val === null)
+      return false;
+    if (isNull === true && val !== null)
+      return false;
+    if (value != null && val !== value)
+      return false;
+    return true;
+  },
+  arrayContains: (x, w) => x?.includes(w),
   isNull: (x, w) => {
     if (w === true)
       return x == null;

package/dist/index.d.ts

@@ -355,6 +355,15 @@ interface FileSystemNode {
     size?: number;
     type: 'blob' | 'tree';
 }
+interface WhereJsonContains {
+    /** Checks for existence of this path inside json object
+     * Example: "meta.countries[0].name". */
+    path: string;
+    /** Checks if value from "path" is exactly null. Note: it is not the same as not having the key in the object. */
+    isNull?: boolean;
+    /** Checks if value from "path" equals provided value */
+    value?: number | string | boolean;
+}
 type RadsUiSlotName = 'entityListActions' | 'entityActions' | 'fieldActions';
 interface RadsUiSlotDefinition {
     entityName?: string | {
@@ -411,4 +420,4 @@ declare function createRadsDb(args?: CreateRadsDbArgs): RadsDb;
  */
 declare function createRadsDbClient(args?: CreateRadsDbClientArgs): RadsDb;
 
-export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepPartial, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, FileUploadResult, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsHookDoc, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };
+export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepPartial, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, FileUploadResult, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsHookDoc, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, WhereJsonContains, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/dist/index.mjs

@@ -118,6 +118,20 @@ const operatorFns = {
   iendsWith: (x, w) => x?.toLowerCase()?.endsWith(w.toLowerCase()),
   contains: (x, w) => x?.includes(w),
   icontains: (x, w) => x?.toLowerCase()?.includes(w.toLowerCase()),
+  jsonContains: (x, w) => {
+    const { path, isNull, value } = w;
+    const val = _.get(x, path);
+    if (val === void 0)
+      return false;
+    if (isNull === false && val === null)
+      return false;
+    if (isNull === true && val !== null)
+      return false;
+    if (value != null && val !== value)
+      return false;
+    return true;
+  },
+  arrayContains: (x, w) => x?.includes(w),
   isNull: (x, w) => {
     if (w === true)
       return x == null;

package/drivers/azureCosmos.cjs

@@ -11,6 +11,7 @@ const cosmosClientCache = {};
 const databaseClientCache = {};
 const containerClientCache = {};
 const simpleSubclauseRegex = /^[a-z0-9_@]+.[a-z0-9_@]+ = [a-z0-9_@.]+$/i;
+const sanitizePathRegex = /^[a-z0-9_\[\]\.]+$/i;
 var _default = options => (schema, entity) => {
   const normalizedOptions = {
     databaseName: "main",
@@ -326,12 +327,8 @@ const operatorHandlers = {
       paramNamePrefix,
       whereVal
     } = whereArgs;
-    const fieldType = ctx.schema[ctx.entity].fields[ctx.field];
     const pn = `${paramNamePrefix}${paramName}`;
     parameters[pn] = whereVal;
-    if (fieldType.isArray) {
-      return `array_contains(${namePrefix}${name}, @${pn})`;
-    }
     return `contains(${namePrefix}${name}, @${pn})`;
   },
   icontains: (ctx, parameters, whereArgs) => {
@@ -346,6 +343,49 @@ const operatorHandlers = {
     parameters[pn] = whereVal;
     return `contains(${namePrefix}${name}, @${pn}, true)`;
   },
+  arrayContains: (ctx, parameters, whereArgs) => {
+    const {
+      name,
+      namePrefix,
+      paramName,
+      paramNamePrefix,
+      whereVal
+    } = whereArgs;
+    const pn = `${paramNamePrefix}${paramName}`;
+    parameters[pn] = whereVal;
+    return `array_contains(${namePrefix}${name}, @${pn})`;
+  },
+  jsonContains: (ctx, parameters, whereArgs) => {
+    const {
+      name,
+      namePrefix,
+      paramName,
+      paramNamePrefix,
+      whereVal
+    } = whereArgs;
+    const {
+      path,
+      isNull,
+      value
+    } = whereVal;
+    if (!path) return "";
+    if (!sanitizePathRegex.test(path)) throw new Error(`Invalid path ${path}`);
+    const pn = `${paramNamePrefix}${paramName}`;
+    parameters[pn] = whereVal;
+    const fullPath = `${namePrefix}${name}.${path}`;
+    if (value != null) {
+      const valuePn = `${paramNamePrefix}${paramName}_value`;
+      parameters[valuePn] = value;
+      return `${fullPath} = @${valuePn}`;
+    }
+    if (isNull != null) {
+      if (isNull) {
+        return `${fullPath} = null`;
+      }
+      return `${fullPath} != null`;
+    }
+    return `is_defined(${fullPath})`;
+  },
   ieq: (ctx, parameters, whereArgs) => {
     const {
       name,
@@ -447,7 +487,10 @@ function getCosmosQueryWhereInner(ctx, parameters, whereArgs) {
     return getCosmosQueryWhere(ctx, parameters, whereVal, `${namePrefix}${name}.`, `${paramNamePrefix}${paramName}_`);
   }
   const fn = operatorHandlers[operator || "eq"];
-  if (!fn) console.warn(`Unsupported operator: "${operator}"`);
+  if (!fn) {
+    console.warn(`Unsupported operator: "${operator}"`);
+    return null;
+  }
   return fn(ctx, parameters, whereArgs);
 }
 function getCosmosContainerClient(options) {

package/drivers/azureCosmos.mjs

@@ -4,6 +4,7 @@ const cosmosClientCache = {};
 const databaseClientCache = {};
 const containerClientCache = {};
 const simpleSubclauseRegex = /^[a-z0-9_@]+.[a-z0-9_@]+ = [a-z0-9_@.]+$/i;
+const sanitizePathRegex = /^[a-z0-9_\[\]\.]+$/i;
 export default (options) => (schema, entity) => {
   const normalizedOptions = {
     databaseName: "main",
@@ -205,12 +206,8 @@ const operatorHandlers = {
   },
   contains: (ctx, parameters, whereArgs) => {
     const { name, namePrefix, paramName, paramNamePrefix, whereVal } = whereArgs;
-    const fieldType = ctx.schema[ctx.entity].fields[ctx.field];
     const pn = `${paramNamePrefix}${paramName}`;
     parameters[pn] = whereVal;
-    if (fieldType.isArray) {
-      return `array_contains(${namePrefix}${name}, @${pn})`;
-    }
     return `contains(${namePrefix}${name}, @${pn})`;
   },
   icontains: (ctx, parameters, whereArgs) => {
@@ -219,6 +216,35 @@ const operatorHandlers = {
     parameters[pn] = whereVal;
     return `contains(${namePrefix}${name}, @${pn}, true)`;
   },
+  arrayContains: (ctx, parameters, whereArgs) => {
+    const { name, namePrefix, paramName, paramNamePrefix, whereVal } = whereArgs;
+    const pn = `${paramNamePrefix}${paramName}`;
+    parameters[pn] = whereVal;
+    return `array_contains(${namePrefix}${name}, @${pn})`;
+  },
+  jsonContains: (ctx, parameters, whereArgs) => {
+    const { name, namePrefix, paramName, paramNamePrefix, whereVal } = whereArgs;
+    const { path, isNull, value } = whereVal;
+    if (!path)
+      return "";
+    if (!sanitizePathRegex.test(path))
+      throw new Error(`Invalid path ${path}`);
+    const pn = `${paramNamePrefix}${paramName}`;
+    parameters[pn] = whereVal;
+    const fullPath = `${namePrefix}${name}.${path}`;
+    if (value != null) {
+      const valuePn = `${paramNamePrefix}${paramName}_value`;
+      parameters[valuePn] = value;
+      return `${fullPath} = @${valuePn}`;
+    }
+    if (isNull != null) {
+      if (isNull) {
+        return `${fullPath} = null`;
+      }
+      return `${fullPath} != null`;
+    }
+    return `is_defined(${fullPath})`;
+  },
   ieq: (ctx, parameters, whereArgs) => {
     const { name, namePrefix, paramName, paramNamePrefix, whereVal } = whereArgs;
     const pn = `${paramNamePrefix}${paramName}`;
@@ -282,8 +308,10 @@ function getCosmosQueryWhereInner(ctx, parameters, whereArgs) {
     return getCosmosQueryWhere(ctx, parameters, whereVal, `${namePrefix}${name}.`, `${paramNamePrefix}${paramName}_`);
   }
   const fn = operatorHandlers[operator || "eq"];
-  if (!fn)
+  if (!fn) {
     console.warn(`Unsupported operator: "${operator}"`);
+    return null;
+  }
   return fn(ctx, parameters, whereArgs);
 }
 function getCosmosContainerClient(options) {

package/drivers/memory.cjs

@@ -19,6 +19,20 @@ const operatorFns = {
   iendsWith: (x, w) => x?.toLowerCase()?.endsWith(w.toLowerCase()),
   contains: (x, w) => x?.includes(w),
   icontains: (x, w) => x?.toLowerCase()?.includes(w.toLowerCase()),
+  jsonContains: (x, w) => {
+    const {
+      path,
+      isNull,
+      value
+    } = w;
+    const val = _lodash.default.get(x, path);
+    if (val === void 0) return false;
+    if (isNull === false && val === null) return false;
+    if (isNull === true && val !== null) return false;
+    if (value != null && val !== value) return false;
+    return true;
+  },
+  arrayContains: (x, w) => x?.includes(w),
   isNull: (x, w) => {
     if (w === true) return x == null;
     if (w === false) return x != null;

package/drivers/memory.mjs

@@ -9,6 +9,20 @@ const operatorFns = {
   iendsWith: (x, w) => x?.toLowerCase()?.endsWith(w.toLowerCase()),
   contains: (x, w) => x?.includes(w),
   icontains: (x, w) => x?.toLowerCase()?.includes(w.toLowerCase()),
+  jsonContains: (x, w) => {
+    const { path, isNull, value } = w;
+    const val = _.get(x, path);
+    if (val === void 0)
+      return false;
+    if (isNull === false && val === null)
+      return false;
+    if (isNull === true && val !== null)
+      return false;
+    if (value != null && val !== value)
+      return false;
+    return true;
+  },
+  arrayContains: (x, w) => x?.includes(w),
   isNull: (x, w) => {
     if (w === true)
       return x == null;

package/integrations/node.cjs

@@ -137,7 +137,7 @@ ${whereFields.join("\n")}
   }
       `.trim()).join("\n");
   return `
-import type { EntityMethods, FileUploadArgs, RadsRequestContext } from 'rads-db'
+import type { EntityMethods, FileUploadArgs, RadsRequestContext, WhereJsonContains } from 'rads-db'
 ${imports.join("\n")}
 ${schemaTypesStr}
 
@@ -211,7 +211,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
     const arrayWhereFields = [`${name}_isEmpty?: boolean`];
     if (!isRequired) arrayWhereFields.push(`${name}_isNull?: boolean`);
     if (isPrimitive || isEnum) {
-      return [`${name}_contains?: ${fieldTypeName}`, ...arrayWhereFields];
+      return [`${name}_arrayContains?: ${fieldTypeName}`, ...arrayWhereFields];
     }
     if (isRelation) {
       return [`${name}_some?: ${getRelationWhereType()}`, ...arrayWhereFields];
@@ -257,6 +257,9 @@ function getWhereFieldsForPrimitive(schema, type, fieldKey) {
   if (field.type === "Record<string, string>") {
     return [];
   }
+  if (field.type === "Record<string, any>") {
+    return [`${name}_jsonContains?: WhereJsonContains`];
+  }
   throw new Error(`Unknown primitive type: ${field.type}`);
 }
 function getWhereFieldsForString(name) {

package/integrations/node.mjs

@@ -137,7 +137,7 @@ ${whereFields.join("\n")}
       `.trim()
   ).join("\n");
   return `
-import type { EntityMethods, FileUploadArgs, RadsRequestContext } from 'rads-db'
+import type { EntityMethods, FileUploadArgs, RadsRequestContext, WhereJsonContains } from 'rads-db'
 ${imports.join("\n")}
 ${schemaTypesStr}
 
@@ -218,7 +218,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
     if (!isRequired)
       arrayWhereFields.push(`${name}_isNull?: boolean`);
     if (isPrimitive || isEnum) {
-      return [`${name}_contains?: ${fieldTypeName}`, ...arrayWhereFields];
+      return [`${name}_arrayContains?: ${fieldTypeName}`, ...arrayWhereFields];
     }
     if (isRelation) {
       return [`${name}_some?: ${getRelationWhereType()}`, ...arrayWhereFields];
@@ -273,6 +273,9 @@ function getWhereFieldsForPrimitive(schema, type, fieldKey) {
   if (field.type === "Record<string, string>") {
     return [];
   }
+  if (field.type === "Record<string, any>") {
+    return [`${name}_jsonContains?: WhereJsonContains`];
+  }
   throw new Error(`Unknown primitive type: ${field.type}`);
 }
 function getWhereFieldsForString(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.42",
+  "version": "3.0.43",
   "files": [
     "dist",
     "drivers",
@@ -109,7 +109,7 @@
     "generate-test-schema": "ts-node ./src/integrations/cli -d './test/entities'",
     "dev": "pnpm install && pnpm link-rads-db && pnpm build && pnpm generate-test-schema && vitest --ui --test-timeout 300000",
     "lint": "cross-env NODE_ENV=production eslint src/**/*.* test/**/*.*",
-    "dev-typecheck": "pnpm install && pnpm build && pnpm generate-test-schema && pnpm link-rads-db && vitest typecheck --ui",
+    "dev-typecheck": "pnpm install && pnpm build && pnpm generate-test-schema && pnpm link-rads-db && vitest typecheck",
     "build": "unbuild"
   }
 }