@lucaapp/service-utils 1.56.7 → 1.57.0

package/dist/lib/api/endpoint.d.ts

@@ -3,5 +3,5 @@ import { Middleware, EndpointResponseSchema } from './types/middleware';
 import { EndpointOptions, EndpointHandler } from './types/endpoint';
 import { ZodObjectSchemaOrUndefined } from './types/utils';
 type HttpMethod = 'get' | 'post' | 'put' | 'delete' | 'patch';
-export declare const mountEndpoint: <TResponseSchemas extends readonly EndpointResponseSchema[], TRequestBodySchema extends ZodObjectSchemaOrUndefined, TRequestParamsSchema extends ZodObjectSchemaOrUndefined, TRequestQuerySchema extends ZodObjectSchemaOrUndefined, TRequestHeadersSchema extends ZodObjectSchemaOrUndefined, TMiddlewares extends readonly Middleware<any, any, any, any, any, any>[] | undefined = undefined>(router: Router, method: HttpMethod, path: string, options: EndpointOptions<TResponseSchemas, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TMiddlewares>, handler: EndpointHandler<TResponseSchemas, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TMiddlewares>, debug: boolean) => void;
+export declare const mountEndpoint: <TResponseSchemas extends ReadonlyArray<EndpointResponseSchema>, TRequestBodySchema extends ZodObjectSchemaOrUndefined, TRequestParamsSchema extends ZodObjectSchemaOrUndefined, TRequestQuerySchema extends ZodObjectSchemaOrUndefined, TRequestHeadersSchema extends ZodObjectSchemaOrUndefined, TMiddlewares extends ReadonlyArray<Middleware<any, any, any, any, any, any>> | undefined = undefined>(router: Router, method: HttpMethod, path: string, options: EndpointOptions<TResponseSchemas, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TMiddlewares>, handler: EndpointHandler<TResponseSchemas, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TMiddlewares>, debug: boolean) => void;
 export {};

package/dist/lib/api/middleware.d.ts

@@ -1,2 +1,2 @@
 import { Middleware, MiddlewareOptions, MiddlewareHandler, EndpointResponseSchema } from './types/middleware';
-export declare const createMiddleware: <TResponseSchemas extends readonly EndpointResponseSchema[], TRequestBody = undefined, TRequestParams = undefined, TRequestQuery = undefined, TRequestHeaders = undefined, TContext = undefined>(options: MiddlewareOptions<TResponseSchemas, TRequestBody, TRequestParams, TRequestQuery, TRequestHeaders, TContext>, handler: MiddlewareHandler<TResponseSchemas, TRequestBody, TRequestParams, TRequestQuery, TRequestHeaders, TContext>) => Middleware<TResponseSchemas, TRequestBody, TRequestParams, TRequestQuery, TRequestHeaders, TContext>;
+export declare const createMiddleware: <TResponseSchemas extends ReadonlyArray<EndpointResponseSchema>, TRequestBody = undefined, TRequestParams = undefined, TRequestQuery = undefined, TRequestHeaders = undefined, TContext = undefined>(options: MiddlewareOptions<TResponseSchemas, TRequestBody, TRequestParams, TRequestQuery, TRequestHeaders, TContext>, handler: MiddlewareHandler<TResponseSchemas, TRequestBody, TRequestParams, TRequestQuery, TRequestHeaders, TContext>) => Middleware<TResponseSchemas, TRequestBody, TRequestParams, TRequestQuery, TRequestHeaders, TContext>;

package/dist/lib/api/response.d.ts

@@ -1,14 +1,14 @@
 import { z } from 'zod';
 declare const noContentSchema: z.ZodVoid;
-export declare const okResponse: <T>(schema?: z.ZodType<T, z.ZodTypeDef, T> | undefined) => {
+export declare const okResponse: <T>(schema?: z.ZodSchema<T>) => {
     status: 200;
     description: string;
-    schema: z.ZodVoid | z.ZodType<T, z.ZodTypeDef, T>;
+    schema: z.ZodSchema<T> | typeof noContentSchema;
 };
-export declare const createdResponse: <T>(schema?: z.ZodType<T, z.ZodTypeDef, T> | undefined) => {
+export declare const createdResponse: <T>(schema?: z.ZodSchema<T>) => {
     status: 201;
     description: string;
-    schema: z.ZodVoid | z.ZodType<T, z.ZodTypeDef, T>;
+    schema: z.ZodSchema<T> | typeof noContentSchema;
 };
 export declare const noContentResponse: () => {
     status: 204;

package/dist/lib/api/send.d.ts

@@ -1,17 +1,17 @@
-export declare const ok: <T, U>(body?: T | undefined, headers?: U | undefined) => {
+export declare const ok: <T, U>(body?: T, headers?: U) => {
     status: 200;
     body: T;
     headers: U;
 };
-export declare const created: <T, U>(body?: T | undefined, headers?: U | undefined) => {
+export declare const created: <T, U>(body?: T, headers?: U) => {
     status: 201;
     body: T;
     headers: U;
 };
-export declare const noContent: <T>(headers?: T | undefined) => {
+export declare const noContent: <T>(headers?: T) => {
     status: 204;
     body: void;
-    headers?: T | undefined;
+    headers?: T;
 };
 /**
  * Specifies that the response is a raw response.

package/dist/lib/api/types/middleware.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { z } from 'zod';
 import { ArrayToUnion, ExtractZodOutput, ZodSchemaOuput } from './utils';
 export type EndpointResponseSchema = {

package/dist/lib/email/emailDataType.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEmailDataType = void 0;
+exports.createEmailDataType = createEmailDataType;
 const sequelize_1 = require("sequelize");
 function createEmailDataType() {
     class Email extends sequelize_1.DataTypes.CITEXT {
@@ -14,4 +14,3 @@ function createEmailDataType() {
     Email.prototype.key = Email.key = 'Email';
     sequelize_1.DataTypes.Email = sequelize_1.Utils.classToInvokable(Email);
 }
-exports.createEmailDataType = createEmailDataType;

package/dist/lib/logger/index.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node/http" />
-/// <reference types="lib/logger/types" />
-/// <reference types="pino-http" />
 import type { IncomingMessage, ServerResponse } from 'http';
 import { Logger } from 'pino';
 import { HttpLoggerCreationOptions } from './utils';

package/dist/lib/money/index.d.ts

@@ -1 +1,2 @@
 export * from './money';
+export * from './supportedCurrencies';

package/dist/lib/money/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./money"), exports);
+__exportStar(require("./supportedCurrencies"), exports);

package/dist/lib/money/money.d.ts

@@ -1,49 +1,52 @@
 import { Model } from 'sequelize';
-interface MoneyInterface {
+import { SupportedCurrencies } from './supportedCurrencies';
+interface MoneyInterface<T extends SupportedCurrencies> {
     getAmount(): number;
-    add(addend?: Money): Money;
-    subtract(subtrahend?: Money): Money;
-    multiply(multiplier: number): Money;
-    divide(divisor: number): Money;
-    equalsTo(comparator: Money): boolean;
-    lessThan(comparator: Money): boolean;
-    lessThanOrEqual(comparator: Money): boolean;
-    greaterThan(comparator: Money): boolean;
-    greaterThanOrEqual(comparator: Money): boolean;
+    add(addend?: Money<T>): Money<T>;
+    subtract(subtrahend?: Money<T>): Money<T>;
+    multiply(multiplier: number): Money<T>;
+    divide(divisor: number): Money<T>;
+    equalsTo(comparator: Money<T>): boolean;
+    lessThan(comparator: Money<T>): boolean;
+    lessThanOrEqual(comparator: Money<T>): boolean;
+    greaterThan(comparator: Money<T>): boolean;
+    greaterThanOrEqual(comparator: Money<T>): boolean;
     isZero(): boolean;
     isPositive(): boolean;
     isNegative(): boolean;
 }
-declare class Money implements MoneyInterface {
+export declare class Money<T extends SupportedCurrencies> implements MoneyInterface<T> {
+    readonly currency: T;
     private readonly value;
-    static fromAmount(value: number): Money;
-    static fromFloat(value: number): Money;
-    static zero(): Money;
+    static fromAmount<T extends SupportedCurrencies>(value: number, currency: T): Money<T>;
+    static fromFloat<T extends SupportedCurrencies>(value: number, currency: T): Money<T>;
+    static zero<T extends SupportedCurrencies>(currency: T): Money<T>;
     private constructor();
-    clone(): Money;
+    clone(): Money<T>;
     getAmount(): number;
-    getEuroAmount(): number;
+    getAmountInMajorUnits(): number;
     /**
      * @deprecated Use getFormattedString in place of getEuroString
      */
     getEuroString(): string;
     getFormattedString(locale: string, includeSymbol?: boolean): string;
-    add(addend?: Money | null): Money;
-    subtract(subtrahend?: Money | null): Money;
-    multiply(multiplier: number): Money;
-    divide(divisor: number): Money;
-    percentage(percentage: number): Money;
-    equalsTo(comparator: Money): boolean;
-    lessThan(comparator: Money): boolean;
-    lessThanOrEqual(comparator: Money): boolean;
-    greaterThan(comparator: Money): boolean;
-    greaterThanOrEqual(comparator: Money): boolean;
+    private assertSameCurrency;
+    add(addend?: Money<T>): Money<T>;
+    subtract(subtrahend?: Money<T>): Money<T>;
+    multiply(multiplier: number): Money<T>;
+    divide(divisor: number): Money<T>;
+    percentage(percentage: number): Money<T>;
+    equalsTo(comparator: Money<T>): boolean;
+    lessThan(comparator: Money<T>): boolean;
+    lessThanOrEqual(comparator: Money<T>): boolean;
+    greaterThan(comparator: Money<T>): boolean;
+    greaterThanOrEqual(comparator: Money<T>): boolean;
     isZero(): boolean;
     isPositive(): boolean;
     isNegative(): boolean;
-    min(comparator: Money): Money;
-    max(comparator: Money): Money;
+    min(comparator: Money<T>): Money<T>;
+    max(comparator: Money<T>): Money<T>;
 }
-declare const moneyfiedGet: (model: Model, key: string) => Money | null;
-declare const moneyfiedSet: (model: Model, key: string, value: Money | undefined) => void;
-export { moneyfiedGet, moneyfiedSet, Money };
+export declare const moneyfiedGet: <T extends SupportedCurrencies>(model: Model, key: string) => Money<T> | null;
+export declare const moneyfiedSet: <T extends SupportedCurrencies>(model: Model, key: string, value: Money<T> | undefined) => void;
+export {};

package/dist/lib/money/money.js

@@ -1,90 +1,110 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Money = exports.moneyfiedSet = exports.moneyfiedGet = void 0;
-const CENTS_PER_EURO = 100;
+exports.moneyfiedSet = exports.moneyfiedGet = exports.Money = void 0;
+const supportedCurrencies_1 = require("./supportedCurrencies");
+const MINOR_UNITS_PER_MAJOR_UNIT = 100;
 const EPSILON = 0.00000000001;
 const roundHalfUp = (value) => {
     const rounded = Math.sign(value) * Math.round(Math.abs(value) + EPSILON);
     return rounded === 0 ? 0 : rounded;
 };
-const euroToAmount = (amountInEuros) => roundHalfUp(amountInEuros * CENTS_PER_EURO);
-const amountToEuro = (value) => value / CENTS_PER_EURO;
+const convertToMinorUnits = (amountInMajorUnits) => roundHalfUp(amountInMajorUnits * MINOR_UNITS_PER_MAJOR_UNIT);
+const convertToMajorUnits = (amountInMinorUnits) => amountInMinorUnits / MINOR_UNITS_PER_MAJOR_UNIT;
 class Money {
-    static fromAmount(value) {
+    static fromAmount(value, currency) {
         if (!Number.isInteger(value)) {
-            throw new TypeError('Integer required.');
+            throw new TypeError('Integer required');
         }
-        return new Money(value);
+        return new Money(value, currency);
     }
-    static fromFloat(value) {
-        return new Money(euroToAmount(value));
+    static fromFloat(value, currency) {
+        return new Money(convertToMinorUnits(value), currency);
     }
-    static zero() {
-        return Money.fromAmount(0);
+    static zero(currency) {
+        return Money.fromAmount(0, currency);
     }
-    constructor(amount) {
+    constructor(amount, currency) {
         this.value = amount;
+        this.currency = currency;
     }
     clone() {
-        return Money.fromAmount(this.value);
+        return Money.fromAmount(this.value, this.currency);
     }
     getAmount() {
         return this.value;
     }
-    getEuroAmount() {
-        return amountToEuro(this.value);
+    getAmountInMajorUnits() {
+        return convertToMajorUnits(this.value);
     }
     /**
      * @deprecated Use getFormattedString in place of getEuroString
      */
     getEuroString() {
-        return this.getEuroAmount().toFixed(2);
+        return this.getAmountInMajorUnits().toFixed(2);
     }
     getFormattedString(locale, includeSymbol = true) {
         const transactionalLanguage = locale === 'de' ? 'de-DE' : 'en-US';
         const formattedString = new Intl.NumberFormat(transactionalLanguage, {
             style: 'currency',
-            currency: 'EUR',
+            currency: this.currency,
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
-        })
-            .format(this.getEuroAmount())
-            .replace(/\s/, ' ');
-        return includeSymbol
-            ? formattedString
-            : formattedString.replace(/€|\s/g, '');
+        }).format(this.getAmountInMajorUnits());
+        if (!includeSymbol) {
+            const symbol = supportedCurrencies_1.currencySymbols[this.currency];
+            return formattedString.replace(new RegExp(`\\${symbol}`, 'g'), '').trim();
+        }
+        return formattedString.replace(/\s/, ' ');
+    }
+    assertSameCurrency(other) {
+        if (!other) {
+            return;
+        }
+        if (this.currency !== other.currency) {
+            throw new TypeError('Currencies must match');
+        }
     }
     add(addend) {
-        return Money.fromAmount(this.value + (addend?.value || 0));
+        this.assertSameCurrency(addend);
+        return Money.fromAmount(this.value + (addend?.value || 0), this.currency);
     }
     subtract(subtrahend) {
-        return Money.fromAmount(this.value - (subtrahend?.value || 0));
+        this.assertSameCurrency(subtrahend);
+        return Money.fromAmount(this.value - (subtrahend?.value || 0), this.currency);
     }
     multiply(multiplier) {
-        return Money.fromAmount(roundHalfUp(this.value * multiplier));
+        return Money.fromAmount(roundHalfUp(this.value * multiplier), this.currency);
     }
     divide(divisor) {
-        return Money.fromAmount(roundHalfUp(this.value / divisor));
+        if (divisor === 0) {
+            throw new TypeError('Divisor cannot be zero');
+        }
+        return Money.fromAmount(roundHalfUp(this.value / divisor), this.currency);
     }
     percentage(percentage) {
         if (Number.isNaN(percentage) || percentage < 0 || percentage > 100) {
             throw new TypeError('Expected number between 0 and 100');
         }
-        return Money.fromAmount(roundHalfUp((this.value / 100) * percentage));
+        return Money.fromAmount(roundHalfUp((this.value / 100) * percentage), this.currency);
     }
     equalsTo(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value === comparator.value;
     }
     lessThan(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value < comparator.value;
     }
     lessThanOrEqual(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value <= comparator.value;
     }
     greaterThan(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value > comparator.value;
     }
     greaterThanOrEqual(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value >= comparator.value;
     }
     isZero() {
@@ -97,9 +117,11 @@ class Money {
         return this.value < 0;
     }
     min(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value < comparator.value ? this.clone() : comparator.clone();
     }
     max(comparator) {
+        this.assertSameCurrency(comparator);
         return this.value > comparator.value ? this.clone() : comparator.clone();
     }
 }
@@ -108,10 +130,13 @@ const moneyfiedGet = (model, key) => {
     const currentValue = model.getDataValue(key);
     return currentValue === null || currentValue === undefined
         ? null
-        : Money.fromAmount(currentValue);
+        : Money.fromAmount(currentValue, model.getDataValue('currency'));
 };
 exports.moneyfiedGet = moneyfiedGet;
 const moneyfiedSet = (model, key, value) => {
+    if (value?.currency && value.currency !== model.getDataValue('currency')) {
+        throw new TypeError('Currencies must match');
+    }
     model.setDataValue(key, value?.getAmount());
 };
 exports.moneyfiedSet = moneyfiedSet;

package/dist/lib/money/supportedCurrencies.d.ts

@@ -0,0 +1,4 @@
+export declare enum SupportedCurrencies {
+    EUR = "EUR"
+}
+export declare const currencySymbols: Record<SupportedCurrencies, string>;

package/dist/lib/money/supportedCurrencies.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.currencySymbols = exports.SupportedCurrencies = void 0;
+var SupportedCurrencies;
+(function (SupportedCurrencies) {
+    SupportedCurrencies["EUR"] = "EUR";
+})(SupportedCurrencies || (exports.SupportedCurrencies = SupportedCurrencies = {}));
+exports.currencySymbols = {
+    [SupportedCurrencies.EUR]: '€',
+};

package/dist/lib/requestTracer/requestTracer.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node/http" />
-/// <reference types="lib/logger/types" />
-/// <reference types="pino-http" />
 declare const getRequestTracerId: () => string;
 declare const getRequestTracerMixin: () => {
     reqId: {};
@@ -8,5 +5,5 @@ declare const getRequestTracerMixin: () => {
     reqId?: undefined;
 };
 declare const getRequestIdHeader: () => object;
-declare const requestTracerMiddleware: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse<import("http").IncomingMessage>, next: (err?: any) => void) => void;
+declare const requestTracerMiddleware: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse, next: (err?: any) => void) => void;
 export { getRequestTracerId, getRequestTracerMixin, getRequestIdHeader, requestTracerMiddleware, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.56.7",
+  "version": "1.57.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -55,8 +55,8 @@
     "@types/pino-http": "5.8.4",
     "@types/supertest": "2.0.11",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
     "@vitest/coverage-v8": "1.4.0",
     "conventional-changelog-conventionalcommits": "^5.0.0",
     "eslint": "8.57.0",
@@ -67,7 +67,7 @@
     "semantic-release": "^19.0.3",
     "semantic-release-monorepo": "^7.0.5",
     "supertest": "^6.3.3",
-    "typescript": "5.3.3",
+    "typescript": "5.5.3",
     "vite-tsconfig-paths": "4.3.2"
   },
   "resolutions": {