@unchainedshop/utils 2.12.2 → 3.0.0-alpha2

package/lib/build-obfuscated-fields-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-obfuscated-fields-filter.d.ts","sourceRoot":"","sources":["../src/build-obfuscated-fields-filter.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,2BAA2B,0BAA0B,MAAM,EAAE,uBA2BlE,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"build-obfuscated-fields-filter.d.ts","sourceRoot":"","sources":["../src/build-obfuscated-fields-filter.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,2BAA2B,0BAA0B,MAAM,EAAE,uBA2BlE,CAAC;AAEF,eAAe,2BAA2B,CAAC"}

package/lib/build-obfuscated-fields-filter.js

@@ -1,8 +1,7 @@
 const defaultObfuscatedFields = [
     'password',
-    'plainPassword',
-    'newPlainPassword',
-    'oldPlainPassword',
+    'newPassword',
+    'oldPassword',
     'authorization',
     'secret',
     'accesskey',

package/lib/build-obfuscated-fields-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-obfuscated-fields-filter.js","sourceRoot":"","sources":["../src/build-obfuscated-fields-filter.ts"],"names":[],"mappings":"AAAA,MAAM,uBAAuB,GAAG;IAC9B,UAAU;IACV,eAAe;IACf,kBAAkB;IAClB,kBAAkB;IAClB,eAAe;IACf,QAAQ;IACR,WAAW;IACX,aAAa;IACb,OAAO;CACR,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,uBAAiC,EAAE,EAAE,EAAE;IAC1E,MAAM,eAAe,GAAG,oBAAoB,IAAI,uBAAuB,CAAC;IAExE,MAAM,wBAAwB,GAAG,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAEvB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChC,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,CAAC,2BAA2B;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,CAAC,wCAAwC;IACvD,CAAC,CAAC;IAEF,OAAO,wBAAwB,CAAC;AAClC,CAAC,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"build-obfuscated-fields-filter.js","sourceRoot":"","sources":["../src/build-obfuscated-fields-filter.ts"],"names":[],"mappings":"AAAA,MAAM,uBAAuB,GAAG;IAC9B,UAAU;IACV,aAAa;IACb,aAAa;IACb,eAAe;IACf,QAAQ;IACR,WAAW;IACX,aAAa;IACb,OAAO;CACR,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,uBAAiC,EAAE,EAAE,EAAE;IAC1E,MAAM,eAAe,GAAG,oBAAoB,IAAI,uBAAuB,CAAC;IAExE,MAAM,wBAAwB,GAAG,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAEvB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChC,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,CAAC,2BAA2B;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,CAAC,wCAAwC;IACvD,CAAC,CAAC;IAEF,OAAO,wBAAwB,CAAC;AAClC,CAAC,CAAC;AAEF,eAAe,2BAA2B,CAAC"}

package/lib/locale-helpers.d.ts

@@ -1,9 +1,7 @@
+import { Currency } from '@unchainedshop/types/currencies.js';
 import type { Locale as LocaleType, Locales as LocalesType } from 'locale';
 export declare const systemLocale: LocaleType;
 export declare const resolveBestSupported: (acceptLanguage: string, supportedLocales: LocalesType) => LocaleType;
 export declare const resolveBestCountry: (localeCountry: any, shopCountry: any, countries: any) => any;
-export declare const resolveUserRemoteAddress: (req: any) => {
-    remoteAddress: any;
-    remotePort: any;
-};
+export declare const resolveBestCurrency: (localeCurrency: any, currencies: Array<Currency>) => string;
 //# sourceMappingURL=locale-helpers.d.ts.map

package/lib/locale-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locale-helpers.d.ts","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAO3E,eAAO,MAAM,YAAY,YAAuD,CAAC;AAEjF,eAAO,MAAM,oBAAoB,mBACf,MAAM,oBACJ,WAAW,KAC5B,UAKF,CAAC;AAEF,eAAO,MAAM,kBAAkB,+DAa9B,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;CAYpC,CAAC"}
+{"version":3,"file":"locale-helpers.d.ts","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAO3E,eAAO,MAAM,YAAY,YAAuD,CAAC;AAEjF,eAAO,MAAM,oBAAoB,mBACf,MAAM,oBACJ,WAAW,KAC5B,UAKF,CAAC;AAEF,eAAO,MAAM,kBAAkB,+DAa9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,oCAAgC,KAAK,CAAC,QAAQ,CAAC,WAc9E,CAAC"}

package/lib/locale-helpers.js

@@ -1,6 +1,6 @@
 import localePkg from 'locale';
 const { Locales, Locale } = localePkg;
-const { UNCHAINED_LANG = 'de', UNCHAINED_COUNTRY = 'CH' } = process.env;
+const { UNCHAINED_LANG = 'de', UNCHAINED_COUNTRY = 'CH', UNCHAINED_CURRENCY = 'CHF' } = process.env;
 export const systemLocale = new Locale(`${UNCHAINED_LANG}-${UNCHAINED_COUNTRY}`);
 export const resolveBestSupported = (acceptLanguage, supportedLocales) => {
     const acceptLocale = new Locales(acceptLanguage);
@@ -23,13 +23,17 @@ export const resolveBestCountry = (localeCountry, shopCountry, countries) => {
     }
     return localeCountry || systemLocale.country;
 };
-export const resolveUserRemoteAddress = (req) => {
-    const remoteAddress = req.headers['x-real-ip'] ||
-        req.headers['x-forwarded-for'] ||
-        req.connection?.remoteAddress ||
-        req.socket?.remoteAddress ||
-        req.connection?.socket?.remoteAddress;
-    const remotePort = req.connection?.remotePort || req.socket?.remotePort || req.connection?.socket?.remotePort;
-    return { remoteAddress, remotePort };
+export const resolveBestCurrency = (localeCurrency, currencies) => {
+    if (localeCurrency) {
+        const resolvedCurrency = currencies.find((currency) => currency.isoCode === localeCurrency);
+        if (resolvedCurrency) {
+            return resolvedCurrency.isoCode;
+        }
+    }
+    const fallbackCurrency = currencies.find((currency) => currency.isoCode === UNCHAINED_CURRENCY);
+    if (fallbackCurrency) {
+        return fallbackCurrency.isoCode;
+    }
+    return currencies?.[0]?.isoCode || UNCHAINED_CURRENCY;
 };
 //# sourceMappingURL=locale-helpers.js.map

package/lib/locale-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"locale-helpers.js","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,QAAQ,CAAC;AAE/B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAEtC,MAAM,EAAE,cAAc,GAAG,IAAI,EAAE,iBAAiB,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAExE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,GAAG,cAAc,IAAI,iBAAiB,EAAE,CAAC,CAAC;AAEjF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,cAAsB,EACtB,gBAA6B,EACjB,EAAE;IACd,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU;QAAE,OAAO,YAAY,CAAC;IACrC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE;IAC1E,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE;YACjE,IAAI,WAAW,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpC,OAAO,OAAO,CAAC,OAAO,CAAC;YACzB,CAAC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,eAAe,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,aAAa,IAAI,YAAY,CAAC,OAAO,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,EAAE;IAC9C,MAAM,aAAa,GACjB,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;QACxB,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;QAC9B,GAAG,CAAC,UAAU,EAAE,aAAa;QAC7B,GAAG,CAAC,MAAM,EAAE,aAAa;QACzB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC;IAExC,MAAM,UAAU,GACd,GAAG,CAAC,UAAU,EAAE,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,IAAI,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC;IAE7F,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;AACvC,CAAC,CAAC"}
+{"version":3,"file":"locale-helpers.js","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,QAAQ,CAAC;AAE/B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAEtC,MAAM,EAAE,cAAc,GAAG,IAAI,EAAE,iBAAiB,GAAG,IAAI,EAAE,kBAAkB,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEpG,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,GAAG,cAAc,IAAI,iBAAiB,EAAE,CAAC,CAAC;AAEjF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,cAAsB,EACtB,gBAA6B,EACjB,EAAE;IACd,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU;QAAE,OAAO,YAAY,CAAC;IACrC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE;IAC1E,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE;YACjE,IAAI,WAAW,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpC,OAAO,OAAO,CAAC,OAAO,CAAC;YACzB,CAAC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,eAAe,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,aAAa,IAAI,YAAY,CAAC,OAAO,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,cAAc,EAAE,UAA2B,EAAE,EAAE;IACjF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,cAAc,CAAC,CAAC;QAC5F,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC,OAAO,CAAC;QAClC,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,kBAAkB,CAAC,CAAC;IAChG,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC,OAAO,CAAC;IAClC,CAAC;IAED,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,kBAAkB,CAAC;AACxD,CAAC,CAAC"}

package/lib/utils-index.js

@@ -21,65 +21,4 @@ export { BasePricingDirector } from './director/BasePricingDirector.js';
 export { BasePricingSheet } from './director/BasePricingSheet.js';
 export { BaseDiscountAdapter } from './director/BaseDiscountAdapter.js';
 export { BaseDiscountDirector } from './director/BaseDiscountDirector.js';
-/*
-
-function resolveBestCountry(
-  contextCountry: string,
-  headerCountry: string | string[],
-  countries: Array<Country>,
-): string;
-function resolveUserRemoteAddress(req: IncomingMessage): {
-  remoteAddress: string;
-  remotePort: string;
-};
-
-function objectInvert(obj: Record<string, string>): Record<string, string>;
-
-const systemLocale: Locale;
-
-const Schemas: {
-  timestampFields: TimestampFields;
-  User: SimpleSchema;
-  Address: SimpleSchema;
-  Contact: SimpleSchema;
-};
-
-// Director
-const BaseAdapter: IBaseAdapter;
-const BaseDirector: <Adapter extends IBaseAdapter>(
-  directorName: string,
-  options?: {
-    adapterSortKey?: string;
-    adapterKeyField?: string;
-  },
-) => IBaseDirector<Adapter>;
-
-const BaseDiscountAdapter: Omit<IDiscountAdapter, 'key' | 'label' | 'version'>;
-const BaseDiscountDirector: (directorName: string) => IDiscountDirector;
-
-const BasePricingAdapter: <
-  AdapterContext extends BasePricingAdapterContext,
-  Calculation extends PricingCalculation,
->() => IPricingAdapter<AdapterContext, Calculation, IPricingSheet<Calculation>>;
-
-const BasePricingDirector: <
-  PricingContext extends BasePricingContext,
-  AdapterPricingContext extends BasePricingAdapterContext,
-  Calculation extends PricingCalculation,
-  Adapter extends IPricingAdapter<AdapterPricingContext, Calculation, IPricingSheet<Calculation>>,
->(
-  directorName: string,
-) => IPricingDirector<
-  PricingContext,
-  Calculation,
-  AdapterPricingContext,
-  IPricingSheet<Calculation>,
-  Adapter
->;
-
-const BasePricingSheet: <Calculation extends PricingCalculation>(
-  params: PricingSheetParams<Calculation>,
-) => IBasePricingSheet<Calculation>;
-
-*/
 //# sourceMappingURL=utils-index.js.map

package/lib/utils-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils-index.js","sourceRoot":"","sources":["../src/utils-index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAEhD,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAE7F;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4DE"}
+{"version":3,"file":"utils-index.js","sourceRoot":"","sources":["../src/utils-index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAEhD,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAE7F;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/utils",
-  "version": "2.12.2",
+  "version": "3.0.0-alpha2",
   "main": "lib/utils-index.js",
   "exports": {
     ".": "./lib/utils-index.js",
@@ -30,16 +30,15 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/logger": "^2.12.2",
-    "abort-controller": "3.0.0",
+    "@unchainedshop/logger": "^3.0.0-alpha2",
     "hashids": "^2.3.0",
     "locale": "0.1.0",
     "simpl-schema": "^3.4.6"
   },
   "devDependencies": {
-    "@types/node": "^20.14.10",
-    "@unchainedshop/types": "^2.12.2",
+    "@types/node": "^20.14.12",
+    "@unchainedshop/types": "^3.0.0-alpha2",
     "jest": "^29.7.0",
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.4"
   }
 }

package/src/build-obfuscated-fields-filter.ts

@@ -1,8 +1,7 @@
 const defaultObfuscatedFields = [
   'password',
-  'plainPassword',
-  'newPlainPassword',
-  'oldPlainPassword',
+  'newPassword',
+  'oldPassword',
   'authorization',
   'secret',
   'accesskey',

package/src/locale-helpers.ts

@@ -1,9 +1,10 @@
+import { Currency } from '@unchainedshop/types/currencies.js';
 import type { Locale as LocaleType, Locales as LocalesType } from 'locale';
 import localePkg from 'locale';
 
 const { Locales, Locale } = localePkg;
 
-const { UNCHAINED_LANG = 'de', UNCHAINED_COUNTRY = 'CH' } = process.env;
+const { UNCHAINED_LANG = 'de', UNCHAINED_COUNTRY = 'CH', UNCHAINED_CURRENCY = 'CHF' } = process.env;
 
 export const systemLocale = new Locale(`${UNCHAINED_LANG}-${UNCHAINED_COUNTRY}`);
 
@@ -32,16 +33,18 @@ export const resolveBestCountry = (localeCountry, shopCountry, countries) => {
   return localeCountry || systemLocale.country;
 };
 
-export const resolveUserRemoteAddress = (req) => {
-  const remoteAddress =
-    req.headers['x-real-ip'] ||
-    req.headers['x-forwarded-for'] ||
-    req.connection?.remoteAddress ||
-    req.socket?.remoteAddress ||
-    req.connection?.socket?.remoteAddress;
+export const resolveBestCurrency = (localeCurrency, currencies: Array<Currency>) => {
+  if (localeCurrency) {
+    const resolvedCurrency = currencies.find((currency) => currency.isoCode === localeCurrency);
+    if (resolvedCurrency) {
+      return resolvedCurrency.isoCode;
+    }
+  }
 
-  const remotePort =
-    req.connection?.remotePort || req.socket?.remotePort || req.connection?.socket?.remotePort;
+  const fallbackCurrency = currencies.find((currency) => currency.isoCode === UNCHAINED_CURRENCY);
+  if (fallbackCurrency) {
+    return fallbackCurrency.isoCode;
+  }
 
-  return { remoteAddress, remotePort };
+  return currencies?.[0]?.isoCode || UNCHAINED_CURRENCY;
 };

package/src/utils-index.test.ts

@@ -1,7 +1,6 @@
 import {
   resolveBestCountry,
   resolveBestSupported,
-  resolveUserRemoteAddress,
   slugify,
   systemLocale,
 } from '@unchainedshop/utils';
@@ -13,7 +12,6 @@ describe('Utils', () => {
     expect(systemLocale).toBeDefined();
     expect(resolveBestCountry).toBeInstanceOf(Function)
     expect(resolveBestSupported).toBeInstanceOf(Function)
-    expect(resolveUserRemoteAddress).toBeInstanceOf(Function)
   });
 
 describe('generateHashId', () => {

package/src/utils-index.ts

@@ -26,65 +26,3 @@ export { BasePricingDirector } from './director/BasePricingDirector.js';
 export { BasePricingSheet } from './director/BasePricingSheet.js';
 export { BaseDiscountAdapter } from './director/BaseDiscountAdapter.js';
 export { BaseDiscountDirector } from './director/BaseDiscountDirector.js';
-
-/*
-
-function resolveBestCountry(
-  contextCountry: string,
-  headerCountry: string | string[],
-  countries: Array<Country>,
-): string;
-function resolveUserRemoteAddress(req: IncomingMessage): {
-  remoteAddress: string;
-  remotePort: string;
-};
-
-function objectInvert(obj: Record<string, string>): Record<string, string>;
-
-const systemLocale: Locale;
-
-const Schemas: {
-  timestampFields: TimestampFields;
-  User: SimpleSchema;
-  Address: SimpleSchema;
-  Contact: SimpleSchema;
-};
-
-// Director
-const BaseAdapter: IBaseAdapter;
-const BaseDirector: <Adapter extends IBaseAdapter>(
-  directorName: string,
-  options?: {
-    adapterSortKey?: string;
-    adapterKeyField?: string;
-  },
-) => IBaseDirector<Adapter>;
-
-const BaseDiscountAdapter: Omit<IDiscountAdapter, 'key' | 'label' | 'version'>;
-const BaseDiscountDirector: (directorName: string) => IDiscountDirector;
-
-const BasePricingAdapter: <
-  AdapterContext extends BasePricingAdapterContext,
-  Calculation extends PricingCalculation,
->() => IPricingAdapter<AdapterContext, Calculation, IPricingSheet<Calculation>>;
-
-const BasePricingDirector: <
-  PricingContext extends BasePricingContext,
-  AdapterPricingContext extends BasePricingAdapterContext,
-  Calculation extends PricingCalculation,
-  Adapter extends IPricingAdapter<AdapterPricingContext, Calculation, IPricingSheet<Calculation>>,
->(
-  directorName: string,
-) => IPricingDirector<
-  PricingContext,
-  Calculation,
-  AdapterPricingContext,
-  IPricingSheet<Calculation>,
-  Adapter
->;
-
-const BasePricingSheet: <Calculation extends PricingCalculation>(
-  params: PricingSheetParams<Calculation>,
-) => IBasePricingSheet<Calculation>;
-
-*/