@unchainedshop/core-payment 4.4.0 → 4.5.0

package/lib/module/configurePaymentModule.d.ts

@@ -2,13 +2,11 @@ import { type PaymentSettingsOptions } from '../payment-settings.ts';
 import type { ModuleInput } from '@unchainedshop/mongodb';
 export declare const configurePaymentModule: ({ db, options: paymentOptions, }: ModuleInput<PaymentSettingsOptions>) => Promise<{
     paymentProviders: {
-        count: (query: import("mongodb").Filter<import("../db/PaymentProvidersCollection.ts").PaymentProvider>) => Promise<number>;
+        count: (query?: import("./configurePaymentProvidersModule.ts").PaymentProviderQuery) => Promise<number>;
         findProvider: ({ paymentProviderId, ...query }: import("mongodb").Filter<import("../db/PaymentProvidersCollection.ts").PaymentProvider> & {
             paymentProviderId: string;
         }, options?: import("mongodb").FindOptions) => Promise<import("../db/PaymentProvidersCollection.ts").PaymentProvider | null>;
-        findProviders: (query: import("mongodb").Filter<import("../db/PaymentProvidersCollection.ts").PaymentProvider> & {
-            includeDeleted?: boolean;
-        }, options?: import("mongodb").FindOptions) => Promise<import("../db/PaymentProvidersCollection.ts").PaymentProvider[]>;
+        findProviders: (query?: import("./configurePaymentProvidersModule.ts").PaymentProviderQuery, options?: import("mongodb").FindOptions) => Promise<import("../db/PaymentProvidersCollection.ts").PaymentProvider[]>;
         allProviders: () => Promise<import("mongodb").WithId<import("../db/PaymentProvidersCollection.ts").PaymentProvider>[]>;
         providerExists: ({ paymentProviderId }: {
             paymentProviderId: string;

package/lib/module/configurePaymentProvidersModule.d.ts

@@ -1,40 +1,23 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import type { PaymentProvider } from '../db/PaymentProvidersCollection.ts';
+import type { PaymentProvider, PaymentProviderType } from '../db/PaymentProvidersCollection.ts';
 export interface PaymentInterface {
     _id: string;
     label: string;
     version: string;
 }
-export declare const buildFindSelector: ({ includeDeleted, ...rest }?: mongodb.Filter<PaymentProvider> & {
+export interface PaymentProviderQuery {
+    paymentProviderIds?: string[];
+    type?: PaymentProviderType;
     includeDeleted?: boolean;
-}) => {
-    type?: mongodb.Condition<import("../db/PaymentProvidersCollection.ts").PaymentProviderType> | undefined;
-    created?: mongodb.Condition<Date> | undefined;
-    deleted?: Date | mongodb.FilterOperators<Date | null | undefined> | null | undefined;
-    updated?: mongodb.Condition<Date | undefined>;
-    adapterKey?: mongodb.Condition<string> | undefined;
-    configuration?: mongodb.Condition<import("../db/PaymentProvidersCollection.ts").PaymentConfiguration> | undefined;
-    _id?: mongodb.Condition<string> | undefined;
-    $and?: mongodb.Filter<mongodb.WithId<PaymentProvider>>[] | undefined;
-    $nor?: mongodb.Filter<mongodb.WithId<PaymentProvider>>[] | undefined;
-    $or?: mongodb.Filter<mongodb.WithId<PaymentProvider>>[] | undefined;
-    $text?: {
-        $search: string;
-        $language?: string;
-        $caseSensitive?: boolean;
-        $diacriticSensitive?: boolean;
-    };
-    $where?: string | ((this: mongodb.WithId<PaymentProvider>) => boolean) | undefined;
-    $comment?: string | mongodb.BSON.Document;
-};
+    queryString?: string;
+}
+export declare const buildFindSelector: ({ includeDeleted, queryString, paymentProviderIds, type, }?: PaymentProviderQuery) => mongodb.Filter<PaymentProvider>;
 export declare const configurePaymentProvidersModule: (PaymentProviders: mongodb.Collection<PaymentProvider>) => {
-    count: (query: mongodb.Filter<PaymentProvider>) => Promise<number>;
+    count: (query?: PaymentProviderQuery) => Promise<number>;
     findProvider: ({ paymentProviderId, ...query }: mongodb.Filter<PaymentProvider> & {
         paymentProviderId: string;
     }, options?: mongodb.FindOptions) => Promise<PaymentProvider | null>;
-    findProviders: (query: mongodb.Filter<PaymentProvider> & {
-        includeDeleted?: boolean;
-    }, options?: mongodb.FindOptions) => Promise<PaymentProvider[]>;
+    findProviders: (query?: PaymentProviderQuery, options?: mongodb.FindOptions) => Promise<PaymentProvider[]>;
     allProviders: () => Promise<mongodb.WithId<PaymentProvider>[]>;
     providerExists: ({ paymentProviderId }: {
         paymentProviderId: string;

package/lib/module/configurePaymentProvidersModule.js

@@ -8,20 +8,31 @@ const PAYMENT_PROVIDER_EVENTS = [
     'PAYMENT_PROVIDER_REMOVE',
 ];
 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, paymentProviderIds, type, } = {}) => {
+    const selector = includeDeleted ? {} : { deleted: null };
+    if (paymentProviderIds) {
+        selector._id = { $in: paymentProviderIds };
+    }
+    if (type) {
+        selector.type = type;
+    }
+    if (queryString) {
+        const regex = new RegExp(queryString, 'i');
+        selector.$or = [{ _id: regex }, { adapterKey: regex }];
+    }
+    return selector;
 };
 export const configurePaymentProvidersModule = (PaymentProviders) => {
     registerEvents(PAYMENT_PROVIDER_EVENTS);
     return {
-        count: async (query) => {
+        count: async (query = {}) => {
             const providerCount = await PaymentProviders.countDocuments(buildFindSelector(query));
             return providerCount;
         },
         findProvider: async ({ paymentProviderId, ...query }, options) => {
             return PaymentProviders.findOne(paymentProviderId ? generateDbFilterById(paymentProviderId) : query, options);
         },
-        findProviders: async (query, options = { sort: { created: 1 } }) => {
+        findProviders: async (query = {}, options = { sort: { created: 1 } }) => {
             const providers = PaymentProviders.find(buildFindSelector(query), options);
             return providers.toArray();
         },

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@unchainedshop/core-payment",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "main": "lib/payment-index.js",
   "types": "lib/payment-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"
   },