qast 1.1.0 → 2.0.0

package/dist/integrations/express.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.qastExpressMiddleware = qastExpressMiddleware;
+const index_1 = require("../index");
+const errors_1 = require("../errors");
+/**
+ * Express middleware for parsing QAST queries
+ */
+function qastExpressMiddleware(options) {
+    return (req, res, next) => {
+        try {
+            const queryString = req.query.filter;
+            if (queryString) {
+                const qastQuery = (0, index_1.parseQueryFull)(queryString, options);
+                req.qastQuery = qastQuery;
+                req.qastFilter = qastQuery.filter; // For backward compatibility
+            }
+            next();
+        }
+        catch (error) {
+            if (error instanceof errors_1.ValidationError) {
+                res.status(400).json({
+                    error: error.message,
+                    details: error.getSnippet ? error.getSnippet() : undefined,
+                });
+            }
+            else {
+                next(error);
+            }
+        }
+    };
+}
+//# sourceMappingURL=express.js.map

package/dist/integrations/express.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/integrations/express.ts"],"names":[],"mappings":";;AAeA,sDAuBC;AArCD,oCAA4E;AAC5E,sCAA4C;AAU5C;;GAEG;AACH,SAAgB,qBAAqB,CAAC,OAAsB;IAC1D,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;QAC/D,IAAI,CAAC;YACH,MAAM,WAAW,GAAI,GAAG,CAAC,KAAa,CAAC,MAA4B,CAAC;YAEpE,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,SAAS,GAAG,IAAA,sBAAc,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACtD,GAAmB,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC1C,GAAmB,CAAC,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,6BAA6B;YACnF,CAAC;YAED,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,wBAAe,EAAE,CAAC;gBACrC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,KAAK,CAAC,OAAO;oBACpB,OAAO,EAAG,KAAa,CAAC,UAAU,CAAC,CAAC,CAAE,KAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS;iBAC7E,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/integrations/fastify.d.ts

@@ -0,0 +1,17 @@
+import { FastifyRequest, FastifyPluginOptions } from 'fastify';
+import { ParseOptions, QueryAST, QastNode } from '../index';
+/**
+ * Fastify request with parsed QAST filter
+ */
+export interface QastFastifyRequest extends FastifyRequest {
+    qastFilter?: QastNode;
+    qastQuery?: QueryAST;
+}
+/**
+ * Fastify plugin for QAST query parsing
+ */
+export declare function qastPlugin(fastify: any, options: FastifyPluginOptions & {
+    parseOptions?: ParseOptions;
+}): Promise<void>;
+export default qastPlugin;
+//# sourceMappingURL=fastify.d.ts.map

package/dist/integrations/fastify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../../src/integrations/fastify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAkB,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAG5E;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,SAAS,CAAC,EAAE,QAAQ,CAAC;CACtB;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,oBAAoB,GAAG;IAAE,YAAY,CAAC,EAAE,YAAY,CAAA;CAAE,GAC9D,OAAO,CAAC,IAAI,CAAC,CAyBf;AAGD,eAAe,UAAU,CAAC"}

package/dist/integrations/fastify.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.qastPlugin = qastPlugin;
+const index_1 = require("../index");
+const errors_1 = require("../errors");
+/**
+ * Fastify plugin for QAST query parsing
+ */
+async function qastPlugin(fastify, options) {
+    const parseOptions = options.parseOptions;
+    fastify.decorateRequest('qastFilter', null);
+    fastify.decorateRequest('qastQuery', null);
+    fastify.addHook('onRequest', async (request, reply) => {
+        const queryString = request.query?.filter;
+        if (queryString) {
+            try {
+                request.qastQuery = (0, index_1.parseQueryFull)(queryString, parseOptions);
+                request.qastFilter = request.qastQuery.filter;
+            }
+            catch (error) {
+                if (error instanceof errors_1.ValidationError) {
+                    reply.code(400).send({
+                        error: error.message,
+                        suggestions: error.getSuggestions(),
+                    });
+                    return;
+                }
+                throw error;
+            }
+        }
+    });
+}
+// Export plugin with default name
+exports.default = qastPlugin;
+//# sourceMappingURL=fastify.js.map

package/dist/integrations/fastify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../../src/integrations/fastify.ts"],"names":[],"mappings":";;AAeA,gCA4BC;AA1CD,oCAA4E;AAC5E,sCAA4C;AAU5C;;GAEG;AACI,KAAK,UAAU,UAAU,CAC9B,OAAY,EACZ,OAA+D;IAE/D,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAE1C,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5C,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAE3C,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,OAA2B,EAAE,KAAmB,EAAE,EAAE;QACtF,MAAM,WAAW,GAAI,OAAO,CAAC,KAA6B,EAAE,MAA4B,CAAC;QAEzF,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,OAAO,CAAC,SAAS,GAAG,IAAA,sBAAc,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBAC9D,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;YAChD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,wBAAe,EAAE,CAAC;oBACrC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,KAAK,EAAE,KAAK,CAAC,OAAO;wBACpB,WAAW,EAAE,KAAK,CAAC,cAAc,EAAE;qBACpC,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kCAAkC;AAClC,kBAAe,UAAU,CAAC"}

package/dist/integrations/hono.d.ts

@@ -0,0 +1,14 @@
+import { Context, Next } from 'hono';
+import { ParseOptions, QueryAST, QastNode } from '../index';
+/**
+ * Hono context with parsed QAST filter
+ */
+export interface QastContext extends Context {
+    qastFilter?: QastNode;
+    qastQuery?: QueryAST;
+}
+/**
+ * Hono middleware for parsing QAST queries
+ */
+export declare function qastMiddleware(options?: ParseOptions): (c: QastContext, next: Next) => Promise<void>;
+//# sourceMappingURL=hono.d.ts.map

package/dist/integrations/hono.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hono.d.ts","sourceRoot":"","sources":["../../src/integrations/hono.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAkB,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAG5E;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,SAAS,CAAC,EAAE,QAAQ,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,YAAY,IACrC,GAAG,WAAW,EAAE,MAAM,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC,CAuBzD"}

package/dist/integrations/hono.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.qastMiddleware = qastMiddleware;
+const index_1 = require("../index");
+const errors_1 = require("../errors");
+/**
+ * Hono middleware for parsing QAST queries
+ */
+function qastMiddleware(options) {
+    return async (c, next) => {
+        const queryString = c.req.query('filter') || undefined;
+        if (queryString) {
+            try {
+                c.qastQuery = (0, index_1.parseQueryFull)(queryString, options);
+                c.qastFilter = c.qastQuery.filter;
+            }
+            catch (error) {
+                if (error instanceof errors_1.ValidationError) {
+                    return c.json({
+                        error: error.message,
+                        suggestions: error.getSuggestions(),
+                    }, 400);
+                }
+                throw error;
+            }
+        }
+        await next();
+    };
+}
+//# sourceMappingURL=hono.js.map

package/dist/integrations/hono.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hono.js","sourceRoot":"","sources":["../../src/integrations/hono.ts"],"names":[],"mappings":";;AAeA,wCAwBC;AAtCD,oCAA4E;AAC5E,sCAA4C;AAU5C;;GAEG;AACH,SAAgB,cAAc,CAAC,OAAsB;IACnD,OAAO,KAAK,EAAE,CAAc,EAAE,IAAU,EAAiB,EAAE;QACzD,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;QAEvD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,CAAC,CAAC,SAAS,GAAG,IAAA,sBAAc,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACnD,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,wBAAe,EAAE,CAAC;oBACrC,OAAO,CAAC,CAAC,IAAI,CACX;wBACE,KAAK,EAAE,KAAK,CAAC,OAAO;wBACpB,WAAW,EAAE,KAAK,CAAC,cAAc,EAAE;qBACpC,EACD,GAAG,CACG,CAAC;gBACX,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAED,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}

package/dist/integrations/nestjs.d.ts

@@ -0,0 +1,23 @@
+import { PipeTransform, ArgumentMetadata } from '@nestjs/common';
+import { ParseOptions, QueryAST, QastNode } from '../index';
+/**
+ * NestJS pipe for parsing QAST queries from query parameters
+ */
+export declare class QastPipe implements PipeTransform {
+    private readonly options?;
+    constructor(options?: ParseOptions | undefined);
+    transform(value: any, _metadata: ArgumentMetadata): QastNode;
+}
+/**
+ * NestJS pipe for parsing full QAST queries (with sorting and pagination)
+ */
+export declare class QastFullPipe implements PipeTransform {
+    private readonly options?;
+    constructor(options?: ParseOptions | undefined);
+    transform(value: any, _metadata: ArgumentMetadata): QueryAST;
+}
+/**
+ * NestJS decorator for extracting query filter from request
+ */
+export declare function QastQuery(_options?: ParseOptions): ParameterDecorator;
+//# sourceMappingURL=nestjs.d.ts.map

package/dist/integrations/nestjs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nestjs.d.ts","sourceRoot":"","sources":["../../src/integrations/nestjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,gBAAgB,EAAuB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAA8B,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGxF;;GAEG;AACH,qBACa,QAAS,YAAW,aAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAR,OAAO,CAAC,EAAE,YAAY,YAAA;IAEnD,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,gBAAgB,GAAG,QAAQ;CAiB7D;AAED;;GAEG;AACH,qBACa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAR,OAAO,CAAC,EAAE,YAAY,YAAA;IAEnD,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,gBAAgB,GAAG,QAAQ;CAiB7D;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,CAAC,EAAE,YAAY,GAAG,kBAAkB,CAKrE"}

package/dist/integrations/nestjs.js

@@ -0,0 +1,137 @@
+"use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QastFullPipe = exports.QastPipe = void 0;
+exports.QastQuery = QastQuery;
+const common_1 = require("@nestjs/common");
+const index_1 = require("../index");
+const errors_1 = require("../errors");
+/**
+ * NestJS pipe for parsing QAST queries from query parameters
+ */
+let QastPipe = (() => {
+    let _classDecorators = [(0, common_1.Injectable)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var QastPipe = _classThis = class {
+        constructor(options) {
+            this.options = options;
+        }
+        transform(value, _metadata) {
+            if (typeof value !== 'string') {
+                throw new common_1.BadRequestException('Query filter must be a string');
+            }
+            try {
+                return (0, index_1.parseQuery)(value, this.options);
+            }
+            catch (error) {
+                if (error instanceof errors_1.ValidationError || error instanceof errors_1.ParseError) {
+                    throw new common_1.BadRequestException({
+                        message: error.message,
+                        suggestions: error.getSuggestions ? error.getSuggestions() : [],
+                    });
+                }
+                throw new common_1.BadRequestException('Invalid query format');
+            }
+        }
+    };
+    __setFunctionName(_classThis, "QastPipe");
+    (() => {
+        const _metadata_1 = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata_1 }, null, _classExtraInitializers);
+        QastPipe = _classThis = _classDescriptor.value;
+        if (_metadata_1) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata_1 });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return QastPipe = _classThis;
+})();
+exports.QastPipe = QastPipe;
+/**
+ * NestJS pipe for parsing full QAST queries (with sorting and pagination)
+ */
+let QastFullPipe = (() => {
+    let _classDecorators = [(0, common_1.Injectable)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var QastFullPipe = _classThis = class {
+        constructor(options) {
+            this.options = options;
+        }
+        transform(value, _metadata) {
+            if (typeof value !== 'string') {
+                throw new common_1.BadRequestException('Query filter must be a string');
+            }
+            try {
+                return (0, index_1.parseQueryFull)(value, this.options);
+            }
+            catch (error) {
+                if (error instanceof errors_1.ValidationError || error instanceof errors_1.ParseError) {
+                    throw new common_1.BadRequestException({
+                        message: error.message,
+                        suggestions: error.getSuggestions ? error.getSuggestions() : [],
+                    });
+                }
+                throw new common_1.BadRequestException('Invalid query format');
+            }
+        }
+    };
+    __setFunctionName(_classThis, "QastFullPipe");
+    (() => {
+        const _metadata_1 = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata_1 }, null, _classExtraInitializers);
+        QastFullPipe = _classThis = _classDescriptor.value;
+        if (_metadata_1) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata_1 });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return QastFullPipe = _classThis;
+})();
+exports.QastFullPipe = QastFullPipe;
+/**
+ * NestJS decorator for extracting query filter from request
+ */
+function QastQuery(_options) {
+    return (_target, _propertyKey, _parameterIndex) => {
+        // This is a simple decorator - actual implementation would use NestJS's metadata system
+        // In practice, you'd use it with @Query('filter') and the QastPipe
+    };
+}
+//# sourceMappingURL=nestjs.js.map

package/dist/integrations/nestjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nestjs.js","sourceRoot":"","sources":["../../src/integrations/nestjs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DA,8BAKC;AAhED,2CAAkG;AAClG,oCAAwF;AACxF,sCAAwD;AAExD;;GAEG;IAEU,QAAQ;4BADpB,IAAA,mBAAU,GAAE;;;;;QAEX,YAA6B,OAAsB;YAAtB,YAAO,GAAP,OAAO,CAAe;QAAG,CAAC;QAEvD,SAAS,CAAC,KAAU,EAAE,SAA2B;YAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,IAAI,4BAAmB,CAAC,+BAA+B,CAAC,CAAC;YACjE,CAAC;YAED,IAAI,CAAC;gBACH,OAAO,IAAA,kBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,wBAAe,IAAI,KAAK,YAAY,mBAAU,EAAE,CAAC;oBACpE,MAAM,IAAI,4BAAmB,CAAC;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE;qBAChE,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,IAAI,4BAAmB,CAAC,sBAAsB,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;;;;;QAnBH,+KAoBC;;;QApBY,uDAAQ;;;;AAAR,4BAAQ;AAsBrB;;GAEG;IAEU,YAAY;4BADxB,IAAA,mBAAU,GAAE;;;;;QAEX,YAA6B,OAAsB;YAAtB,YAAO,GAAP,OAAO,CAAe;QAAG,CAAC;QAEvD,SAAS,CAAC,KAAU,EAAE,SAA2B;YAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,IAAI,4BAAmB,CAAC,+BAA+B,CAAC,CAAC;YACjE,CAAC;YAED,IAAI,CAAC;gBACH,OAAO,IAAA,sBAAc,EAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,wBAAe,IAAI,KAAK,YAAY,mBAAU,EAAE,CAAC;oBACpE,MAAM,IAAI,4BAAmB,CAAC;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE;qBAChE,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,IAAI,4BAAmB,CAAC,sBAAsB,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;;;;;QAnBH,+KAoBC;;;QApBY,uDAAY;;;;AAAZ,oCAAY;AAsBzB;;GAEG;AACH,SAAgB,SAAS,CAAC,QAAuB;IAC/C,OAAO,CAAC,OAAY,EAAE,YAAyC,EAAE,eAAuB,EAAE,EAAE;QAC1F,wFAAwF;QACxF,mEAAmE;IACrE,CAAC,CAAC;AACJ,CAAC"}

package/dist/parser/parser.d.ts

@@ -1,5 +1,5 @@
 import { Token } from './tokenizer';
-import { QastNode } from '../types/ast';
+import { QastNode, QueryAST } from '../types/ast';
 /**
  * Parser for QAST query strings
  * Grammar:
@@ -25,11 +25,11 @@ export declare class Parser {
      */
     private check;
     /**
-     * Parse a factor: IDENTIFIER OPERATOR VALUE
+     * Parse a factor: IDENTIFIER OPERATOR VALUE | IDENTIFIER between VALUE and VALUE | IDENTIFIER (isNull|isNotNull)
      */
     private parseFactor;
     /**
-     * Parse a term: factor | "(" expression ")"
+     * Parse a term: factor | "(" expression ")" | "not" term
      */
     private parseTerm;
     /**
@@ -38,12 +38,20 @@ export declare class Parser {
      */
     private parseExpression;
     /**
-     * Parse the query and return the AST
+     * Parse orderBy clause: orderBy field (asc|desc) (, field (asc|desc))*
      */
-    parse(): QastNode;
+    private parseOrderBy;
+    /**
+     * Parse the query and return the QueryAST
+     */
+    parse(): QueryAST;
 }
 /**
- * Parse a query string into an AST
+ * Parse a query string into a QueryAST
+ */
+export declare function parseQueryString(query: string): QueryAST;
+/**
+ * Parse a query string into just the filter AST (backward compatibility)
  */
-export declare function parseQueryString(query: string): QastNode;
+export declare function parseQueryStringFilter(query: string): QastNode;
 //# sourceMappingURL=parser.d.ts.map

package/dist/parser/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAa,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAA4B,MAAM,cAAc,CAAC;AAGlE;;;;;;GAMG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAQ;gBAEhB,MAAM,EAAE,KAAK,EAAE;IAM3B;;OAEG;IACH,OAAO,CAAC,OAAO;IASf;;OAEG;IACH,OAAO,CAAC,MAAM;IAYd;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;OAEG;IACH,OAAO,CAAC,WAAW;IAoCnB;;OAEG;IACH,OAAO,CAAC,SAAS;IAajB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAyBvB;;OAEG;IACI,KAAK,IAAI,QAAQ;CAmBzB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,CAYxD"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAa,MAAM,aAAa,CAAC;AAC1D,OAAO,EACL,QAAQ,EAMR,QAAQ,EAGT,MAAM,cAAc,CAAC;AAGtB;;;;;;GAMG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAQ;gBAEhB,MAAM,EAAE,KAAK,EAAE;IAM3B;;OAEG;IACH,OAAO,CAAC,OAAO;IASf;;OAEG;IACH,OAAO,CAAC,MAAM;IAYd;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;OAEG;IACH,OAAO,CAAC,WAAW;IAsEnB;;OAEG;IACH,OAAO,CAAC,SAAS;IAuBjB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAiCvB;;OAEG;IACH,OAAO,CAAC,YAAY;IA+BpB;;OAEG;IACI,KAAK,IAAI,QAAQ;CAoCzB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,CAYxD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,CAG9D"}

package/dist/parser/parser.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
 exports.parseQueryString = parseQueryString;
+exports.parseQueryStringFilter = parseQueryStringFilter;
 const tokenizer_1 = require("./tokenizer");
 const errors_1 = require("../errors");
 /**
@@ -48,22 +49,52 @@ class Parser {
         return this.currentToken.type === type;
     }
     /**
-     * Parse a factor: IDENTIFIER OPERATOR VALUE
+     * Parse a factor: IDENTIFIER OPERATOR VALUE | IDENTIFIER between VALUE and VALUE | IDENTIFIER (isNull|isNotNull)
      */
     parseFactor() {
         // Get field name (identifier)
         const fieldToken = this.expect(tokenizer_1.TokenType.IDENTIFIER, 'Expected field name (identifier)');
         const field = fieldToken.value;
+        // Check for isNull/isNotNull
+        if (this.check(tokenizer_1.TokenType.IS_NULL)) {
+            this.advance();
+            return {
+                type: 'NULL_CHECK',
+                field,
+                isNull: true,
+            };
+        }
+        if (this.check(tokenizer_1.TokenType.IS_NOT_NULL)) {
+            this.advance();
+            return {
+                type: 'NULL_CHECK',
+                field,
+                isNull: false,
+            };
+        }
+        // Check for between operator
+        if (this.check(tokenizer_1.TokenType.BETWEEN)) {
+            this.advance(); // Skip 'between'
+            const minToken = this.expect(tokenizer_1.TokenType.VALUE, 'Expected value after between');
+            this.expect(tokenizer_1.TokenType.AND_KEYWORD, 'Expected "and" after between value');
+            const maxToken = this.expect(tokenizer_1.TokenType.VALUE, 'Expected value after and');
+            return {
+                type: 'BETWEEN',
+                field,
+                min: minToken.value,
+                max: maxToken.value,
+            };
+        }
         // Get operator
-        const operatorToken = this.expect(tokenizer_1.TokenType.OPERATOR, 'Expected operator (eq, ne, gt, lt, gte, lte, in, contains)');
+        const operatorToken = this.expect(tokenizer_1.TokenType.OPERATOR, 'Expected operator');
         const op = operatorToken.value;
         // Get value
         const valueToken = this.expect(tokenizer_1.TokenType.VALUE, 'Expected value');
         const value = valueToken.value;
         // Validate operator and value combination
-        if (op === 'in') {
+        if (op === 'in' || op === 'notIn') {
             if (!Array.isArray(value)) {
-                throw new errors_1.ParseError(`Operator 'in' requires an array value, got ${typeof value} at position ${valueToken.position}`);
+                throw new errors_1.ParseError(`Operator '${op}' requires an array value, got ${typeof value} at position ${valueToken.position}`);
             }
         }
         return {
@@ -74,9 +105,18 @@ class Parser {
         };
     }
     /**
-     * Parse a term: factor | "(" expression ")"
+     * Parse a term: factor | "(" expression ")" | "not" term
      */
     parseTerm() {
+        // Check for NOT operator
+        if (this.check(tokenizer_1.TokenType.NOT)) {
+            this.advance(); // Skip 'not'
+            const operand = this.parseTerm();
+            return {
+                type: 'NOT',
+                operand,
+            };
+        }
         if (this.check(tokenizer_1.TokenType.PAREN_OPEN)) {
             // Handle parentheses: "(" expression ")"
             this.advance(); // Skip '('
@@ -96,10 +136,17 @@ class Parser {
     parseExpression() {
         let left = this.parseTerm();
         // Process logical operators (left-associative)
-        while (this.check(tokenizer_1.TokenType.LOGICAL_OP) &&
+        // Note: "and" is tokenized as AND_KEYWORD, but we treat it as a logical operator here
+        while ((this.check(tokenizer_1.TokenType.LOGICAL_OP) || this.check(tokenizer_1.TokenType.AND_KEYWORD)) &&
             this.currentToken.type !== tokenizer_1.TokenType.EOF) {
             const logicalOpToken = this.currentToken;
-            const logicalOp = logicalOpToken.value.toUpperCase();
+            let logicalOp;
+            if (this.check(tokenizer_1.TokenType.AND_KEYWORD)) {
+                logicalOp = 'AND';
+            }
+            else {
+                logicalOp = logicalOpToken.value.toUpperCase();
+            }
             this.advance(); // Skip logical operator
             const right = this.parseTerm();
             // Create logical node (left-associative)
@@ -112,24 +159,72 @@ class Parser {
         return left;
     }
     /**
-     * Parse the query and return the AST
+     * Parse orderBy clause: orderBy field (asc|desc) (, field (asc|desc))*
+     */
+    parseOrderBy() {
+        const orderBy = [];
+        // Parse first field
+        const fieldToken = this.expect(tokenizer_1.TokenType.IDENTIFIER, 'Expected field name after orderBy');
+        let direction = 'asc';
+        if (this.check(tokenizer_1.TokenType.ASC) || this.check(tokenizer_1.TokenType.DESC)) {
+            direction = this.currentToken.value.toLowerCase();
+            this.advance();
+        }
+        orderBy.push({ field: fieldToken.value, direction });
+        // Parse additional fields
+        while (this.check(tokenizer_1.TokenType.COMMA)) {
+            this.advance(); // Skip comma
+            const nextFieldToken = this.expect(tokenizer_1.TokenType.IDENTIFIER, 'Expected field name after comma');
+            let nextDirection = 'asc';
+            if (this.check(tokenizer_1.TokenType.ASC) || this.check(tokenizer_1.TokenType.DESC)) {
+                nextDirection = this.currentToken.value.toLowerCase();
+                this.advance();
+            }
+            orderBy.push({ field: nextFieldToken.value, direction: nextDirection });
+        }
+        return orderBy;
+    }
+    /**
+     * Parse the query and return the QueryAST
      */
     parse() {
         if (this.tokens.length === 1 && this.tokens[0].type === tokenizer_1.TokenType.EOF) {
             throw new errors_1.ParseError('Empty query string');
         }
-        const ast = this.parseExpression();
-        // Ensure we've consumed all tokens (except EOF)
-        if (this.currentToken.type !== tokenizer_1.TokenType.EOF &&
-            !this.check(tokenizer_1.TokenType.EOF)) {
-            throw new errors_1.ParseError(`Unexpected token: ${this.currentToken.type} at position ${this.currentToken.position}. Expected end of query.`);
+        const filter = this.parseExpression();
+        const result = { filter };
+        // Parse optional clauses
+        while (this.currentToken.type !== tokenizer_1.TokenType.EOF) {
+            if (this.check(tokenizer_1.TokenType.ORDER_BY)) {
+                this.advance(); // Skip 'orderBy'
+                result.orderBy = this.parseOrderBy();
+            }
+            else if (this.check(tokenizer_1.TokenType.LIMIT)) {
+                this.advance(); // Skip 'limit'
+                const limitToken = this.expect(tokenizer_1.TokenType.VALUE, 'Expected number after limit');
+                if (typeof limitToken.value !== 'number' || limitToken.value < 0) {
+                    throw new errors_1.ParseError(`Limit must be a non-negative number, got ${limitToken.value} at position ${limitToken.position}`);
+                }
+                result.limit = limitToken.value;
+            }
+            else if (this.check(tokenizer_1.TokenType.OFFSET)) {
+                this.advance(); // Skip 'offset'
+                const offsetToken = this.expect(tokenizer_1.TokenType.VALUE, 'Expected number after offset');
+                if (typeof offsetToken.value !== 'number' || offsetToken.value < 0) {
+                    throw new errors_1.ParseError(`Offset must be a non-negative number, got ${offsetToken.value} at position ${offsetToken.position}`);
+                }
+                result.offset = offsetToken.value;
+            }
+            else {
+                throw new errors_1.ParseError(`Unexpected token: ${this.currentToken.type} at position ${this.currentToken.position}. Expected orderBy, limit, offset, or end of query.`);
+            }
         }
-        return ast;
+        return result;
     }
 }
 exports.Parser = Parser;
 /**
- * Parse a query string into an AST
+ * Parse a query string into a QueryAST
  */
 function parseQueryString(query) {
     try {
@@ -145,4 +240,11 @@ function parseQueryString(query) {
         throw new errors_1.ParseError(`Failed to parse query: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
+/**
+ * Parse a query string into just the filter AST (backward compatibility)
+ */
+function parseQueryStringFilter(query) {
+    const queryAST = parseQueryString(query);
+    return queryAST.filter;
+}
 //# sourceMappingURL=parser.js.map

package/dist/parser/parser.js.map

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

package/dist/parser/tokenizer.d.ts

@@ -11,6 +11,16 @@ export declare enum TokenType {
     BRACKET_OPEN = "BRACKET_OPEN",
     BRACKET_CLOSE = "BRACKET_CLOSE",
     COMMA = "COMMA",
+    NOT = "NOT",
+    BETWEEN = "BETWEEN",
+    AND_KEYWORD = "AND_KEYWORD",
+    IS_NULL = "IS_NULL",
+    IS_NOT_NULL = "IS_NOT_NULL",
+    ORDER_BY = "ORDER_BY",
+    LIMIT = "LIMIT",
+    OFFSET = "OFFSET",
+    ASC = "ASC",
+    DESC = "DESC",
     EOF = "EOF"
 }
 /**
@@ -42,7 +52,7 @@ export declare class Tokenizer {
      */
     private peek;
     /**
-     * Read an identifier (field name)
+     * Read an identifier (field name, supports nested fields with dots)
      */
     private readIdentifier;
     /**

package/dist/parser/tokenizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenizer.d.ts","sourceRoot":"","sources":["../../src/parser/tokenizer.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,SAAS;IACnB,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,GAAG,QAAQ;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAC9D,QAAQ,EAAE,MAAM,CAAC;CAClB;AAYD;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAgB;gBAEvB,KAAK,EAAE,MAAM;IAMzB;;OAEG;IACH,OAAO,CAAC,OAAO;IASf;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;IACH,OAAO,CAAC,IAAI;IAOZ;;OAEG;IACH,OAAO,CAAC,cAAc;IAWtB;;OAEG;IACH,OAAO,CAAC,UAAU;IA2ClB;;OAEG;IACH,OAAO,CAAC,UAAU;IAoClB;;OAEG;IACH,OAAO,CAAC,WAAW;IAkBnB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAehB;;OAEG;IACH,OAAO,CAAC,SAAS;IAoDjB;;OAEG;IACI,SAAS,IAAI,KAAK;IAuJzB;;OAEG;IACI,QAAQ,IAAI,KAAK,EAAE;CAU3B"}
+{"version":3,"file":"tokenizer.d.ts","sourceRoot":"","sources":["../../src/parser/tokenizer.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,SAAS;IACnB,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAC9D,QAAQ,EAAE,MAAM,CAAC;CAClB;AA4CD;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAgB;gBAEvB,KAAK,EAAE,MAAM;IAMzB;;OAEG;IACH,OAAO,CAAC,OAAO;IASf;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;IACH,OAAO,CAAC,IAAI;IAOZ;;OAEG;IACH,OAAO,CAAC,cAAc;IAWtB;;OAEG;IACH,OAAO,CAAC,UAAU;IA2ClB;;OAEG;IACH,OAAO,CAAC,UAAU;IAoClB;;OAEG;IACH,OAAO,CAAC,WAAW;IAkBnB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAehB;;OAEG;IACH,OAAO,CAAC,SAAS;IAoDjB;;OAEG;IACI,SAAS,IAAI,KAAK;IAwKzB;;OAEG;IACI,QAAQ,IAAI,KAAK,EAAE;CAU3B"}