@moreapp/common-nodejs 0.12.4 → 0.12.5

package/dist/__tests__/utils.test.js

@@ -2,40 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const utils_1 = require("../utils");
-(0, vitest_1.describe)("environmentVariable", () => {
-    (0, vitest_1.test)("Should throw when environment variable does not exist", () => {
-        (0, vitest_1.expect)(() => (0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING")).toThrow("Missing environment variable 'COMMONS_NODEJS_TEST_NON_EXISTING'");
-    });
-    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (string)", () => {
-        (0, vitest_1.expect)((0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", "my-fallback")).toBe("my-fallback");
-    });
-    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (number)", () => {
-        (0, vitest_1.expect)((0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", 1)).toBe(1);
-    });
-    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (boolean)", () => {
-        (0, vitest_1.expect)((0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", false)).toBe(false);
-    });
-    (0, vitest_1.test)("Should return actual value when environment variable exists (string)", () => {
-        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "actual-value";
-        (0, vitest_1.expect)((0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", "my-fallback")).toBe("actual-value");
-    });
-    (0, vitest_1.test)("Should return actual value when environment variable exists (number)", () => {
-        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "2";
-        (0, vitest_1.expect)((0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", 1)).toBe(2);
-    });
-    (0, vitest_1.test)("Should return actual value when environment variable exists (boolean)", () => {
-        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "true";
-        (0, vitest_1.expect)((0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toBe(true);
-    });
-    (0, vitest_1.test)("should throw when environment variable contains an invalid type (number)", () => {
-        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "not-a-number";
-        (0, vitest_1.expect)(() => (0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", 1)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
-    });
-    (0, vitest_1.test)("should throw when environment variable contains an invalid type (boolean)", () => {
-        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "not-a-boolean";
-        (0, vitest_1.expect)(() => (0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
-    });
-});
 (0, vitest_1.describe)("isValidEmail", () => {
     (0, vitest_1.describe)("Valid email addresses", () => {
         (0, vitest_1.test)("Standard email address", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@moreapp.dev")).toBeTruthy());

package/dist/observability/tracer.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const api_1 = require("@opentelemetry/api");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
@@ -11,10 +44,9 @@ const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const resources_1 = require("@opentelemetry/resources");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const propagator_b3_1 = require("@opentelemetry/propagator-b3");
-const utils_1 = require("../utils");
+const environmentVariable_1 = require("../utils/environmentVariable");
 const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
 const lodash_1 = require("lodash");
-const logger_1 = require("../logger");
 let provider;
 const start = (serviceName, { http = {
     portsToInstrument: [3000],
@@ -25,10 +57,10 @@ const start = (serviceName, { http = {
     provider = new sdk_trace_node_1.NodeTracerProvider({
         resource: (0, resources_1.resourceFromAttributes)({
             [semantic_conventions_1.ATTR_SERVICE_NAME]: serviceName,
-            [semantic_conventions_1.ATTR_SERVICE_INSTANCE_ID]: (0, utils_1.environmentVariable)("HOSTNAME", "local"),
+            [semantic_conventions_1.ATTR_SERVICE_INSTANCE_ID]: (0, environmentVariable_1.environmentVariable)("HOSTNAME", "local"),
         }),
         spanProcessors: [
-            ...((0, utils_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
+            ...((0, environmentVariable_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
                 ? [new sdk_trace_base_1.BatchSpanProcessor(new exporter_trace_otlp_grpc_1.OTLPTraceExporter())]
                 : []),
             ...(debug ? [new sdk_trace_base_1.BatchSpanProcessor(new sdk_trace_node_1.ConsoleSpanExporter())] : []),
@@ -55,7 +87,8 @@ const start = (serviceName, { http = {
 };
 const shutdown = async () => {
     if (!(0, lodash_1.isNil)(provider)) {
-        logger_1.logger.info("Shutting down tracer");
+        const { logger } = await Promise.resolve().then(() => __importStar(require("../logger")));
+        logger.info("Shutting down tracer");
         await provider.shutdown();
     }
 };

package/dist/utils/__tests__/environmentVariable.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/__tests__/environmentVariable.test.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const environmentVariable_1 = require("../environmentVariable");
+(0, vitest_1.describe)("environmentVariable", () => {
+    (0, vitest_1.test)("Should throw when environment variable does not exist", () => {
+        (0, vitest_1.expect)(() => (0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING")).toThrow("Missing environment variable 'COMMONS_NODEJS_TEST_NON_EXISTING'");
+    });
+    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (string)", () => {
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", "my-fallback")).toBe("my-fallback");
+    });
+    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (number)", () => {
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", 1)).toBe(1);
+    });
+    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (boolean)", () => {
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", false)).toBe(false);
+    });
+    (0, vitest_1.test)("Should return actual value when environment variable exists (string)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "actual-value";
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", "my-fallback")).toBe("actual-value");
+    });
+    (0, vitest_1.test)("Should return actual value when environment variable exists (number)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "2";
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", 1)).toBe(2);
+    });
+    (0, vitest_1.test)("Should return actual value when environment variable exists (boolean)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "true";
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toBe(true);
+    });
+    (0, vitest_1.test)("should throw when environment variable contains an invalid type (number)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "not-a-number";
+        (0, vitest_1.expect)(() => (0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", 1)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
+    });
+    (0, vitest_1.test)("should throw when environment variable contains an invalid type (boolean)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "not-a-boolean";
+        (0, vitest_1.expect)(() => (0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
+    });
+});

package/dist/utils/environmentVariable.d.ts

@@ -0,0 +1,4 @@
+export declare function environmentVariable(key: string): string;
+export declare function environmentVariable(key: string, fallback: string): string;
+export declare function environmentVariable(key: string, fallback: number): number;
+export declare function environmentVariable(key: string, fallback: boolean): boolean;

package/dist/utils/environmentVariable.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.environmentVariable = environmentVariable;
+const lodash_1 = require("lodash");
+function environmentVariable(key, fallback) {
+    const value = process.env[key] || fallback;
+    if (value === undefined) {
+        throw new Error(`Missing environment variable '${key}'`);
+    }
+    else if (fallback === undefined) {
+        return value;
+    }
+    else if ((0, lodash_1.isString)(fallback) && (0, lodash_1.isString)(value)) {
+        return value;
+    }
+    else if ((0, lodash_1.isFinite)(fallback) && (0, lodash_1.isFinite)(Number(value))) {
+        return Number(value);
+    }
+    else if ((0, lodash_1.isBoolean)(fallback) && ((0, lodash_1.isBoolean)(value) || value === "true" || value === "false")) {
+        return Boolean(value);
+    }
+    throw new Error(`Wrong type for environment variable '${key}'`);
+}

package/dist/utils.d.ts

@@ -1,8 +1,4 @@
 import { FormVersionField } from "./types";
-export declare function environmentVariable(key: string): string;
-export declare function environmentVariable(key: string, fallback: string): string;
-export declare function environmentVariable(key: string, fallback: number): number;
-export declare function environmentVariable(key: string, fallback: boolean): boolean;
 export declare function currentTraceId(): string | undefined;
 export declare function isValidEmail(email: string): boolean;
 export declare function parseDynamicRecipients(dynamicRecipients: string[], fields: FormVersionField[], data: Record<string, unknown>): string[];

package/dist/utils.js

@@ -1,65 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.environmentVariable = environmentVariable;
 exports.currentTraceId = currentTraceId;
 exports.isValidEmail = isValidEmail;
 exports.parseDynamicRecipients = parseDynamicRecipients;
 exports.getDataForDataName = getDataForDataName;
 const api_1 = require("@opentelemetry/api");
-const lodash_1 = __importStar(require("lodash"));
-function environmentVariable(key, fallback) {
-    const value = process.env[key] || fallback;
-    if (value === undefined) {
-        throw new Error(`Missing environment variable '${key}'`);
-    }
-    else if (fallback === undefined) {
-        return value;
-    }
-    else if (lodash_1.default.isString(fallback) && lodash_1.default.isString(value)) {
-        return value;
-    }
-    else if (lodash_1.default.isFinite(fallback) && lodash_1.default.isFinite(Number(value))) {
-        return Number(value);
-    }
-    else if (lodash_1.default.isBoolean(fallback) &&
-        (lodash_1.default.isBoolean(value) || value === "true" || value === "false")) {
-        return Boolean(value);
-    }
-    throw new Error(`Wrong type for environment variable '${key}'`);
-}
+const lodash_1 = require("lodash");
 function currentTraceId() {
     return api_1.trace.getSpanContext(api_1.context.active())?.traceId;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,21 +30,21 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/core": "2.7.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.218.0",
-    "@opentelemetry/instrumentation": "0.218.0",
-    "@opentelemetry/instrumentation-dns": "0.61.0",
-    "@opentelemetry/instrumentation-express": "0.66.0",
-    "@opentelemetry/instrumentation-http": "0.218.0",
-    "@opentelemetry/instrumentation-winston": "0.62.0",
-    "@opentelemetry/resources": "2.7.1",
-    "@opentelemetry/sdk-node": "0.218.0",
-    "@opentelemetry/sdk-trace-base": "2.7.1",
-    "@opentelemetry/sdk-trace-node": "2.7.1",
+    "@opentelemetry/core": "2.8.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.219.0",
+    "@opentelemetry/instrumentation": "0.219.0",
+    "@opentelemetry/instrumentation-dns": "0.62.0",
+    "@opentelemetry/instrumentation-express": "0.67.0",
+    "@opentelemetry/instrumentation-http": "0.219.0",
+    "@opentelemetry/instrumentation-winston": "0.63.0",
+    "@opentelemetry/resources": "2.8.0",
+    "@opentelemetry/sdk-node": "0.219.0",
+    "@opentelemetry/sdk-trace-base": "2.8.0",
+    "@opentelemetry/sdk-trace-node": "2.8.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
-    "axios": "1.16.0",
+    "axios": "1.18.1",
     "content-disposition-parser": "1.0.2",
-    "date-and-time": "4.5.0",
+    "date-and-time": "4.5.1",
     "express": "5.2.1",
     "lodash": "4.18.1",
     "prom-client": "15.1.3",
@@ -54,22 +54,22 @@
   "devDependencies": {
     "@types/express": "5.0.6",
     "@types/lodash": "4.17.24",
-    "@types/node": "24.12.3",
-    "@typescript-eslint/eslint-plugin": "8.59.2",
-    "@typescript-eslint/parser": "8.59.2",
-    "@vitest/coverage-v8": "4.1.6",
-    "@vitest/ui": "4.1.6",
+    "@types/node": "24.13.2",
+    "@typescript-eslint/eslint-plugin": "8.61.1",
+    "@typescript-eslint/parser": "8.61.1",
+    "@vitest/coverage-v8": "4.1.9",
+    "@vitest/ui": "4.1.9",
     "eslint": "9.39.4",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-prettier": "5.5.5",
+    "eslint-plugin-prettier": "5.5.6",
     "husky": "9.1.7",
-    "lint-staged": "17.0.4",
-    "nock": "14.0.15",
-    "prettier": "3.8.3",
+    "lint-staged": "17.0.8",
+    "nock": "14.0.16",
+    "prettier": "3.8.5",
     "ts-node": "10.9.2",
     "typescript": "6.0.3",
-    "typescript-eslint": "8.59.2",
-    "vitest": "4.1.6",
+    "typescript-eslint": "8.61.1",
+    "vitest": "4.1.9",
     "vitest-mock-extended": "4.0.0"
   },
   "prettier": {