wapi-client 0.12.0-beta.3 → 0.12.5-beta.0

package/dist/db/consts.browser.cjs

@@ -98,8 +98,6 @@ __export(consts_exports, {
   DbFilterOperatorExtendedSchema: () => DbFilterOperatorExtendedSchema,
   DbFilterOperatorForNumbersSchema: () => DbFilterOperatorForNumbersSchema,
   DbFilterOperatorForStringsSchema: () => DbFilterOperatorForStringsSchema,
-  DbFilterOperatorInSchema: () => DbFilterOperatorInSchema,
-  DbFilterOperatorNullSchema: () => DbFilterOperatorNullSchema,
   DbFilterOperatorStringSchema: () => DbFilterOperatorStringSchema,
   DbFilterSchema: () => DbFilterSchema,
   DbFilterShapeSchema: () => DbFilterShapeSchema,
@@ -4115,8 +4113,6 @@ var DbModelNameEnum = (0, import_ts_utils.createEnumFromTuple)(DbModelNameSchema
 var DbFilterOperatorEqualsSchema = z.enum(["="]);
 var DbFilterOperatorBasicSchema = z.enum([">=", "<=", "<", ">"]);
 var DbFilterOperatorStringSchema = z.enum(["like", "ilike"]);
-var DbFilterOperatorInSchema = z.enum(["in", "notIn"]);
-var DbFilterOperatorNullSchema = z.enum(["null", "notNull"]);
 var DbFilterOperatorForNumbersSchema = z.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options
@@ -4129,9 +4125,9 @@ var DbFilterOperatorForStringsSchema = z.enum([
 var DbFilterOperatorAllSchema = z.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options,
-  ...DbFilterOperatorStringSchema.options,
-  ...DbFilterOperatorInSchema.options,
-  ...DbFilterOperatorNullSchema.options
+  ...DbFilterOperatorStringSchema.options
+  // ...DbFilterOperatorInSchema.options,
+  // ...DbFilterOperatorNullSchema.options,
 ]);
 var DbFilterAllowedValueSchema = z.union([
   z.string(),
@@ -4312,29 +4308,19 @@ function validateSchema(data, schema, ctx) {
   const validation = schema.safeParse(data);
   if (!validation.success) {
     validation.error.errors.forEach((err) => {
-      ctx.addIssue(__spreadValues({}, err));
+      ctx.addIssue(__spreadProps(__spreadValues({}, err), {
+        message: "complex_error:" + err.message
+      }));
     });
   }
   return validation.success;
 }
-function getDbFilter(fieldDescriptors, shape) {
-  const fields = Array.from(
-    /* @__PURE__ */ new Set([
-      ...fieldDescriptors.strings,
-      ...fieldDescriptors.numbers,
-      ...fieldDescriptors.booleans,
-      ...fieldDescriptors.nullables,
-      ...fieldDescriptors.datetimes,
-      ...fieldDescriptors.foreigns,
-      ...fieldDescriptors.identifiers
-    ])
-  );
-  const FieldsSchema = z.enum(fields);
+function getDbFilter(objectInputSchema, schema) {
+  const InSideSchema = schema.required();
+  const FieldsSchema = InSideSchema.keyof();
   const ObjectFilterSchema = z.object({
     function: DbFilterFunctionBasicSchema,
-    value: shape ? shape : z.object({
-      metadata: DbFilterMetadataSchema
-    })
+    value: objectInputSchema
   });
   const refineFn = (data, ctx) => {
     if (!validateSchema(data, DbFilterShapeSchema, ctx)) {
@@ -4362,13 +4348,32 @@ function getDbFilter(fieldDescriptors, shape) {
         ctx
       );
     }
-    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx)) {
+    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx) || !InSideSchema.shape[filterShapedData.field]) {
       return false;
     }
+    if (filterShapedData.function.toLowerCase().includes("null")) {
+      return true;
+    }
+    if (InSideSchema.shape[filterShapedData.field]._def.typeName === "ZodEnum") {
+      if (!Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field],
+        ctx
+      )) {
+        return false;
+      }
+      if (Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field].array(),
+        ctx
+      )) {
+        return false;
+      }
+    }
   };
   return z.record(DbFilterAllowedKeySchema, z.unknown()).superRefine((data, ctx) => {
-    if (shape && !data.function) {
-      return validateSchema(data, shape, ctx);
+    if (!data.function) {
+      return validateSchema(data, objectInputSchema, ctx);
     }
     return refineFn(data, ctx);
   });

package/dist/db/consts.browser.js

@@ -4043,8 +4043,6 @@ var DbModelNameEnum = createEnumFromTuple(DbModelNameSchema.options);
 var DbFilterOperatorEqualsSchema = z.enum(["="]);
 var DbFilterOperatorBasicSchema = z.enum([">=", "<=", "<", ">"]);
 var DbFilterOperatorStringSchema = z.enum(["like", "ilike"]);
-var DbFilterOperatorInSchema = z.enum(["in", "notIn"]);
-var DbFilterOperatorNullSchema = z.enum(["null", "notNull"]);
 var DbFilterOperatorForNumbersSchema = z.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options
@@ -4057,9 +4055,9 @@ var DbFilterOperatorForStringsSchema = z.enum([
 var DbFilterOperatorAllSchema = z.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options,
-  ...DbFilterOperatorStringSchema.options,
-  ...DbFilterOperatorInSchema.options,
-  ...DbFilterOperatorNullSchema.options
+  ...DbFilterOperatorStringSchema.options
+  // ...DbFilterOperatorInSchema.options,
+  // ...DbFilterOperatorNullSchema.options,
 ]);
 var DbFilterAllowedValueSchema = z.union([
   z.string(),
@@ -4240,29 +4238,19 @@ function validateSchema(data, schema, ctx) {
   const validation = schema.safeParse(data);
   if (!validation.success) {
     validation.error.errors.forEach((err) => {
-      ctx.addIssue(__spreadValues({}, err));
+      ctx.addIssue(__spreadProps(__spreadValues({}, err), {
+        message: "complex_error:" + err.message
+      }));
     });
   }
   return validation.success;
 }
-function getDbFilter(fieldDescriptors, shape) {
-  const fields = Array.from(
-    /* @__PURE__ */ new Set([
-      ...fieldDescriptors.strings,
-      ...fieldDescriptors.numbers,
-      ...fieldDescriptors.booleans,
-      ...fieldDescriptors.nullables,
-      ...fieldDescriptors.datetimes,
-      ...fieldDescriptors.foreigns,
-      ...fieldDescriptors.identifiers
-    ])
-  );
-  const FieldsSchema = z.enum(fields);
+function getDbFilter(objectInputSchema, schema) {
+  const InSideSchema = schema.required();
+  const FieldsSchema = InSideSchema.keyof();
   const ObjectFilterSchema = z.object({
     function: DbFilterFunctionBasicSchema,
-    value: shape ? shape : z.object({
-      metadata: DbFilterMetadataSchema
-    })
+    value: objectInputSchema
   });
   const refineFn = (data, ctx) => {
     if (!validateSchema(data, DbFilterShapeSchema, ctx)) {
@@ -4290,13 +4278,32 @@ function getDbFilter(fieldDescriptors, shape) {
         ctx
       );
     }
-    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx)) {
+    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx) || !InSideSchema.shape[filterShapedData.field]) {
       return false;
     }
+    if (filterShapedData.function.toLowerCase().includes("null")) {
+      return true;
+    }
+    if (InSideSchema.shape[filterShapedData.field]._def.typeName === "ZodEnum") {
+      if (!Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field],
+        ctx
+      )) {
+        return false;
+      }
+      if (Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field].array(),
+        ctx
+      )) {
+        return false;
+      }
+    }
   };
   return z.record(DbFilterAllowedKeySchema, z.unknown()).superRefine((data, ctx) => {
-    if (shape && !data.function) {
-      return validateSchema(data, shape, ctx);
+    if (!data.function) {
+      return validateSchema(data, objectInputSchema, ctx);
     }
     return refineFn(data, ctx);
   });
@@ -4344,8 +4351,6 @@ export {
   DbFilterOperatorExtendedSchema,
   DbFilterOperatorForNumbersSchema,
   DbFilterOperatorForStringsSchema,
-  DbFilterOperatorInSchema,
-  DbFilterOperatorNullSchema,
   DbFilterOperatorStringSchema,
   DbFilterSchema,
   DbFilterShapeSchema,

package/dist/db/consts.cjs

@@ -1,6 +1,8 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
@@ -18,6 +20,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -85,8 +88,6 @@ __export(consts_exports, {
   DbFilterOperatorExtendedSchema: () => DbFilterOperatorExtendedSchema,
   DbFilterOperatorForNumbersSchema: () => DbFilterOperatorForNumbersSchema,
   DbFilterOperatorForStringsSchema: () => DbFilterOperatorForStringsSchema,
-  DbFilterOperatorInSchema: () => DbFilterOperatorInSchema,
-  DbFilterOperatorNullSchema: () => DbFilterOperatorNullSchema,
   DbFilterOperatorStringSchema: () => DbFilterOperatorStringSchema,
   DbFilterSchema: () => DbFilterSchema,
   DbFilterShapeSchema: () => DbFilterShapeSchema,
@@ -145,8 +146,6 @@ var DbModelNameEnum = (0, import_ts_utils.createEnumFromTuple)(DbModelNameSchema
 var DbFilterOperatorEqualsSchema = import_zod.default.enum(["="]);
 var DbFilterOperatorBasicSchema = import_zod.default.enum([">=", "<=", "<", ">"]);
 var DbFilterOperatorStringSchema = import_zod.default.enum(["like", "ilike"]);
-var DbFilterOperatorInSchema = import_zod.default.enum(["in", "notIn"]);
-var DbFilterOperatorNullSchema = import_zod.default.enum(["null", "notNull"]);
 var DbFilterOperatorForNumbersSchema = import_zod.default.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options
@@ -159,9 +158,9 @@ var DbFilterOperatorForStringsSchema = import_zod.default.enum([
 var DbFilterOperatorAllSchema = import_zod.default.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options,
-  ...DbFilterOperatorStringSchema.options,
-  ...DbFilterOperatorInSchema.options,
-  ...DbFilterOperatorNullSchema.options
+  ...DbFilterOperatorStringSchema.options
+  // ...DbFilterOperatorInSchema.options,
+  // ...DbFilterOperatorNullSchema.options,
 ]);
 var DbFilterAllowedValueSchema = import_zod.default.union([
   import_zod.default.string(),
@@ -342,29 +341,19 @@ function validateSchema(data, schema, ctx) {
   const validation = schema.safeParse(data);
   if (!validation.success) {
     validation.error.errors.forEach((err) => {
-      ctx.addIssue(__spreadValues({}, err));
+      ctx.addIssue(__spreadProps(__spreadValues({}, err), {
+        message: "complex_error:" + err.message
+      }));
     });
   }
   return validation.success;
 }
-function getDbFilter(fieldDescriptors, shape) {
-  const fields = Array.from(
-    /* @__PURE__ */ new Set([
-      ...fieldDescriptors.strings,
-      ...fieldDescriptors.numbers,
-      ...fieldDescriptors.booleans,
-      ...fieldDescriptors.nullables,
-      ...fieldDescriptors.datetimes,
-      ...fieldDescriptors.foreigns,
-      ...fieldDescriptors.identifiers
-    ])
-  );
-  const FieldsSchema = import_zod.default.enum(fields);
+function getDbFilter(objectInputSchema, schema) {
+  const InSideSchema = schema.required();
+  const FieldsSchema = InSideSchema.keyof();
   const ObjectFilterSchema = import_zod.default.object({
     function: DbFilterFunctionBasicSchema,
-    value: shape ? shape : import_zod.default.object({
-      metadata: DbFilterMetadataSchema
-    })
+    value: objectInputSchema
   });
   const refineFn = (data, ctx) => {
     if (!validateSchema(data, DbFilterShapeSchema, ctx)) {
@@ -392,13 +381,32 @@ function getDbFilter(fieldDescriptors, shape) {
         ctx
       );
     }
-    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx)) {
+    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx) || !InSideSchema.shape[filterShapedData.field]) {
       return false;
     }
+    if (filterShapedData.function.toLowerCase().includes("null")) {
+      return true;
+    }
+    if (InSideSchema.shape[filterShapedData.field]._def.typeName === "ZodEnum") {
+      if (!Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field],
+        ctx
+      )) {
+        return false;
+      }
+      if (Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field].array(),
+        ctx
+      )) {
+        return false;
+      }
+    }
   };
   return import_zod.default.record(DbFilterAllowedKeySchema, import_zod.default.unknown()).superRefine((data, ctx) => {
-    if (shape && !data.function) {
-      return validateSchema(data, shape, ctx);
+    if (!data.function) {
+      return validateSchema(data, objectInputSchema, ctx);
     }
     return refineFn(data, ctx);
   });
@@ -447,8 +455,6 @@ function getDbFilter(fieldDescriptors, shape) {
   DbFilterOperatorExtendedSchema,
   DbFilterOperatorForNumbersSchema,
   DbFilterOperatorForStringsSchema,
-  DbFilterOperatorInSchema,
-  DbFilterOperatorNullSchema,
   DbFilterOperatorStringSchema,
   DbFilterSchema,
   DbFilterShapeSchema,

package/dist/db/consts.d.ts

@@ -1,3 +1,4 @@
+import { ForeignFilter, IdentifierFilter } from '../txs/consts.enums';
 import z from 'zod';
 export type Metadata = {
     [key: string]: string | boolean | number | null | Metadata | undefined | (string | boolean | number | null | Metadata | undefined)[];
@@ -27,11 +28,9 @@ export declare const DbModelNameEnum: Readonly<{
 export declare const DbFilterOperatorEqualsSchema: z.ZodEnum<["="]>;
 export declare const DbFilterOperatorBasicSchema: z.ZodEnum<[">=", "<=", "<", ">"]>;
 export declare const DbFilterOperatorStringSchema: z.ZodEnum<["like", "ilike"]>;
-export declare const DbFilterOperatorInSchema: z.ZodEnum<["in", "notIn"]>;
-export declare const DbFilterOperatorNullSchema: z.ZodEnum<["null", "notNull"]>;
 export declare const DbFilterOperatorForNumbersSchema: z.ZodDefault<z.ZodEnum<["=", ">=", "<=", "<", ">"]>>;
 export declare const DbFilterOperatorForStringsSchema: z.ZodDefault<z.ZodEnum<["=", ">=", "<=", "<", ">", "like", "ilike"]>>;
-export declare const DbFilterOperatorAllSchema: z.ZodEnum<["=", ">=", "<=", "<", ">", "like", "ilike", "in", "notIn", "null", "notNull"]>;
+export declare const DbFilterOperatorAllSchema: z.ZodEnum<["=", ">=", "<=", "<", ">", "like", "ilike"]>;
 export declare const DbFilterAllowedValueSchema: z.ZodUnion<[z.ZodString, z.ZodBoolean, z.ZodNumber]>;
 export declare const DbFilterForeignSchema: z.ZodObject<{
     foreign: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
@@ -373,79 +372,103 @@ export type ModelFieldDescriptors = {
     foreigns: string[];
     metadata: boolean;
 };
-export type DbFilterFunctionWherePrimitiveGeneric<F extends ModelFieldDescriptors> = (F['booleans'][0] extends string ? {
+export type RemoveUndefined<T> = T extends undefined ? never : T;
+export type ExtractTypeofKeys<Type extends object, KeyType extends string | number | boolean | null | undefined> = RemoveUndefined<{
+    [K in keyof Type]: KeyType extends Type[K] ? K : never;
+}[keyof Type]>;
+type IsForeignFilter<T, K> = ForeignFilter extends RemoveUndefined<T> ? RemoveUndefined<T> extends ForeignFilter ? K : never : never;
+export type ExtractForeignKeys<Type extends object> = RemoveUndefined<{
+    [K in keyof Type]: IsForeignFilter<Type[K], K>;
+}[keyof Type]>;
+type IsIdentifierFilter<T, K> = IdentifierFilter extends RemoveUndefined<T> ? RemoveUndefined<T> extends IdentifierFilter ? K : never : never;
+export type ExtractIdentifierKeys<Type extends object> = RemoveUndefined<{
+    [K in keyof Type]: IsIdentifierFilter<Type[K], K>;
+}[keyof Type]>;
+export type IsEnum<T, K> = RemoveUndefined<T> extends string ? string extends RemoveUndefined<T> ? never : K : never;
+export type ExtractEnumKeys<Type extends object> = RemoveUndefined<{
+    [K in keyof Type]: IsEnum<Type[K], K>;
+}[keyof Type]>;
+export type Values<T> = RemoveUndefined<T[keyof T]>;
+export type DbFilterEnumGeneric<Shape extends object> = Values<{
+    [k in keyof Shape as 'true' extends IsEnum<Shape[k], 'true'> ? k : never]: {
+        function: z.infer<typeof DbFilterFunctionBasicSchema>;
+        field: k;
+        operator?: z.infer<typeof DbFilterOperatorEqualsSchema>;
+        value: RemoveUndefined<Shape[k]>;
+    };
+}>;
+export type DbFilterEnumInGeneric<Shape extends object> = Values<{
+    [k in keyof Shape as 'true' extends IsEnum<Shape[k], 'true'> ? k : never]: {
+        function: z.infer<typeof DbFilterFunctionInSchema>;
+        field: k;
+        value: RemoveUndefined<Shape[k]>[];
+    };
+}>;
+export type DbFilterFunctionWherePrimitiveGeneric<Shape extends object> = (ExtractTypeofKeys<Shape, boolean> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['booleans'][number];
+    field: ExtractTypeofKeys<Shape, boolean>;
     operator?: z.infer<typeof DbFilterOperatorEqualsSchema>;
     value: boolean;
-} : never) | (F['numbers'][0] extends string ? {
-    function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['numbers'][number];
-    operator?: z.infer<typeof DbFilterOperatorForNumbersSchema>;
-    value: number;
-} : never) | (F['strings'][0] extends string ? {
+}) | (ExtractForeignKeys<Shape> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['strings'][number];
-    operator?: z.infer<typeof DbFilterOperatorForStringsSchema>;
-    value: string | number;
-} : never) | (F['datetimes'][0] extends string ? {
+    field: ExtractForeignKeys<Shape>;
+    operator?: z.infer<typeof DbFilterOperatorEqualsSchema>;
+    value: ForeignFilter;
+} | {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['datetimes'][number];
+    field: ExtractForeignKeys<Shape>;
     operator?: z.infer<typeof DbFilterOperatorForStringsSchema>;
-    value: string | number;
-} : never) | (F['foreigns'][0] extends string ? {
+    value: string;
+}) | (ExtractIdentifierKeys<Shape> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['foreigns'][number];
+    field: ExtractIdentifierKeys<Shape>;
     operator?: z.infer<typeof DbFilterOperatorEqualsSchema>;
-    value: z.infer<typeof DbFilterFunctionWhereForeignAllowedSchema>;
-} : never) | (F['foreigns'][0] extends string ? {
+    value: IdentifierFilter;
+} | {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['foreigns'][number];
+    field: ExtractIdentifierKeys<Shape>;
     operator?: z.infer<typeof DbFilterOperatorForStringsSchema>;
     value: string;
-} : never) | (F['identifiers'][0] extends string ? {
+}) | DbFilterEnumGeneric<Shape> | (ExtractTypeofKeys<Shape, number> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['identifiers'][number];
-    operator?: z.infer<typeof DbFilterOperatorEqualsSchema>;
-    value: z.infer<typeof DbFilterFunctionWhereIdentifierAllowedSchema>;
-} : never) | (F['identifiers'][0] extends string ? {
+    field: ExtractTypeofKeys<Shape, number>;
+    operator?: z.infer<typeof DbFilterOperatorForNumbersSchema>;
+    value: number;
+}) | (ExtractTypeofKeys<Shape, string> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    field: F['identifiers'][number];
+    field: ExtractTypeofKeys<Shape, string>;
     operator?: z.infer<typeof DbFilterOperatorForStringsSchema>;
-    value: string;
-} : never);
-export type DbFilterFunctionWhereInGeneric<F extends ModelFieldDescriptors> = (F['numbers'][0] extends string ? {
+    value: string | number;
+});
+export type DbFilterFunctionWhereInGeneric<Shape extends object> = (ExtractTypeofKeys<Shape, number> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionInSchema>;
-    field: F['numbers'][number];
+    field: ExtractTypeofKeys<Shape, number>;
     value: number[];
-} : never) | (F['strings'][0] extends string ? {
+}) | (ExtractTypeofKeys<Shape, string> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionInSchema>;
-    field: F['strings'][number];
-    value: string[];
-} : never) | (F['datetimes'][0] extends string ? {
+    field: ExtractTypeofKeys<Shape, string>;
+    value: (string | number)[];
+}) | DbFilterEnumInGeneric<Shape> | (ExtractForeignKeys<Shape> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionInSchema>;
-    field: F['datetimes'][number];
-    value: string[];
-} : never) | (F['foreigns'][0] extends string ? {
+    field: ExtractForeignKeys<Shape>;
+    value: (string | number)[];
+}) | (ExtractIdentifierKeys<Shape> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionInSchema>;
-    field: F['foreigns'][number];
-    value: string[];
-} : never) | (F['identifiers'][0] extends string ? {
-    function: z.infer<typeof DbFilterFunctionInSchema>;
-    field: F['identifiers'][number];
-    value: string[];
-} : never);
-export type DbFilterFunctionWhereNullGeneric<F extends ModelFieldDescriptors> = F['nullables'][0] extends string ? {
+    field: ExtractIdentifierKeys<Shape>;
+    value: (string | number)[];
+});
+export type DbFilterFunctionWhereNullGeneric<Shape extends object> = ExtractTypeofKeys<Shape, null> extends never | undefined ? never : {
     function: z.infer<typeof DbFilterFunctionNullSchema>;
-    field: F['nullables'][number];
-} : never;
+    field: ExtractTypeofKeys<Shape, null>;
+};
 export type DbFilterFunctionWhereObjectGeneric<O extends z.ZodTypeAny> = {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
     value: z.infer<O>;
 };
-export type DbFilterInnerGeneric<F extends ModelFieldDescriptors, O extends z.ZodTypeAny = never> = {
+export type DbFilterInnerGeneric<Shape extends object, O extends z.ZodTypeAny = never> = {
     function: z.infer<typeof DbFilterFunctionBasicSchema>;
-    inner: DbFilterGeneric<F, O>[];
+    inner: DbFilterGeneric<Shape, O>[];
 };
-export type DbFilterGeneric<F extends ModelFieldDescriptors, O extends z.ZodTypeAny = never> = DbFilterFunctionWherePrimitiveGeneric<F> | DbFilterFunctionWhereInGeneric<F> | DbFilterFunctionWhereNullGeneric<F> | (O extends never ? never : DbFilterFunctionWhereObjectGeneric<O>) | z.infer<O> | z.infer<typeof DbFilterMetadataFilteringSchema> | DbFilterInnerGeneric<F, O>;
-export declare function getDbFilter<F extends ModelFieldDescriptors, ZShape extends z.ZodTypeAny>(fieldDescriptors: F, shape?: ZShape): z.ZodType<DbFilterGeneric<F, ZShape>>;
+export type DbFilterGeneric<Schema extends object, O extends z.ZodTypeAny = never> = DbFilterFunctionWherePrimitiveGeneric<Schema> | DbFilterFunctionWhereInGeneric<Schema> | DbFilterFunctionWhereNullGeneric<Schema> | (O extends never ? never : DbFilterFunctionWhereObjectGeneric<O>) | z.infer<O> | z.infer<typeof DbFilterMetadataFilteringSchema> | DbFilterInnerGeneric<Schema, O>;
+export declare function getDbFilter<ObjectInputSchema extends z.AnyZodObject, Schema extends z.AnyZodObject>(objectInputSchema: ObjectInputSchema, schema: Schema): z.ZodType<DbFilterGeneric<z.infer<Schema>, ObjectInputSchema>>;
+export {};

package/dist/db/consts.enums.d.ts

@@ -4,7 +4,7 @@ import { TransferGroupTableType, TransferGroupTableStatus } from './transfer-gro
 import { WalletTableType, WalletTableStatus } from './wallet/wallet.enums';
 import { WapiSettingTableType } from './wapi-setting/wapi-setting.enums';
 import z from 'zod';
-import { DatetimeSchema, DbFilterAllowedKeySchema, DbFilterAllowedValueOrMetadataSchema, DbFilterAllowedValueSchema, DbFilterForeignSchema, DbFilterFunctionAllSchema, DbFilterFunctionBasicSchema, DbFilterFunctionInSchema, DbFilterFunctionMetadataBasicSchema, DbFilterFunctionMetadataInSchema, DbFilterFunctionMetadataNullSchema, DbFilterFunctionNullSchema, DbFilterFunctionWhereForeignAllowedSchema, DbFilterFunctionWhereIdentifierAllowedSchema, DbFilterFunctionWhereInSchema, DbFilterFunctionWhereMetadataInSchema, DbFilterFunctionWhereMetadataNullSchema, DbFilterFunctionWhereMetadataPrimitiveSchema, DbFilterFunctionWhereNullSchema, DbFilterFunctionWhereObjectSchema, DbFilterFunctionWherePrimitiveForeignSchema, DbFilterFunctionWherePrimitiveIdentifierSchema, DbFilterFunctionWherePrimitiveObjectSchema, DbFilterFunctionWherePrimitiveSchema, DbFilterIdentifierSchema, DbFilterInnerGenericSchema, DbFilterInnerSchema, DbFilterMetadataFilteringSchema, DbFilterMetadataObjectSchema, DbFilterMetadataSchema, DbFilterOperatorAllSchema, DbFilterOperatorBasicSchema, DbFilterOperatorEqualsSchema, DbFilterOperatorExtendedSchema, DbFilterOperatorForNumbersSchema, DbFilterOperatorForStringsSchema, DbFilterOperatorInSchema, DbFilterOperatorNullSchema, DbFilterOperatorStringSchema, DbFilterSchema, DbFilterShapeSchema, DbFilterStringNumberArraySchema, DbModelNameSchema, flagsSchema } from './consts';
+import { DatetimeSchema, DbFilterAllowedKeySchema, DbFilterAllowedValueOrMetadataSchema, DbFilterAllowedValueSchema, DbFilterForeignSchema, DbFilterFunctionAllSchema, DbFilterFunctionBasicSchema, DbFilterFunctionInSchema, DbFilterFunctionMetadataBasicSchema, DbFilterFunctionMetadataInSchema, DbFilterFunctionMetadataNullSchema, DbFilterFunctionNullSchema, DbFilterFunctionWhereForeignAllowedSchema, DbFilterFunctionWhereIdentifierAllowedSchema, DbFilterFunctionWhereInSchema, DbFilterFunctionWhereMetadataInSchema, DbFilterFunctionWhereMetadataNullSchema, DbFilterFunctionWhereMetadataPrimitiveSchema, DbFilterFunctionWhereNullSchema, DbFilterFunctionWhereObjectSchema, DbFilterFunctionWherePrimitiveForeignSchema, DbFilterFunctionWherePrimitiveIdentifierSchema, DbFilterFunctionWherePrimitiveObjectSchema, DbFilterFunctionWherePrimitiveSchema, DbFilterIdentifierSchema, DbFilterInnerGenericSchema, DbFilterInnerSchema, DbFilterMetadataFilteringSchema, DbFilterMetadataObjectSchema, DbFilterMetadataSchema, DbFilterOperatorAllSchema, DbFilterOperatorBasicSchema, DbFilterOperatorEqualsSchema, DbFilterOperatorExtendedSchema, DbFilterOperatorForNumbersSchema, DbFilterOperatorForStringsSchema, DbFilterOperatorStringSchema, DbFilterSchema, DbFilterShapeSchema, DbFilterStringNumberArraySchema, DbModelNameSchema, flagsSchema } from './consts';
 export type Datetime = z.infer<typeof DatetimeSchema>;
 export type DbFilterAllowedKey = z.infer<typeof DbFilterAllowedKeySchema>;
 export type DbFilterAllowedValueOrMetadata = z.infer<typeof DbFilterAllowedValueOrMetadataSchema>;
@@ -41,8 +41,6 @@ export type DbFilterOperatorEquals = z.infer<typeof DbFilterOperatorEqualsSchema
 export type DbFilterOperatorExtended = z.infer<typeof DbFilterOperatorExtendedSchema>;
 export type DbFilterOperatorForNumbers = z.infer<typeof DbFilterOperatorForNumbersSchema>;
 export type DbFilterOperatorForStrings = z.infer<typeof DbFilterOperatorForStringsSchema>;
-export type DbFilterOperatorIn = z.infer<typeof DbFilterOperatorInSchema>;
-export type DbFilterOperatorNull = z.infer<typeof DbFilterOperatorNullSchema>;
 export type DbFilterOperatorString = z.infer<typeof DbFilterOperatorStringSchema>;
 export type DbFilter = z.infer<typeof DbFilterSchema>;
 export type DbFilterShape = z.infer<typeof DbFilterShapeSchema>;

package/dist/db/consts.js

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,6 +16,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 // src/db/consts.ts
 import { createEnumFromTuple } from "../lib/ts-utils";
@@ -63,8 +66,6 @@ var DbModelNameEnum = createEnumFromTuple(DbModelNameSchema.options);
 var DbFilterOperatorEqualsSchema = z.enum(["="]);
 var DbFilterOperatorBasicSchema = z.enum([">=", "<=", "<", ">"]);
 var DbFilterOperatorStringSchema = z.enum(["like", "ilike"]);
-var DbFilterOperatorInSchema = z.enum(["in", "notIn"]);
-var DbFilterOperatorNullSchema = z.enum(["null", "notNull"]);
 var DbFilterOperatorForNumbersSchema = z.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options
@@ -77,9 +78,9 @@ var DbFilterOperatorForStringsSchema = z.enum([
 var DbFilterOperatorAllSchema = z.enum([
   ...DbFilterOperatorEqualsSchema.options,
   ...DbFilterOperatorBasicSchema.options,
-  ...DbFilterOperatorStringSchema.options,
-  ...DbFilterOperatorInSchema.options,
-  ...DbFilterOperatorNullSchema.options
+  ...DbFilterOperatorStringSchema.options
+  // ...DbFilterOperatorInSchema.options,
+  // ...DbFilterOperatorNullSchema.options,
 ]);
 var DbFilterAllowedValueSchema = z.union([
   z.string(),
@@ -260,29 +261,19 @@ function validateSchema(data, schema, ctx) {
   const validation = schema.safeParse(data);
   if (!validation.success) {
     validation.error.errors.forEach((err) => {
-      ctx.addIssue(__spreadValues({}, err));
+      ctx.addIssue(__spreadProps(__spreadValues({}, err), {
+        message: "complex_error:" + err.message
+      }));
     });
   }
   return validation.success;
 }
-function getDbFilter(fieldDescriptors, shape) {
-  const fields = Array.from(
-    /* @__PURE__ */ new Set([
-      ...fieldDescriptors.strings,
-      ...fieldDescriptors.numbers,
-      ...fieldDescriptors.booleans,
-      ...fieldDescriptors.nullables,
-      ...fieldDescriptors.datetimes,
-      ...fieldDescriptors.foreigns,
-      ...fieldDescriptors.identifiers
-    ])
-  );
-  const FieldsSchema = z.enum(fields);
+function getDbFilter(objectInputSchema, schema) {
+  const InSideSchema = schema.required();
+  const FieldsSchema = InSideSchema.keyof();
   const ObjectFilterSchema = z.object({
     function: DbFilterFunctionBasicSchema,
-    value: shape ? shape : z.object({
-      metadata: DbFilterMetadataSchema
-    })
+    value: objectInputSchema
   });
   const refineFn = (data, ctx) => {
     if (!validateSchema(data, DbFilterShapeSchema, ctx)) {
@@ -310,13 +301,32 @@ function getDbFilter(fieldDescriptors, shape) {
         ctx
       );
     }
-    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx)) {
+    if (!validateSchema(filterShapedData.field, FieldsSchema, ctx) || !InSideSchema.shape[filterShapedData.field]) {
       return false;
     }
+    if (filterShapedData.function.toLowerCase().includes("null")) {
+      return true;
+    }
+    if (InSideSchema.shape[filterShapedData.field]._def.typeName === "ZodEnum") {
+      if (!Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field],
+        ctx
+      )) {
+        return false;
+      }
+      if (Array.isArray(filterShapedData.value) && !validateSchema(
+        filterShapedData.value,
+        InSideSchema.shape[filterShapedData.field].array(),
+        ctx
+      )) {
+        return false;
+      }
+    }
   };
   return z.record(DbFilterAllowedKeySchema, z.unknown()).superRefine((data, ctx) => {
-    if (shape && !data.function) {
-      return validateSchema(data, shape, ctx);
+    if (!data.function) {
+      return validateSchema(data, objectInputSchema, ctx);
     }
     return refineFn(data, ctx);
   });
@@ -364,8 +374,6 @@ export {
   DbFilterOperatorExtendedSchema,
   DbFilterOperatorForNumbersSchema,
   DbFilterOperatorForStringsSchema,
-  DbFilterOperatorInSchema,
-  DbFilterOperatorNullSchema,
   DbFilterOperatorStringSchema,
   DbFilterSchema,
   DbFilterShapeSchema,