node-consul-service 1.0.60 → 1.0.62

package/dist/consul/dataLink.d.ts

@@ -3,14 +3,10 @@ interface LinkSchema {
     field: string;
     service: string;
     path: string;
-    headers?: AxiosRequestHeaders;
+    headers?: AxiosRequestHeaders | {
+        [key: string]: string | string[] | number | boolean | undefined;
+    };
     cacheGetter?: (ids: string[]) => Promise<(any | null)[]>;
 }
-export declare class DataLinkError extends Error {
-    service: string;
-    path: string;
-    originalError: any;
-    constructor(service: string, path: string, originalError: any);
-}
 export declare function dataLink(data: any[] | any, schema: LinkSchema[]): Promise<any[] | any>;
 export {};

package/dist/index.cjs.js

@@ -19057,6 +19057,15 @@ async function callService(serviceName, options = {}) {
     }
 }
 
+// 🛠 أدوات التعامل مع المسارات
+function getValueByPath(obj, path) {
+    return path.split(".").reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], obj);
+}
+
+function hasValueAtPath(obj, path) {
+    return getValueByPath(obj, path) !== undefined;
+}
+
 function normalizeId(id) {
     if (id && typeof id === "object" && typeof id.toString === "function") {
         return id.toString();
@@ -19064,6 +19073,72 @@ function normalizeId(id) {
     return id;
 }
 
+function setValueByPath(obj, path, value) {
+    const keys = path.split(".");
+    const lastKey = keys.pop();
+    const target = keys.reduce((acc, key) => {
+        if (!acc[key])
+            acc[key] = {};
+        return acc[key];
+    }, obj);
+    if (lastKey)
+        target[lastKey] = value;
+}
+
+function applyResolvedValues(item, field, cacheMap) {
+    // لو القيمة مش موجودة أصلاً، ما نعملش أي حاجة
+    if (!hasValueAtPath(item, field))
+        return;
+    const value = getValueByPath(item, field);
+    // ✅ تجاهل الحقول غير الموجودة أو الفارغة تمامًا
+    if (value === undefined || value === null)
+        return;
+    if (typeof value === "string") {
+        if (value.includes(",")) {
+            const ids = value.split(",").map((v) => normalizeId(v.trim()));
+            setValueByPath(item, field, ids.map((id) => { var _a; return (_a = cacheMap.get(id)) !== null && _a !== void 0 ? _a : id; }));
+        }
+        else {
+            const id = normalizeId(value);
+            if (cacheMap.has(id))
+                setValueByPath(item, field, cacheMap.get(id));
+        }
+    }
+    else if (Array.isArray(value)) {
+        setValueByPath(item, field, value.map((id) => {
+            var _a;
+            const key = normalizeId(id);
+            return (_a = cacheMap.get(key)) !== null && _a !== void 0 ? _a : id;
+        }));
+    }
+    else if (value &&
+        typeof value === "object" &&
+        typeof value.toString === "function") {
+        const key = normalizeId(value);
+        if (cacheMap.has(key))
+            setValueByPath(item, field, cacheMap.get(key));
+    }
+}
+
+function extractIdsFromField(item, field) {
+    const value = getValueByPath(item, field);
+    if (typeof value === "string") {
+        return value.includes(",")
+            ? value.split(",").map((v) => normalizeId(v.trim()))
+            : [normalizeId(value)];
+    }
+    if (Array.isArray(value)) {
+        return value
+            .filter((v) => typeof v === "string" ||
+            (v && typeof v === "object" && typeof v.toString === "function"))
+            .map((v) => normalizeId(v));
+    }
+    if (value && typeof value === "object" && typeof value.toString === "function") {
+        return [normalizeId(value)];
+    }
+    return [];
+}
+
 class DataLinkError extends Error {
     constructor(service, path, originalError) {
         super(`DataLinkError: Failed to fetch from ${service}:${path}`);
@@ -19076,130 +19151,70 @@ class DataLinkError extends Error {
         }
     }
 }
-// 🛠 أدوات التعامل مع المسارات
-function getValueByPath(obj, path) {
-    return path.split(".").reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], obj);
+async function fetchItemsFromService(service, path, ids, headers) {
+    if (!path.startsWith("/")) {
+        throw new DataLinkError(service, path, new Error("Path must start with '/'"));
+    }
+    try {
+        const response = await callService(service, {
+            method: "POST",
+            path,
+            headers,
+            data: { ids },
+        });
+        if (!(response === null || response === void 0 ? void 0 : response.success)) {
+            throw new DataLinkError(service, path, response);
+        }
+        return Array.isArray(response.data) ? response.data : [];
+    }
+    catch (error) {
+        throw new DataLinkError(service, path, error);
+    }
 }
-function setValueByPath(obj, path, value) {
-    const keys = path.split(".");
-    const lastKey = keys.pop();
-    const target = keys.reduce((acc, key) => {
-        if (!acc[key])
-            acc[key] = {};
-        return acc[key];
-    }, obj);
-    if (lastKey)
-        target[lastKey] = value;
+
+async function getCachedAndUncachedItems(ids, cacheGetter) {
+    const cacheMap = new Map();
+    let idsToFetch = ids;
+    if (cacheGetter) {
+        const results = await cacheGetter(ids);
+        idsToFetch = [];
+        results.forEach((item, index) => {
+            const id = ids[index];
+            if (item) {
+                cacheMap.set(id, item);
+            }
+            else {
+                idsToFetch.push(id);
+            }
+        });
+    }
+    return { cacheMap, idsToFetch };
 }
+
 async function dataLink(data, schema) {
     const isArray = Array.isArray(data);
     const sourceData = isArray ? data : [data];
     const result = sourceData.map((item) => ({ ...item }));
-    await Promise.all(schema.map(async ({ field, service, path, headers, cacheGetter }) => {
-        if (!path || !path.trim().startsWith("/")) {
-            throw new DataLinkError(service, path, new Error(`Invalid path: "${path}". Path must start with "/"`));
-        }
-        const uniqueIds = Array.from(new Set(sourceData.flatMap((item) => {
-            const value = getValueByPath(item, field);
-            if (typeof value === "string") {
-                if (value.includes(",")) {
-                    return value.split(",").map((v) => normalizeId(v.trim()));
-                }
-                return [normalizeId(value)];
-            }
-            if (Array.isArray(value)) {
-                return value
-                    .filter((v) => typeof v === "string" ||
-                    (v &&
-                        typeof v === "object" &&
-                        typeof v.toString === "function"))
-                    .map((v) => normalizeId(v));
-            }
-            if (value &&
-                typeof value === "object" &&
-                typeof value.toString === "function") {
-                return [normalizeId(value)];
-            }
-            return [];
-        })));
-        if (uniqueIds.length === 0)
-            return;
-        let cacheMap = new Map();
-        let idsToFetch = uniqueIds;
-        if (cacheGetter) {
-            const cacheResults = await cacheGetter(uniqueIds);
-            idsToFetch = [];
-            cacheResults.forEach((item, index) => {
-                const id = uniqueIds[index];
-                if (item) {
-                    cacheMap.set(id, item);
-                }
-                else {
-                    idsToFetch.push(id);
-                }
-            });
-        }
+    for (const { field, service, path, headers, cacheGetter } of schema) {
+        const allIds = Array.from(new Set(sourceData.flatMap((item) => extractIdsFromField(item, field))));
+        if (allIds.length === 0)
+            continue;
+        const { cacheMap, idsToFetch } = await getCachedAndUncachedItems(allIds, cacheGetter);
         if (idsToFetch.length > 0) {
-            try {
-                const response = await callService(service, {
-                    method: "POST",
-                    path,
-                    headers,
-                    data: { ids: idsToFetch },
-                });
-                if ((response === null || response === void 0 ? void 0 : response.success) && Array.isArray(response.data)) {
-                    for (const item of response.data) {
-                        if (item === null || item === void 0 ? void 0 : item._id) {
-                            cacheMap.set(normalizeId(item._id), item);
-                        }
-                    }
+            const fetched = await fetchItemsFromService(service, path, idsToFetch, headers);
+            for (const item of fetched) {
+                if (item === null || item === void 0 ? void 0 : item._id) {
+                    cacheMap.set(normalizeId(item._id), item);
                 }
-                if (!(response === null || response === void 0 ? void 0 : response.success)) {
-                    throw new DataLinkError(service, path, response);
-                }
-            }
-            catch (error) {
-                throw new DataLinkError(service, path, error);
             }
         }
         for (const item of result) {
-            const value = getValueByPath(item, field);
-            if (!value)
-                continue;
-            console.log("🚀 ~ dataLink ~ value:", value);
-            if (typeof value === "string") {
-                if (value.includes(",")) {
-                    const ids = value.split(",").map((v) => normalizeId(v.trim()));
-                    setValueByPath(item, field, ids.map((id) => { var _a; return (_a = cacheMap.get(id)) !== null && _a !== void 0 ? _a : id; }));
-                }
-                else {
-                    const key = normalizeId(value);
-                    if (cacheMap.has(key)) {
-                        setValueByPath(item, field, cacheMap.get(key));
-                    }
-                }
-            }
-            else if (Array.isArray(value)) {
-                setValueByPath(item, field, value.map((id) => {
-                    var _a;
-                    const key = normalizeId(id);
-                    return (_a = cacheMap.get(key)) !== null && _a !== void 0 ? _a : id;
-                }));
-            }
-            else if (value &&
-                typeof value === "object" &&
-                typeof value.toString === "function") {
-                const key = normalizeId(value);
-                if (cacheMap.has(key)) {
-                    setValueByPath(item, field, cacheMap.get(key));
-                }
-            }
+            applyResolvedValues(item, field, cacheMap);
         }
-    }));
+    }
     return isArray ? result : result[0];
 }
 
-exports.DataLinkError = DataLinkError;
 exports.callService = callService;
 exports.dataLink = dataLink;
 exports.deregisterService = deregisterService;

package/dist/index.esm.js

@@ -19055,6 +19055,15 @@ async function callService(serviceName, options = {}) {
     }
 }
 
+// 🛠 أدوات التعامل مع المسارات
+function getValueByPath(obj, path) {
+    return path.split(".").reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], obj);
+}
+
+function hasValueAtPath(obj, path) {
+    return getValueByPath(obj, path) !== undefined;
+}
+
 function normalizeId(id) {
     if (id && typeof id === "object" && typeof id.toString === "function") {
         return id.toString();
@@ -19062,6 +19071,72 @@ function normalizeId(id) {
     return id;
 }
 
+function setValueByPath(obj, path, value) {
+    const keys = path.split(".");
+    const lastKey = keys.pop();
+    const target = keys.reduce((acc, key) => {
+        if (!acc[key])
+            acc[key] = {};
+        return acc[key];
+    }, obj);
+    if (lastKey)
+        target[lastKey] = value;
+}
+
+function applyResolvedValues(item, field, cacheMap) {
+    // لو القيمة مش موجودة أصلاً، ما نعملش أي حاجة
+    if (!hasValueAtPath(item, field))
+        return;
+    const value = getValueByPath(item, field);
+    // ✅ تجاهل الحقول غير الموجودة أو الفارغة تمامًا
+    if (value === undefined || value === null)
+        return;
+    if (typeof value === "string") {
+        if (value.includes(",")) {
+            const ids = value.split(",").map((v) => normalizeId(v.trim()));
+            setValueByPath(item, field, ids.map((id) => { var _a; return (_a = cacheMap.get(id)) !== null && _a !== void 0 ? _a : id; }));
+        }
+        else {
+            const id = normalizeId(value);
+            if (cacheMap.has(id))
+                setValueByPath(item, field, cacheMap.get(id));
+        }
+    }
+    else if (Array.isArray(value)) {
+        setValueByPath(item, field, value.map((id) => {
+            var _a;
+            const key = normalizeId(id);
+            return (_a = cacheMap.get(key)) !== null && _a !== void 0 ? _a : id;
+        }));
+    }
+    else if (value &&
+        typeof value === "object" &&
+        typeof value.toString === "function") {
+        const key = normalizeId(value);
+        if (cacheMap.has(key))
+            setValueByPath(item, field, cacheMap.get(key));
+    }
+}
+
+function extractIdsFromField(item, field) {
+    const value = getValueByPath(item, field);
+    if (typeof value === "string") {
+        return value.includes(",")
+            ? value.split(",").map((v) => normalizeId(v.trim()))
+            : [normalizeId(value)];
+    }
+    if (Array.isArray(value)) {
+        return value
+            .filter((v) => typeof v === "string" ||
+            (v && typeof v === "object" && typeof v.toString === "function"))
+            .map((v) => normalizeId(v));
+    }
+    if (value && typeof value === "object" && typeof value.toString === "function") {
+        return [normalizeId(value)];
+    }
+    return [];
+}
+
 class DataLinkError extends Error {
     constructor(service, path, originalError) {
         super(`DataLinkError: Failed to fetch from ${service}:${path}`);
@@ -19074,128 +19149,69 @@ class DataLinkError extends Error {
         }
     }
 }
-// 🛠 أدوات التعامل مع المسارات
-function getValueByPath(obj, path) {
-    return path.split(".").reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], obj);
+async function fetchItemsFromService(service, path, ids, headers) {
+    if (!path.startsWith("/")) {
+        throw new DataLinkError(service, path, new Error("Path must start with '/'"));
+    }
+    try {
+        const response = await callService(service, {
+            method: "POST",
+            path,
+            headers,
+            data: { ids },
+        });
+        if (!(response === null || response === void 0 ? void 0 : response.success)) {
+            throw new DataLinkError(service, path, response);
+        }
+        return Array.isArray(response.data) ? response.data : [];
+    }
+    catch (error) {
+        throw new DataLinkError(service, path, error);
+    }
 }
-function setValueByPath(obj, path, value) {
-    const keys = path.split(".");
-    const lastKey = keys.pop();
-    const target = keys.reduce((acc, key) => {
-        if (!acc[key])
-            acc[key] = {};
-        return acc[key];
-    }, obj);
-    if (lastKey)
-        target[lastKey] = value;
+
+async function getCachedAndUncachedItems(ids, cacheGetter) {
+    const cacheMap = new Map();
+    let idsToFetch = ids;
+    if (cacheGetter) {
+        const results = await cacheGetter(ids);
+        idsToFetch = [];
+        results.forEach((item, index) => {
+            const id = ids[index];
+            if (item) {
+                cacheMap.set(id, item);
+            }
+            else {
+                idsToFetch.push(id);
+            }
+        });
+    }
+    return { cacheMap, idsToFetch };
 }
+
 async function dataLink(data, schema) {
     const isArray = Array.isArray(data);
     const sourceData = isArray ? data : [data];
     const result = sourceData.map((item) => ({ ...item }));
-    await Promise.all(schema.map(async ({ field, service, path, headers, cacheGetter }) => {
-        if (!path || !path.trim().startsWith("/")) {
-            throw new DataLinkError(service, path, new Error(`Invalid path: "${path}". Path must start with "/"`));
-        }
-        const uniqueIds = Array.from(new Set(sourceData.flatMap((item) => {
-            const value = getValueByPath(item, field);
-            if (typeof value === "string") {
-                if (value.includes(",")) {
-                    return value.split(",").map((v) => normalizeId(v.trim()));
-                }
-                return [normalizeId(value)];
-            }
-            if (Array.isArray(value)) {
-                return value
-                    .filter((v) => typeof v === "string" ||
-                    (v &&
-                        typeof v === "object" &&
-                        typeof v.toString === "function"))
-                    .map((v) => normalizeId(v));
-            }
-            if (value &&
-                typeof value === "object" &&
-                typeof value.toString === "function") {
-                return [normalizeId(value)];
-            }
-            return [];
-        })));
-        if (uniqueIds.length === 0)
-            return;
-        let cacheMap = new Map();
-        let idsToFetch = uniqueIds;
-        if (cacheGetter) {
-            const cacheResults = await cacheGetter(uniqueIds);
-            idsToFetch = [];
-            cacheResults.forEach((item, index) => {
-                const id = uniqueIds[index];
-                if (item) {
-                    cacheMap.set(id, item);
-                }
-                else {
-                    idsToFetch.push(id);
-                }
-            });
-        }
+    for (const { field, service, path, headers, cacheGetter } of schema) {
+        const allIds = Array.from(new Set(sourceData.flatMap((item) => extractIdsFromField(item, field))));
+        if (allIds.length === 0)
+            continue;
+        const { cacheMap, idsToFetch } = await getCachedAndUncachedItems(allIds, cacheGetter);
         if (idsToFetch.length > 0) {
-            try {
-                const response = await callService(service, {
-                    method: "POST",
-                    path,
-                    headers,
-                    data: { ids: idsToFetch },
-                });
-                if ((response === null || response === void 0 ? void 0 : response.success) && Array.isArray(response.data)) {
-                    for (const item of response.data) {
-                        if (item === null || item === void 0 ? void 0 : item._id) {
-                            cacheMap.set(normalizeId(item._id), item);
-                        }
-                    }
+            const fetched = await fetchItemsFromService(service, path, idsToFetch, headers);
+            for (const item of fetched) {
+                if (item === null || item === void 0 ? void 0 : item._id) {
+                    cacheMap.set(normalizeId(item._id), item);
                 }
-                if (!(response === null || response === void 0 ? void 0 : response.success)) {
-                    throw new DataLinkError(service, path, response);
-                }
-            }
-            catch (error) {
-                throw new DataLinkError(service, path, error);
             }
         }
         for (const item of result) {
-            const value = getValueByPath(item, field);
-            if (!value)
-                continue;
-            console.log("🚀 ~ dataLink ~ value:", value);
-            if (typeof value === "string") {
-                if (value.includes(",")) {
-                    const ids = value.split(",").map((v) => normalizeId(v.trim()));
-                    setValueByPath(item, field, ids.map((id) => { var _a; return (_a = cacheMap.get(id)) !== null && _a !== void 0 ? _a : id; }));
-                }
-                else {
-                    const key = normalizeId(value);
-                    if (cacheMap.has(key)) {
-                        setValueByPath(item, field, cacheMap.get(key));
-                    }
-                }
-            }
-            else if (Array.isArray(value)) {
-                setValueByPath(item, field, value.map((id) => {
-                    var _a;
-                    const key = normalizeId(id);
-                    return (_a = cacheMap.get(key)) !== null && _a !== void 0 ? _a : id;
-                }));
-            }
-            else if (value &&
-                typeof value === "object" &&
-                typeof value.toString === "function") {
-                const key = normalizeId(value);
-                if (cacheMap.has(key)) {
-                    setValueByPath(item, field, cacheMap.get(key));
-                }
-            }
+            applyResolvedValues(item, field, cacheMap);
         }
-    }));
+    }
     return isArray ? result : result[0];
 }
 
-export { DataLinkError, callService, dataLink, deregisterService, getClient, getRandomServiceInstance, getServiceInstances, getServiceUrl, initClient, listServices, registerService, toBoolean };
+export { callService, dataLink, deregisterService, getClient, getRandomServiceInstance, getServiceInstances, getServiceUrl, initClient, listServices, registerService, toBoolean };
 //# sourceMappingURL=index.esm.js.map

package/dist/utils/applyResolvedValues.d.ts

@@ -0,0 +1 @@
+export declare function applyResolvedValues(item: any, field: string, cacheMap: Map<string, any>): void;

package/dist/utils/extractIdsFromField.d.ts

@@ -0,0 +1 @@
+export declare function extractIdsFromField(item: any, field: string): string[];

package/dist/utils/fetchItemsFromService.d.ts

@@ -0,0 +1,8 @@
+import { AxiosRequestHeaders } from "axios";
+export declare class DataLinkError extends Error {
+    service: string;
+    path: string;
+    originalError: any;
+    constructor(service: string, path: string, originalError: any);
+}
+export declare function fetchItemsFromService(service: string, path: string, ids: string[], headers?: AxiosRequestHeaders): Promise<any[]>;

package/dist/utils/getCachedAndUncachedItems.d.ts

@@ -0,0 +1,4 @@
+export declare function getCachedAndUncachedItems(ids: string[], cacheGetter?: (ids: string[]) => Promise<(any | null)[]>): Promise<{
+    cacheMap: Map<string, any>;
+    idsToFetch: string[];
+}>;

package/dist/utils/getValueByPath.d.ts

@@ -0,0 +1 @@
+export declare function getValueByPath(obj: any, path: string): any;

package/dist/utils/hasValueAtPath.d.ts

@@ -0,0 +1 @@
+export declare function hasValueAtPath(obj: any, path: string): boolean;

package/dist/utils/setValueByPath.d.ts

@@ -0,0 +1 @@
+export declare function setValueByPath(obj: any, path: string, value: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-consul-service",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",