joist-core 2.2.0-next.3 → 2.2.0-next.30

package/build/dataloaders/fastWhereFilterHash.js

@@ -0,0 +1,164 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fastWhereFilterHash = fastWhereFilterHash;
+const Aliases_1 = require("../Aliases");
+const Entity_1 = require("../Entity");
+const relations_1 = require("../relations");
+const temporal_1 = require("../temporal");
+const temporalMappers_1 = require("../temporalMappers");
+const Temporal = (0, temporal_1.maybeRequireTemporal)()?.Temporal;
+/**
+ * Returns a fast stable key for find filters.
+ *
+ * This avoids `object-hash` for simple find filters; the phase 8 query-prep benchmark saw 1,000-query p50s drop
+ * from ~22-26ms to ~7.6-10.9ms, with heap allocation dropping from ~24-30MB to ~10-16MB.
+ *
+ * We also benchmarked native/WASM non-cryptographic hash libraries, but they only hash bytes; they still need this
+ * deterministic serialization first. For 1,000 filter keys, this helper alone had p50s of 0.337/0.353/0.410ms vs.
+ * object-hash md5 at 7.467/7.436/7.620ms, and wrapping this key with native hashes was slower: farmhash
+ * fingerprint64 at 0.517/0.524/0.538ms, @node-rs/xxhash xxh3-128 at 0.611/0.613/0.627ms, and xxhash-addon
+ * XXH128 at 1.031/1.078/1.348ms. So the stable serialization is the necessary work, and keeping it as the cache
+ * key avoids extra native-call/digest overhead and avoids introducing probabilistic hash collisions.
+ */
+function fastWhereFilterHash(value) {
+    return appendStableValue("", value, new WeakSet());
+}
+/** Appends a deterministic, type-tagged representation of `value` to `key`. */
+function appendStableValue(key, value, seen) {
+    if (value === undefined)
+        return `${key}u;`;
+    if (value === null)
+        return `${key}n;`;
+    switch (typeof value) {
+        case "string":
+            return `${key}s${value.length}:${value};`;
+        case "number":
+            return `${key}d${value};`;
+        case "boolean":
+            return `${key}b${value ? 1 : 0};`;
+        case "bigint":
+            return `${key}i${value.toString()};`;
+        case "object":
+            return appendStableObject(key, value, seen);
+        case "function":
+            return (0, Aliases_1.isAlias)(value) ? `${key}xalias;` : undefined;
+        default:
+            return undefined;
+    }
+}
+/** Appends a deterministic, type-tagged representation of `value` to `key`. */
+function appendStableObject(key, value, seen) {
+    if (value instanceof Date)
+        return `${key}t${value.toISOString().length}:${value.toISOString()};`;
+    if (ArrayBuffer.isView(value))
+        return appendArrayBufferView(key, value);
+    if (Array.isArray(value)) {
+        if (seen.has(value))
+            return undefined;
+        seen.add(value);
+        key = `${key}a${value.length}[`;
+        for (const item of value) {
+            const nextKey = appendStableValue(key, item, seen);
+            if (nextKey === undefined) {
+                seen.delete(value);
+                return undefined;
+            }
+            key = nextKey;
+        }
+        seen.delete(value);
+        return `${key}]`;
+    }
+    if (isPlainObject(value)) {
+        if (seen.has(value))
+            return undefined;
+        seen.add(value);
+        const keys = Object.keys(value).sort();
+        key = `${key}o${keys.length}{`;
+        for (const property of keys) {
+            key = `${key}${property.length}:${property}=`;
+            const nextKey = appendStableValue(key, value[property], seen);
+            if (nextKey === undefined) {
+                seen.delete(value);
+                return undefined;
+            }
+            key = nextKey;
+        }
+        seen.delete(value);
+        return `${key}}`;
+    }
+    if ((0, Entity_1.isEntity)(value))
+        return `${key}e${value.toString().length}:${value.toString()};`;
+    const referenceKey = appendReferenceValue(key, value);
+    if (referenceKey !== undefined)
+        return referenceKey;
+    const temporalValue = toTemporalDbValue(value);
+    if (temporalValue !== undefined)
+        return appendTemporalValue(key, temporalValue);
+    const valueObjectKey = appendValueObject(key, value, seen);
+    if (valueObjectKey !== undefined)
+        return valueObjectKey;
+    return undefined;
+}
+/** Appends an ArrayBuffer view by its exact byte contents. */
+function appendArrayBufferView(key, value) {
+    const bytes = Buffer.from(value.buffer, value.byteOffset, value.byteLength).toString("base64");
+    return `${key}y${value.constructor.name.length}:${value.constructor.name}:${bytes.length}:${bytes};`;
+}
+/** Appends a Joist reference by its tagged id. */
+function appendReferenceValue(key, value) {
+    if (!(0, relations_1.isReference)(value))
+        return undefined;
+    const id = value.idTaggedMaybe;
+    return id === undefined ? `${key}r;` : `${key}r${id.length}:${id};`;
+}
+/** Appends a custom value object by constructor name and enumerable properties. */
+function appendValueObject(key, value, seen) {
+    if (!isValueObject(value))
+        return undefined;
+    if (seen.has(value))
+        return undefined;
+    seen.add(value);
+    const constructorName = value.constructor.name;
+    const keys = Object.keys(value).sort();
+    key = `${key}c${constructorName.length}:${constructorName}:${keys.length}{`;
+    for (const property of keys) {
+        key = `${key}${property.length}:${property}=`;
+        const nextKey = appendStableValue(key, value[property], seen);
+        if (nextKey === undefined) {
+            seen.delete(value);
+            return undefined;
+        }
+        key = nextKey;
+    }
+    seen.delete(value);
+    return `${key}}`;
+}
+/** Appends a Temporal value as a distinct scalar type. */
+function appendTemporalValue(key, value) {
+    return `${key}t${value.length}:${value};`;
+}
+/** Returns the db representation for Temporal values, or undefined for non-Temporal values. */
+function toTemporalDbValue(value) {
+    if (!Temporal)
+        return undefined;
+    if (value instanceof Temporal.ZonedDateTime)
+        return temporalMappers_1.zonedDateTimeMapper.toDb(value);
+    if (value instanceof Temporal.PlainDateTime)
+        return temporalMappers_1.plainDateTimeMapper.toDb(value);
+    if (value instanceof Temporal.PlainDate)
+        return temporalMappers_1.plainDateMapper.toDb(value);
+    if (value instanceof Temporal.PlainTime)
+        return temporalMappers_1.plainTimeMapper.toDb(value);
+    return undefined;
+}
+/** Returns true for plain object literals used by find filters/settings. */
+function isPlainObject(value) {
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+}
+/** Returns true for custom value objects that can be represented by enumerable fields. */
+function isValueObject(value) {
+    const prototype = Object.getPrototypeOf(value);
+    return prototype !== Object.prototype && prototype !== null && Object.keys(value).length > 0;
+}
+//# sourceMappingURL=fastWhereFilterHash.js.map

package/build/dataloaders/fastWhereFilterHash.js.map

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

package/build/dataloaders/fastWhereFilterHash.test.d.ts

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

package/build/dataloaders/fastWhereFilterHash.test.d.ts.map

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

package/build/dataloaders/fastWhereFilterHash.test.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fastWhereFilterHash_1 = require("./fastWhereFilterHash");
+describe("fastWhereFilterHash", () => {
+    it("returns stable hashes for object keys regardless of insertion order", () => {
+        const first = (0, fastWhereFilterHash_1.fastWhereFilterHash)({ b: 2, a: "one" });
+        const second = (0, fastWhereFilterHash_1.fastWhereFilterHash)({ a: "one", b: 2 });
+        expect(first).toEqual("o2{1:a=s3:one;1:b=d2;}");
+        expect(second).toEqual(first);
+    });
+    it("uses type tags to distinguish similar scalar values", () => {
+        expect([
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: "1" }),
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: 1 }),
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: true }),
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: 1n }),
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: null }),
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: undefined }),
+        ]).toEqual([
+            "o1{5:value=s1:1;}",
+            "o1{5:value=d1;}",
+            "o1{5:value=b1;}",
+            "o1{5:value=i1;}",
+            "o1{5:value=n;}",
+            "o1{5:value=u;}",
+        ]);
+    });
+    it("hashes nested arrays and plain objects", () => {
+        const hash = (0, fastWhereFilterHash_1.fastWhereFilterHash)({ ids: [1, 2], nested: { name: "a1" } });
+        expect(hash).toEqual("o2{3:ids=a2[d1;d2;]6:nested=o1{4:name=s2:a1;}}");
+    });
+    it("hashes date values with their db representation", () => {
+        expect((0, fastWhereFilterHash_1.fastWhereFilterHash)({ at: new Date("2020-01-02T03:04:05.000Z") })).toEqual("o1{2:at=t24:2020-01-02T03:04:05.000Z;}");
+    });
+    it("hashes byte array values by their contents", () => {
+        expect((0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: new Uint8Array([11, 22]) })).toEqual("o1{5:value=y10:Uint8Array:4:CxY=;}");
+    });
+    it("hashes custom value objects by constructor and enumerable values", () => {
+        expect((0, fastWhereFilterHash_1.fastWhereFilterHash)({ value: new SupportedValue("a1") })).toEqual("o1{5:value=c14:SupportedValue:1{4:name=s2:a1;}}");
+    });
+    it("returns undefined for unsupported object types", () => {
+        expect([
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)(new Map([["name", "a1"]])),
+            (0, fastWhereFilterHash_1.fastWhereFilterHash)(function unsupportedFunction() { }),
+        ]).toEqual([undefined, undefined]);
+    });
+    it("returns undefined for circular structures", () => {
+        const value = { name: "a1" };
+        value.self = value;
+        expect((0, fastWhereFilterHash_1.fastWhereFilterHash)(value)).toEqual(undefined);
+    });
+});
+class SupportedValue {
+    name;
+    constructor(name) {
+        this.name = name;
+    }
+}
+//# sourceMappingURL=fastWhereFilterHash.test.js.map

package/build/dataloaders/fastWhereFilterHash.test.js.map

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

package/build/dataloaders/findCountDataLoader.d.ts

@@ -1,7 +1,6 @@
-import DataLoader from "dataloader";
 import { Entity } from "../Entity";
 import { FilterAndSettings } from "../EntityFilter";
 import { EntityManager, MaybeAbstractEntityConstructor } from "../EntityManager";
 export declare const findCountOperation = "find-count";
-export declare function findCountDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>): DataLoader<FilterAndSettings<T>, number>;
+export declare function findCountDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>): Promise<number>;
 //# sourceMappingURL=findCountDataLoader.d.ts.map

package/build/dataloaders/findCountDataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findCountDataLoader.d.ts","sourceRoot":"","sources":["../../src/dataloaders/findCountDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAajF,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAClD,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,8BAA8B,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC3B,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CA0E1C"}
+{"version":3,"file":"findCountDataLoader.d.ts","sourceRoot":"","sources":["../../src/dataloaders/findCountDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAoB,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAcnG,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAClD,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,8BAA8B,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAmFjB"}

package/build/dataloaders/findCountDataLoader.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findCountOperation = void 0;
 exports.findCountDataLoader = findCountDataLoader;
+const EntityManager_1 = require("../EntityManager");
 const EntityMetadata_1 = require("../EntityMetadata");
 const keywords_1 = require("../keywords");
 const QueryParser_1 = require("../QueryParser");
@@ -16,18 +17,22 @@ function findCountDataLoader(em, type, filter) {
     }
     const meta = (0, EntityMetadata_1.getMetadata)(type);
     const query = (0, QueryParser_1.parseFindQuery)(meta, where, opts);
+    const pendingDeletedIds = appendPendingDeletedIds(em, type, query, meta.idDbType, where, opts);
+    const { findSettings } = em["prepareFind"](meta, exports.findCountOperation, query, { ...opts, checkLimit: false });
+    const bindings = [];
+    (0, findDataLoader_1.collectValues)(bindings, query);
+    const prepared = { filter, pendingDeletedIds, query, bindings, findSettings };
     const batchKey = (0, findDataLoader_1.getBatchKeyFromGenericStructure)(meta, query);
-    return em.getLoader(exports.findCountOperation, batchKey, async (queries) => {
+    return em
+        .getLoader(exports.findCountOperation, batchKey, async (entries) => {
         // We're guaranteed that these queries all have the same structure
         // Don't bother with the CTE if there's only 1 query (or each query has exactly the same filter values)
-        if (queries.length === 1) {
-            const { where, ...options } = queries[0];
-            const meta = (0, EntityMetadata_1.getMetadata)(type);
-            const query = (0, QueryParser_1.parseFindQuery)(meta, where, options);
+        if (entries.length === 1) {
+            const { query, findSettings } = entries[0];
             const primary = query.tables.find((t) => t.join === "primary") ?? (0, utils_1.fail)("No primary");
             query.selects = [`count(distinct ${(0, keywords_1.kq)(primary.alias)}.id) as count`];
             query.orderBys = [];
-            const rows = await em["executeFind"](meta, exports.findCountOperation, query, { ...options, checkLimit: false });
+            const rows = await em["executePreparedFind"](meta, exports.findCountOperation, query, findSettings, false);
             return [Number(rows[0].count)];
         }
         // WITH _find (tag, arg1, arg2) AS (
@@ -40,8 +45,7 @@ function findCountDataLoader(em, type, filter) {
         //   FROM author a WHERE a.first_name = _find.arg1 OR a.last_name = _find.arg2
         // ) _data
         // Build the list of 'arg1', 'arg2', ... strings
-        const { where, ...options } = queries[0];
-        const query = (0, QueryParser_1.parseFindQuery)((0, EntityMetadata_1.getMetadata)(type), where, options);
+        const { query, findSettings } = entries[0];
         const argsColumns = (0, findDataLoader_1.collectAndReplaceArgs)(query);
         argsColumns.unshift({ columnName: "tag", dbType: "int" });
         // We're not returning the entities, just counting them...
@@ -56,19 +60,50 @@ function findCountDataLoader(em, type, filter) {
                 { join: "lateral", query: query, table: meta.tableName, alias: "_data", fromAlias: "_f" },
             ],
             // For each unique query, capture its filter values in `bindings` to populate the CTE _find table
-            ctes: [(0, unnest_1.buildUnnestCte)("_find", argsColumns, (0, findDataLoader_1.createColumnValues)(meta, argsColumns, queries))],
+            ctes: [(0, unnest_1.buildUnnestCte)("_find", argsColumns, (0, findDataLoader_1.createColumnValuesFromPrepared)(argsColumns, entries))],
             orderBys: [],
         };
-        const rows = await em["executeFind"](meta, exports.findCountOperation, query2, { ...options, checkLimit: false });
+        const rows = await em["executePreparedFind"](meta, exports.findCountOperation, query2, findSettings, false);
         // Make an empty array for each batched query, per the dataloader contract
-        const results = queries.map(() => 0);
+        const results = entries.map(() => 0);
         // Then put each row into the tagged query it matched
         for (const row of rows) {
             results[row.tag] = Number(row.count);
         }
         return results;
     }, 
-    // Our filter/order tuple is a complex object, so object-hash it to ensure caching works
-    { cacheKeyFn: findDataLoader_1.whereFilterHash });
+    // Our filter/order tuple is a complex object, so use a stable cache key to ensure caching works.
+    {
+        cacheKeyFn: (entry) => {
+            // Include pendingDeletedIds so that each new em.delete => recalcs the count
+            return (0, findDataLoader_1.whereFilterHash)({ ...entry.filter, pendingDeletedIds: entry.pendingDeletedIds });
+        },
+    })
+        .load(prepared);
+}
+/** Adds `id not in pendingDeletedIds` to the count query so pending deletes are excluded in SQL. */
+function appendPendingDeletedIds(em, type, query, idDbType, where, opts) {
+    const pendingDeletedIds = Object.keys(where).length === 0 && opts.conditions === undefined ? [] : (0, EntityManager_1.getEmInternalApi)(em).pendingDeleteIds(type);
+    if (pendingDeletedIds.length === 0)
+        return pendingDeletedIds;
+    const primary = query.tables.find((t) => t.join === "primary") ?? (0, utils_1.fail)("No primary");
+    const condition = {
+        kind: "column",
+        alias: primary.alias,
+        column: "id",
+        dbType: idDbType,
+        cond: { kind: "nin", value: pendingDeletedIds },
+        pruneable: true,
+    };
+    if (!query.condition) {
+        query.condition = { kind: "exp", op: "and", conditions: [condition] };
+    }
+    else if (query.condition.op === "and") {
+        query.condition.conditions.push(condition);
+    }
+    else {
+        query.condition = { kind: "exp", op: "and", conditions: [query.condition, condition] };
+    }
+    return pendingDeletedIds;
 }
 //# sourceMappingURL=findCountDataLoader.js.map

package/build/dataloaders/findCountDataLoader.js.map

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

package/build/dataloaders/findDataLoader.d.ts

@@ -1,15 +1,15 @@
-import DataLoader from "dataloader";
 import { Entity } from "../Entity";
 import { FilterAndSettings } from "../EntityFilter";
 import { EntityManager, MaybeAbstractEntityConstructor } from "../EntityManager";
 import { EntityMetadata } from "../EntityMetadata";
 import { ParsedCteClause, ParsedFindQuery } from "../QueryParser";
-import { optimizeCollectionJoins } from "../QueryParser.collectionJoins";
 import { OpColumn } from "../drivers/EntityWriter";
 import { LoadHint } from "../loadHints";
 export declare const findOperation = "find";
-export declare function findDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>, hint: LoadHint<T> | undefined): DataLoader<FilterAndSettings<T>, T[]>;
-export declare function whereFilterHash(where: FilterAndSettings<any>): any;
+export declare function findDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>, hint: LoadHint<T> | undefined): Promise<T[]>;
+export declare function whereFilterHash(where: object): any;
+/** Filters pending-delete entities in place to avoid allocating a replacement array for the common find path. */
+export declare function filterDeletedEntities<T extends Entity>(em: EntityManager, entities: T[]): T[];
 /**
  * Recursively finds args in `query` and replaces them with `_find.argX` placeholders.
  *
@@ -19,7 +19,12 @@ export declare function collectAndReplaceArgs(query: ParsedFindQuery): {
     columnName: string;
     dbType: string;
 }[];
-export declare function createColumnValues(meta: EntityMetadata, columns: OpColumn[], queries: readonly FilterAndSettings<any>[], optimizeOptions?: Parameters<typeof optimizeCollectionJoins>[1]): any[][];
+/** Builds `_find` column values from already prepared queries. */
+export declare function createColumnValuesFromPrepared(columns: OpColumn[], entries: readonly {
+    bindings: any[];
+}[]): any[][];
+/** Pushes the arg values of a given query in the cross-query `bindings` array. */
+export declare function collectValues(bindings: any[], query: ParsedFindQuery): void;
 /**
  * Creates a `VALUES (...), (...)` SQL string for use in a CTE, typically for our
  * batch INSERTs/UPDATEs where the CTE is how we inject N rows of data/params into

package/build/dataloaders/findDataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findDataLoader.d.ts","sourceRoot":"","sources":["../../src/dataloaders/findDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAY,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,8BAA8B,EAAoB,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,cAAc,EAAe,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAEL,eAAe,EACf,eAAe,EAMhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMxC,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,8BAA8B,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,GAC5B,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAmHvC;AA0BD,wBAAgB,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,GAAG,CAAC,GAAG,GAAG,CAElE;AASD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,CAiCtG;AAaD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,QAAQ,EAAE,EACnB,OAAO,EAAE,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAC1C,eAAe,GAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAM,GAClE,GAAG,EAAE,EAAE,CAkBT;AA2ED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,EACjD,IAAI,EAAE,SAAS,GAAG,EAAE,EAEpB,QAAQ,EAAE,SAAS,GAAG,EAAE,GACvB,eAAe,CAYjB;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,eAAe,GAAG,MAAM,CAUpG"}
+{"version":3,"file":"findDataLoader.d.ts","sourceRoot":"","sources":["../../src/dataloaders/findDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,8BAA8B,EAAoB,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,cAAc,EAAe,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAEL,eAAe,EACf,eAAe,EAQhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMxC,eAAO,MAAM,aAAa,SAAS,CAAC;AAUpC,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,8BAA8B,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,GAC5B,OAAO,CAAC,CAAC,EAAE,CAAC,CA2Gd;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAIlD;AAED,iHAAiH;AACjH,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAgB7F;AASD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,CAiCtG;AAaD,kEAAkE;AAClE,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,SAAS;IAAE,QAAQ,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,GAAG,GAAG,EAAE,EAAE,CAUpH;AAED,kFAAkF;AAClF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI,CAc3E;AAuHD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,EACjD,IAAI,EAAE,SAAS,GAAG,EAAE,EAEpB,QAAQ,EAAE,SAAS,GAAG,EAAE,GACvB,eAAe,CAYjB;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,eAAe,GAAG,MAAM,CAUpG"}