node-consul-service 1.0.50 → 1.0.52

package/dist/index.cjs.js

@@ -19060,7 +19060,13 @@ async function callService(serviceName, options = {}) {
     }
 }
 
-// ✅ Custom Error Class
+function normalizeId(id) {
+    if (id && typeof id === "object" && typeof id.toString === "function") {
+        return id.toString();
+    }
+    return id;
+}
+
 class DataLinkError extends Error {
     constructor(service, path, originalError) {
         super(`DataLinkError: Failed to fetch from ${service}:${path}`);
@@ -19073,31 +19079,36 @@ class DataLinkError extends Error {
         }
     }
 }
-// ✅ Helper to normalize Mongo IDs or ObjectIds
-function normalizeId(id) {
-    if (id && typeof id === "object" && typeof id.toString === "function") {
-        return id.toString();
-    }
-    return id;
+// 🛠 أدوات التعامل مع المسارات
+function getValueByPath(obj, path) {
+    return path.split(".").reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], obj);
+}
+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;
 }
-// ✅ Main function
 async function dataLink(data, schema) {
     const isArray = Array.isArray(data);
     const sourceData = isArray ? data : [data];
-    // Clone data to avoid mutating original
     const result = sourceData.map((item) => ({ ...item }));
     await Promise.all(schema.map(async ({ filed, service, path, headers, cacheGetter }) => {
         var _a;
-        // ✅ Safety check + trim path
         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 = item[filed];
-            if (typeof value === "string" ||
-                (value &&
-                    typeof value === "object" &&
-                    typeof value.toString === "function")) {
+            const value = getValueByPath(item, filed);
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    return value.split(",").map((v) => normalizeId(v.trim()));
+                }
                 return [normalizeId(value)];
             }
             if (Array.isArray(value)) {
@@ -19108,13 +19119,17 @@ async function dataLink(data, schema) {
                         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;
-        // ✅ Check cache first
         if (cacheGetter) {
             const cacheResults = await cacheGetter(uniqueIds);
             idsToFetch = [];
@@ -19128,7 +19143,6 @@ async function dataLink(data, schema) {
                 }
             });
         }
-        // ✅ Fetch missing items from service
         if (idsToFetch.length > 0) {
             try {
                 const response = await callService(service, {
@@ -19152,24 +19166,34 @@ async function dataLink(data, schema) {
                 throw new DataLinkError(service, path, error);
             }
         }
-        // ✅ Replace ids in result with full objects
         for (const item of result) {
-            const value = item[filed];
-            if (typeof value === "string" ||
-                (value &&
-                    typeof value === "object" &&
-                    typeof value.toString === "function")) {
-                const key = normalizeId(value);
-                if (cacheMap.has(key)) {
-                    item[filed] = cacheMap.get(key);
+            const value = getValueByPath(item, filed);
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    const ids = value.split(",").map((v) => normalizeId(v.trim()));
+                    setValueByPath(item, filed, 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, filed, cacheMap.get(key));
+                    }
                 }
             }
             else if (Array.isArray(value)) {
-                item[filed] = value.map((id) => {
+                setValueByPath(item, filed, 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, filed, cacheMap.get(key));
+                }
             }
         }
     }));

package/dist/index.esm.js

@@ -19058,7 +19058,13 @@ async function callService(serviceName, options = {}) {
     }
 }
 
-// ✅ Custom Error Class
+function normalizeId(id) {
+    if (id && typeof id === "object" && typeof id.toString === "function") {
+        return id.toString();
+    }
+    return id;
+}
+
 class DataLinkError extends Error {
     constructor(service, path, originalError) {
         super(`DataLinkError: Failed to fetch from ${service}:${path}`);
@@ -19071,31 +19077,36 @@ class DataLinkError extends Error {
         }
     }
 }
-// ✅ Helper to normalize Mongo IDs or ObjectIds
-function normalizeId(id) {
-    if (id && typeof id === "object" && typeof id.toString === "function") {
-        return id.toString();
-    }
-    return id;
+// 🛠 أدوات التعامل مع المسارات
+function getValueByPath(obj, path) {
+    return path.split(".").reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], obj);
+}
+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;
 }
-// ✅ Main function
 async function dataLink(data, schema) {
     const isArray = Array.isArray(data);
     const sourceData = isArray ? data : [data];
-    // Clone data to avoid mutating original
     const result = sourceData.map((item) => ({ ...item }));
     await Promise.all(schema.map(async ({ filed, service, path, headers, cacheGetter }) => {
         var _a;
-        // ✅ Safety check + trim path
         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 = item[filed];
-            if (typeof value === "string" ||
-                (value &&
-                    typeof value === "object" &&
-                    typeof value.toString === "function")) {
+            const value = getValueByPath(item, filed);
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    return value.split(",").map((v) => normalizeId(v.trim()));
+                }
                 return [normalizeId(value)];
             }
             if (Array.isArray(value)) {
@@ -19106,13 +19117,17 @@ async function dataLink(data, schema) {
                         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;
-        // ✅ Check cache first
         if (cacheGetter) {
             const cacheResults = await cacheGetter(uniqueIds);
             idsToFetch = [];
@@ -19126,7 +19141,6 @@ async function dataLink(data, schema) {
                 }
             });
         }
-        // ✅ Fetch missing items from service
         if (idsToFetch.length > 0) {
             try {
                 const response = await callService(service, {
@@ -19150,24 +19164,34 @@ async function dataLink(data, schema) {
                 throw new DataLinkError(service, path, error);
             }
         }
-        // ✅ Replace ids in result with full objects
         for (const item of result) {
-            const value = item[filed];
-            if (typeof value === "string" ||
-                (value &&
-                    typeof value === "object" &&
-                    typeof value.toString === "function")) {
-                const key = normalizeId(value);
-                if (cacheMap.has(key)) {
-                    item[filed] = cacheMap.get(key);
+            const value = getValueByPath(item, filed);
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    const ids = value.split(",").map((v) => normalizeId(v.trim()));
+                    setValueByPath(item, filed, 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, filed, cacheMap.get(key));
+                    }
                 }
             }
             else if (Array.isArray(value)) {
-                item[filed] = value.map((id) => {
+                setValueByPath(item, filed, 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, filed, cacheMap.get(key));
+                }
             }
         }
     }));

package/dist/utils/normalizeId.d.ts

@@ -0,0 +1 @@
+export declare function normalizeId(id: any): string;

package/package.json

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