@nest-boot/graphql-connection 7.3.0 → 7.5.0

package/dist/types/field-options.type.d.ts

@@ -0,0 +1,12 @@
+import type { FieldType, ReplacementCallbackFieldOptions as FilterReplacementCallbackFieldOptions, ReplacementFieldOptions as FilterReplacementFieldOptions, SimpleFieldOptions as FilterSimpleFieldOptions } from "mikro-orm-filter-query-schema";
+export interface BaseFieldOptions {
+    filterable?: boolean;
+    searchable?: boolean;
+}
+export interface SortableFieldOptions {
+    sortable?: boolean;
+}
+export type SimpleFieldOptions<Entity extends object, Type extends FieldType = never> = FilterSimpleFieldOptions<Entity, Type> & BaseFieldOptions & SortableFieldOptions;
+export type ReplacementFieldOptions<Entity extends object, Type extends FieldType = never, Field extends string = never> = FilterReplacementFieldOptions<Entity, Type, Field> & BaseFieldOptions & SortableFieldOptions;
+export type ReplacementFunctionFieldOptions<Entity extends object, Type extends FieldType = never> = FilterReplacementCallbackFieldOptions<Entity, Type> & BaseFieldOptions & SortableFieldOptions;
+export type FieldOptions<Entity extends object, Type extends FieldType = never, Field extends string = never> = SimpleFieldOptions<Entity, Type> | ReplacementFieldOptions<Entity, Type, Field> | ReplacementFunctionFieldOptions<Entity, Type>;

package/dist/{interfaces/field-options.interface.js → types/field-options.type.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=field-options.interface.js.map
+//# sourceMappingURL=field-options.type.js.map

package/dist/types/field-options.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"field-options.type.js","sourceRoot":"","sources":["../../src/types/field-options.type.ts"],"names":[],"mappings":""}

package/dist/types/index.d.ts

@@ -1 +1,2 @@
 export * from "./connection-class.type";
+export * from "./field-options.type";

package/dist/types/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./connection-class.type"), exports);
+__exportStar(require("./field-options.type"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC;AACxC,uDAAqC"}

package/dist/utils/create-connection-args.d.ts

@@ -1,6 +1,6 @@
 import type { FilterQuery } from "@mikro-orm/core";
 import { type Type } from "@nestjs/common";
 import { GraphQLScalarType } from "graphql";
+import type { FieldType } from "mikro-orm-filter-query-schema";
 import { ConnectionArgsInterface, FieldOptions, OrderInterface } from "../interfaces";
-import { FilterValue } from "./create-filter";
-export declare function createConnectionArgs<Entity extends object>(entityName: string, fieldOptionsMap: Map<string, FieldOptions<Entity, any, any>>, OrderClass: Type<OrderInterface<Entity>>, FilterScalar: GraphQLScalarType<FilterQuery<Entity>, FilterValue>): Type<ConnectionArgsInterface<Entity>>;
+export declare function createConnectionArgs<Entity extends object>(entityName: string, fieldOptionsMap: Map<string, FieldOptions<Entity, FieldType, string>>, OrderClass: Type<OrderInterface<Entity>>, FilterScalar: GraphQLScalarType<FilterQuery<Entity>>): Type<ConnectionArgsInterface<Entity>>;

package/dist/utils/create-connection-args.js

@@ -30,6 +30,13 @@ function createConnectionArgs(entityName, fieldOptionsMap, OrderClass, FilterSca
         }),
         __metadata("design:type", String)
     ], ConnectionArgs.prototype, "query", void 0);
+    __decorate([
+        (0, graphql_1.Field)(() => FilterScalar, {
+            nullable: true,
+            description: `Filter ${humanizeAndPluralizeEntityName} using MongoDB query syntax.`,
+        }),
+        __metadata("design:type", Object)
+    ], ConnectionArgs.prototype, "filter", void 0);
     __decorate([
         (0, graphql_1.Field)(() => graphql_1.Int, {
             nullable: true,
@@ -65,13 +72,6 @@ function createConnectionArgs(entityName, fieldOptionsMap, OrderClass, FilterSca
         }),
         __metadata("design:type", Object)
     ], ConnectionArgs.prototype, "orderBy", void 0);
-    __decorate([
-        (0, graphql_1.Field)(() => FilterScalar, {
-            nullable: true,
-            description: `Filter ${humanizeAndPluralizeEntityName} using MongoDB query syntax.`,
-        }),
-        __metadata("design:type", Object)
-    ], ConnectionArgs.prototype, "filter", void 0);
     ConnectionArgs = __decorate([
         (0, graphql_1.ArgsType)(`${entityName}ConnectionArgs`)
     ], ConnectionArgs);

package/dist/utils/create-connection-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-connection-args.js","sourceRoot":"","sources":["../../src/utils/create-connection-args.ts"],"names":[],"mappings":";;;;;;;;;;;AAaA,oDAkEC;AA9ED,gDAA0D;AAG1D,2CAAiD;AASjD,SAAgB,oBAAoB,CAClC,UAAkB,EAClB,eAA4D,EAC5D,UAAwC,EACxC,YAAiE;IAEjE,MAAM,8BAA8B,GAAG,IAAA,sBAAS,EAAC,IAAA,qBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7E,MAAM,gBAAgB,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAC3D,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAC5B,CAAC;IAGF,IAAM,cAAc,GAApB,MAAM,cAAc;KAkDnB,CAAA;IAvCC;QAVC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,QAAQ,EAAE,IAAI;YACd,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;gBAC7B,CAAC,CAAC;oBACE,WAAW,EAAE,8EAA8E,gBAAgB;yBACxG,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC;yBAClC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAChB;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;;iDACa;IAMf;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;YAChB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qDAAqD;SACnE,CAAC;;iDACa;IAMf;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;YAChB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,oDAAoD;SAClE,CAAC;;gDACY;IAMd;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,WAAW,EAAE,4DAA4D;YACzE,QAAQ,EAAE,IAAI;SACf,CAAC;;iDACa;IAMf;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,WAAW,EAAE,6DAA6D;YAC1E,QAAQ,EAAE,IAAI;SACf,CAAC;;kDACc;IAOhB;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE;YACvB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qCAAqC,8BAA8B,GAAG;SACpF,CAAC;;mDAC+B;IAOjC;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,YAAY,EAAE;YACzB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,UAAU,8BAA8B,8BAA8B;SACpF,CAAC;;kDAC2B;IAjDzB,cAAc;QADnB,IAAA,kBAAQ,EAAC,GAAG,UAAU,gBAAgB,CAAC;OAClC,cAAc,CAkDnB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}
+{"version":3,"file":"create-connection-args.js","sourceRoot":"","sources":["../../src/utils/create-connection-args.ts"],"names":[],"mappings":";;;;;;;;;;;AAaA,oDAkEC;AA9ED,gDAA0D;AAG1D,2CAAiD;AASjD,SAAgB,oBAAoB,CAClC,UAAkB,EAClB,eAAqE,EACrE,UAAwC,EACxC,YAAoD;IAEpD,MAAM,8BAA8B,GAAG,IAAA,sBAAS,EAAC,IAAA,qBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7E,MAAM,gBAAgB,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAC3D,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAC5B,CAAC;IAGF,IAAM,cAAc,GAApB,MAAM,cAAc;KAkDnB,CAAA;IAvCC;QAVC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,QAAQ,EAAE,IAAI;YACd,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;gBAC7B,CAAC,CAAC;oBACE,WAAW,EAAE,8EAA8E,gBAAgB;yBACxG,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC;yBAClC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAChB;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;;iDACa;IAOf;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,YAAY,EAAE;YACzB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,UAAU,8BAA8B,8BAA8B;SACpF,CAAC;;kDAC2B;IAM7B;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;YAChB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qDAAqD;SACnE,CAAC;;iDACa;IAMf;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;YAChB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,oDAAoD;SAClE,CAAC;;gDACY;IAMd;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,WAAW,EAAE,4DAA4D;YACzE,QAAQ,EAAE,IAAI;SACf,CAAC;;iDACa;IAMf;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,WAAW,EAAE,6DAA6D;YAC1E,QAAQ,EAAE,IAAI;SACf,CAAC;;kDACc;IAOhB;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE;YACvB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qCAAqC,8BAA8B,GAAG;SACpF,CAAC;;mDAC+B;IAjD7B,cAAc;QADnB,IAAA,kBAAQ,EAAC,GAAG,UAAU,gBAAgB,CAAC;OAClC,cAAc,CAkDnB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}

package/dist/utils/create-connection.d.ts

@@ -1,4 +1,6 @@
-import type { EntityClass } from "@mikro-orm/core";
+import type { EntityClass, FilterQuery } from "@mikro-orm/core";
 import { type Type } from "@nestjs/common";
+import type { FieldType } from "mikro-orm-filter-query-schema";
+import type { ZodType } from "zod";
 import { ConnectionInterface, EdgeInterface, FieldOptions } from "../interfaces";
-export declare function createConnection<Entity extends object>(entityClass: EntityClass<Entity>, entityName: string, EdgeClass: Type<EdgeInterface<Entity>>, fieldOptionsMap: Map<string, FieldOptions<Entity, any, any>>): Type<ConnectionInterface<Entity>>;
+export declare function createConnection<Entity extends object>(entityClass: EntityClass<Entity>, entityName: string, EdgeClass: Type<EdgeInterface<Entity>>, fieldOptionsMap: Map<string, FieldOptions<Entity, FieldType, string>>, filterQuerySchema: ZodType<FilterQuery<Entity>>): Type<ConnectionInterface<Entity>>;

package/dist/utils/create-connection.js

@@ -14,7 +14,7 @@ const graphql_1 = require("@nest-boot/graphql");
 const inflection_1 = require("inflection");
 const graphql_connection_constants_1 = require("../graphql-connection.constants");
 const objects_1 = require("../objects");
-function createConnection(entityClass, entityName, EdgeClass, fieldOptionsMap) {
+function createConnection(entityClass, entityName, EdgeClass, fieldOptionsMap, filterQuerySchema) {
     const pluralizeEntityName = (0, inflection_1.pluralize)(entityName);
     let Connection = class Connection {
     };
@@ -43,6 +43,7 @@ function createConnection(entityClass, entityName, EdgeClass, fieldOptionsMap) {
         Reflect.metadata(graphql_connection_constants_1.GRAPHQL_CONNECTION_METADATA, {
             entityClass,
             fieldOptionsMap,
+            filterQuerySchema,
         }),
         (0, graphql_1.ObjectType)(`${entityName}Connection`, {
             isAbstract: true,

package/dist/utils/create-connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-connection.js","sourceRoot":"","sources":["../../src/utils/create-connection.ts"],"names":[],"mappings":";;;;;;;;;;;AAcA,4CAsCC;AAnDD,gDAA4D;AAE5D,2CAAuC;AAEvC,kFAA8E;AAO9E,wCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,WAAgC,EAChC,UAAkB,EAClB,SAAsC,EACtC,eAA4D;IAE5D,MAAM,mBAAmB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAUlD,IAAM,UAAU,GAAhB,MAAM,UAAU;KAmBf,CAAA;IAbC;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE;YACxB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,kBAAkB;SAChC,CAAC;;6CAC8B;IAMhC;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,kBAAQ,EAAE;YACrB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,mCAAmC;SACjD,CAAC;kCACS,kBAAQ;gDAAC;IAMpB;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;YAChB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,wDAAwD;SACtE,CAAC;;kDACkB;IAlBhB,UAAU;QARf,OAAO,CAAC,QAAQ,CAAC,0DAA2B,EAAE;YAC7C,WAAW;YACX,eAAe;SACqB,CAAC;QACtC,IAAA,oBAAU,EAAC,GAAG,UAAU,YAAY,EAAE;YACrC,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,0DAA0D,mBAAmB,GAAG;SAC9F,CAAC;OACI,UAAU,CAmBf;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"create-connection.js","sourceRoot":"","sources":["../../src/utils/create-connection.ts"],"names":[],"mappings":";;;;;;;;;;;AAgBA,4CAwCC;AAvDD,gDAA4D;AAE5D,2CAAuC;AAIvC,kFAA8E;AAO9E,wCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,WAAgC,EAChC,UAAkB,EAClB,SAAsC,EACtC,eAAqE,EACrE,iBAA+C;IAE/C,MAAM,mBAAmB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAWlD,IAAM,UAAU,GAAhB,MAAM,UAAU;KAmBf,CAAA;IAbC;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE;YACxB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,kBAAkB;SAChC,CAAC;;6CAC8B;IAMhC;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,kBAAQ,EAAE;YACrB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,mCAAmC;SACjD,CAAC;kCACS,kBAAQ;gDAAC;IAMpB;QAJC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;YAChB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,wDAAwD;SACtE,CAAC;;kDACkB;IAlBhB,UAAU;QATf,OAAO,CAAC,QAAQ,CAAC,0DAA2B,EAAE;YAC7C,WAAW;YACX,eAAe;YACf,iBAAiB;SACmB,CAAC;QACtC,IAAA,oBAAU,EAAC,GAAG,UAAU,YAAY,EAAE;YACrC,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,0DAA0D,mBAAmB,GAAG;SAC9F,CAAC;OACI,UAAU,CAmBf;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/utils/create-filter.d.ts

@@ -1,5 +1,10 @@
 import { FilterQuery } from "@mikro-orm/core";
 import { GraphQLScalarType } from "graphql";
+import { FieldType, FilterOptions, FilterQuerySchemaBuilder } from "mikro-orm-filter-query-schema";
 import { FieldOptions } from "../interfaces";
-export type FilterValue = Record<string, unknown>;
-export declare function createFilter<Entity extends object>(entityName: string, fieldOptionsMap: Map<string, FieldOptions<Entity, any, any>>): GraphQLScalarType<FilterQuery<Entity>, FilterValue>;
+export type FilterQuerySchema<Entity extends object> = ReturnType<FilterQuerySchemaBuilder<Entity>["build"]>;
+export interface CreateFilterResult<Entity extends object> {
+    Filter: GraphQLScalarType<FilterQuery<Entity>>;
+    filterQuerySchema: FilterQuerySchema<Entity>;
+}
+export declare function createFilter<Entity extends object>(entityName: string, fieldOptionsMap: Map<string, FieldOptions<Entity, FieldType, string>>, filterOptions?: FilterOptions): CreateFilterResult<Entity>;

package/dist/utils/create-filter.js

@@ -2,67 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFilter = createFilter;
 const graphql_1 = require("graphql");
-const zod_1 = require("zod");
-const errors_1 = require("../errors");
-const comparisonOperators = [
-    "$eq",
-    "$ne",
-    "$gt",
-    "$gte",
-    "$lt",
-    "$lte",
-    "$in",
-    "$nin",
-    "$like",
-    "$ilike",
-    "$re",
-    "$fulltext",
-    "$contains",
-    "$overlap",
-];
-const logicalOperators = ["$and", "$or", "$not"];
-function createComparisonSchema() {
-    const primitiveSchema = zod_1.z.union([
-        zod_1.z.string(),
-        zod_1.z.number(),
-        zod_1.z.boolean(),
-        zod_1.z.null(),
-    ]);
-    const comparisonObjectSchema = zod_1.z
-        .object({
-        $eq: primitiveSchema.optional(),
-        $ne: primitiveSchema.optional(),
-        $gt: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
-        $gte: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
-        $lt: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
-        $lte: zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).optional(),
-        $in: zod_1.z.array(primitiveSchema).optional(),
-        $nin: zod_1.z.array(primitiveSchema).optional(),
-        $like: zod_1.z.string().optional(),
-        $ilike: zod_1.z.string().optional(),
-        $re: zod_1.z.string().optional(),
-        $fulltext: zod_1.z.string().optional(),
-        $contains: zod_1.z.array(primitiveSchema).optional(),
-        $overlap: zod_1.z.array(primitiveSchema).optional(),
-    })
-        .strict();
-    return zod_1.z.union([primitiveSchema, comparisonObjectSchema]);
-}
-function createFilterSchema() {
-    const comparisonSchema = createComparisonSchema();
-    const baseFilterSchema = zod_1.z.lazy(() => zod_1.z.union([
-        zod_1.z
-            .object({
-            $and: zod_1.z.array(baseFilterSchema).optional(),
-            $or: zod_1.z.array(baseFilterSchema).optional(),
-            $not: baseFilterSchema.optional(),
-        })
-            .catchall(comparisonSchema),
-        zod_1.z.record(zod_1.z.string(), comparisonSchema),
-    ]));
-    return baseFilterSchema;
-}
-const filterSchema = createFilterSchema();
+const mikro_orm_filter_query_schema_1 = require("mikro-orm-filter-query-schema");
 function parseJson(value) {
     if (typeof value === "string") {
         try {
@@ -74,13 +14,6 @@ function parseJson(value) {
     }
     return value;
 }
-function validateSchema(value) {
-    const result = filterSchema.safeParse(value);
-    if (!result.success) {
-        throw new Error(`Invalid filter: ${result.error.message}`);
-    }
-    return result.data;
-}
 function parseLiteralValue(ast) {
     switch (ast.kind) {
         case graphql_1.Kind.STRING:
@@ -107,103 +40,30 @@ function parseLiteralValue(ast) {
             throw new Error(`Unexpected AST kind: ${ast.kind}`);
     }
 }
-function validateFilterFields(filter, fieldOptionsMap, inFieldComparison = false) {
-    if (filter === null || typeof filter !== "object") {
-        return;
-    }
-    for (const key of Object.keys(filter)) {
-        if (logicalOperators.includes(key)) {
-            const value = filter[key];
-            if (key === "$not" && value !== null && typeof value === "object") {
-                validateFilterFields(value, fieldOptionsMap, false);
-            }
-            else if (Array.isArray(value)) {
-                for (const item of value) {
-                    validateFilterFields(item, fieldOptionsMap, false);
-                }
-            }
-            continue;
-        }
-        if (comparisonOperators.includes(key)) {
-            if (!inFieldComparison) {
-                throw new Error(`Comparison operator '${key}' is not allowed at root level. Use it inside a field object, e.g., { "fieldName": { "${key}": value } }`);
-            }
-            continue;
-        }
-        const fieldOptions = fieldOptionsMap.get(key);
-        if (typeof fieldOptions === "undefined") {
-            throw new errors_1.UnknownFieldError(key);
-        }
-        if (fieldOptions.filterable === false) {
-            throw new Error(`Field '${key}' is not filterable`);
-        }
-        const fieldValue = filter[key];
-        if (fieldValue !== null &&
-            typeof fieldValue === "object" &&
-            !Array.isArray(fieldValue)) {
-            validateFilterFields(fieldValue, fieldOptionsMap, true);
-        }
-    }
-}
-function applyReplacement(filter, fieldOptionsMap) {
-    if (filter === null || typeof filter !== "object") {
-        return filter;
-    }
-    const result = {};
-    for (const key of Object.keys(filter)) {
-        const value = filter[key];
-        if (logicalOperators.includes(key)) {
-            if (key === "$not" && value !== null && typeof value === "object") {
-                result[key] = applyReplacement(value, fieldOptionsMap);
-            }
-            else if (Array.isArray(value)) {
-                result[key] = value.map((item) => applyReplacement(item, fieldOptionsMap));
-            }
-            else {
-                result[key] = value;
-            }
-            continue;
-        }
-        const fieldOptions = fieldOptionsMap.get(key);
-        if (typeof fieldOptions !== "undefined") {
-            const replacement = fieldOptions
-                .replacement;
-            const targetKey = typeof replacement === "string" ? replacement : fieldOptions.field;
-            if (value !== null &&
-                typeof value === "object" &&
-                !Array.isArray(value)) {
-                result[targetKey] = applyReplacement(value, fieldOptionsMap);
-            }
-            else {
-                result[targetKey] = value;
-            }
-        }
-        else {
-            result[key] = value;
-        }
-    }
-    return result;
-}
-function createFilter(entityName, fieldOptionsMap) {
+function createFilter(entityName, fieldOptionsMap, filterOptions) {
     const filterableFields = [...fieldOptionsMap.values()]
-        .filter((field) => field.filterable)
+        .filter((field) => field.filterable !== false)
         .map((field) => field.field);
-    return new graphql_1.GraphQLScalarType({
+    const builder = new mikro_orm_filter_query_schema_1.FilterQuerySchemaBuilder(filterOptions);
+    for (const [, options] of fieldOptionsMap) {
+        if (options.filterable !== false) {
+            builder.addField(options);
+        }
+    }
+    const filterQuerySchema = builder.build();
+    const Filter = new graphql_1.GraphQLScalarType({
         name: `${entityName}Filter`,
         description: `A filter for ${entityName} that accepts MongoDB query syntax.\nSupported fields: ${filterableFields.join(", ")}`,
         serialize: (value) => value,
         parseValue: (value) => {
             const parsed = parseJson(value);
-            const validated = validateSchema(parsed);
-            validateFilterFields(validated, fieldOptionsMap);
-            return applyReplacement(validated, fieldOptionsMap);
+            return filterQuerySchema.parse(parsed);
         },
         parseLiteral: (ast) => {
             const parsed = parseLiteralValue(ast);
-            const validated = validateSchema(parsed);
-            validateFilterFields(validated, fieldOptionsMap);
-            return applyReplacement(validated, fieldOptionsMap);
+            return filterQuerySchema.parse(parsed);
         },
     });
+    return { Filter, filterQuerySchema };
 }
 //# sourceMappingURL=create-filter.js.map

package/dist/utils/create-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-filter.js","sourceRoot":"","sources":["../../src/utils/create-filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-filter.js","sourceRoot":"","sources":["../../src/utils/create-filter.ts"],"names":[],"mappings":"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"}

package/dist/utils/create-order.d.ts

@@ -1,7 +1,8 @@
 import { type Type } from "@nestjs/common";
+import type { FieldType } from "mikro-orm-filter-query-schema";
 import { FieldOptions, OrderFieldType, OrderInterface } from "../interfaces";
 export interface CreateOrderResult<Entity extends object> {
     Order: Type<OrderInterface<Entity>>;
     OrderField: OrderFieldType<Entity>;
 }
-export declare function createOrder<Entity extends object>(entityName: string, fieldOptionsMap: Map<string, FieldOptions<Entity, any, any>>): CreateOrderResult<Entity>;
+export declare function createOrder<Entity extends object>(entityName: string, fieldOptionsMap: Map<string, FieldOptions<Entity, FieldType, string>>): CreateOrderResult<Entity>;

package/dist/utils/create-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-order.js","sourceRoot":"","sources":["../../src/utils/create-order.ts"],"names":[],"mappings":";;;;;;;;;;;AAmBA,kCA2CC;AA9DD,gDAAwE;AAExE,2CAA6D;AAE7D,oCAA0C;AAe1C,SAAgB,WAAW,CACzB,UAAkB,EAClB,eAA4D;IAE5D,MAAM,kBAAkB,GAAG,IAAA,qBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACtD,MAAM,8BAA8B,GAAG,IAAA,sBAAS,EAAC,IAAA,qBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7E,MAAM,cAAc,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACzD,CAAC,KAAK,EAAE,EAAE,CAAE,KAA8B,EAAE,QAAQ,CACrD,CAAC;IAEF,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CACtC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;QACvB,OAAO;YACL,GAAG,MAAM;YACT,CAAC,IAAA,uBAAU,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,EAC3C,YAAgD,CAAC,WAAW;gBAC7D,YAAY,CAAC,KAAK;SACrB,CAAC;IACJ,CAAC,EACD,EAAE,EAAE,EAAE,IAAI,EAAuC,CAClD,CAAC;IAEF,IAAA,0BAAgB,EAAC,UAAU,EAAE;QAC3B,IAAI,EAAE,GAAG,UAAU,YAAY;QAC/B,WAAW,EAAE,uBAAuB,kBAAkB,8BAA8B;KACrF,CAAC,CAAC;IAKH,IAAM,KAAK,GAAX,MAAM,KAAK;KASV,CAAA;IAJC;QAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,UAAoB,EAAE;YACjC,WAAW,EAAE,sBAAsB,8BAA8B,MAAM;SACxE,CAAC;;wCAC4B;IAG9B;QADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,sBAAc,EAAE,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;;4CAC7C;IARvB,KAAK;QAHV,IAAA,mBAAS,EAAC,GAAG,UAAU,OAAO,EAAE;YAC/B,WAAW,EAAE,wBAAwB,kBAAkB,cAAc;SACtE,CAAC;OACI,KAAK,CASV;IAED,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"create-order.js","sourceRoot":"","sources":["../../src/utils/create-order.ts"],"names":[],"mappings":";;;;;;;;;;;AAmBA,kCA2CC;AA9DD,gDAAwE;AAExE,2CAA6D;AAG7D,oCAA0C;AAc1C,SAAgB,WAAW,CACzB,UAAkB,EAClB,eAAqE;IAErE,MAAM,kBAAkB,GAAG,IAAA,qBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACtD,MAAM,8BAA8B,GAAG,IAAA,sBAAS,EAAC,IAAA,qBAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7E,MAAM,cAAc,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACzD,CAAC,KAAK,EAAE,EAAE,CAAE,KAA8B,EAAE,QAAQ,CACrD,CAAC;IAEF,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CACtC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;QACvB,OAAO;YACL,GAAG,MAAM;YACT,CAAC,IAAA,uBAAU,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,EAC3C,YAAyC,CAAC,WAAW;gBACtD,YAAY,CAAC,KAAK;SACrB,CAAC;IACJ,CAAC,EACD,EAAE,EAAE,EAAE,IAAI,EAAuC,CAClD,CAAC;IAEF,IAAA,0BAAgB,EAAC,UAAU,EAAE;QAC3B,IAAI,EAAE,GAAG,UAAU,YAAY;QAC/B,WAAW,EAAE,uBAAuB,kBAAkB,8BAA8B;KACrF,CAAC,CAAC;IAKH,IAAM,KAAK,GAAX,MAAM,KAAK;KASV,CAAA;IAJC;QAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,UAAoB,EAAE;YACjC,WAAW,EAAE,sBAAsB,8BAA8B,MAAM;SACxE,CAAC;;wCAC4B;IAG9B;QADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,sBAAc,EAAE,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;;4CAC7C;IARvB,KAAK;QAHV,IAAA,mBAAS,EAAC,GAAG,UAAU,OAAO,EAAE;YAC/B,WAAW,EAAE,wBAAwB,kBAAkB,cAAc;SACtE,CAAC;OACI,KAAK,CASV;IAED,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AAC/B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-boot/graphql-connection",
-  "version": "7.3.0",
+  "version": "7.5.0",
   "description": "",
   "author": "d4rkcr0w <me@d4rkcr0w.com>",
   "homepage": "",
@@ -14,10 +14,11 @@
     "dist"
   ],
   "dependencies": {
-    "chevrotain": "10.5.0",
     "inflection": "^3.0.2",
     "lodash": "^4.17.21",
-    "zod": "^3.25.67"
+    "mikro-orm-filter-query-schema": "^1.1.0",
+    "search-syntax": "^3.5.0",
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.5.8",
@@ -39,7 +40,7 @@
     "rxjs": "^7.8.2",
     "ts-jest": "^29.4.4",
     "typescript": "^5.9.3",
-    "@nest-boot/eslint-config": "^7.0.1",
+    "@nest-boot/eslint-config": "^7.0.2",
     "@nest-boot/eslint-plugin": "^7.0.2",
     "@nest-boot/graphql": "^7.1.1",
     "@nest-boot/tsconfig": "^7.0.0"

package/dist/enums/comparator-operator.enum.d.ts

@@ -1,11 +0,0 @@
-export declare enum ComparatorOperator {
-    EQ = "$eq",
-    LT = "$lt",
-    GT = "$gt",
-    LTE = "$lte",
-    GTE = "$gte",
-    IN = "$in",
-    CONTAINS = "$contains",
-    FULLTEXT = "$fulltext",
-    LIKE = "$like"
-}

package/dist/enums/comparator-operator.enum.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComparatorOperator = void 0;
-var ComparatorOperator;
-(function (ComparatorOperator) {
-    ComparatorOperator["EQ"] = "$eq";
-    ComparatorOperator["LT"] = "$lt";
-    ComparatorOperator["GT"] = "$gt";
-    ComparatorOperator["LTE"] = "$lte";
-    ComparatorOperator["GTE"] = "$gte";
-    ComparatorOperator["IN"] = "$in";
-    ComparatorOperator["CONTAINS"] = "$contains";
-    ComparatorOperator["FULLTEXT"] = "$fulltext";
-    ComparatorOperator["LIKE"] = "$like";
-})(ComparatorOperator || (exports.ComparatorOperator = ComparatorOperator = {}));
-//# sourceMappingURL=comparator-operator.enum.js.map

package/dist/enums/comparator-operator.enum.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"comparator-operator.enum.js","sourceRoot":"","sources":["../../src/enums/comparator-operator.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAUX;AAVD,WAAY,kBAAkB;IAC5B,gCAAU,CAAA;IACV,gCAAU,CAAA;IACV,gCAAU,CAAA;IACV,kCAAY,CAAA;IACZ,kCAAY,CAAA;IACZ,gCAAU,CAAA;IACV,4CAAsB,CAAA;IACtB,4CAAsB,CAAA;IACtB,oCAAc,CAAA;AAChB,CAAC,EAVW,kBAAkB,kCAAlB,kBAAkB,QAU7B"}

package/dist/errors/index.d.ts

@@ -1 +0,0 @@
-export * from "./unknown-field.error";

package/dist/errors/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./unknown-field.error"), exports);
-//# sourceMappingURL=index.js.map

package/dist/errors/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC"}

package/dist/errors/unknown-field.error.d.ts

@@ -1,4 +0,0 @@
-export declare class UnknownFieldError extends Error {
-    readonly field: string;
-    constructor(field: string);
-}

package/dist/errors/unknown-field.error.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnknownFieldError = void 0;
-class UnknownFieldError extends Error {
-    constructor(field) {
-        super(`Unknown field: ${field}`);
-        this.field = field;
-        this.name = "UnknownFieldError";
-    }
-}
-exports.UnknownFieldError = UnknownFieldError;
-//# sourceMappingURL=unknown-field.error.js.map

package/dist/errors/unknown-field.error.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"unknown-field.error.js","sourceRoot":"","sources":["../../src/errors/unknown-field.error.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YAA4B,KAAa;QACvC,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;QADP,UAAK,GAAL,KAAK,CAAQ;QAEvC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AALD,8CAKC"}

package/dist/interfaces/field-options.interface.d.ts

@@ -1,24 +0,0 @@
-import type { FilterQuery } from "@mikro-orm/core";
-import { AutoPath } from "@mikro-orm/core/typings";
-import { ReplacementArgs } from "./replacement-args.interface";
-export interface BaseFieldOptions<Type extends "string" | "number" | "bigint" | "boolean" | "date" = never> {
-    type: Type;
-    field: string;
-    array?: boolean;
-    fulltext?: boolean;
-    searchable?: boolean;
-    filterable?: boolean;
-}
-export interface SortableFieldOptions<Type extends "string" | "number" | "bigint" | "boolean" | "date" = never> extends BaseFieldOptions<Type> {
-    sortable?: boolean;
-}
-export interface SimpleFieldOptions<Entity extends object, Type extends "string" | "number" | "bigint" | "boolean" | "date" = never> extends SortableFieldOptions<Type> {
-    field: Extract<keyof Entity, string>;
-}
-export interface ReplacementFieldOptions<Entity extends object, Type extends "string" | "number" | "bigint" | "boolean" | "date" = never, Field extends string = never> extends SortableFieldOptions<Type> {
-    replacement: Extract<AutoPath<Entity, Field>, string>;
-}
-export interface ReplacementFunctionFieldOptions<Entity extends object, Type extends "string" | "number" | "bigint" | "boolean" | "date" = never> extends BaseFieldOptions<Type> {
-    replacement?: (args: ReplacementArgs<Type>) => FilterQuery<Entity>;
-}
-export type FieldOptions<Entity extends object, Type extends "string" | "number" | "bigint" | "boolean" | "date" = never, Field extends string = never> = SimpleFieldOptions<Entity, Type> | ReplacementFieldOptions<Entity, Type, Field> | ReplacementFunctionFieldOptions<Entity, Type>;

package/dist/interfaces/field-options.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"field-options.interface.js","sourceRoot":"","sources":["../../src/interfaces/field-options.interface.ts"],"names":[],"mappings":""}

package/dist/interfaces/replacement-args.interface.d.ts

@@ -1,9 +0,0 @@
-import { EntityManager } from "@mikro-orm/core";
-import { type ComparatorOperator } from "../enums";
-export interface ReplacementArgs<Type extends "string" | "number" | "bigint" | "boolean" | "date" = never> {
-    entityManager: EntityManager;
-    type: Type;
-    field: string;
-    operator: ComparatorOperator;
-    value: (Type extends "string" ? string : Type extends "number" ? number : Type extends "bigint" ? bigint : Type extends "boolean" ? boolean : Date) | (Type extends "string" ? string : Type extends "number" ? number : Type extends "bigint" ? bigint : Type extends "boolean" ? boolean : Date)[];
-}

package/dist/interfaces/replacement-args.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"replacement-args.interface.js","sourceRoot":"","sources":["../../src/interfaces/replacement-args.interface.ts"],"names":[],"mappings":""}

package/dist/interfaces/search-syntax-field-options.interface.d.ts

@@ -1,12 +0,0 @@
-import type { FilterQuery } from "@mikro-orm/core";
-import { AutoPath } from "@mikro-orm/core/typings";
-import { ReplacementArgs } from "./replacement-args.interface";
-export interface SearchSyntaxFieldOptions<Entity extends object, Fields extends string = never, Type extends "string" | "number" | "bigint" | "boolean" | "date" = never> {
-    field: string;
-    type: Type;
-    replacement?: AutoPath<Entity, Fields> | ((args: ReplacementArgs<Type>) => FilterQuery<Entity>);
-    array?: boolean;
-    fulltext?: boolean;
-    searchable?: boolean;
-    filterable?: boolean;
-}

package/dist/interfaces/search-syntax-field-options.interface.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=search-syntax-field-options.interface.js.map

package/dist/interfaces/search-syntax-field-options.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"search-syntax-field-options.interface.js","sourceRoot":"","sources":["../../src/interfaces/search-syntax-field-options.interface.ts"],"names":[],"mappings":""}

package/dist/scripts/generate-cst-dts.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/scripts/generate-cst-dts.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const chevrotain_1 = require("chevrotain");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const search_syntax_parser_1 = require("../search-syntax.parser");
-(0, fs_1.writeFileSync)((0, path_1.resolve)(__dirname, "./cst.d.ts"), `/* eslint-disable */\n${(0, chevrotain_1.generateCstDts)(search_syntax_parser_1.searchSyntaxParser.getGAstProductions())}`);
-//# sourceMappingURL=generate-cst-dts.js.map

package/dist/scripts/generate-cst-dts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate-cst-dts.js","sourceRoot":"","sources":["../../src/scripts/generate-cst-dts.ts"],"names":[],"mappings":";;AAAA,2CAA4C;AAC5C,2BAAmC;AACnC,+BAA+B;AAE/B,kEAA6D;AAE7D,IAAA,kBAAa,EACX,IAAA,cAAO,EAAC,SAAS,EAAE,YAAY,CAAC,EAChC,yBAAyB,IAAA,2BAAc,EAAC,yCAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,CACnF,CAAC"}

package/dist/search-syntax.lexer.d.ts

@@ -1,5 +0,0 @@
-import { Lexer } from "chevrotain";
-export declare class SearchSyntaxLexer extends Lexer {
-    constructor();
-}
-export declare const searchSyntaxLexer: SearchSyntaxLexer;

package/dist/search-syntax.lexer.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchSyntaxLexer = exports.SearchSyntaxLexer = void 0;
-const chevrotain_1 = require("chevrotain");
-const tokens_1 = require("./tokens");
-class SearchSyntaxLexer extends chevrotain_1.Lexer {
-    constructor() {
-        super(tokens_1.tokens);
-    }
-}
-exports.SearchSyntaxLexer = SearchSyntaxLexer;
-exports.searchSyntaxLexer = new SearchSyntaxLexer();
-//# sourceMappingURL=search-syntax.lexer.js.map

package/dist/search-syntax.lexer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"search-syntax.lexer.js","sourceRoot":"","sources":["../src/search-syntax.lexer.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AAEnC,qCAAkC;AAElC,MAAa,iBAAkB,SAAQ,kBAAK;IAC1C;QACE,KAAK,CAAC,eAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,8CAIC;AAEY,QAAA,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC"}

package/dist/search-syntax.parser.d.ts

@@ -1,6 +0,0 @@
-import { CstParser } from "chevrotain";
-export declare class SearchSyntaxParser extends CstParser {
-    [key: string]: any;
-    constructor();
-}
-export declare const searchSyntaxParser: SearchSyntaxParser;