node-consul-service 1.0.49 → 1.0.51

package/dist/consul/client.d.ts

@@ -4,5 +4,6 @@ export interface ConsulClientOptions {
     port?: number;
     secure?: boolean;
 }
+export declare function toBoolean(value?: string | boolean | null): boolean;
 export declare function initClient({ host, port, secure, }: ConsulClientOptions): void;
 export declare function getClient(): Consul;

package/dist/index.cjs.js

@@ -15,12 +15,18 @@ var events = require('events');
 
 // src/lib/client.ts
 let consulClient = null;
+function toBoolean(value) {
+    if (typeof value === "boolean")
+        return value;
+    if (typeof value === "string")
+        return value.toLowerCase() === "true";
+    return false;
+}
 function initClient({ host = "127.0.0.1", port = 8500, secure = false, }) {
-    console.log("🚀 ~ secure:", secure, typeof secure, Boolean(secure), typeof Boolean(secure));
     consulClient = new Consul({
         host: host !== null && host !== void 0 ? host : "127.0.0.1",
         port: port !== null && port !== void 0 ? port : 8500,
-        secure: Boolean(secure),
+        secure: toBoolean(secure),
     });
     consulClient.agent.self((err) => {
         if (err) {
@@ -19054,7 +19060,6 @@ async function callService(serviceName, options = {}) {
     }
 }
 
-// ✅ Custom Error Class
 class DataLinkError extends Error {
     constructor(service, path, originalError) {
         super(`DataLinkError: Failed to fetch from ${service}:${path}`);
@@ -19067,31 +19072,27 @@ 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;
 }
-// ✅ 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")) {
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    return value.split(",").map((v) => normalizeId(v.trim()));
+                }
                 return [normalizeId(value)];
             }
             if (Array.isArray(value)) {
@@ -19102,13 +19103,18 @@ 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 [];
         })));
+        console.log("🚀 ~ schema.map ~ uniqueIds:", uniqueIds);
         if (uniqueIds.length === 0)
             return;
         let cacheMap = new Map();
         let idsToFetch = uniqueIds;
-        // ✅ Check cache first
         if (cacheGetter) {
             const cacheResults = await cacheGetter(uniqueIds);
             idsToFetch = [];
@@ -19122,7 +19128,6 @@ async function dataLink(data, schema) {
                 }
             });
         }
-        // ✅ Fetch missing items from service
         if (idsToFetch.length > 0) {
             try {
                 const response = await callService(service, {
@@ -19146,16 +19151,18 @@ 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);
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    const ids = value.split(",").map((v) => normalizeId(v.trim()));
+                    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)) {
+                        item[filed] = cacheMap.get(key);
+                    }
                 }
             }
             else if (Array.isArray(value)) {
@@ -19165,6 +19172,14 @@ async function dataLink(data, schema) {
                     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)) {
+                    item[filed] = cacheMap.get(key);
+                }
+            }
         }
     }));
     return isArray ? result : result[0];
@@ -19181,4 +19196,5 @@ exports.getServiceUrl = getServiceUrl;
 exports.initClient = initClient;
 exports.listServices = listServices;
 exports.registerService = registerService;
+exports.toBoolean = toBoolean;
 //# sourceMappingURL=index.cjs.js.map

package/dist/index.esm.js

@@ -13,12 +13,18 @@ import { EventEmitter } from 'events';
 
 // src/lib/client.ts
 let consulClient = null;
+function toBoolean(value) {
+    if (typeof value === "boolean")
+        return value;
+    if (typeof value === "string")
+        return value.toLowerCase() === "true";
+    return false;
+}
 function initClient({ host = "127.0.0.1", port = 8500, secure = false, }) {
-    console.log("🚀 ~ secure:", secure, typeof secure, Boolean(secure), typeof Boolean(secure));
     consulClient = new Consul({
         host: host !== null && host !== void 0 ? host : "127.0.0.1",
         port: port !== null && port !== void 0 ? port : 8500,
-        secure: Boolean(secure),
+        secure: toBoolean(secure),
     });
     consulClient.agent.self((err) => {
         if (err) {
@@ -19052,7 +19058,6 @@ async function callService(serviceName, options = {}) {
     }
 }
 
-// ✅ Custom Error Class
 class DataLinkError extends Error {
     constructor(service, path, originalError) {
         super(`DataLinkError: Failed to fetch from ${service}:${path}`);
@@ -19065,31 +19070,27 @@ 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;
 }
-// ✅ 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")) {
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    return value.split(",").map((v) => normalizeId(v.trim()));
+                }
                 return [normalizeId(value)];
             }
             if (Array.isArray(value)) {
@@ -19100,13 +19101,18 @@ 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 [];
         })));
+        console.log("🚀 ~ schema.map ~ uniqueIds:", uniqueIds);
         if (uniqueIds.length === 0)
             return;
         let cacheMap = new Map();
         let idsToFetch = uniqueIds;
-        // ✅ Check cache first
         if (cacheGetter) {
             const cacheResults = await cacheGetter(uniqueIds);
             idsToFetch = [];
@@ -19120,7 +19126,6 @@ async function dataLink(data, schema) {
                 }
             });
         }
-        // ✅ Fetch missing items from service
         if (idsToFetch.length > 0) {
             try {
                 const response = await callService(service, {
@@ -19144,16 +19149,18 @@ 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);
+            if (typeof value === "string") {
+                if (value.includes(",")) {
+                    const ids = value.split(",").map((v) => normalizeId(v.trim()));
+                    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)) {
+                        item[filed] = cacheMap.get(key);
+                    }
                 }
             }
             else if (Array.isArray(value)) {
@@ -19163,10 +19170,18 @@ async function dataLink(data, schema) {
                     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)) {
+                    item[filed] = cacheMap.get(key);
+                }
+            }
         }
     }));
     return isArray ? result : result[0];
 }
 
-export { DataLinkError, callService, dataLink, deregisterService, getClient, getRandomServiceInstance, getServiceInstances, getServiceUrl, initClient, listServices, registerService };
+export { DataLinkError, callService, dataLink, deregisterService, getClient, getRandomServiceInstance, getServiceInstances, getServiceUrl, initClient, listServices, registerService, toBoolean };
 //# sourceMappingURL=index.esm.js.map

package/package.json

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