@webda/ql 4.0.0-beta.5 → 4.0.0-beta.7

package/lib/bind.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bind.d.ts","sourceRoot":"","sources":["../src/bind.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAsCrF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC,CAAC,CAsC3F"}
+{"version":3,"file":"bind.d.ts","sourceRoot":"","sources":["../src/bind.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAsCrF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC,CAAC,CA4C3F"}

package/lib/bind.js

@@ -77,6 +77,12 @@ export function bind(query, params) {
     // Placeholders are only allowed where a value is expected
     validateSyntax(query);
     const values = named ? namedValues(placeholders, params) : positionalValues(placeholders, params);
+    const assigned = assignedPlaceholders(query);
+    placeholders.forEach((token, i) => {
+        if ((values[i] === null || values[i] === undefined) && assigned.has(token.startIndex)) {
+            throw new WebdaQLError(`A null value cannot be assigned in UPDATE SET ('${token.text}')`);
+        }
+    });
     const parts = [];
     let position = 0;
     for (const token of placeholders) {
@@ -94,6 +100,29 @@ export function bind(query, params) {
     }
     return bound;
 }
+/**
+ * Placeholders standing for the value of an `UPDATE SET` assignment, by start index: from `SET` to the
+ * `WHERE` or `LIMIT` closing the assignment list
+ * @param query - the query string
+ * @returns the start indexes of those placeholders
+ */
+function assignedPlaceholders(query) {
+    const res = new Set();
+    let inSet = false;
+    for (const token of tokenize(query)) {
+        if (token.type === WebdaQLLexer.SET) {
+            inSet = true;
+        }
+        else if (token.type === WebdaQLLexer.WHERE || token.type === WebdaQLLexer.LIMIT) {
+            inSet = false;
+        }
+        else if (inSet &&
+            (token.type === WebdaQLLexer.POSITIONAL_PARAMETER || token.type === WebdaQLLexer.NAMED_PARAMETER)) {
+            res.add(token.startIndex);
+        }
+    }
+    return res;
+}
 /**
  * Values of the `?` placeholders, in order
  * @param placeholders - the placeholder tokens

package/lib/bind.js.map

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

package/lib/filter.d.ts

@@ -0,0 +1,54 @@
+import { type Expression } from "./query.js";
+import type { WebdaQLString } from "./webdaql-string.js";
+type Primitive = string | number | boolean | bigint | symbol | null | undefined;
+type PropertyPaths<T extends object> = {
+    [K in Extract<keyof T, string>]: T[K] extends Function ? never : NonNullable<T[K]> extends Primitive | Date | RegExp | Array<any> | Map<any, any> | Set<any> ? K : NonNullable<T[K]> extends object ? K | `${K}.${PropertyPaths<NonNullable<T[K]>>}` : K;
+}[Extract<keyof T, string>];
+type PathValue<T, K extends string> = K extends `${infer H}.${infer R}` ? H extends keyof T ? PathValue<NonNullable<T[H]>, R> : never : K extends keyof T ? T[K] : never;
+type PropertyPathType<T extends object, K extends PropertyPaths<T>> = PathValue<T, K>;
+export type FilterOperators<V> = {
+    $eq?: V | null;
+    $ne?: V | null;
+    $gt?: V;
+    $gte?: V;
+    $lt?: V;
+    $lte?: V;
+    $in?: V[];
+    $like?: string;
+    $contains?: V extends readonly (infer E)[] ? Extract<E, string> : never;
+    $exists?: boolean;
+};
+export type ModelFilter<T extends object = any> = {
+    [K in PropertyPaths<T>]?: PropertyPathType<T, K> | null | FilterOperators<PropertyPathType<T, K>>;
+} & {
+    $or?: ModelFilter<T>[];
+    $and?: ModelFilter<T>[];
+};
+export interface FindOptions<T extends object> {
+    orderBy?: {
+        field: PropertyPaths<T>;
+        direction: "ASC" | "DESC";
+    }[];
+    limit?: number;
+    continuationToken?: string;
+}
+/**
+ * Convert a JSON filter to a WebdaQL expression
+ *
+ * Keys set to `undefined` are ignored, so optional criteria can be spread in. A plain object without
+ * operators matches its nested fields: `{ address: { city: "Paris" } }` is `address.city = "Paris"`.
+ * @param filter - the JSON filter
+ * @returns the expression
+ * @throws {WebdaQLError} for an invalid filter
+ */
+export declare function filterToExpression(filter: ModelFilter): Expression;
+/**
+ * Convert a JSON filter and its find options to a WebdaQL query string
+ * @param filter - the JSON filter
+ * @param options - ordering, limit and continuation token
+ * @returns the WebdaQL query
+ * @throws {WebdaQLError} for an invalid filter
+ */
+export declare function toWebdaQL<T extends object = any>(filter: ModelFilter<T>, options?: FindOptions<T>): WebdaQLString<T>;
+export {};
+//# sourceMappingURL=filter.d.ts.map

package/lib/filter.d.ts.map

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

package/lib/filter.js

@@ -0,0 +1,135 @@
+import { AndExpression, ComparisonExpression, OrExpression, checkFieldPath, normalizeQuery } from "./query.js";
+import { WebdaQLError } from "./webdaql-string.js";
+const operators = {
+    $eq: "=",
+    $ne: "!=",
+    $gt: ">",
+    $gte: ">=",
+    $lt: "<",
+    $lte: "<=",
+    $in: "IN",
+    $like: "LIKE",
+    $contains: "CONTAINS"
+};
+/**
+ * WebdaQL has no date literal: dates are compared as ISO 8601 strings, the way they are serialized
+ * @param value - the filter value
+ * @returns the value, with dates as ISO strings
+ */
+function toFilterValue(value) {
+    if (Array.isArray(value))
+        return value.map(toFilterValue);
+    if (!(value instanceof Date))
+        return value;
+    if (isNaN(value.getTime()))
+        throw new WebdaQLError("Invalid date in filter");
+    return value.toISOString();
+}
+/**
+ * Convert a JSON filter to a WebdaQL expression
+ *
+ * Keys set to `undefined` are ignored, so optional criteria can be spread in. A plain object without
+ * operators matches its nested fields: `{ address: { city: "Paris" } }` is `address.city = "Paris"`.
+ * @param filter - the JSON filter
+ * @returns the expression
+ * @throws {WebdaQLError} for an invalid filter
+ */
+export function filterToExpression(filter) {
+    if (!filter || typeof filter !== "object" || Array.isArray(filter))
+        throw new WebdaQLError("Filter must be an object");
+    const parts = [];
+    for (const key of Object.keys(filter)) {
+        const value = filter[key];
+        if (value === undefined)
+            continue;
+        if (key === "$or" || key === "$and") {
+            if (!Array.isArray(value) || !value.length)
+                throw new WebdaQLError(`${key} requires a non-empty array`);
+            parts.push(key === "$or"
+                ? new OrExpression(value.map(filterToExpression))
+                : new AndExpression(value.map(filterToExpression)));
+            continue;
+        }
+        if (key.startsWith("$"))
+            throw new WebdaQLError(`Unknown filter operator '${key}'`);
+        fieldToExpressions(key, value, parts);
+    }
+    return new AndExpression(parts);
+}
+/**
+ * Add the conditions on one field
+ * @param key - the field path
+ * @param value - a plain value, an operator object or a nested object
+ * @param parts - the conditions to add to
+ */
+function fieldToExpressions(key, value, parts) {
+    checkFieldPath(key);
+    if (value === null) {
+        parts.push(new ComparisonExpression("IS NULL", key, true));
+        return;
+    }
+    if (typeof value !== "object" || Array.isArray(value) || value instanceof Date) {
+        parts.push(new ComparisonExpression("=", key, toFilterValue(value)));
+        return;
+    }
+    const keys = Object.keys(value);
+    if (!keys.length)
+        throw new WebdaQLError(`Empty filter object for '${key}'`);
+    const operatorKeys = keys.filter(k => k.startsWith("$"));
+    if (!operatorKeys.length) {
+        // Nested object: match each of its fields
+        const before = parts.length;
+        for (const sub of keys) {
+            if (value[sub] !== undefined)
+                fieldToExpressions(`${key}.${sub}`, value[sub], parts);
+        }
+        if (parts.length === before)
+            throw new WebdaQLError(`Empty filter object for '${key}'`);
+        return;
+    }
+    if (operatorKeys.length !== keys.length)
+        throw new WebdaQLError(`Cannot mix operators and fields in '${key}'`);
+    for (const op of keys) {
+        const operand = value[op];
+        if (operand === undefined)
+            continue;
+        if (op === "$exists") {
+            if (typeof operand !== "boolean")
+                throw new WebdaQLError("$exists must be a boolean");
+            parts.push(new ComparisonExpression(operand ? "IS NOT NULL" : "IS NULL", key, true));
+        }
+        else if ((op === "$eq" || op === "$ne") && operand === null) {
+            parts.push(new ComparisonExpression(op === "$eq" ? "IS NULL" : "IS NOT NULL", key, true));
+        }
+        else {
+            const mapped = operators[op];
+            if (!mapped)
+                throw new WebdaQLError(`Unknown filter operator '${op}'`);
+            if (operand === null)
+                throw new WebdaQLError("null is only supported with $eq, $ne, or $exists");
+            if (op === "$in" && (!Array.isArray(operand) || !operand.length))
+                throw new WebdaQLError("$in requires a non-empty array");
+            if (op === "$contains" && typeof operand !== "string")
+                throw new WebdaQLError("$contains takes a string");
+            parts.push(new ComparisonExpression(mapped, key, toFilterValue(operand)));
+        }
+    }
+}
+/**
+ * Convert a JSON filter and its find options to a WebdaQL query string
+ * @param filter - the JSON filter
+ * @param options - ordering, limit and continuation token
+ * @returns the WebdaQL query
+ * @throws {WebdaQLError} for an invalid filter
+ */
+export function toWebdaQL(filter, options) {
+    const q = normalizeQuery({
+        type: "SELECT",
+        filter: filterToExpression(filter),
+        orderBy: options?.orderBy,
+        limit: options?.limit,
+        continuationToken: options?.continuationToken
+    });
+    return q.toString();
+}
+//# sourceMappingURL=filter.js.map

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":"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"}

package/lib/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./query.js";
 export * from "./webdaql-string.js";
 export * from "./bind.js";
+export * from "./aggregation.js";
+export * from "./filter.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"}
+{"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"}

package/lib/index.js

@@ -1,4 +1,6 @@
 export * from "./query.js";
 export * from "./webdaql-string.js";
 export * from "./bind.js";
+export * from "./aggregation.js";
+export * from "./filter.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"}
+{"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"}