@unchainedshop/core-warehousing 4.4.0 → 4.5.0

package/lib/module/configureWarehousingModule.d.ts

@@ -1,35 +1,21 @@
 import { type mongodb, type ModuleInput } from '@unchainedshop/mongodb';
-import { type WarehousingProvider } from '../db/WarehousingProvidersCollection.ts';
+import { type WarehousingProvider, type WarehousingProviderType } from '../db/WarehousingProvidersCollection.ts';
 import { type TokenSurrogate } from '../db/TokenSurrogateCollection.ts';
 interface TokenQuery {
     queryString?: string;
     userId?: string;
+    walletAddressExists?: boolean;
 }
-export declare const buildFindSelector: ({ includeDeleted, ...rest }?: mongodb.Filter<WarehousingProvider> & {
+export interface WarehousingProviderQuery {
+    warehousingProviderIds?: string[];
+    type?: WarehousingProviderType;
     includeDeleted?: boolean;
-}) => {
-    type?: mongodb.Condition<import("../db/WarehousingProvidersCollection.ts").WarehousingProviderType> | undefined;
-    created?: mongodb.Condition<Date> | undefined;
-    deleted?: Date | mongodb.FilterOperators<Date | null | undefined> | null | undefined;
-    adapterKey?: mongodb.Condition<string> | undefined;
-    configuration?: mongodb.Condition<import("../db/WarehousingProvidersCollection.ts").WarehousingConfiguration> | undefined;
-    updated?: mongodb.Condition<Date | undefined>;
-    _id?: mongodb.Condition<string> | undefined;
-    $and?: mongodb.Filter<mongodb.WithId<WarehousingProvider>>[] | undefined;
-    $nor?: mongodb.Filter<mongodb.WithId<WarehousingProvider>>[] | undefined;
-    $or?: mongodb.Filter<mongodb.WithId<WarehousingProvider>>[] | undefined;
-    $text?: {
-        $search: string;
-        $language?: string;
-        $caseSensitive?: boolean;
-        $diacriticSensitive?: boolean;
-    };
-    $where?: string | ((this: mongodb.WithId<WarehousingProvider>) => boolean) | undefined;
-    $comment?: string | mongodb.BSON.Document;
-};
-export declare const buildTokenFindSelector: ({ queryString, ...rest }: TokenQuery) => mongodb.Filter<TokenSurrogate>;
+    queryString?: string;
+}
+export declare const buildFindSelector: ({ includeDeleted, queryString, warehousingProviderIds, type, }?: WarehousingProviderQuery) => mongodb.Filter<WarehousingProvider>;
+export declare const buildTokenFindSelector: ({ queryString, walletAddressExists, ...rest }: TokenQuery) => mongodb.Filter<TokenSurrogate>;
 export declare const configureWarehousingModule: ({ db }: ModuleInput<Record<string, never>>) => Promise<{
-    count: (query: mongodb.Filter<WarehousingProvider>) => Promise<number>;
+    count: (query?: WarehousingProviderQuery) => Promise<number>;
     createTokens: (tokens: TokenSurrogate[]) => Promise<void>;
     findProvider: ({ warehousingProviderId }: {
         warehousingProviderId: string;
@@ -44,9 +30,7 @@ export declare const configureWarehousingModule: ({ db }: ModuleInput<Record<str
     } | {
         walletAddresses: string[];
     }, options?: mongodb.FindOptions) => Promise<TokenSurrogate[]>;
-    findProviders: (query: mongodb.Filter<WarehousingProvider> & {
-        includeDeleted?: boolean;
-    }, options?: mongodb.FindOptions) => Promise<WarehousingProvider[]>;
+    findProviders: (query?: WarehousingProviderQuery, options?: mongodb.FindOptions) => Promise<WarehousingProvider[]>;
     allProviders: () => Promise<mongodb.WithId<WarehousingProvider>[]>;
     providerExists: ({ warehousingProviderId, }: {
         warehousingProviderId: string;

package/lib/module/configureWarehousingModule.js

@@ -12,15 +12,29 @@ const WAREHOUSING_PROVIDER_EVENTS = [
     'TOKEN_INVALIDATED',
 ];
 const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
-export const buildFindSelector = ({ includeDeleted = false, ...rest } = {}) => {
-    return { ...(includeDeleted ? {} : { deleted: null }), ...rest };
+export const buildFindSelector = ({ includeDeleted = false, queryString, warehousingProviderIds, type, } = {}) => {
+    const selector = includeDeleted ? {} : { deleted: null };
+    if (warehousingProviderIds) {
+        selector._id = { $in: warehousingProviderIds };
+    }
+    if (type) {
+        selector.type = type;
+    }
+    if (queryString) {
+        const regex = new RegExp(queryString, 'i');
+        selector.$or = [{ _id: regex }, { adapterKey: regex }];
+    }
+    return selector;
 };
-export const buildTokenFindSelector = ({ queryString, ...rest }) => {
+export const buildTokenFindSelector = ({ queryString, walletAddressExists, ...rest }) => {
     const selector = { ...(rest || {}) };
     if (queryString) {
         assertDocumentDBCompatMode();
         selector.$text = { $search: queryString };
     }
+    if (walletAddressExists !== undefined) {
+        selector.walletAddress = walletAddressExists ? { $exists: true } : { $exists: false };
+    }
     return selector;
 };
 export const configureWarehousingModule = async ({ db }) => {
@@ -28,7 +42,7 @@ export const configureWarehousingModule = async ({ db }) => {
     const WarehousingProviders = await WarehousingProvidersCollection(db);
     const TokenSurrogates = await TokenSurrogateCollection(db);
     return {
-        count: async (query) => {
+        count: async (query = {}) => {
             const providerCount = await WarehousingProviders.countDocuments(buildFindSelector(query));
             return providerCount;
         },
@@ -65,7 +79,7 @@ export const configureWarehousingModule = async ({ db }) => {
             const userTokens = await TokenSurrogates.find(selector, options).toArray();
             return userTokens;
         },
-        findProviders: async (query, options = { sort: { created: 1 } }) => {
+        findProviders: async (query = {}, options = { sort: { created: 1 } }) => {
             const providers = WarehousingProviders.find(buildFindSelector(query), options);
             return providers.toArray();
         },

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@unchainedshop/core-warehousing",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "main": "lib/warehousing-index.js",
   "types": "lib/warehousing-index.d.ts",
   "type": "module",
+  "sideEffects": false,
   "scripts": {
     "clean": "tsc -b --clean",
     "build": "tsc -b",
@@ -33,9 +34,9 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^4.4.0",
-    "@unchainedshop/logger": "^4.4.0",
-    "@unchainedshop/utils": "^4.4.0",
+    "@unchainedshop/events": "^4.5.0",
+    "@unchainedshop/logger": "^4.5.0",
+    "@unchainedshop/utils": "^4.5.0",
     "expiry-map": "^2.0.0",
     "p-memoize": "^8.0.0"
   },