@effect-app/infra 4.0.0-beta.22 → 4.0.0-beta.221

package/dist/Model/query/new-kid-interpreter.d.ts

@@ -1,19 +1,88 @@
-import { S } from "effect-app";
+import * as S from "effect-app/Schema";
 import type { FilterResult } from "../filter/filterApi.js";
 import type { FieldValues } from "../filter/types.js";
 import { type QAll } from "../query/dsl.js";
-export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldValuesRefined extends TFieldValues = TFieldValues>(q: QAll<TFieldValues, TFieldValuesRefined, A, R>) => {
+export type ComputedProjectionMathIrExpression = {
+    readonly _tag: "field";
+    readonly field: string;
+} | {
+    readonly _tag: "mul";
+    readonly left: ComputedProjectionMathIrExpression;
+    readonly right: ComputedProjectionMathIrExpression;
+};
+export type ComputedProjectionIrExpression = {
+    readonly _tag: "relation-count";
+    readonly path: string;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-any";
+    readonly path: string;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-every";
+    readonly path: string;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-distinct-count";
+    readonly path: string;
+    readonly field: string;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-sum";
+    readonly path: string;
+    readonly field: string;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-sum-expr";
+    readonly path: string;
+    readonly expression: ComputedProjectionMathIrExpression;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-sum-expr-by";
+    readonly path: string;
+    readonly expression: ComputedProjectionMathIrExpression;
+    readonly unit: string;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-sum-expr-normalized";
+    readonly path: string;
+    readonly expression: ComputedProjectionMathIrExpression;
+    readonly unit: string;
+    readonly toBase: string;
+    readonly factors: Readonly<Record<string, number>>;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-collect";
+    readonly path: string;
+    readonly field: string;
+    readonly distinct: boolean;
+    readonly filter: readonly FilterResult[];
+} | {
+    readonly _tag: "relation-collect-fields";
+    readonly path: string;
+    readonly fields: readonly string[];
+    readonly distinct: boolean;
+    readonly filter: readonly FilterResult[];
+};
+export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldValuesRefined extends TFieldValues = TFieldValues>(q: QAll<TFieldValues, TFieldValuesRefined, A, R>, baseSchema?: S.Schema<unknown>) => {
     t: Exclude<TFieldValues, undefined>;
     limit: number;
     skip: number;
-    select: readonly [keyof TFieldValues | {
+    select: readonly [{
         key: string;
         subKeys: string[];
-    }, ...(keyof TFieldValues | {
+    } | {
+        key: string;
+        computed: ComputedProjectionIrExpression;
+    } | keyof TFieldValues, ...({
         key: string;
         subKeys: string[];
-    })[]];
+    } | {
+        key: string;
+        computed: ComputedProjectionIrExpression;
+    } | keyof TFieldValues)[]];
     schema: S.Codec<any, TFieldValues, any, never>;
+    computed: Record<string, ComputedProjectionIrExpression>;
     order: readonly [{
         key: import("../filter/types/path/eager.js").Path<TFieldValues>;
         direction: "ASC" | "DESC";
@@ -21,8 +90,8 @@ export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldVa
         key: import("../filter/types/path/eager.js").Path<TFieldValues>;
         direction: "ASC" | "DESC";
     }[]];
-    ttype: "one" | "count" | "many";
-    mode: "project" | "collect" | "transform";
+    ttype: "count" | "many" | "one";
+    mode: "collect" | "project" | "transform";
     filter: FilterResult[];
 };
-//# sourceMappingURL=new-kid-interpreter.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV3LWtpZC1pbnRlcnByZXRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL01vZGVsL3F1ZXJ5L25ldy1raWQtaW50ZXJwcmV0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLENBQUMsTUFBTSxtQkFBbUIsQ0FBQTtBQUt0QyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUMxRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUVyRCxPQUFPLEVBQWdCLEtBQUssSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFFekQsTUFBTSxNQUFNLGtDQUFrQyxHQUMxQztJQUNBLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFBO0lBQ3RCLFFBQVEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0NBQ3ZCLEdBQ0M7SUFDQSxRQUFRLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQTtJQUNwQixRQUFRLENBQUMsSUFBSSxFQUFFLGtDQUFrQyxDQUFBO0lBQ2pELFFBQVEsQ0FBQyxLQUFLLEVBQUUsa0NBQWtDLENBQUE7Q0FDbkQsQ0FBQTtBQUVILE1BQU0sTUFBTSw4QkFBOEIsR0FDdEM7SUFDQSxRQUFRLENBQUMsSUFBSSxFQUFFLGdCQUFnQixDQUFBO0lBQy9CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFBO0lBQ3JCLFFBQVEsQ0FBQyxNQUFNLEVBQUUsU0FBUyxZQUFZLEVBQUUsQ0FBQTtDQUN6QyxHQUNDO0lBQ0EsUUFBUSxDQUFDLElBQUksRUFBRSxjQUFjLENBQUE7SUFDN0IsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUE7SUFDckIsUUFBUSxDQUFDLE1BQU0sRUFBRSxTQUFTLFlBQVksRUFBRSxDQUFBO0NBQ3pDLEdBQ0M7SUFDQSxRQUFRLENBQUMsSUFBSSxFQUFFLGdCQUFnQixDQUFBO0lBQy9CLFFBQVEsQ0FB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

package/dist/Model/query/new-kid-interpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwC,CAAC,EAAE,MAAM,YAAY,CAAA;AAGpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAiJzD,eAAO,MAAM,QAAQ,GACnB,YAAY,SAAS,WAAW,EAChC,CAAC,EACD,CAAC,EACD,mBAAmB,SAAS,YAAY,GAAG,YAAY,EAEvD,GAAG,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;;;;;aAKP,MAAM;iBAAW,MAAM,EAAE;;aAAzB,MAAM;iBAAW,MAAM,EAAE;;;;;mBArJhB,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;;;CAkMjE,CAAA"}
+{"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"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"}

package/dist/Model/query/new-kid-interpreter.js

@@ -1,8 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { Array, identity, Match, Option, pipe, S } from "effect-app";
+import * as Array from "effect-app/Array";
 import { toNonEmptyArray } from "effect-app/Array";
+import * as Option from "effect-app/Option";
+import * as S from "effect-app/Schema";
 import { dropUndefinedT } from "effect-app/utils";
+import { identity, pipe } from "effect/Function";
+import * as Match from "effect/Match";
+import * as SchemaAST from "effect/SchemaAST";
 import { make } from "../query/dsl.js";
 const interpret = (_) => {
     const a = _;
@@ -13,7 +18,8 @@ const interpret = (_) => {
         skip: undefined,
         order: [],
         ttype: undefined,
-        mode: undefined
+        mode: undefined,
+        computed: undefined
     };
     const upd = (v) => {
         data.filter.push(...v.filter);
@@ -28,6 +34,8 @@ const interpret = (_) => {
             data.schema = v.schema;
         if (v.mode !== undefined)
             data.mode = v.mode;
+        if (v.computed !== undefined)
+            data.computed = v.computed;
     };
     const applyPath = (path) => (_) => _.t === "where" || _.t === "and" || _.t === "or"
         ? { ..._, path: `${path}.-1.${_.path}` }
@@ -103,8 +111,82 @@ const interpret = (_) => {
         },
         project: (v) => {
             upd(interpret(v.current));
+            if (v.computed && v.mode === "transform") {
+                throw new Error("Computed projections require mode 'project' or 'collect', not 'transform'");
+            }
             data.schema = v.schema;
-            data.mode = v.mode;
+            data.mode = v.computed
+                ? v.mode === "collect" ? "collect" : "project"
+                : v.mode;
+            data.computed = v.computed
+                ? Object.fromEntries(Object.entries(v.computed).map(([key, expression]) => {
+                    const e = expression;
+                    const filter = e.operation ? interpret(e.operation(make())).filter.map(applyPath(e.path)) : [];
+                    switch (e._tag) {
+                        case "relation-count":
+                        case "relation-any":
+                        case "relation-every":
+                            return [key, { _tag: e._tag, path: e.path, filter }];
+                        case "relation-distinct-count":
+                        case "relation-sum":
+                            return [
+                                key,
+                                { _tag: e._tag, path: e.path, field: e.field, filter }
+                            ];
+                        case "relation-sum-expr":
+                            return [
+                                key,
+                                { _tag: e._tag, path: e.path, expression: e.expression, filter }
+                            ];
+                        case "relation-sum-expr-by":
+                            return [
+                                key,
+                                {
+                                    _tag: e._tag,
+                                    path: e.path,
+                                    expression: e.expression,
+                                    unit: e.unit,
+                                    filter
+                                }
+                            ];
+                        case "relation-sum-expr-normalized":
+                            return [
+                                key,
+                                {
+                                    _tag: e._tag,
+                                    path: e.path,
+                                    expression: e.expression,
+                                    unit: e.unit,
+                                    toBase: e.toBase,
+                                    factors: e.factors,
+                                    filter
+                                }
+                            ];
+                        case "relation-collect":
+                            return [
+                                key,
+                                {
+                                    _tag: e._tag,
+                                    path: e.path,
+                                    field: e.field,
+                                    distinct: e.distinct,
+                                    filter
+                                }
+                            ];
+                        case "relation-collect-fields":
+                            return [
+                                key,
+                                {
+                                    _tag: e._tag,
+                                    path: e.path,
+                                    fields: e.fields,
+                                    distinct: e.distinct,
+                                    filter
+                                }
+                            ];
+                    }
+                }))
+                : undefined;
         }
     }));
     return data;
@@ -115,14 +197,14 @@ const walkTransformation = (t) => {
     }
     return t;
 };
-export const toFilter = (q) => {
+export const toFilter = (q, baseSchema) => {
     // TODO: Native interpreter for each db adapter, instead of the intermediate "new-kid" format
     const a = interpret(q);
     const schema = a.schema;
     let select = [];
     // TODO: support more complex (nested) schemas?
     if (schema) {
-        const t = walkTransformation(schema.ast);
+        const t = walkTransformation(SchemaAST.toEncoded(schema.ast));
         if (S.AST.isObjects(t)) {
             select = t.propertySignatures.map((_) => _.name);
             for (const prop of t.propertySignatures) {
@@ -148,12 +230,51 @@ export const toFilter = (q) => {
             }
         }
     }
+    const computed = a.computed;
+    const getSelectKey = (_) => {
+        if (typeof _ === "string") {
+            return _;
+        }
+        if (typeof _ === "object" && _ !== null && "key" in _) {
+            return _.key;
+        }
+        return String(_);
+    };
+    const schemaKeys = select.map(getSelectKey);
+    const nonEncodedSchemaKeys = (() => {
+        if (!baseSchema) {
+            return [];
+        }
+        const encoded = walkTransformation(SchemaAST.toEncoded(baseSchema.ast));
+        if (!S.AST.isObjects(encoded)) {
+            return [];
+        }
+        const encodedKeys = encoded.propertySignatures.map((_) => _.name);
+        return schemaKeys.filter((key) => !encodedKeys.includes(key));
+    })();
+    const missingComputedKeys = nonEncodedSchemaKeys.filter((key) => !(computed && key in computed));
+    if (Array.isArrayNonEmpty(missingComputedKeys)) {
+        throw new Error(`Missing computed projections for schema keys: ${missingComputedKeys.join(", ")}`);
+    }
+    if (computed) {
+        const computedKeys = Object.keys(computed);
+        const extraComputedKeys = computedKeys.filter((key) => !schemaKeys.includes(key));
+        if (Array.isArrayNonEmpty(extraComputedKeys)) {
+            throw new Error(`Computed projection keys must exist in projection schema: ${extraComputedKeys.join(", ")}`);
+        }
+        select = select.filter((_) => {
+            const key = getSelectKey(_);
+            return !(key in computed);
+        });
+        select.push(...Object.entries(computed).map(([key, expression]) => ({ key, computed: expression })));
+    }
     return dropUndefinedT({
         t: null,
         limit: a.limit,
         skip: a.skip,
         select: Option.getOrUndefined(toNonEmptyArray(select)),
         schema,
+        computed,
         order: Option.getOrUndefined(toNonEmptyArray(a.order)),
         ttype: a.ttype,
         mode: a.mode ?? "transform",
@@ -162,4 +283,4 @@ export const toFilter = (q) => {
             : undefined
     });
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"new-kid-interpreter.js","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"new-kid-interpreter.js","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"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"}

package/dist/Model/query.d.ts

@@ -12,4 +12,4 @@ export interface RawQuery<Encoded, Out> {
     };
     memory: (t: readonly Encoded[]) => readonly Out[];
 }
-//# sourceMappingURL=query.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Nb2RlbC9xdWVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdCQUFnQixDQUFBO0FBQzlCLGNBQWMsZ0NBQWdDLENBQUE7QUFFOUMsTUFBTSxXQUFXLFFBQVEsQ0FBQyxPQUFPLEVBQUUsR0FBRztJQUNwQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUU7UUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFBO0tBQUUsS0FBSztRQUNsQyxLQUFLLEVBQUUsTUFBTSxDQUFBO1FBQ2IsVUFBVSxFQUFFO1lBQ1YsSUFBSSxFQUFFLE1BQU0sQ0FBQTtZQUNaLEtBQUssRUFBRSxHQUFHLENBQUE7U0FDWCxFQUFFLENBQUE7S0FDSixDQUFBO0lBQ0QsTUFBTSxFQUFFLENBQUMsQ0FBQyxFQUFFLFNBQVMsT0FBTyxFQUFFLEtBQUssU0FBUyxHQUFHLEVBQUUsQ0FBQTtDQUNsRCJ9

package/dist/Model.d.ts

@@ -1,4 +1,5 @@
 export * from "./Model/dsl.js";
 export * as Q from "./Model/query.js";
 export { makeRepo } from "./Model/Repository.js";
-//# sourceMappingURL=Model.d.ts.map
+export { type RegisteredRepository, RepositoryRegistry, RepositoryRegistryLive } from "./Model/Repository.js";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9Nb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdCQUFnQixDQUFBO0FBQzlCLE9BQU8sS0FBSyxDQUFDLE1BQU0sa0JBQWtCLENBQUE7QUFDckMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHVCQUF1QixDQUFBO0FBQ2hELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLGtCQUFrQixFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUJBQXVCLENBQUEifQ==

package/dist/Model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../src/Model.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,OAAO,KAAK,CAAC,MAAM,kBAAkB,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../src/Model.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,OAAO,KAAK,CAAC,MAAM,kBAAkB,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA"}

package/dist/Model.js

@@ -1,4 +1,5 @@
 export * from "./Model/dsl.js";
 export * as Q from "./Model/query.js";
 export { makeRepo } from "./Model/Repository.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvTW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQTtBQUM5QixPQUFPLEtBQUssQ0FBQyxNQUFNLGtCQUFrQixDQUFBO0FBQ3JDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQSJ9
+export { RepositoryRegistry, RepositoryRegistryLive } from "./Model/Repository.js";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvTW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQTtBQUM5QixPQUFPLEtBQUssQ0FBQyxNQUFNLGtCQUFrQixDQUFBO0FBQ3JDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUNoRCxPQUFPLEVBQTZCLGtCQUFrQixFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUJBQXVCLENBQUEifQ==

package/dist/QueueMaker/SQLQueue.d.ts

@@ -1,16 +1,15 @@
 import { type QueueBase } from "@effect-app/infra/QueueMaker/service";
-import { Effect, S } from "effect-app";
-import type { NonEmptyString255 } from "effect-app/Schema";
+import * as Effect from "effect-app/Effect";
+import * as S from "effect-app/Schema";
+import { type NonEmptyString255 } from "effect-app/Schema";
 import { SqlClient } from "effect/unstable/sql";
-export declare const QueueId: S.brand<import("effect/Schema").Number & {
-    withDefault: S.withConstructorDefault<import("effect/Schema").Number & S.WithoutConstructorDefault>;
-}, "QueueId">;
+export declare const QueueId: S.brand<import("effect/Schema").Finite, "QueueId">;
 export type QueueId = typeof QueueId.Type;
-export declare function makeSQLQueue<Evt extends {
+export declare const makeSQLQueue: <Evt extends {
     id: S.StringId;
     _tag: string;
 }, DrainEvt extends {
     id: S.StringId;
     _tag: string;
-}, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Codec<Evt, EvtE>, drainSchema: S.Codec<DrainEvt, DrainEvtE>): Effect.Effect<QueueBase<Evt, DrainEvt>, never, SqlClient.SqlClient>;
-//# sourceMappingURL=SQLQueue.d.ts.map
+}, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Codec<Evt, EvtE, never, never>, drainSchema: S.Codec<DrainEvt, DrainEvtE, never, never>) => Effect.Effect<QueueBase<Evt, DrainEvt>, never, SqlClient.SqlClient>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU1FMUXVldWUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9RdWV1ZU1ha2VyL1NRTFF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBYSxNQUFNLHNDQUFzQyxDQUFBO0FBR2hGLE9BQU8sS0FBSyxNQUFNLE1BQU0sbUJBQW1CLENBQUE7QUFFM0MsT0FBTyxLQUFLLENBQUMsTUFBTSxtQkFBbUIsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBSTFELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUsvQyxlQUFPLE1BQU0sT0FBTyxvREFBb0MsQ0FBQTtBQUN4RCxNQUFNLE1BQU0sT0FBTyxHQUFHLE9BQU8sT0FBTyxDQUFDLElBQUksQ0FBQTtBQUd6QyxlQUFPLE1BQU0sWUFBWSxHQUN2QixHQUFHLFNBQVM7SUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQztJQUFDLElBQUksRUFBRSxNQUFNLENBQUE7Q0FBRSxFQUM1QyxRQUFRLFNBQVM7SUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQztJQUFDLElBQUksRUFBRSxNQUFNLENBQUE7Q0FBRSxFQUNqRCxJQUFJLEVBQ0osU0FBUyw0T0FnS1QsQ0FBQSJ9

package/dist/QueueMaker/SQLQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,sCAAsC,CAAA;AAEhF,OAAO,EAAE,MAAM,EAA6C,CAAC,EAAU,MAAM,YAAY,CAAA;AACzF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAI/C,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,EAC1B,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,uEAoK1C"}
+{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,sCAAsC,CAAA;AAGhF,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAI1D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAK/C,eAAO,MAAM,OAAO,oDAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,eAAO,MAAM,YAAY,GACvB,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,4OAgKT,CAAA"}