@webda/ql 4.0.0-beta.6 → 4.0.0-beta.8

package/lib/filter.js.map

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

package/lib/filter.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=filter.spec.d.ts.map

package/lib/filter.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter.spec.d.ts","sourceRoot":"","sources":["../src/filter.spec.ts"],"names":[],"mappings":""}

package/lib/filter.spec.js

@@ -0,0 +1,124 @@
+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 __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;
+};
+import { suite, test } from "@webda/test";
+import * as assert from "assert";
+import { filterToExpression, toWebdaQL } from "./filter.js";
+import { QueryValidator } from "./query.js";
+import { WebdaQLError } from "./webdaql-string.js";
+let FilterTest = (() => {
+    let _classDecorators = [suite];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _instanceExtraInitializers = [];
+    let _convertsFilters_decorators;
+    let _handlesUndefinedNestedAndEmpty_decorators;
+    let _dateEvalKeepsNumericComparison_decorators;
+    let _refusesInjectionAndInvalidValues_decorators;
+    var FilterTest = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _convertsFilters_decorators = [test];
+            _handlesUndefinedNestedAndEmpty_decorators = [test];
+            _dateEvalKeepsNumericComparison_decorators = [test];
+            _refusesInjectionAndInvalidValues_decorators = [test];
+            __esDecorate(this, null, _convertsFilters_decorators, { kind: "method", name: "convertsFilters", static: false, private: false, access: { has: obj => "convertsFilters" in obj, get: obj => obj.convertsFilters }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _handlesUndefinedNestedAndEmpty_decorators, { kind: "method", name: "handlesUndefinedNestedAndEmpty", static: false, private: false, access: { has: obj => "handlesUndefinedNestedAndEmpty" in obj, get: obj => obj.handlesUndefinedNestedAndEmpty }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _dateEvalKeepsNumericComparison_decorators, { kind: "method", name: "dateEvalKeepsNumericComparison", static: false, private: false, access: { has: obj => "dateEvalKeepsNumericComparison" in obj, get: obj => obj.dateEvalKeepsNumericComparison }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _refusesInjectionAndInvalidValues_decorators, { kind: "method", name: "refusesInjectionAndInvalidValues", static: false, private: false, access: { has: obj => "refusesInjectionAndInvalidValues" in obj, get: obj => obj.refusesInjectionAndInvalidValues }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            FilterTest = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        convertsFilters() {
+            assert.strictEqual(toWebdaQL({ a: 1, b: 2 }), "a = 1 AND b = 2");
+            assert.strictEqual(toWebdaQL({ a: null }), "a IS NULL");
+            assert.strictEqual(toWebdaQL({ a: { $ne: null } }), "a IS NOT NULL");
+            assert.strictEqual(toWebdaQL({ a: { $gte: 2, $lt: 10 } }), "a >= 2 AND a < 10");
+            assert.strictEqual(toWebdaQL({ a: { $in: ["x", "y"] } }), 'a IN ["x", "y"]');
+            assert.strictEqual(toWebdaQL({ a: { $like: "Do%" } }), 'a LIKE "Do%"');
+            assert.strictEqual(toWebdaQL({ tags: { $contains: "urgent" } }), 'tags CONTAINS "urgent"');
+            assert.strictEqual(toWebdaQL({ a: { $exists: false } }), "a IS NULL");
+            assert.strictEqual(toWebdaQL({ $or: [{ a: 1 }, { b: 2 }] }), "a = 1 OR b = 2");
+            assert.strictEqual(toWebdaQL({ $or: [{ a: 1 }, { b: 2 }], c: 3 }), "( a = 1 OR b = 2 ) AND c = 3");
+            assert.strictEqual(toWebdaQL({ "profile.verified": true }), "profile.verified = TRUE");
+            assert.strictEqual(toWebdaQL({}), "");
+            const date = new Date("2026-01-02T03:04:05.000Z");
+            assert.strictEqual(toWebdaQL({ due: date }), 'due = "2026-01-02T03:04:05.000Z"');
+            assert.strictEqual(toWebdaQL({ due: { $gte: date } }), 'due >= "2026-01-02T03:04:05.000Z"');
+            assert.strictEqual(toWebdaQL({ due: { $in: [date] } }), 'due IN ["2026-01-02T03:04:05.000Z"]');
+            assert.throws(() => toWebdaQL({ due: new Date("nope") }), WebdaQLError);
+            // Evaluation compares stored dates as ISO strings
+            const target = { due: new Date("2026-01-02T03:04:05.000Z") };
+            assert.ok(new QueryValidator(toWebdaQL({ due: date })).eval(target));
+            assert.ok(new QueryValidator(toWebdaQL({ due: { $lt: new Date("2026-02-01T00:00:00.000Z") } })).eval(target));
+            assert.ok(!new QueryValidator(toWebdaQL({ due: { $gt: date } })).eval(target));
+        }
+        handlesUndefinedNestedAndEmpty() {
+            assert.strictEqual(toWebdaQL({ a: undefined, b: 2 }), "b = 2");
+            assert.strictEqual(toWebdaQL({ $or: undefined, b: 2 }), "b = 2");
+            assert.strictEqual(toWebdaQL({ a: { $gte: undefined, $lt: 10 } }), "a < 10");
+            assert.strictEqual(toWebdaQL({ address: { city: "Paris", zip: undefined } }), 'address.city = "Paris"');
+            assert.strictEqual(toWebdaQL({ a: { b: { c: 1 } } }), "a.b.c = 1");
+            assert.throws(() => toWebdaQL({ a: {} }), /Empty filter object/);
+            assert.throws(() => toWebdaQL({ a: { b: {} } }), /Empty filter object/);
+            assert.throws(() => toWebdaQL({ a: { $gt: 1, b: 2 } }), /Cannot mix/);
+            assert.throws(() => toWebdaQL({ a: { $contains: 5 } }), /\$contains takes a string/);
+        }
+        dateEvalKeepsNumericComparison() {
+            const target = { due: new Date(1800000000000) };
+            assert.ok(new QueryValidator("due > 1700000000000").eval(target));
+            assert.ok(!new QueryValidator("due < 1700000000000").eval(target));
+            assert.ok(new QueryValidator(`due > "2020-01-01T00:00:00.000Z"`).eval(target));
+            assert.ok(new QueryValidator(`due IN ["${target.due.toISOString()}"]`).eval(target));
+        }
+        refusesInjectionAndInvalidValues() {
+            assert.throws(() => filterToExpression({ "a' OR 1=1 --": 1 }), WebdaQLError);
+            assert.throws(() => filterToExpression({ $or: [{ "a = 1 OR b": 1 }] }), WebdaQLError);
+            assert.throws(() => toWebdaQL({ a: { $nor: [] } }), WebdaQLError);
+            assert.throws(() => toWebdaQL({ a: { $in: [] } }), WebdaQLError);
+            assert.throws(() => toWebdaQL({ $or: [] }), WebdaQLError);
+            assert.throws(() => toWebdaQL({ $and: [] }), WebdaQLError);
+            assert.strictEqual(toWebdaQL({ a: 'it\'s "safe"' }), 'a = "it\'s ""safe"""');
+        }
+        constructor() {
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+    };
+    return FilterTest = _classThis;
+})();
+//# sourceMappingURL=filter.spec.js.map

package/lib/filter.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter.spec.js","sourceRoot":"","sources":["../src/filter.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;IAG7C,UAAU;4BADf,KAAK;;;;;;;;;;;;;2CAEH,IAAI;0DA0BJ,IAAI;0DAaJ,IAAI;4DASJ,IAAI;YA/CL,gMAAA,eAAe,6DAuBd;YAGD,6OAAA,8BAA8B,6DAU7B;YAGD,6OAAA,8BAA8B,6DAM7B;YAGD,mPAAA,gCAAgC,6DAQ/B;YA1DH,6KA2DC;;;YA3DK,uDAAU;;QAEd,eAAe;YACb,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;YACjE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;YACxD,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;YACrE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;YAChF,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;YAC7E,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;YACvE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,wBAAwB,CAAC,CAAC;YAC3F,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;YACtE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC/E,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,8BAA8B,CAAC,CAAC;YACnG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,EAAE,yBAAyB,CAAC,CAAC;YACvF,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAClD,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,kCAAkC,CAAC,CAAC;YACjF,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,mCAAmC,CAAC,CAAC;YAC5F,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,qCAAqC,CAAC,CAAC;YAC/F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;YACxE,kDAAkD;YAClD,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC;YAC7D,MAAM,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACrE,MAAM,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9G,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACjF,CAAC;QAGD,8BAA8B;YAC5B,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAC/D,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACjE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC7E,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,wBAAwB,CAAC,CAAC;YACxG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,qBAAqB,CAAC,CAAC;YACjE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,qBAAqB,CAAC,CAAC;YACxE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YAC7E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAS,CAAC,EAAE,2BAA2B,CAAC,CAAC;QAC9F,CAAC;QAGD,8BAA8B;YAC5B,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,cAAc,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACnE,MAAM,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,kCAAkC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/E,MAAM,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,YAAY,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACvF,CAAC;QAGD,gCAAgC;YAC9B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC,EAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YACpF,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,EAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YAC7F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YACzE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YACxE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;YAC1D,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;YAC3D,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,sBAAsB,CAAC,CAAC;QAC/E,CAAC;;YA1DG,mDAAU"}

package/lib/index.d.ts

@@ -2,4 +2,6 @@ export * from "./query.js";
 export * from "./webdaql-string.js";
 export * from "./bind.js";
 export * from "./aggregation.js";
+export * from "./filter.js";
+export * from "./completion.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}

package/lib/index.js

@@ -2,4 +2,6 @@ export * from "./query.js";
 export * from "./webdaql-string.js";
 export * from "./bind.js";
 export * from "./aggregation.js";
+export * from "./filter.js";
+export * from "./completion.js";
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}

package/lib/now.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=now.spec.d.ts.map

package/lib/now.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"now.spec.d.ts","sourceRoot":"","sources":["../src/now.spec.ts"],"names":[],"mappings":""}

package/lib/now.spec.js

@@ -0,0 +1,258 @@
+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 __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;
+};
+import { suite, test } from "@webda/test";
+import * as assert from "assert";
+import { vi } from "vitest";
+import { bind } from "./bind.js";
+import { parse, parseDurationToMs, PartialValidator, PrependCondition, QueryValidator, SetterValidator, validateSyntax } from "./query.js";
+import { WebdaQLError } from "./webdaql-string.js";
+let NowFunctionTest = (() => {
+    let _classDecorators = [suite];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _instanceExtraInitializers = [];
+    let _parseDurationUnits_decorators;
+    let _invalidDurationsThrowWebdaQLError_decorators;
+    let _grammarParsesNowVariants_decorators;
+    let _invalidDurationAtParseTimeThrowsWebdaQLError_decorators;
+    let _lowercaseNowRemainsIdentifier_decorators;
+    let _evalWithFakeClockReturnsDynamicResults_decorators;
+    let _isDynamicDetection_decorators;
+    let _toStringRoundTripsNow_decorators;
+    let _mergePreservesDynamicValues_decorators;
+    let _partialValidatorRoundTripsAndEvaluates_decorators;
+    let _bindHandlesParametersInsideNow_decorators;
+    let _updateSetNowAppliesResolvedTimestamp_decorators;
+    let _webdaQLStringTypeAllowsNow_decorators;
+    var NowFunctionTest = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _parseDurationUnits_decorators = [test];
+            _invalidDurationsThrowWebdaQLError_decorators = [test];
+            _grammarParsesNowVariants_decorators = [test];
+            _invalidDurationAtParseTimeThrowsWebdaQLError_decorators = [test];
+            _lowercaseNowRemainsIdentifier_decorators = [test];
+            _evalWithFakeClockReturnsDynamicResults_decorators = [test];
+            _isDynamicDetection_decorators = [test];
+            _toStringRoundTripsNow_decorators = [test];
+            _mergePreservesDynamicValues_decorators = [test];
+            _partialValidatorRoundTripsAndEvaluates_decorators = [test];
+            _bindHandlesParametersInsideNow_decorators = [test];
+            _updateSetNowAppliesResolvedTimestamp_decorators = [test];
+            _webdaQLStringTypeAllowsNow_decorators = [test];
+            __esDecorate(this, null, _parseDurationUnits_decorators, { kind: "method", name: "parseDurationUnits", static: false, private: false, access: { has: obj => "parseDurationUnits" in obj, get: obj => obj.parseDurationUnits }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _invalidDurationsThrowWebdaQLError_decorators, { kind: "method", name: "invalidDurationsThrowWebdaQLError", static: false, private: false, access: { has: obj => "invalidDurationsThrowWebdaQLError" in obj, get: obj => obj.invalidDurationsThrowWebdaQLError }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _grammarParsesNowVariants_decorators, { kind: "method", name: "grammarParsesNowVariants", static: false, private: false, access: { has: obj => "grammarParsesNowVariants" in obj, get: obj => obj.grammarParsesNowVariants }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _invalidDurationAtParseTimeThrowsWebdaQLError_decorators, { kind: "method", name: "invalidDurationAtParseTimeThrowsWebdaQLError", static: false, private: false, access: { has: obj => "invalidDurationAtParseTimeThrowsWebdaQLError" in obj, get: obj => obj.invalidDurationAtParseTimeThrowsWebdaQLError }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _lowercaseNowRemainsIdentifier_decorators, { kind: "method", name: "lowercaseNowRemainsIdentifier", static: false, private: false, access: { has: obj => "lowercaseNowRemainsIdentifier" in obj, get: obj => obj.lowercaseNowRemainsIdentifier }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _evalWithFakeClockReturnsDynamicResults_decorators, { kind: "method", name: "evalWithFakeClockReturnsDynamicResults", static: false, private: false, access: { has: obj => "evalWithFakeClockReturnsDynamicResults" in obj, get: obj => obj.evalWithFakeClockReturnsDynamicResults }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _isDynamicDetection_decorators, { kind: "method", name: "isDynamicDetection", static: false, private: false, access: { has: obj => "isDynamicDetection" in obj, get: obj => obj.isDynamicDetection }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _toStringRoundTripsNow_decorators, { kind: "method", name: "toStringRoundTripsNow", static: false, private: false, access: { has: obj => "toStringRoundTripsNow" in obj, get: obj => obj.toStringRoundTripsNow }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _mergePreservesDynamicValues_decorators, { kind: "method", name: "mergePreservesDynamicValues", static: false, private: false, access: { has: obj => "mergePreservesDynamicValues" in obj, get: obj => obj.mergePreservesDynamicValues }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _partialValidatorRoundTripsAndEvaluates_decorators, { kind: "method", name: "partialValidatorRoundTripsAndEvaluates", static: false, private: false, access: { has: obj => "partialValidatorRoundTripsAndEvaluates" in obj, get: obj => obj.partialValidatorRoundTripsAndEvaluates }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _bindHandlesParametersInsideNow_decorators, { kind: "method", name: "bindHandlesParametersInsideNow", static: false, private: false, access: { has: obj => "bindHandlesParametersInsideNow" in obj, get: obj => obj.bindHandlesParametersInsideNow }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _updateSetNowAppliesResolvedTimestamp_decorators, { kind: "method", name: "updateSetNowAppliesResolvedTimestamp", static: false, private: false, access: { has: obj => "updateSetNowAppliesResolvedTimestamp" in obj, get: obj => obj.updateSetNowAppliesResolvedTimestamp }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _webdaQLStringTypeAllowsNow_decorators, { kind: "method", name: "webdaQLStringTypeAllowsNow", static: false, private: false, access: { has: obj => "webdaQLStringTypeAllowsNow" in obj, get: obj => obj.webdaQLStringTypeAllowsNow }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            NowFunctionTest = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        parseDurationUnits() {
+            assert.strictEqual(parseDurationToMs("10s"), 10000);
+            assert.strictEqual(parseDurationToMs("10sec"), 10000);
+            assert.strictEqual(parseDurationToMs("10seconds"), 10000);
+            assert.strictEqual(parseDurationToMs("-10s"), -10000);
+            assert.strictEqual(parseDurationToMs("+10s"), 10000);
+            assert.strictEqual(parseDurationToMs("2m"), 120000);
+            assert.strictEqual(parseDurationToMs("-10m"), -600000);
+            assert.strictEqual(parseDurationToMs("+1d"), 86400000);
+            assert.strictEqual(parseDurationToMs("-1d2h"), -93600000);
+            assert.strictEqual(parseDurationToMs("1h30m"), 5400000);
+            assert.strictEqual(parseDurationToMs("30"), 30000);
+            assert.strictEqual(parseDurationToMs(-60), -60000);
+            assert.strictEqual(parseDurationToMs(120), 120000);
+        }
+        invalidDurationsThrowWebdaQLError() {
+            assert.throws(() => parseDurationToMs(""), WebdaQLError);
+            assert.throws(() => parseDurationToMs("   "), WebdaQLError);
+            assert.throws(() => parseDurationToMs("bogus"), WebdaQLError);
+            assert.throws(() => parseDurationToMs("10xyz"), WebdaQLError);
+            assert.throws(() => parseDurationToMs("10m bogus"), WebdaQLError);
+            assert.throws(() => parseDurationToMs("1d -2h"), WebdaQLError);
+        }
+        grammarParsesNowVariants() {
+            validateSyntax("expiresAt < NOW()");
+            validateSyntax("mfaAt > NOW('-10m')");
+            validateSyntax("mfaAt > NOW('+1d')");
+            validateSyntax("mfaAt > NOW('-1d2h')");
+            validateSyntax("mfaAt > NOW(:offset)");
+            validateSyntax("mfaAt > NOW(?)");
+            validateSyntax("mfaAt > NOW(60)");
+            validateSyntax("mfaAt > NOW(-600)");
+            validateSyntax("UPDATE SET updatedAt = NOW() WHERE id = 1");
+            validateSyntax("UPDATE SET updatedAt = NOW('-5m')");
+            validateSyntax("x IN [NOW(), 0]");
+        }
+        invalidDurationAtParseTimeThrowsWebdaQLError() {
+            assert.throws(() => parse("expiresAt < NOW('bogus')"), WebdaQLError);
+            assert.throws(() => parse("expiresAt < NOW('10xyz')"), WebdaQLError);
+            assert.throws(() => parse("expiresAt < NOW('')"), WebdaQLError);
+            assert.throws(() => parse("expiresAt < NOW('   ')"), WebdaQLError);
+            assert.throws(() => parse("expiresAt < NOW('10m bogus')"), WebdaQLError);
+        }
+        lowercaseNowRemainsIdentifier() {
+            const q1 = parse("now = 1");
+            assert.strictEqual(q1.filter.toString(), "now = 1");
+            const q2 = parse("UPDATE SET now = 1 WHERE id = 2");
+            assert.deepStrictEqual(q2.assignments, [{ field: "now", value: 1 }]);
+            assert.throws(() => parse("NOW = 1"), SyntaxError);
+        }
+        evalWithFakeClockReturnsDynamicResults() {
+            vi.useFakeTimers();
+            try {
+                vi.setSystemTime(1000000);
+                const qv = new QueryValidator("expiresAt > NOW('-10s')");
+                // At t = 1000000, NOW('-10s') = 990000. Target at 995000 is > 990000 (true)
+                assert.strictEqual(qv.eval({ expiresAt: 995000 }), true);
+                // Target at 980000 is not > 990000 (false)
+                assert.strictEqual(qv.eval({ expiresAt: 980000 }), false);
+                // Advance clock by 10s: now t = 1010000, NOW('-10s') = 1000000
+                vi.advanceTimersByTime(10000);
+                // Target at 995000 is now < 1000000 (false!) without reparsing
+                assert.strictEqual(qv.eval({ expiresAt: 995000 }), false);
+                // Now value is fresh on every eval
+                const qvNow = new QueryValidator("expiresAt <= NOW()");
+                assert.strictEqual(qvNow.eval({ expiresAt: 1010000 }), true);
+                assert.strictEqual(qvNow.eval({ expiresAt: 1010001 }), false);
+            }
+            finally {
+                vi.useRealTimers();
+            }
+        }
+        isDynamicDetection() {
+            assert.strictEqual(parse("expiresAt < NOW()").filter.isDynamic(), true);
+            assert.strictEqual(parse("expiresAt < NOW('-10m')").filter.isDynamic(), true);
+            assert.strictEqual(parse("a = 1 AND (b = 2 OR c > NOW())").filter.isDynamic(), true);
+            assert.strictEqual(parse("a = 1 AND b = 2").filter.isDynamic(), false);
+            assert.strictEqual(new QueryValidator("expiresAt < NOW()").isDynamic(), true);
+            assert.strictEqual(new QueryValidator("a = 1").isDynamic(), false);
+        }
+        toStringRoundTripsNow() {
+            for (const [query, expected] of [
+                ["expiresAt < NOW()", "expiresAt < NOW()"],
+                ["mfaAt > NOW('-10m')", "mfaAt > NOW('-10m')"],
+                [
+                    "lastUsedAt < NOW('-30d') ORDER BY lastUsedAt ASC LIMIT 100",
+                    "lastUsedAt < NOW('-30d') ORDER BY lastUsedAt ASC LIMIT 100"
+                ],
+                ["UPDATE SET touchedAt = NOW() WHERE uuid = 'x'", 'UPDATE SET touchedAt = NOW() WHERE uuid = "x"'],
+                ["UPDATE SET touchedAt = NOW('-10m') WHERE uuid = 'x'", "UPDATE SET touchedAt = NOW('-10m') WHERE uuid = \"x\""]
+            ]) {
+                const parsed = parse(query);
+                assert.strictEqual(parsed.toString(), expected);
+            }
+        }
+        mergePreservesDynamicValues() {
+            const merged = PrependCondition("status = 'active'", "mfaAt > NOW('-10m')");
+            assert.strictEqual(merged, "status = \"active\" AND mfaAt > NOW('-10m')");
+            const qv = new QueryValidator(merged);
+            assert.strictEqual(qv.isDynamic(), true);
+        }
+        partialValidatorRoundTripsAndEvaluates() {
+            vi.useFakeTimers();
+            try {
+                vi.setSystemTime(1000000);
+                const pv = new PartialValidator("mfaAt > NOW('-10m')");
+                assert.strictEqual(pv.toString(), "mfaAt > NOW('-10m')");
+                assert.strictEqual(pv.isDynamic(), true);
+                assert.strictEqual(pv.eval({ mfaAt: 900000 }), true); // 900000 > 400000
+                assert.strictEqual(pv.eval({ mfaAt: 300000 }), false);
+                // In partial mode, missing attribute is treated as match
+                assert.strictEqual(pv.eval({}), true);
+            }
+            finally {
+                vi.useRealTimers();
+            }
+        }
+        bindHandlesParametersInsideNow() {
+            const boundString = bind("mfaAt > NOW(?)", ["-10m"]);
+            assert.strictEqual(boundString, "mfaAt > NOW('-10m')");
+            const boundNamed = bind("mfaAt > NOW(:offset)", { offset: "+1d" });
+            assert.strictEqual(boundNamed, "mfaAt > NOW('+1d')");
+            const boundNumber = bind("mfaAt > NOW(?)", [-600]);
+            assert.strictEqual(boundNumber, "mfaAt > NOW(-600)");
+            const boundNamedNum = bind("mfaAt > NOW(:offset)", { offset: 30 });
+            assert.strictEqual(boundNamedNum, "mfaAt > NOW(30)");
+            const q = parse(boundString);
+            assert.strictEqual(q.filter.isDynamic(), true);
+        }
+        updateSetNowAppliesResolvedTimestamp() {
+            const parsed = parse("UPDATE SET touchedAt = NOW() WHERE uuid = 'x'");
+            assert.strictEqual(parsed.type, "UPDATE");
+            assert.strictEqual(parsed.assignments.length, 1);
+            const assignment = parsed.assignments[0];
+            assert.strictEqual(assignment.field, "touchedAt");
+            const val1 = assignment.value;
+            assert.strictEqual(typeof val1, "number");
+            assert.ok(Math.abs(val1 - Date.now()) < 5000);
+            // SetterValidator
+            const setter = new SetterValidator("touchedAt = NOW()");
+            const target = {};
+            setter.eval(target);
+            assert.strictEqual(typeof target.touchedAt, "number");
+            assert.ok(Math.abs(target.touchedAt - Date.now()) < 5000);
+            // With offset
+            const setterOffset = new SetterValidator("touchedAt = NOW('-10m')");
+            const targetOffset = {};
+            setterOffset.eval(targetOffset);
+            assert.strictEqual(typeof targetOffset.touchedAt, "number");
+            assert.ok(Math.abs(targetOffset.touchedAt - (Date.now() - 600000)) < 5000);
+        }
+        webdaQLStringTypeAllowsNow() {
+            const q1 = "mfaAt > NOW('-10m')";
+            assert.strictEqual(typeof q1, "string");
+            const q2 = "expiresAt < NOW()";
+            assert.strictEqual(typeof q2, "string");
+        }
+        constructor() {
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+    };
+    return NowFunctionTest = _classThis;
+})();
+//# sourceMappingURL=now.spec.js.map

package/lib/now.spec.js.map

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