@unchainedshop/core-delivery 4.4.0 → 4.6.0

package/lib/module/configureDeliveryModule.d.ts

@@ -1,41 +1,24 @@
 import { mongodb, type ModuleInput } from '@unchainedshop/mongodb';
-import { type DeliveryProvider } from '../db/DeliveryProvidersCollection.ts';
+import { type DeliveryProvider, type DeliveryProviderType } from '../db/DeliveryProvidersCollection.ts';
 import { type DeliverySettingsOptions } from '../delivery-settings.ts';
 export interface DeliveryInterface {
     _id: string;
     label: string;
     version: string;
 }
-export declare const buildFindSelector: ({ includeDeleted, ...rest }?: mongodb.Filter<DeliveryProvider> & {
+export interface DeliveryProviderQuery {
+    deliveryProviderIds?: string[];
+    type?: DeliveryProviderType;
     includeDeleted?: boolean;
-}) => {
-    type?: mongodb.Condition<import("../db/DeliveryProvidersCollection.ts").DeliveryProviderType> | 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/DeliveryProvidersCollection.ts").DeliveryConfiguration> | undefined;
-    updated?: mongodb.Condition<Date | undefined>;
-    _id?: mongodb.Condition<string> | undefined;
-    $and?: mongodb.Filter<mongodb.WithId<DeliveryProvider>>[] | undefined;
-    $nor?: mongodb.Filter<mongodb.WithId<DeliveryProvider>>[] | undefined;
-    $or?: mongodb.Filter<mongodb.WithId<DeliveryProvider>>[] | undefined;
-    $text?: {
-        $search: string;
-        $language?: string;
-        $caseSensitive?: boolean;
-        $diacriticSensitive?: boolean;
-    };
-    $where?: string | ((this: mongodb.WithId<DeliveryProvider>) => boolean) | undefined;
-    $comment?: string | mongodb.BSON.Document;
-};
+    queryString?: string;
+}
+export declare const buildFindSelector: ({ includeDeleted, queryString, deliveryProviderIds, type, }?: DeliveryProviderQuery) => mongodb.Filter<DeliveryProvider>;
 export declare const configureDeliveryModule: ({ db, options: deliveryOptions, }: ModuleInput<DeliverySettingsOptions>) => Promise<{
-    count: (query: mongodb.Filter<DeliveryProvider>) => Promise<number>;
+    count: (query?: DeliveryProviderQuery) => Promise<number>;
     findProvider: ({ deliveryProviderId, ...query }: {
         deliveryProviderId: string;
     } & mongodb.Filter<DeliveryProvider>, options?: mongodb.FindOptions) => Promise<DeliveryProvider | null>;
-    findProviders: (query: mongodb.Filter<DeliveryProvider> & {
-        includeDeleted?: boolean;
-    }, options?: mongodb.FindOptions) => Promise<DeliveryProvider[]>;
+    findProviders: (query?: DeliveryProviderQuery, options?: mongodb.FindOptions) => Promise<DeliveryProvider[]>;
     allProviders: () => Promise<mongodb.WithId<DeliveryProvider>[]>;
     providerExists: ({ deliveryProviderId }: {
         deliveryProviderId: string;

package/lib/module/configureDeliveryModule.js

@@ -1,5 +1,5 @@
 import { emit, registerEvents } from '@unchainedshop/events';
-import { mongodb, generateDbFilterById, generateDbObjectId, } from '@unchainedshop/mongodb';
+import { mongodb, generateDbFilterById, generateDbObjectId, escapeRegexString, } from '@unchainedshop/mongodb';
 import { DeliveryProvidersCollection, } from "../db/DeliveryProvidersCollection.js";
 import { deliverySettings } from "../delivery-settings.js";
 import pMemoize from 'p-memoize';
@@ -9,8 +9,19 @@ const DELIVERY_PROVIDER_EVENTS = [
     'DELIVERY_PROVIDER_UPDATE',
     'DELIVERY_PROVIDER_REMOVE',
 ];
-export const buildFindSelector = ({ includeDeleted = false, ...rest } = {}) => {
-    return { ...(includeDeleted ? {} : { deleted: null }), ...rest };
+export const buildFindSelector = ({ includeDeleted = false, queryString, deliveryProviderIds, type, } = {}) => {
+    const selector = includeDeleted ? {} : { deleted: null };
+    if (deliveryProviderIds) {
+        selector._id = { $in: deliveryProviderIds };
+    }
+    if (type) {
+        selector.type = type;
+    }
+    if (queryString) {
+        const regex = new RegExp(escapeRegexString(queryString), 'i');
+        selector.$or = [{ _id: regex }, { adapterKey: regex }];
+    }
+    return selector;
 };
 const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
 export const configureDeliveryModule = async ({ db, options: deliveryOptions = {}, }) => {
@@ -18,14 +29,14 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
     deliverySettings.configureSettings(deliveryOptions);
     const DeliveryProviders = await DeliveryProvidersCollection(db);
     return {
-        count: async (query) => {
+        count: async (query = {}) => {
             const providerCount = await DeliveryProviders.countDocuments(buildFindSelector(query));
             return providerCount;
         },
         findProvider: async ({ deliveryProviderId, ...query }, options) => {
             return DeliveryProviders.findOne(deliveryProviderId ? generateDbFilterById(deliveryProviderId) : query, options);
         },
-        findProviders: async (query, options = { sort: { created: 1 } }) => {
+        findProviders: async (query = {}, options = { sort: { created: 1 } }) => {
             const providers = DeliveryProviders.find(buildFindSelector(query), options);
             return providers.toArray();
         },

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@unchainedshop/core-delivery",
-  "version": "4.4.0",
+  "description": "Delivery provider management module for the Unchained Engine",
+  "version": "4.6.0",
   "main": "lib/delivery-index.js",
   "types": "lib/delivery-index.d.ts",
   "type": "module",
+  "sideEffects": false,
   "scripts": {
     "clean": "tsc -b --clean",
     "build": "tsc -b",
@@ -33,10 +35,10 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^4.4.0",
-    "@unchainedshop/logger": "^4.4.0",
-    "@unchainedshop/mongodb": "^4.4.0",
-    "@unchainedshop/utils": "^4.4.0",
+    "@unchainedshop/events": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/mongodb": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0",
     "expiry-map": "^2.0.0",
     "p-memoize": "^8.0.0"
   },