@frogbotai/db-mongodb 0.29.0 → 0.31.0

package/dist/search/search.js

@@ -6,40 +6,75 @@ import { isDraftSearch } from './isDraftSearch.js';
 import { buildHybridPipeline } from './pipelines/buildHybridPipeline.js';
 import { buildSearchStage } from './pipelines/buildSearchStage.js';
 import { buildVectorScore } from './pipelines/buildVectorScore.js';
-import { buildVectorSearchStage, isApproximateVectorSearch, } from './pipelines/buildVectorSearchStage.js';
+import { buildVectorSearchStage, isApproximateVectorSearch } from './pipelines/buildVectorSearchStage.js';
 import { buildSearchFilter } from './queries/buildSearchFilter.js';
 import { buildSearchOperator } from './queries/buildSearchOperator.js';
 import { buildVectorSearchFilter } from './queries/buildVectorSearchFilter.js';
 import { supportsRankFusion } from './supportsRankFusion.js';
 const distinctParentStages = [
-    { $sort: { score: -1, id: 1 } },
-    { $group: { _id: '$id', row: { $first: '$$ROOT' } } },
-    { $replaceRoot: { newRoot: '$row' } },
-    { $sort: { score: -1, id: 1 } },
+    {
+        $sort: {
+            score: -1,
+            id: 1
+        }
+    },
+    {
+        $group: {
+            _id: '$id',
+            row: {
+                $first: '$$ROOT'
+            }
+        }
+    },
+    {
+        $replaceRoot: {
+            newRoot: '$row'
+        }
+    },
+    {
+        $sort: {
+            score: -1,
+            id: 1
+        }
+    }
 ];
-function getRanking({ approximate, index, mode, }) {
+function getRanking({ approximate, index, mode }) {
     const lexical = {
         method: 'mongodb-search',
         higherIsBetter: true,
-        approximate: false,
+        approximate: false
     };
     const vector = {
         method: approximate ? 'mongodb-hnsw' : 'mongodb-exact',
         higherIsBetter: index.vector?.metric !== 'euclidean',
+        approximate
+    };
+    if (mode === 'lexical') return lexical;
+    if (mode === 'vector') return vector;
+    return {
+        method: 'rrf',
+        higherIsBetter: true,
         approximate,
+        components: {
+            lexical,
+            vector
+        }
     };
-    if (mode === 'lexical')
-        return lexical;
-    if (mode === 'vector')
-        return vector;
-    return { method: 'rrf', higherIsBetter: true, approximate, components: { lexical, vector } };
 }
-function buildScoreStage({ index, mode, }) {
-    if (mode === 'lexical')
-        return undefined;
+function buildScoreStage({ index, mode }) {
+    if (mode === 'lexical') return undefined;
     const { metric } = index.vector;
     if (mode === 'vector') {
-        return { $project: { _id: 0, id: 1, score: buildVectorScore({ metric, score: '$score' }) } };
+        return {
+            $project: {
+                _id: 0,
+                id: 1,
+                score: buildVectorScore({
+                    metric,
+                    score: '$score'
+                })
+            }
+        };
     }
     return {
         $project: {
@@ -49,77 +84,141 @@ function buildScoreStage({ index, mode, }) {
             lexical: 1,
             vector: {
                 $cond: [
-                    { $eq: [{ $ifNull: ['$vector', null] }, null] },
+                    {
+                        $eq: [
+                            {
+                                $ifNull: [
+                                    '$vector',
+                                    null
+                                ]
+                            },
+                            null
+                        ]
+                    },
                     null,
-                    { rank: '$vector.rank', score: buildVectorScore({ metric, score: '$vector.score' }) },
-                ],
-            },
-        },
+                    {
+                        rank: '$vector.rank',
+                        score: buildVectorScore({
+                            metric,
+                            score: '$vector.score'
+                        })
+                    }
+                ]
+            }
+        }
     };
 }
 function getComponent(component) {
-    if (!component || typeof component !== 'object')
-        return null;
+    if (!component || typeof component !== 'object') return null;
     const { rank, score } = component;
-    return { rank: Number(rank), score: Number(score) };
+    return {
+        rank: Number(rank),
+        score: Number(score)
+    };
 }
-export const search = async ({ candidates, collection, db, draft, index, limit, locale: requestedLocale, mode, query, where, }) => {
+export const search = async ({ candidates, collection, db, draft, index, limit, locale: requestedLocale, mode, query, where })=>{
     const adapter = db;
     const { localization } = adapter.payload.config;
     const locale = requestedLocale ?? (localization ? localization.defaultLocale : undefined);
-    const versions = isDraftSearch({ adapter, collection, draft });
-    const searchIndexes = getSearchIndexes(adapter).filter((searchIndex) => searchIndex.collection === collection &&
-        searchIndex.index === index.name &&
-        searchIndex.versions === versions);
+    const versions = isDraftSearch({
+        adapter,
+        collection,
+        draft
+    });
+    const searchIndexes = getSearchIndexes(adapter).filter((searchIndex)=>searchIndex.collection === collection && searchIndex.index === index.name && searchIndex.versions === versions);
     if (!searchIndexes.length) {
         throw new SearchReadinessError(`Search index '${index.name}' is not set up for collection '${collection}'. Restart to apply search configuration changes.`);
     }
-    const lexicalIndex = searchIndexes.find((searchIndex) => searchIndex.mode === 'lexical');
-    const vectorIndex = searchIndexes.find((searchIndex) => searchIndex.mode === 'vector');
+    const lexicalIndex = searchIndexes.find((searchIndex)=>searchIndex.mode === 'lexical');
+    const vectorIndex = searchIndexes.find((searchIndex)=>searchIndex.mode === 'vector');
     const depth = Math.max(limit, candidates ?? limit);
     const vectorLimit = mode === 'hybrid' ? depth : limit;
-    const approximate = mode !== 'lexical' &&
-        isApproximateVectorSearch({ approximate: index.vector.approximate, limit: vectorLimit });
-    const ranking = getRanking({ approximate, index, mode });
-    const filter = await buildSearchFilter({ adapter, locale, searchIndex: searchIndexes[0], where });
-    if (filter === false)
-        return { ranking, rows: [] };
-    const Model = getSearchModel({ adapter, collection, versions });
-    const fields = getSearchFields({ adapter, collection, versions });
-    const idPath = versions ? 'parent' : '_id';
-    const getPath = (path) => getSearchPath({ adapter, collection, fields, locale, path, versions }).path;
-    const getSearchPipeline = (searchLimit) => [
-        buildSearchStage({
-            filter: filter === true ? undefined : buildSearchOperator(filter),
-            name: lexicalIndex.name,
-            paths: index.lexical.fields.map(({ path }) => getPath(path)),
-            text: query.text,
-        }),
-        { $limit: searchLimit },
-    ];
-    const getVectorSearchStage = () => buildVectorSearchStage({
+    const approximate = mode !== 'lexical' && isApproximateVectorSearch({
+        approximate: index.vector.approximate,
+        limit: vectorLimit
+    });
+    const ranking = getRanking({
         approximate,
-        candidates: depth,
-        filter: filter === true ? undefined : buildVectorSearchFilter(filter),
-        limit: vectorLimit,
-        name: vectorIndex.name,
-        path: getPath(index.vector.path),
-        vector: query.vector,
+        index,
+        mode
+    });
+    const filter = await buildSearchFilter({
+        adapter,
+        locale,
+        searchIndex: searchIndexes[0],
+        where
     });
+    if (filter === false) return {
+        ranking,
+        rows: []
+    };
+    const Model = getSearchModel({
+        adapter,
+        collection,
+        versions
+    });
+    const fields = getSearchFields({
+        adapter,
+        collection,
+        versions
+    });
+    const idPath = versions ? 'parent' : '_id';
+    const getPath = (path)=>getSearchPath({
+            adapter,
+            collection,
+            fields,
+            locale,
+            path,
+            versions
+        }).path;
+    const getSearchPipeline = (searchLimit)=>[
+            buildSearchStage({
+                filter: filter === true ? undefined : buildSearchOperator(filter),
+                name: lexicalIndex.name,
+                paths: index.lexical.fields.map(({ path })=>getPath(path)),
+                text: query.text
+            }),
+            {
+                $limit: searchLimit
+            }
+        ];
+    const getVectorSearchStage = ()=>buildVectorSearchStage({
+            approximate,
+            candidates: depth,
+            filter: filter === true ? undefined : buildVectorSearchFilter(filter),
+            limit: vectorLimit,
+            name: vectorIndex.name,
+            path: getPath(index.vector.path),
+            vector: query.vector
+        });
     let pipeline;
     if (mode === 'lexical') {
         pipeline = [
             ...getSearchPipeline(limit),
-            { $project: { _id: 0, id: `$${idPath}`, score: { $meta: 'searchScore' } } },
+            {
+                $project: {
+                    _id: 0,
+                    id: `$${idPath}`,
+                    score: {
+                        $meta: 'searchScore'
+                    }
+                }
+            }
         ];
-    }
-    else if (mode === 'vector') {
+    } else if (mode === 'vector') {
         pipeline = [
             getVectorSearchStage(),
-            { $project: { _id: 0, id: `$${idPath}`, score: { $meta: 'vectorSearchScore' } } },
+            {
+                $project: {
+                    _id: 0,
+                    id: `$${idPath}`,
+                    score: {
+                        $meta: 'vectorSearchScore'
+                    }
+                }
+            }
         ];
-    }
-    else {
+    } else {
         pipeline = buildHybridPipeline({
             collection: Model.collection.name,
             idPath,
@@ -127,24 +226,29 @@ export const search = async ({ candidates, collection, db, draft, index, limit,
             rankFusion: await supportsRankFusion(Model),
             searchPipeline: getSearchPipeline(depth),
             vectorSearchStage: getVectorSearchStage(),
-            weights: index.hybrid.weights,
+            weights: index.hybrid.weights
         });
     }
-    if (versions)
-        pipeline.push(...distinctParentStages);
-    const scoreStage = buildScoreStage({ index, mode });
-    if (scoreStage)
-        pipeline.push(scoreStage);
-    const rows = await Model.aggregate(pipeline).exec();
+    if (versions) pipeline.push(...distinctParentStages);
+    const scoreStage = buildScoreStage({
+        index,
+        mode
+    });
+    if (scoreStage) pipeline.push(scoreStage);
+    const rows = await Model.collection.aggregate(pipeline).toArray();
     return {
         ranking,
-        rows: rows.map(({ id, lexical, score, vector }) => ({
-            id: typeof id === 'number' ? id : String(id),
-            score,
-            ...(mode === 'hybrid'
-                ? { components: { lexical: getComponent(lexical), vector: getComponent(vector) } }
-                : {}),
-        })),
+        rows: rows.map(({ id, lexical, score, vector })=>({
+                id: typeof id === 'number' ? id : String(id),
+                score,
+                ...mode === 'hybrid' ? {
+                    components: {
+                        lexical: getComponent(lexical),
+                        vector: getComponent(vector)
+                    }
+                } : {}
+            }))
     };
 };
+
 //# sourceMappingURL=search.js.map

package/dist/search/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/search/search.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../src/search/search.ts"],"names":["SearchReadinessError","getSearchIndexes","getSearchModel","getSearchFields","getSearchPath","isDraftSearch","buildHybridPipeline","buildSearchStage","buildVectorScore","buildVectorSearchStage","isApproximateVectorSearch","buildSearchFilter","buildSearchOperator","buildVectorSearchFilter","supportsRankFusion","distinctParentStages","$sort","score","id","$group","_id","row","$first","$replaceRoot","newRoot","getRanking","approximate","index","mode","lexical","method","higherIsBetter","vector","metric","components","buildScoreStage","undefined","$project","$cond","$eq","$ifNull","rank","getComponent","component","Number","search","candidates","collection","db","draft","limit","locale","requestedLocale","query","where","adapter","localization","payload","config","defaultLocale","versions","searchIndexes","filter","searchIndex","name","length","lexicalIndex","find","vectorIndex","depth","Math","max","vectorLimit","ranking","rows","Model","fields","idPath","getPath","path","getSearchPipeline","searchLimit","paths","map","text","$limit","getVectorSearchStage","pipeline","$meta","rankFusion","searchPipeline","vectorSearchStage","weights","hybrid","push","scoreStage","aggregate","toArray","String"],"mappings":"AASA,SAASA,oBAAoB,QAAQ,iBAAiB;AAEtD,SAASC,gBAAgB,QAAQ,wBAAwB;AACzD,SAASC,cAAc,QAAQ,sBAAsB;AACrD,SAASC,eAAe,EAAEC,aAAa,QAAQ,qBAAqB;AACpE,SAASC,aAAa,QAAQ,qBAAqB;AACnD,SAASC,mBAAmB,QAAQ,qCAAqC;AACzE,SAASC,gBAAgB,QAAQ,kCAAkC;AACnE,SAASC,gBAAgB,QAAQ,kCAAkC;AACnE,SACEC,sBAAsB,EACtBC,yBAAyB,QACpB,wCAAwC;AAC/C,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,mBAAmB,QAAQ,mCAAmC;AACvE,SAASC,uBAAuB,QAAQ,uCAAuC;AAC/E,SAASC,kBAAkB,QAAQ,0BAA0B;AAS7D,MAAMC,uBAAuB;IAC3B;QAAEC,OAAO;YAAEC,OAAO,CAAC;YAAGC,IAAI;QAAE;IAAE;IAC9B;QAAEC,QAAQ;YAAEC,KAAK;YAAOC,KAAK;gBAAEC,QAAQ;YAAS;QAAE;IAAE;IACpD;QAAEC,cAAc;YAAEC,SAAS;QAAO;IAAE;IACpC;QAAER,OAAO;YAAEC,OAAO,CAAC;YAAGC,IAAI;QAAE;IAAE;CAC/B;AAED,SAASO,WAAW,EAClBC,WAAW,EACXC,KAAK,EACLC,IAAI,EAKL;IACC,MAAMC,UAAkC;QACtCC,QAAQ;QACRC,gBAAgB;QAChBL,aAAa;IACf;IAEA,MAAMM,SAAiC;QACrCF,QAAQJ,cAAc,iBAAiB;QACvCK,gBAAgBJ,MAAMK,MAAM,EAAEC,WAAW;QACzCP;IACF;IAEA,IAAIE,SAAS,WAAW,OAAOC;IAE/B,IAAID,SAAS,UAAU,OAAOI;IAE9B,OAAO;QAAEF,QAAQ;QAAOC,gBAAgB;QAAML;QAAaQ,YAAY;YAAEL;YAASG;QAAO;IAAE;AAC7F;AAEA,SAASG,gBAAgB,EACvBR,KAAK,EACLC,IAAI,EAIL;IACC,IAAIA,SAAS,WAAW,OAAOQ;IAE/B,MAAM,EAAEH,MAAM,EAAE,GAAGN,MAAMK,MAAM;IAE/B,IAAIJ,SAAS,UAAU;QACrB,OAAO;YAAES,UAAU;gBAAEjB,KAAK;gBAAGF,IAAI;gBAAGD,OAAOT,iBAAiB;oBAAEyB;oBAAQhB,OAAO;gBAAS;YAAG;QAAE;IAC7F;IAEA,OAAO;QACLoB,UAAU;YACRjB,KAAK;YACLF,IAAI;YACJD,OAAO;YACPY,SAAS;YACTG,QAAQ;gBACNM,OAAO;oBACL;wBAAEC,KAAK;4BAAC;gCAAEC,SAAS;oCAAC;oCAAW;iCAAK;4BAAC;4BAAG;yBAAK;oBAAC;oBAC9C;oBACA;wBAAEC,MAAM;wBAAgBxB,OAAOT,iBAAiB;4BAAEyB;4BAAQhB,OAAO;wBAAgB;oBAAG;iBACrF;YACH;QACF;IACF;AACF;AAEA,SAASyB,aAAaC,SAAkB;IACtC,IAAI,CAACA,aAAa,OAAOA,cAAc,UAAU,OAAO;IAExD,MAAM,EAAEF,IAAI,EAAExB,KAAK,EAAE,GAAG0B;IAExB,OAAO;QAAEF,MAAMG,OAAOH;QAAOxB,OAAO2B,OAAO3B;IAAO;AACpD;AAEA,OAAO,MAAM4B,SAAwB,OAAO,EAC1CC,UAAU,EACVC,UAAU,EACVC,EAAE,EACFC,KAAK,EACLtB,KAAK,EACLuB,KAAK,EACLC,QAAQC,eAAe,EACvBxB,IAAI,EACJyB,KAAK,EACLC,KAAK,EACN;IACC,MAAMC,UAAUP;IAChB,MAAM,EAAEQ,YAAY,EAAE,GAAGD,QAAQE,OAAO,CAACC,MAAM;IAC/C,MAAMP,SAASC,mBAAoBI,CAAAA,eAAeA,aAAaG,aAAa,GAAGvB,SAAQ;IACvF,MAAMwB,WAAWvD,cAAc;QAAEkD;QAASR;QAAYE;IAAM;IAE5D,MAAMY,gBAAgB5D,iBAAiBsD,SAASO,MAAM,CACpD,CAACC,cACCA,YAAYhB,UAAU,KAAKA,cAC3BgB,YAAYpC,KAAK,KAAKA,MAAMqC,IAAI,IAChCD,YAAYH,QAAQ,KAAKA;IAG7B,IAAI,CAACC,cAAcI,MAAM,EAAE;QACzB,MAAM,IAAIjE,qBACR,CAAC,cAAc,EAAE2B,MAAMqC,IAAI,CAAC,gCAAgC,EAAEjB,WAAW,iDAAiD,CAAC;IAE/H;IAEA,MAAMmB,eAAeL,cAAcM,IAAI,CAAC,CAACJ,cAAgBA,YAAYnC,IAAI,KAAK;IAC9E,MAAMwC,cAAcP,cAAcM,IAAI,CAAC,CAACJ,cAAgBA,YAAYnC,IAAI,KAAK;IAE7E,MAAMyC,QAAQC,KAAKC,GAAG,CAACrB,OAAOJ,cAAcI;IAC5C,MAAMsB,cAAc5C,SAAS,WAAWyC,QAAQnB;IAEhD,MAAMxB,cACJE,SAAS,aACTlB,0BAA0B;QAAEgB,aAAaC,MAAMK,MAAM,CAAEN,WAAW;QAAEwB,OAAOsB;IAAY;IAEzF,MAAMC,UAAUhD,WAAW;QAAEC;QAAaC;QAAOC;IAAK;IACtD,MAAMkC,SAAS,MAAMnD,kBAAkB;QAAE4C;QAASJ;QAAQY,aAAaF,aAAa,CAAC,EAAE;QAAEP;IAAM;IAE/F,IAAIQ,WAAW,OAAO,OAAO;QAAEW;QAASC,MAAM,EAAE;IAAC;IAEjD,MAAMC,QAAQzE,eAAe;QAAEqD;QAASR;QAAYa;IAAS;IAC7D,MAAMgB,SAASzE,gBAAgB;QAAEoD;QAASR;QAAYa;IAAS;IAC/D,MAAMiB,SAASjB,WAAW,WAAW;IAErC,MAAMkB,UAAU,CAACC,OACf3E,cAAc;YAAEmD;YAASR;YAAY6B;YAAQzB;YAAQ4B;YAAMnB;QAAS,GAAGmB,IAAI;IAE7E,MAAMC,oBAAoB,CAACC,cAAwB;YACjD1E,iBAAiB;gBACfuD,QAAQA,WAAW,OAAO1B,YAAYxB,oBAAoBkD;gBAC1DE,MAAME,aAAcF,IAAI;gBACxBkB,OAAOvD,MAAME,OAAO,CAAE+C,MAAM,CAACO,GAAG,CAAC,CAAC,EAAEJ,IAAI,EAAE,GAAKD,QAAQC;gBACvDK,MAAM/B,MAAM+B,IAAI;YAClB;YACA;gBAAEC,QAAQJ;YAAY;SACvB;IAED,MAAMK,uBAAuB,IAC3B7E,uBAAuB;YACrBiB;YACAoB,YAAYuB;YACZP,QAAQA,WAAW,OAAO1B,YAAYvB,wBAAwBiD;YAC9DZ,OAAOsB;YACPR,MAAMI,YAAaJ,IAAI;YACvBe,MAAMD,QAAQnD,MAAMK,MAAM,CAAE+C,IAAI;YAChC/C,QAAQqB,MAAMrB,MAAM;QACtB;IAEF,IAAIuD;IAEJ,IAAI3D,SAAS,WAAW;QACtB2D,WAAW;eACNP,kBAAkB9B;YACrB;gBAAEb,UAAU;oBAAEjB,KAAK;oBAAGF,IAAI,CAAC,CAAC,EAAE2D,QAAQ;oBAAE5D,OAAO;wBAAEuE,OAAO;oBAAc;gBAAE;YAAE;SAC3E;IACH,OAAO,IAAI5D,SAAS,UAAU;QAC5B2D,WAAW;YACTD;YACA;gBAAEjD,UAAU;oBAAEjB,KAAK;oBAAGF,IAAI,CAAC,CAAC,EAAE2D,QAAQ;oBAAE5D,OAAO;wBAAEuE,OAAO;oBAAoB;gBAAE;YAAE;SACjF;IACH,OAAO;QACLD,WAAWjF,oBAAoB;YAC7ByC,YAAY4B,MAAM5B,UAAU,CAACiB,IAAI;YACjCa;YACA3B;YACAuC,YAAY,MAAM3E,mBAAmB6D;YACrCe,gBAAgBV,kBAAkBX;YAClCsB,mBAAmBL;YACnBM,SAASjE,MAAMkE,MAAM,CAAED,OAAO;QAChC;IACF;IAEA,IAAIhC,UAAU2B,SAASO,IAAI,IAAI/E;IAE/B,MAAMgF,aAAa5D,gBAAgB;QAAER;QAAOC;IAAK;IAEjD,IAAImE,YAAYR,SAASO,IAAI,CAACC;IAE9B,MAAMrB,OAAO,MAAMC,MAAM5B,UAAU,CAACiD,SAAS,CAAYT,UAAUU,OAAO;IAE1E,OAAO;QACLxB;QACAC,MAAMA,KAAKS,GAAG,CAAC,CAAC,EAAEjE,EAAE,EAAEW,OAAO,EAAEZ,KAAK,EAAEe,MAAM,EAAE,GAAM,CAAA;gBAClDd,IAAI,OAAOA,OAAO,WAAWA,KAAKgF,OAAOhF;gBACzCD;gBACA,GAAIW,SAAS,WACT;oBAAEM,YAAY;wBAAEL,SAASa,aAAab;wBAAUG,QAAQU,aAAaV;oBAAQ;gBAAE,IAC/E,CAAC,CAAC;YACR,CAAA;IACF;AACF,EAAE","file":"search.js"}

package/dist/search/supportsRankFusion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supportsRankFusion.d.ts","sourceRoot":"","sources":["../../src/search/supportsRankFusion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,qBAAqB,CAAC;AAMvE,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CA6BvE"}
+{"version":3,"file":"supportsRankFusion.d.ts","sourceRoot":"","sources":["../../src/search/supportsRankFusion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAMvD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BvE"}

package/dist/search/supportsRankFusion.js

@@ -1,25 +1,44 @@
 import { getErrorCode } from './createSearchSetupError.js';
-const unsupportedCodes = new Set([224, 40324]);
+const unsupportedCodes = new Set([
+    224,
+    40324
+]);
 const rankFusionSupport = new WeakMap();
 export function supportsRankFusion(Model) {
     const connection = Model.db;
     const cached = rankFusionSupport.get(connection);
-    if (cached)
-        return cached;
+    if (cached) return cached;
     const pipeline = [
-        { $rankFusion: { input: { pipelines: { probe: [{ $sort: { _id: 1 } }, { $limit: 1 }] } } } },
-        { $limit: 1 },
+        {
+            $rankFusion: {
+                input: {
+                    pipelines: {
+                        probe: [
+                            {
+                                $sort: {
+                                    _id: 1
+                                }
+                            },
+                            {
+                                $limit: 1
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            $limit: 1
+        }
     ];
-    const supported = Model.aggregate(pipeline)
-        .exec()
-        .then(() => true, (error) => {
+    const supported = Model.collection.aggregate(pipeline).toArray().then(()=>true, (error)=>{
         const code = getErrorCode(error);
-        if (typeof code === 'number' && unsupportedCodes.has(code))
-            return false;
+        if (typeof code === 'number' && unsupportedCodes.has(code)) return false;
         rankFusionSupport.delete(connection);
         throw error;
     });
     rankFusionSupport.set(connection, supported);
     return supported;
 }
+
 //# sourceMappingURL=supportsRankFusion.js.map

package/dist/search/supportsRankFusion.js.map

@@ -1 +1 @@
-{"version":3,"file":"supportsRankFusion.js","sourceRoot":"","sources":["../../src/search/supportsRankFusion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAE/C,MAAM,iBAAiB,GAAG,IAAI,OAAO,EAA4B,CAAC;AAElE,MAAM,UAAU,kBAAkB,CAAC,KAAkB;IACnD,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEjD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,MAAM,QAAQ,GAAG;QACf,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;QAC5F,EAAE,MAAM,EAAE,CAAC,EAAE;KACd,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,QAAqC,CAAC;SACrE,IAAI,EAAE;SACN,IAAI,CACH,GAAG,EAAE,CAAC,IAAI,EACV,CAAC,KAAc,EAAE,EAAE;QACjB,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QAEjC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAEzE,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAErC,MAAM,KAAK,CAAC;IACd,CAAC,CACF,CAAC;IAEJ,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAE7C,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"sources":["../../src/search/supportsRankFusion.ts"],"names":["getErrorCode","unsupportedCodes","Set","rankFusionSupport","WeakMap","supportsRankFusion","Model","connection","db","cached","get","pipeline","$rankFusion","input","pipelines","probe","$sort","_id","$limit","supported","collection","aggregate","toArray","then","error","code","has","delete","set"],"mappings":"AAAA,SAASA,YAAY,QAAQ,8BAA8B;AAG3D,MAAMC,mBAAmB,IAAIC,IAAI;IAAC;IAAK;CAAM;AAE7C,MAAMC,oBAAoB,IAAIC;AAE9B,OAAO,SAASC,mBAAmBC,KAAkB;IACnD,MAAMC,aAAaD,MAAME,EAAE;IAC3B,MAAMC,SAASN,kBAAkBO,GAAG,CAACH;IAErC,IAAIE,QAAQ,OAAOA;IAEnB,MAAME,WAAW;QACf;YAAEC,aAAa;gBAAEC,OAAO;oBAAEC,WAAW;wBAAEC,OAAO;4BAAC;gCAAEC,OAAO;oCAAEC,KAAK;gCAAE;4BAAE;4BAAG;gCAAEC,QAAQ;4BAAE;yBAAE;oBAAC;gBAAE;YAAE;QAAE;QAC3F;YAAEA,QAAQ;QAAE;KACb;IAED,MAAMC,YAAYb,MAAMc,UAAU,CAC/BC,SAAS,CAACV,UACVW,OAAO,GACPC,IAAI,CACH,IAAM,MACN,CAACC;QACC,MAAMC,OAAOzB,aAAawB;QAE1B,IAAI,OAAOC,SAAS,YAAYxB,iBAAiByB,GAAG,CAACD,OAAO,OAAO;QAEnEtB,kBAAkBwB,MAAM,CAACpB;QAEzB,MAAMiB;IACR;IAGJrB,kBAAkByB,GAAG,CAACrB,YAAYY;IAElC,OAAOA;AACT","file":"supportsRankFusion.js"}

package/dist/search/types.js

@@ -1,2 +1,3 @@
-export {};
+export { };
+
 //# sourceMappingURL=types.js.map

package/dist/search/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/search/types.ts"],"names":[],"mappings":""}
+{"version":3,"sources":["../../src/search/types.ts"],"names":[],"mappings":"AA4BA,WAAsD","file":"types.js"}

package/dist/updateJobLeases.js

@@ -1,12 +1,27 @@
 import { getJobModel, getJobSession, transformJobUpdate } from './jobModel.js';
-export async function updateJobLeases({ adapter, data, req, where, }) {
+export async function updateJobLeases({ adapter, data, req, where }) {
     if (req.payload !== adapter.payload) {
         throw new Error('FrogBot job lease updates require a request for this runtime.');
     }
     const { Model } = getJobModel(adapter);
-    const query = await Model.buildQuery({ payload: adapter.payload, where });
-    const update = transformJobUpdate({ adapter, data: { ...data } });
-    const session = await getJobSession({ adapter, req });
-    await Model.updateMany(query, update, { session, timestamps: false });
+    const query = await Model.buildQuery({
+        payload: adapter.payload,
+        where
+    });
+    const update = transformJobUpdate({
+        adapter,
+        data: {
+            ...data
+        }
+    });
+    const session = await getJobSession({
+        adapter,
+        req
+    });
+    await Model.updateMany(query, update, {
+        session,
+        timestamps: false
+    });
 }
+
 //# sourceMappingURL=updateJobLeases.js.map

package/dist/updateJobLeases.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateJobLeases.js","sourceRoot":"","sources":["../src/updateJobLeases.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,IAAI,EACJ,GAAG,EACH,KAAK,GAC2C;IAChD,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1E,MAAM,MAAM,GAAG,kBAAkB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAEtD,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"sources":["../src/updateJobLeases.ts"],"names":["getJobModel","getJobSession","transformJobUpdate","updateJobLeases","adapter","data","req","where","payload","Error","Model","query","buildQuery","update","session","updateMany","timestamps"],"mappings":"AAGA,SAASA,WAAW,EAAEC,aAAa,EAAEC,kBAAkB,QAAQ,gBAAgB;AAE/E,OAAO,eAAeC,gBAAgB,EACpCC,OAAO,EACPC,IAAI,EACJC,GAAG,EACHC,KAAK,EAC2C;IAChD,IAAID,IAAIE,OAAO,KAAKJ,QAAQI,OAAO,EAAE;QACnC,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAM,EAAEC,KAAK,EAAE,GAAGV,YAAYI;IAE9B,MAAMO,QAAQ,MAAMD,MAAME,UAAU,CAAC;QAAEJ,SAASJ,QAAQI,OAAO;QAAED;IAAM;IAEvE,MAAMM,SAASX,mBAAmB;QAAEE;QAASC,MAAM;YAAE,GAAGA,IAAI;QAAC;IAAE;IAE/D,MAAMS,UAAU,MAAMb,cAAc;QAAEG;QAASE;IAAI;IAEnD,MAAMI,MAAMK,UAAU,CAACJ,OAAOE,QAAQ;QAAEC;QAASE,YAAY;IAAM;AACrE","file":"updateJobLeases.js"}

package/dist/updateJobs.js

@@ -3,9 +3,8 @@ import { getJobClaimFields, getJobLeaseContext, recordJobClaims } from 'frogbot/
 import { getJobModel, getJobSession, transformJobUpdate } from './jobModel.js';
 export function createUpdateJobs(adapter) {
     const updateJobs = adapter.updateJobs;
-    return async (args) => {
-        if (args.data.processing !== true)
-            return updateJobs.call(adapter, args);
+    return async (args)=>{
+        if (args.data.processing !== true) return updateJobs.call(adapter, args);
         const context = getJobLeaseContext();
         if (!context || context.payload !== adapter.payload) {
             throw new Error('FrogBot job claims require an active jobs run for this runtime.');
@@ -15,43 +14,93 @@ export function createUpdateJobs(adapter) {
         const where = {
             and: [
                 args.where ?? {},
-                ...(id !== undefined ? [{ id: { equals: id } }] : []),
-                { processing: { equals: false } },
-            ],
+                ...id !== undefined ? [
+                    {
+                        id: {
+                            equals: id
+                        }
+                    }
+                ] : [],
+                {
+                    processing: {
+                        equals: false
+                    }
+                }
+            ]
         };
-        const query = await Model.buildQuery({ payload: adapter.payload, where });
-        const session = await getJobSession({ adapter, req });
-        const candidates = id !== undefined
-            ? [{ id }]
-            : (await adapter.find({
-                collection: 'payload-jobs',
-                where,
-                sort,
-                limit: typeof limit === 'number' && limit > 0 ? limit : 0,
-                pagination: false,
-                select: { id: true },
-                req,
-            })).docs;
-        const data = { ...args.data };
-        if (!(Array.isArray(data.log) && data.log.length) &&
-            !(data.log && typeof data.log === 'object' && '$push' in data.log)) {
+        const query = await Model.buildQuery({
+            payload: adapter.payload,
+            where
+        });
+        const session = await getJobSession({
+            adapter,
+            req
+        });
+        const candidates = id !== undefined ? [
+            {
+                id
+            }
+        ] : (await adapter.find({
+            collection: 'payload-jobs',
+            where,
+            sort,
+            limit: typeof limit === 'number' && limit > 0 ? limit : 0,
+            pagination: false,
+            select: {
+                id: true
+            },
+            req
+        })).docs;
+        const data = {
+            ...args.data
+        };
+        if (!(Array.isArray(data.log) && data.log.length) && !(data.log && typeof data.log === 'object' && '$push' in data.log)) {
             delete data.log;
         }
-        const update = transformJobUpdate({ adapter, data });
+        const update = transformJobUpdate({
+            adapter,
+            data
+        });
         const result = [];
-        for (const candidate of candidates) {
+        for (const candidate of candidates){
             const candidateQuery = await Model.buildQuery({
                 payload: adapter.payload,
-                where: { id: { equals: candidate.id } },
+                where: {
+                    id: {
+                        equals: candidate.id
+                    }
+                }
+            });
+            const doc = await Model.findOneAndUpdate({
+                $and: [
+                    query,
+                    candidateQuery
+                ]
+            }, {
+                ...update,
+                $set: {
+                    ...update.$set,
+                    ...getJobClaimFields()
+                }
+            }, {
+                session,
+                timestamps: false,
+                new: true
+            }).lean();
+            if (!doc) continue;
+            transform({
+                adapter,
+                data: doc,
+                fields,
+                operation: 'read'
             });
-            const doc = await Model.findOneAndUpdate({ $and: [query, candidateQuery] }, { ...update, $set: { ...update.$set, ...getJobClaimFields() } }, { session, timestamps: false, new: true }).lean();
-            if (!doc)
-                continue;
-            transform({ adapter, data: doc, fields, operation: 'read' });
-            recordJobClaims([doc.id]);
+            recordJobClaims([
+                doc.id
+            ]);
             result.push(doc);
         }
         return returning === false ? null : result;
     };
 }
+
 //# sourceMappingURL=updateJobs.js.map