@moreapp/common-nodejs 0.7.15 → 0.8.0

package/README.md

@@ -34,8 +34,8 @@ And then use the `--require` [Node.js CLI option](https://nodejs.org/api/cli.htm
 
 Follow the steps below to create a new release:
 
-1. Ensure that the `master` branch has the commits you want to release
-2. Start a new build in Bitbucket Pipelines for the `master` branch with the `create-release` pipeline
+1. Ensure that the (upstream) `master` branch has the commits you want to release
+2. Start a new build in GitHub actions for the `master` branch with the `Publish` workflow
 3. Select which type of version bump you want to do
 4. The build will automatically create a new version and publish it to NPM
 

package/dist/MoreAppClient.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { AxiosRequestConfig } from "axios";
 interface Options {
     serviceName: string;

package/dist/utils.d.ts

@@ -1,6 +1,9 @@
+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[];
+export declare function getDataForDataName(data: Record<string, unknown>, dataName: string | undefined): unknown | null;

package/dist/utils.js

@@ -1,11 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidEmail = exports.currentTraceId = exports.environmentVariable = void 0;
+exports.getDataForDataName = exports.parseDynamicRecipients = exports.isValidEmail = exports.currentTraceId = exports.environmentVariable = void 0;
 const api_1 = require("@opentelemetry/api");
-const lodash_1 = __importDefault(require("lodash"));
+const lodash_1 = __importStar(require("lodash"));
 function environmentVariable(key, fallback) {
     const value = process.env[key] || fallback;
     if (value === undefined) {
@@ -54,3 +74,58 @@ function isValidEmail(email) {
         emailAddressDomainPattern.test(domain));
 }
 exports.isValidEmail = isValidEmail;
+function parseDynamicRecipients(dynamicRecipients, fields, data) {
+    const recipients = [];
+    dynamicRecipients.forEach((fieldUid) => {
+        if (!fieldUid) {
+            return;
+        }
+        let dataName;
+        if (fieldUid.includes(".")) {
+            // column in Search-widget, like: "<field-uid>.email"
+            const parts = fieldUid.split(".");
+            dataName = [getDataNameForFieldUid(fields, parts[0]), parts[1]].join(".");
+        }
+        else {
+            dataName = getDataNameForFieldUid(fields, fieldUid);
+        }
+        if (dataName) {
+            const fieldData = getDataForDataName(data, dataName);
+            if (fieldData && Array.isArray(fieldData)) {
+                // like multiple Lookup-widget
+                fieldData.forEach(function (dataFieldEntry) {
+                    if (typeof dataFieldEntry === "string" && isValidEmail(dataFieldEntry.trim())) {
+                        recipients.push(dataFieldEntry.trim());
+                    }
+                });
+            }
+            else if (typeof fieldData === "string" && isValidEmail(fieldData.trim())) {
+                recipients.push(fieldData.trim());
+            }
+        }
+    });
+    return recipients;
+}
+exports.parseDynamicRecipients = parseDynamicRecipients;
+function getDataNameForFieldUid(fields, fieldUid) {
+    return fields.find((field) => field.uid === fieldUid)?.properties.data_name;
+}
+function getDataForDataName(data, dataName) {
+    if (!dataName || !data) {
+        return null;
+    }
+    // resolve nested field (like: SEARCH_FIELD.name)
+    if (dataName.includes(".")) {
+        const parts = dataName.split(".");
+        let nestedData = data[parts[0]];
+        if (isObject(nestedData)) {
+            const nestedKey = parts.slice(1).join(".");
+            return getDataForDataName(nestedData, nestedKey);
+        }
+    }
+    return data[dataName];
+}
+exports.getDataForDataName = getDataForDataName;
+function isObject(data) {
+    return (0, lodash_1.isPlainObject)(data);
+}

package/dist/utils.test.js

@@ -63,3 +63,49 @@ describe("isValidEmail", () => {
         test("Local part contains whitespace", () => expect((0, utils_1.isValidEmail)("a b@moreapp.dev")).toBeFalsy());
     });
 });
+describe("parseDynamicRecipients", () => {
+    test("should parse all type of data (root, object, array)", () => {
+        const fields = [
+            { uid: "UID-root", properties: { data_name: "customer" } },
+            { uid: "UID-object", properties: { data_name: "vendor" } },
+            { uid: "UID-array", properties: { data_name: "contacts" } },
+        ];
+        expect((0, utils_1.parseDynamicRecipients)(["UID-root", "UID-object.email", "UID-array"], fields, {
+            customer: "customer@example.com",
+            vendor: { id: 1, email: "vendor@example.com" },
+            contacts: ["contact1@example.com", "contact2@example.com"],
+        })).toEqual([
+            "customer@example.com",
+            "vendor@example.com",
+            "contact1@example.com",
+            "contact2@example.com",
+        ]);
+    });
+});
+describe("getDataForDataName", () => {
+    test("should return (nested) values in objects based on dataName", () => {
+        let data = {
+            name: "John",
+            age: 10,
+            address: {
+                street: "Main Street",
+                city: "New York",
+                location: {
+                    longitude: 10,
+                    latitude: 10,
+                },
+            },
+            "flat.test": "hi",
+        };
+        expect((0, utils_1.getDataForDataName)(data, "name")).toBe("John");
+        expect((0, utils_1.getDataForDataName)(data, "age")).toBe(10);
+        expect((0, utils_1.getDataForDataName)(data, "address.city")).toBe("New York");
+        expect((0, utils_1.getDataForDataName)(data, "address.location.longitude")).toBe(10);
+        expect((0, utils_1.getDataForDataName)(data, "flat.test")).toBe("hi");
+        expect((0, utils_1.getDataForDataName)(data, "unknown")).toBe(undefined);
+        expect((0, utils_1.getDataForDataName)(data, "unknown.nested")).toBe(undefined);
+        expect((0, utils_1.getDataForDataName)(data, "address.unknown")).toBe(undefined);
+        expect((0, utils_1.getDataForDataName)(data, "flat..")).toBe(undefined);
+        expect((0, utils_1.getDataForDataName)(data, ".")).toBe(undefined);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.7.15",
+  "version": "0.8.0",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "dist/**/*"
   ],
   "dependencies": {
-    "@google-cloud/logging": "10.5.0",
+    "@google-cloud/logging": "11.2.0",
     "@google-cloud/opentelemetry-cloud-trace-exporter": "2.1.0",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -33,7 +33,7 @@
     "@opentelemetry/sdk-trace-base": "1.22.0",
     "@opentelemetry/sdk-trace-node": "1.22.0",
     "@opentelemetry/semantic-conventions": "1.22.0",
-    "axios": "1.6.8",
+    "axios": "1.8.2",
     "content-disposition-parser": "1.0.2",
     "date-and-time": "3.1.1",
     "lodash": "4.17.21",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/jest": "29.5.11",
     "@types/lodash": "4.17.0",
-    "@types/node": "18.19.26",
+    "@types/node": "22.16.2",
     "@typescript-eslint/eslint-plugin": "6.21.0",
     "@typescript-eslint/parser": "6.21.0",
     "eslint": "8.57.0",