@unchainedshop/plugins 2.5.12 → 2.6.1

package/src/files/gridfs/index.ts

@@ -1,30 +1,22 @@
-import mongodb from 'mongodb';
+import { mongodb } from '@unchainedshop/mongodb';
 
 export const configureGridFSFileUploadModule = ({ db }) => {
-  // eslint-disable-next-line
-  // @ts-ignore
-  const isMeteor = typeof Meteor === 'object';
-
   // eslint-disable-next-line
   let { GridFSBucket } = mongodb;
-  if (isMeteor) {
-    const { MongoInternals } = require('meteor/mongo'); // eslint-disable-line
-    GridFSBucket = MongoInternals.NpmModule.GridFSBucket;
-  }
 
   return {
     createWriteStream: async (directoryName, fileId, fileName) => {
-      const options = { bucketName: `file_uploads_${directoryName}`, chunkSizeBytes: 5 * 1024 * 1024 };
+      const options = { bucketName: `file_uploads_${directoryName}` };
       const bucket = new GridFSBucket(db, options);
-      return bucket.openUploadStreamWithId(fileId, fileName, { writeConcern: { w: 0, journal: false } });
+      return bucket.openUploadStreamWithId(fileId, fileName);
     },
     createReadStream: async (directoryName, fileId) => {
-      const options = { bucketName: `file_uploads_${directoryName}`, chunkSizeBytes: 5 * 1024 * 1024 };
+      const options = { bucketName: `file_uploads_${directoryName}` };
       const bucket = new GridFSBucket(db, options);
       return bucket.openDownloadStream(fileId);
     },
     removeFileFromBucket: async (directoryName, fileId) => {
-      const options = { bucketName: `file_uploads_${directoryName}`, chunkSizeBytes: 5 * 1024 * 1024 };
+      const options = { bucketName: `file_uploads_${directoryName}` };
       const bucket = new GridFSBucket(db, options);
       return bucket.delete(fileId);
     },

package/src/files/minio/minio-adapter.ts

@@ -2,12 +2,13 @@ import https from 'https';
 import http, { OutgoingHttpHeaders } from 'http';
 import { Readable } from 'stream';
 import { URL } from 'url';
-import { IFileAdapter, UploadFileData } from '@unchainedshop/types/files.js';
+import { UploadFileData } from '@unchainedshop/types/files.js';
 import {
   FileAdapter,
   FileDirector,
   buildHashedFilename,
   resolveExpirationDate,
+  IFileAdapter,
 } from '@unchainedshop/file-upload';
 
 import { log, LogLevel } from '@unchainedshop/logger';
@@ -90,7 +91,7 @@ connectToMinio().then(function setClient(c) {
   client = c;
 });
 
-const createDownloadStream = async (
+const createHttpDownloadStream = async (
   fileUrl: string,
   headers: OutgoingHttpHeaders,
 ): Promise<http.IncomingMessage> => {
@@ -211,8 +212,8 @@ export const MinioAdapter: IFileAdapter = {
     const fileName = fname || href.split('/').pop();
     const _id = buildHashedFilename(directoryName, fileName, new Date());
 
-    const stream = await createDownloadStream(fileLink, headers);
-    const type = stream?.headers?.['content-type'] || getMimeType(fileName);
+    const stream = await createHttpDownloadStream(fileLink, headers);
+    const type = mimeType.lookup(fileName) || stream.headers['content-type'];
 
     const metaData = {
       'Content-Type': type,
@@ -237,6 +238,13 @@ export const MinioAdapter: IFileAdapter = {
       url: generateMinioUrl(directoryName, _id),
     } as UploadFileData;
   },
+
+  async createDownloadStream(file) {
+    if (!client) throw new Error('Minio not connected, check env variables');
+
+    const stream = await client.getObject(MINIO_BUCKET_NAME, generateMinioPath(file.path, file._id));
+    return stream;
+  },
 };
 
 FileDirector.registerAdapter(MinioAdapter);

package/src/filters/local-search.ts

@@ -1,7 +1,9 @@
 import { FilterDirector, FilterAdapter } from '@unchainedshop/core-filters';
 import { IFilterAdapter } from '@unchainedshop/types/filters.js';
-import { Query } from '@unchainedshop/types/common.js';
 import escapeStringRegexp from 'escape-string-regexp';
+import { mongodb } from '@unchainedshop/mongodb';
+import { ProductText } from '@unchainedshop/types/products.js';
+import { AssortmentText } from '@unchainedshop/types/assortments.js';
 
 const { AMAZON_DOCUMENTDB_COMPAT_MODE } = process.env;
 
@@ -11,7 +13,7 @@ const LocalSearch: IFilterAdapter = {
   key: 'shop.unchained.filters.local-search',
   label: 'Simple Fulltext search with MongoDB',
   version: '1.0.0',
-  orderIndex: 1,
+  orderIndex: 10,
 
   actions: (params) => {
     return {
@@ -23,7 +25,7 @@ const LocalSearch: IFilterAdapter = {
 
         if (!queryString) return productIds;
 
-        const selector: Query = AMAZON_DOCUMENTDB_COMPAT_MODE
+        const selector: mongodb.Filter<ProductText> = AMAZON_DOCUMENTDB_COMPAT_MODE
           ? {
               $or: [
                 { title: { $regex: `${escapeStringRegexp(queryString)}`, $options: 'im' } },
@@ -59,7 +61,7 @@ const LocalSearch: IFilterAdapter = {
           return assortmentIds;
         }
 
-        const selector: Query = {
+        const selector: mongodb.Filter<AssortmentText> = {
           $text: { $search: queryString },
         };
 
@@ -75,6 +77,27 @@ const LocalSearch: IFilterAdapter = {
 
         return assortments.map(({ assortmentId }) => assortmentId);
       },
+
+      async transformFilterSelector(last) {
+        const { queryString, filterIds, includeInactive } = params.searchQuery;
+
+        if (queryString && !filterIds) {
+          // Global search without assortment scope:
+          // Return all filters
+          const selector = { ...last };
+          if (selector?.key) {
+            // Do not restrict to keys
+            delete selector.key;
+          }
+          if (!includeInactive) {
+            // Include only active filters
+            selector.isActive = true;
+          }
+          return selector;
+        }
+
+        return last;
+      },
     };
   },
 };

package/src/payment/apple-iap/db/AppleTransactionsCollection.ts

@@ -1,12 +1,13 @@
-import { Db, TimestampFields, _ID } from '@unchainedshop/types/common.js';
+import { mongodb } from '@unchainedshop/mongodb';
+import { TimestampFields } from '@unchainedshop/types/common.js';
 
 export type AppleTransaction = {
-  _id?: _ID;
+  _id?: string;
   matchedTransaction: any;
   orderId: string;
 } & TimestampFields;
 
-export const AppleTransactionsCollection = async (db: Db) => {
+export const AppleTransactionsCollection = async (db: mongodb.Db) => {
   const AppleTransactions = db.collection<AppleTransaction>('payment_apple_iap_processed_transactions');
 
   return AppleTransactions;

package/src/payment/apple-iap/module/configureAppleTransactionsModule.ts

@@ -1,4 +1,3 @@
-import { Db } from '@unchainedshop/types/common.js';
 import { AppleTransaction, AppleTransactionsCollection } from '../db/AppleTransactionsCollection.js';
 
 export interface AppleTransactionsModule {
@@ -7,11 +6,7 @@ export interface AppleTransactionsModule {
   createTransaction: (doc: AppleTransaction, userId: string) => Promise<string | null>;
 }
 
-export const configureAppleTransactionsModule = async ({
-  db,
-}: {
-  db: Db;
-}): Promise<AppleTransactionsModule> => {
+export const configureAppleTransactionsModule = async ({ db }): Promise<AppleTransactionsModule> => {
   const AppleTransactions = await AppleTransactionsCollection(db);
 
   return {

package/src/payment/cryptopay/db/CryptopayTransactions.ts

@@ -1,17 +1,17 @@
-import { Db, TimestampFields, _ID } from '@unchainedshop/types/common.js';
-import { Decimal128 } from 'mongodb';
+import { TimestampFields } from '@unchainedshop/types/common.js';
+import { mongodb } from '@unchainedshop/mongodb';
 
 export type CryptopayTransaction = {
-  _id?: _ID;
+  _id?: string;
   blockHeight: number;
   mostRecentBlockHeight: number;
-  amount: Decimal128;
+  amount: mongodb.Decimal128;
   currency: string;
   decimals: number;
   contract: string;
   orderPaymentId?: string;
 } & TimestampFields;
 
-export const CryptopayTransactionsCollection = (db: Db) => {
+export const CryptopayTransactionsCollection = (db: mongodb.Db) => {
   return db.collection<CryptopayTransaction>('cryptopay_transactions');
 };

package/src/payment/cryptopay/module/configureCryptopayModule.ts

@@ -1,5 +1,4 @@
-import { Db } from '@unchainedshop/types/common.js';
-import { Decimal128 } from 'mongodb';
+import { mongodb } from '@unchainedshop/mongodb';
 import { CryptopayTransaction, CryptopayTransactionsCollection } from '../db/CryptopayTransactions.js';
 
 export interface CryptopayModule {
@@ -23,7 +22,7 @@ export interface CryptopayModule {
   getNextDerivationNumber: (currency: string) => Promise<number>;
 }
 
-export const configureCryptopayModule = ({ db }: { db: Db }): CryptopayModule => {
+export const configureCryptopayModule = ({ db }): CryptopayModule => {
   const CryptoTransactions = CryptopayTransactionsCollection(db);
 
   const getWalletAddress: CryptopayModule['getWalletAddress'] = async (addressId) => {
@@ -64,7 +63,7 @@ export const configureCryptopayModule = ({ db }: { db: Db }): CryptopayModule =>
           decimals: null,
           mostRecentBlockHeight: 0,
           blockHeight: 0,
-          amount: Decimal128.fromString('0'),
+          amount: mongodb.Decimal128.fromString('0'),
           created: new Date(),
         },
         $set: {
@@ -112,7 +111,7 @@ export const configureCryptopayModule = ({ db }: { db: Db }): CryptopayModule =>
           decimals,
           blockHeight,
           mostRecentBlockHeight: blockHeight,
-          amount: Decimal128.fromString(amount),
+          amount: mongodb.Decimal128.fromString(amount),
           updated: new Date(),
         },
       },

package/src/plugins-index.ts

@@ -1,5 +1,5 @@
 import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { ModuleInput, UnchainedCore } from '@unchainedshop/types/core.js';
 import express from 'express';
 
 // Delivery
@@ -89,7 +89,12 @@ const {
 // import './files/minio/minio-adapter';
 // import { minioHandler } from './files/minio/minio-webhook';
 
-export const defaultModules = {
+export const defaultModules: Record<
+  string,
+  {
+    configure: (params: ModuleInput<any>) => any;
+  }
+> = {
   appleTransactions: {
     configure: configureAppleTransactionsModule,
   },

package/src/pricing/delivery-swiss-tax.ts

@@ -33,7 +33,7 @@ export const DeliverySwissTax: IDeliveryPricingAdapter = {
   key: 'shop.unchained.pricing.delivery-swiss-tax',
   version: '1.0.0',
   label: 'Apply Swiss Tax on Delivery Fees',
-  orderIndex: 20,
+  orderIndex: 80,
 
   isActivatedFor: (context) => {
     return isDeliveryAddressInSwitzerland(context);

package/src/pricing/discount-100-off.ts

@@ -7,7 +7,7 @@ export const HundredOff: IDiscountAdapter = {
   key: 'shop.unchained.discount.100-off',
   label: '100 Off',
   version: '1.0.0',
-  orderIndex: 1,
+  orderIndex: 10,
 
   // return true if a discount is allowed to get added manually by a user
   isManualAdditionAllowed: async () => {

package/src/pricing/discount-half-price-manual.ts

@@ -7,7 +7,7 @@ export const HalfPriceManual: IDiscountAdapter = {
   key: 'shop.unchained.discount.half-price-manual',
   label: 'Half Price Manual',
   version: '1.0.0',
-  orderIndex: 2,
+  orderIndex: 10,
 
   // return true if a discount is allowed to get added manually by a user
   isManualAdditionAllowed: async () => {

package/src/pricing/discount-half-price.ts

@@ -7,7 +7,7 @@ export const HalfPrice: IDiscountAdapter = {
   key: 'shop.unchained.discount.half-price',
   label: 'Half Price',
   version: '1.0.0',
-  orderIndex: 3,
+  orderIndex: 10,
 
   // return true if a discount is allowed to get added manually by a user
   isManualAdditionAllowed: async () => {

package/src/pricing/order-discount.ts

@@ -8,7 +8,7 @@ export const OrderDiscount: IOrderPricingAdapter = {
   key: 'shop.unchained.pricing.order-discount',
   version: '1.0.0',
   label: 'Apply Discounts on Total Order Value',
-  orderIndex: 90,
+  orderIndex: 40,
 
   isActivatedFor: () => {
     return true;

package/src/pricing/order-items-discount.ts

@@ -8,7 +8,7 @@ const OrderItemsDiscount: IOrderPricingAdapter = {
   key: 'shop.unchained.pricing.order-items-discount',
   version: '1.0.0',
   label: 'Apply Discounts on Total Value Of Goods',
-  orderIndex: 89,
+  orderIndex: 30,
 
   isActivatedFor: () => {
     return true;

package/src/pricing/order-payment.ts

@@ -7,7 +7,7 @@ const OrderPayment: IOrderPricingAdapter = {
   key: 'shop.unchained.pricing.order-payment',
   version: '1.0.0',
   label: 'Add Payment Fees to Order',
-  orderIndex: 20,
+  orderIndex: 10,
 
   isActivatedFor: () => {
     return true;

package/src/pricing/order-round.ts

@@ -0,0 +1,139 @@
+import { OrderPricingAdapter, OrderPricingDirector } from '@unchainedshop/core-orders';
+import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
+
+interface PriceRoundSettings {
+  defaultPrecision: number;
+  roundTo: (value: number, precision: number, currency: string) => number;
+}
+
+export const OrderPriceRound: IOrderPricingAdapter & {
+  configure: (params: PriceRoundSettings) => void;
+  settings: PriceRoundSettings;
+} = {
+  ...OrderPricingAdapter,
+
+  key: 'shop.unchained.pricing.order-round',
+  version: '1.0.0',
+  label: 'Round order price to the next precision number',
+  orderIndex: 90,
+
+  isActivatedFor: () => {
+    return true;
+  },
+
+  settings: {
+    defaultPrecision: 5,
+    roundTo: (value: number, precision: number) =>
+      precision !== 0 ? Math.round(value / precision) * precision : value,
+  },
+
+  configure({ defaultPrecision, roundTo }) {
+    if (defaultPrecision) this.settings.defaultPrecision = defaultPrecision;
+    if (roundTo) this.settings.roundTo = roundTo;
+  },
+
+  actions: (params) => {
+    const pricingAdapter = OrderPricingAdapter.actions(params);
+
+    const calculateDifference = (amount: number, currency: string) => {
+      const roundedAmount = OrderPriceRound.settings.roundTo(
+        amount,
+        OrderPriceRound.settings.defaultPrecision,
+        currency,
+      );
+      return roundedAmount - amount;
+    };
+
+    return {
+      ...pricingAdapter,
+
+      calculate: async () => {
+        const { currency } = params.context;
+
+        const { amount: deliveryAmount } = params.calculationSheet.total({
+          category: OrderPricingRowCategory.Delivery,
+          useNetPrice: true,
+        });
+        if (deliveryAmount) {
+          pricingAdapter.resultSheet().addDelivery({
+            amount: calculateDifference(deliveryAmount, currency),
+            taxAmount: 0,
+            meta: {
+              adapter: OrderPriceRound.key,
+            },
+          });
+        }
+
+        const { amount: discountAmount } = params.calculationSheet.total({
+          category: OrderPricingRowCategory.Discounts,
+          useNetPrice: true,
+        });
+        if (discountAmount) {
+          pricingAdapter.resultSheet().addDiscount({
+            amount: calculateDifference(discountAmount, currency),
+            taxAmount: 0,
+            meta: {
+              adapter: OrderPriceRound.key,
+            },
+            discountId: null,
+          });
+        }
+
+        const { amount: itemsAmount } = params.calculationSheet.total({
+          category: OrderPricingRowCategory.Items,
+          useNetPrice: true,
+        });
+        if (itemsAmount) {
+          pricingAdapter.resultSheet().addItems({
+            amount: calculateDifference(itemsAmount, currency),
+            taxAmount: 0,
+            meta: {
+              adapter: OrderPriceRound.key,
+            },
+          });
+        }
+
+        const { amount: paymentAmount } = params.calculationSheet.total({
+          category: OrderPricingRowCategory.Payment,
+          useNetPrice: true,
+        });
+        if (paymentAmount) {
+          pricingAdapter.resultSheet().addPayment({
+            amount: calculateDifference(paymentAmount, currency),
+            taxAmount: 0,
+            meta: {
+              adapter: OrderPriceRound.key,
+            },
+          });
+        }
+
+        const taxesAmount = params.calculationSheet.taxSum({
+          category: OrderPricingRowCategory.Taxes,
+        });
+        if (taxesAmount) {
+          const taxDifference = calculateDifference(taxesAmount, currency);
+          pricingAdapter.resultSheet().calculation.push({
+            category: OrderPricingRowCategory.Taxes,
+            amount: taxDifference,
+            meta: {
+              adapter: OrderPriceRound.key,
+            },
+          });
+          // WORKAROUND BECAUSE ORDER TOTAL GROSS PRICE IS CALCULATED WITH A SUM OF EVERYTHING EXCEPT TAXES
+          // AS OF UNCHAINED <= 2.6
+          pricingAdapter.resultSheet().calculation.push({
+            category: null,
+            amount: taxDifference,
+            meta: {
+              adapter: OrderPriceRound.key,
+            },
+          });
+        }
+
+        return pricingAdapter.calculate();
+      },
+    };
+  },
+};
+
+OrderPricingDirector.registerAdapter(OrderPriceRound);

package/src/pricing/product-discount.ts

@@ -12,7 +12,7 @@ const ProductDiscount: IProductPricingAdapter = {
   key: 'shop.unchained.pricing.product-discount',
   version: '1.0.0',
   label: 'Apply Discounts on Product Price',
-  orderIndex: 10,
+  orderIndex: 30,
 
   isActivatedFor: () => {
     return true;

package/src/pricing/product-price-rateconversion.ts

@@ -7,7 +7,7 @@ export const ProductPriceRateConversion: IProductPricingAdapter = {
   key: 'shop.unchained.pricing.rate-conversion',
   version: '1.0.0',
   label: 'Generic rate conversion plugin that converts between rates if entry in DB exists.',
-  orderIndex: 1,
+  orderIndex: 10,
 
   isActivatedFor: () => {
     return true;

package/src/pricing/product-round.ts

@@ -0,0 +1,63 @@
+import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
+import { ProductPricingAdapter, ProductPricingDirector } from '@unchainedshop/core-products';
+
+interface PriceRoundSettings {
+  defaultPrecision: number;
+  roundTo: (value: number, precision: number, currency: string) => number;
+}
+
+export const ProductRound: IProductPricingAdapter & {
+  configure: (params: PriceRoundSettings) => void;
+  settings: PriceRoundSettings;
+} = {
+  ...ProductPricingAdapter,
+
+  key: 'shop.unchained.pricing.product-round',
+  version: '1.0.0',
+  label: 'Round product price',
+  orderIndex: 90,
+
+  isActivatedFor: () => {
+    return true;
+  },
+
+  settings: {
+    defaultPrecision: 5,
+    roundTo: (value: number, precision: number) => Math.round(value / precision) * precision,
+  },
+
+  configure({ defaultPrecision, roundTo }) {
+    if (defaultPrecision) this.settings.defaultPrecision = defaultPrecision;
+    if (roundTo) this.settings.roundTo = roundTo;
+  },
+
+  actions: (params) => {
+    const pricingAdapter = ProductPricingAdapter.actions(params);
+
+    return {
+      ...pricingAdapter,
+
+      calculate: async () => {
+        const { currency } = params.context;
+        const { defaultPrecision, roundTo } = ProductRound.settings;
+        const { calculation = [] } = params.calculationSheet;
+
+        if (calculation?.length) {
+          pricingAdapter.resultSheet().resetCalculation(params.calculationSheet);
+
+          calculation.forEach((item) => {
+            const newAmount = roundTo(item.amount, defaultPrecision, currency);
+            pricingAdapter.resultSheet().calculation.push({
+              ...item,
+              amount: newAmount,
+            });
+          });
+        }
+
+        return pricingAdapter.calculate();
+      },
+    };
+  },
+};
+
+ProductPricingDirector.registerAdapter(ProductRound);

package/src/pricing/product-swiss-tax.test.ts

@@ -8,7 +8,7 @@ describe('getTaxRate', () => {
     expect(getTaxRate({
       product: {} as any,
       order: {} as any,
-    })).toBe(0.077);
+    })).toBe(0.081);
   });
 
   it('reduced rate', () => {
@@ -17,7 +17,7 @@ describe('getTaxRate', () => {
         tags: ['swiss-tax-category:reduced']
       } as any,
       order: {} as any,
-    })).toBe(0.025);
+    })).toBe(0.026);
   });
 
   it('special rate', () => {
@@ -26,7 +26,7 @@ describe('getTaxRate', () => {
         tags: ['swiss-tax-category:special']
       } as any,
       order: {} as any,
-    })).toBe(0.037);
+    })).toBe(0.038);
   });
 
   it('default rate', () => {
@@ -35,7 +35,7 @@ describe('getTaxRate', () => {
         tags: ['swiss-tax-category:default']
       } as any,
       order: {} as any,
-    })).toBe(0.077);
+    })).toBe(0.081);
   });
 
 })

package/src/pricing/product-swiss-tax.ts

@@ -7,8 +7,8 @@ import { SwissTaxCategories } from './tax/ch.js';
 export const getTaxRate = (context: { product: Product; order?: Order }) => {
   const { product, order } = context;
 
-  const productSpecialTaxTag = product.tags?.find(
-    (tag) => tag?.trim().toLowerCase().startsWith('swiss-tax-category:'),
+  const productSpecialTaxTag = product.tags?.find((tag) =>
+    tag?.trim().toLowerCase().startsWith('swiss-tax-category:'),
   );
   const taxCategory =
     Object.values(SwissTaxCategories).find(
@@ -41,7 +41,7 @@ export const ProductSwissTax: IProductPricingAdapter = {
   key: 'shop.unchained.pricing.product-swiss-tax',
   version: '1.0.0',
   label: 'Apply Swiss Tax on Product',
-  orderIndex: 20,
+  orderIndex: 80,
 
   isActivatedFor: () => {
     return true;

package/src/warehousing/eth-minter.ts

@@ -3,9 +3,10 @@ import {
   WarehousingAdapter,
   WarehousingProviderType,
 } from '@unchainedshop/core-warehousing';
+import { generateDbObjectId } from '@unchainedshop/mongodb';
 import { ProductType, ProductContractStandard } from '@unchainedshop/types/products.js';
 import { IWarehousingAdapter, WarehousingError } from '@unchainedshop/types/warehousing.js';
-import { generateDbObjectId, systemLocale } from '@unchainedshop/utils';
+import { systemLocale } from '@unchainedshop/utils';
 
 const { MINTER_TOKEN_OFFSET = '0' } = process.env;
 

package/src/warehousing/google-sheets.ts

@@ -6,7 +6,7 @@ import {
 import Sheets from 'node-sheets';
 import { log, LogLevel } from '@unchainedshop/logger';
 import 'abort-controller/polyfill.js';
-import { LRUCache } from 'lru-cache';
+import * as lruCache from 'lru-cache';
 import { IWarehousingAdapter } from '@unchainedshop/types/warehousing.js';
 
 const { NODE_ENV, GOOGLE_SHEETS_ID, GOOGLE_SHEETS_PRIVATE_KEY_DATA } = process.env;
@@ -48,7 +48,7 @@ const updateGoogleCache = async (cache) => {
   return null;
 };
 
-const googleCache = new LRUCache({
+const googleCache = new lruCache.LRUCache({
   max: 500,
   ttl, // 1 second in dev
   allowStale: true,