@optifye/dashboard-core 4.3.4 → 4.3.5

package/dist/index.js

@@ -25086,17 +25086,49 @@ var AIAgentView = () => {
               chartElements.push(chartElement);
             } else {
               console.warn(`[DEBUG] Chart element was null for type: ${chartType}`);
+              console.warn(`[DEBUG] Args were:`, args);
+              chartElements.push(
+                /* @__PURE__ */ jsxRuntime.jsxs(
+                  "div",
+                  {
+                    className: "text-red-500 text-sm border border-red-300 bg-red-50 p-3 rounded",
+                    children: [
+                      /* @__PURE__ */ jsxRuntime.jsx("strong", { children: "Chart Rendering Error:" }),
+                      " Failed to render ",
+                      chartType,
+                      /* @__PURE__ */ jsxRuntime.jsx("br", {}),
+                      /* @__PURE__ */ jsxRuntime.jsxs("small", { children: [
+                        "Check console for details. Args: ",
+                        JSON.stringify(args, null, 2)
+                      ] })
+                    ]
+                  },
+                  `error-${startIndex}`
+                )
+              );
             }
           } catch (error) {
             console.error(`Failed to parse chart ${chartType}:`, error);
+            console.error(`Args string was:`, argsString);
             chartElements.push(
               /* @__PURE__ */ jsxRuntime.jsxs(
                 "div",
                 {
-                  className: "text-red-500 text-sm",
+                  className: "text-red-500 text-sm border border-red-300 bg-red-50 p-3 rounded",
                   children: [
-                    "Error rendering chart: ",
-                    match[0]
+                    /* @__PURE__ */ jsxRuntime.jsx("strong", { children: "Chart Parsing Error:" }),
+                    " Failed to parse ",
+                    chartType,
+                    /* @__PURE__ */ jsxRuntime.jsx("br", {}),
+                    /* @__PURE__ */ jsxRuntime.jsxs("small", { children: [
+                      "Error: ",
+                      error instanceof Error ? error.message : String(error)
+                    ] }),
+                    /* @__PURE__ */ jsxRuntime.jsx("br", {}),
+                    /* @__PURE__ */ jsxRuntime.jsxs("small", { children: [
+                      "Original: ",
+                      match[0]
+                    ] })
                   ]
                 },
                 `error-${startIndex}`
@@ -25127,43 +25159,126 @@ var AIAgentView = () => {
       return chartElements;
     };
     const parseChartArguments = (argsString) => {
-      const args = {};
       console.log("[DEBUG] Parsing chart arguments:", argsString);
-      const jsonParamRegex = /(\w+)\s*=\s*(\[[\s\S]*?\](?=\s*(?:,|\s*\)|\s*$))|\{[\s\S]*?\}(?=\s*(?:,|\s*\)|\s*$)))/g;
-      let jsonMatch;
-      while ((jsonMatch = jsonParamRegex.exec(argsString)) !== null) {
-        const paramName = jsonMatch[1];
-        const jsonValue = jsonMatch[2];
-        console.log(`[DEBUG] Found JSON parameter: ${paramName} = ${jsonValue}`);
-        try {
-          args[paramName] = JSON.parse(jsonValue);
-          console.log(`[DEBUG] Successfully parsed ${paramName}:`, args[paramName]);
-          argsString = argsString.replace(jsonMatch[0], "");
-        } catch (e) {
-          console.error(`Failed to parse ${paramName} JSON:`, e);
-          console.error(`JSON value that failed:`, jsonValue);
-        }
-      }
-      const argRegex = /(\w+)\s*=\s*("([^"]*)"|'([^']*)'|([^,\s\)]+))/g;
-      let argMatch;
-      while ((argMatch = argRegex.exec(argsString)) !== null) {
-        const key = argMatch[1];
-        const value = argMatch[3] || argMatch[4] || argMatch[5];
-        if (key === "data") continue;
-        if (value === "true" || value === "True") {
-          args[key] = true;
-        } else if (value === "false" || value === "False") {
-          args[key] = false;
-        } else if (value === "null" || value === "None") {
-          args[key] = null;
-        } else if (!isNaN(Number(value)) && value !== "") {
-          args[key] = Number(value);
-        } else {
-          args[key] = value;
+      const extractParameters = (str) => {
+        const params = {};
+        let currentPos = 0;
+        while (currentPos < str.length) {
+          while (currentPos < str.length && /\s|,/.test(str[currentPos])) {
+            currentPos++;
+          }
+          if (currentPos >= str.length) break;
+          const paramMatch = str.substring(currentPos).match(/^(\w+)\s*=/);
+          if (!paramMatch) {
+            console.warn("[DEBUG] No parameter name found at position", currentPos);
+            break;
+          }
+          const paramName = paramMatch[1];
+          currentPos += paramMatch[0].length;
+          while (currentPos < str.length && /\s/.test(str[currentPos])) {
+            currentPos++;
+          }
+          if (currentPos >= str.length) break;
+          let value;
+          let valueEnd;
+          if (str[currentPos] === "[") {
+            let bracketCount = 0;
+            let arrayStart = currentPos;
+            valueEnd = str.length;
+            for (let i = currentPos; i < str.length; i++) {
+              if (str[i] === "[") bracketCount++;
+              else if (str[i] === "]") bracketCount--;
+              if (bracketCount === 0) {
+                valueEnd = i + 1;
+                break;
+              }
+            }
+            if (bracketCount !== 0) {
+              console.error("[DEBUG] Unmatched brackets in array value");
+              break;
+            }
+            const arrayStr = str.substring(arrayStart, valueEnd);
+            console.log(`[DEBUG] Found array parameter: ${paramName} = ${arrayStr}`);
+            try {
+              value = JSON.parse(arrayStr);
+              console.log(`[DEBUG] Successfully parsed array ${paramName}:`, value);
+            } catch (e) {
+              console.error(`[DEBUG] Failed to parse array ${paramName}:`, e);
+              console.error(`Array value that failed:`, arrayStr);
+              value = arrayStr;
+            }
+          } else if (str[currentPos] === "{") {
+            let braceCount = 0;
+            let objectStart = currentPos;
+            valueEnd = str.length;
+            for (let i = currentPos; i < str.length; i++) {
+              if (str[i] === "{") braceCount++;
+              else if (str[i] === "}") braceCount--;
+              if (braceCount === 0) {
+                valueEnd = i + 1;
+                break;
+              }
+            }
+            if (braceCount !== 0) {
+              console.error("[DEBUG] Unmatched braces in object value");
+              break;
+            }
+            const objectStr = str.substring(objectStart, valueEnd);
+            console.log(`[DEBUG] Found object parameter: ${paramName} = ${objectStr}`);
+            try {
+              value = JSON.parse(objectStr);
+              console.log(`[DEBUG] Successfully parsed object ${paramName}:`, value);
+            } catch (e) {
+              console.error(`[DEBUG] Failed to parse object ${paramName}:`, e);
+              console.error(`Object value that failed:`, objectStr);
+              value = objectStr;
+            }
+          } else if (str[currentPos] === '"') {
+            let stringStart = currentPos + 1;
+            let stringEnd = stringStart;
+            while (stringEnd < str.length) {
+              if (str[stringEnd] === '"' && str[stringEnd - 1] !== "\\") {
+                break;
+              }
+              stringEnd++;
+            }
+            if (stringEnd >= str.length) {
+              console.error("[DEBUG] Unterminated string value");
+              valueEnd = str.length;
+              break;
+            }
+            value = str.substring(stringStart, stringEnd);
+            valueEnd = stringEnd + 1;
+            console.log(`[DEBUG] Found string parameter: ${paramName} = "${value}"`);
+          } else {
+            let valueStart = currentPos;
+            let valueEndPos = valueStart;
+            while (valueEndPos < str.length && str[valueEndPos] !== ",") {
+              valueEndPos++;
+            }
+            const rawValue = str.substring(valueStart, valueEndPos).trim();
+            valueEnd = valueEndPos;
+            if (rawValue === "true" || rawValue === "True") {
+              value = true;
+            } else if (rawValue === "false" || rawValue === "False") {
+              value = false;
+            } else if (rawValue === "null" || rawValue === "None") {
+              value = null;
+            } else if (!isNaN(Number(rawValue)) && rawValue !== "") {
+              value = Number(rawValue);
+            } else {
+              value = rawValue;
+            }
+            console.log(`[DEBUG] Found unquoted parameter: ${paramName} = ${rawValue} (parsed as ${typeof value})`);
+          }
+          params[paramName] = value;
+          currentPos = valueEnd;
         }
-      }
-      console.log("[DEBUG] Final parsed arguments:", args);
-      return args;
+        return params;
+      };
+      const result = extractParameters(argsString);
+      console.log("[DEBUG] Final parsed arguments:", result);
+      return result;
     };
     const renderChart = (chartType, args, key) => {
       console.log(`[DEBUG] Attempting to render chart type: ${chartType}`, args);

package/dist/index.mjs

@@ -25057,17 +25057,49 @@ var AIAgentView = () => {
               chartElements.push(chartElement);
             } else {
               console.warn(`[DEBUG] Chart element was null for type: ${chartType}`);
+              console.warn(`[DEBUG] Args were:`, args);
+              chartElements.push(
+                /* @__PURE__ */ jsxs(
+                  "div",
+                  {
+                    className: "text-red-500 text-sm border border-red-300 bg-red-50 p-3 rounded",
+                    children: [
+                      /* @__PURE__ */ jsx("strong", { children: "Chart Rendering Error:" }),
+                      " Failed to render ",
+                      chartType,
+                      /* @__PURE__ */ jsx("br", {}),
+                      /* @__PURE__ */ jsxs("small", { children: [
+                        "Check console for details. Args: ",
+                        JSON.stringify(args, null, 2)
+                      ] })
+                    ]
+                  },
+                  `error-${startIndex}`
+                )
+              );
             }
           } catch (error) {
             console.error(`Failed to parse chart ${chartType}:`, error);
+            console.error(`Args string was:`, argsString);
             chartElements.push(
               /* @__PURE__ */ jsxs(
                 "div",
                 {
-                  className: "text-red-500 text-sm",
+                  className: "text-red-500 text-sm border border-red-300 bg-red-50 p-3 rounded",
                   children: [
-                    "Error rendering chart: ",
-                    match[0]
+                    /* @__PURE__ */ jsx("strong", { children: "Chart Parsing Error:" }),
+                    " Failed to parse ",
+                    chartType,
+                    /* @__PURE__ */ jsx("br", {}),
+                    /* @__PURE__ */ jsxs("small", { children: [
+                      "Error: ",
+                      error instanceof Error ? error.message : String(error)
+                    ] }),
+                    /* @__PURE__ */ jsx("br", {}),
+                    /* @__PURE__ */ jsxs("small", { children: [
+                      "Original: ",
+                      match[0]
+                    ] })
                   ]
                 },
                 `error-${startIndex}`
@@ -25098,43 +25130,126 @@ var AIAgentView = () => {
       return chartElements;
     };
     const parseChartArguments = (argsString) => {
-      const args = {};
       console.log("[DEBUG] Parsing chart arguments:", argsString);
-      const jsonParamRegex = /(\w+)\s*=\s*(\[[\s\S]*?\](?=\s*(?:,|\s*\)|\s*$))|\{[\s\S]*?\}(?=\s*(?:,|\s*\)|\s*$)))/g;
-      let jsonMatch;
-      while ((jsonMatch = jsonParamRegex.exec(argsString)) !== null) {
-        const paramName = jsonMatch[1];
-        const jsonValue = jsonMatch[2];
-        console.log(`[DEBUG] Found JSON parameter: ${paramName} = ${jsonValue}`);
-        try {
-          args[paramName] = JSON.parse(jsonValue);
-          console.log(`[DEBUG] Successfully parsed ${paramName}:`, args[paramName]);
-          argsString = argsString.replace(jsonMatch[0], "");
-        } catch (e) {
-          console.error(`Failed to parse ${paramName} JSON:`, e);
-          console.error(`JSON value that failed:`, jsonValue);
-        }
-      }
-      const argRegex = /(\w+)\s*=\s*("([^"]*)"|'([^']*)'|([^,\s\)]+))/g;
-      let argMatch;
-      while ((argMatch = argRegex.exec(argsString)) !== null) {
-        const key = argMatch[1];
-        const value = argMatch[3] || argMatch[4] || argMatch[5];
-        if (key === "data") continue;
-        if (value === "true" || value === "True") {
-          args[key] = true;
-        } else if (value === "false" || value === "False") {
-          args[key] = false;
-        } else if (value === "null" || value === "None") {
-          args[key] = null;
-        } else if (!isNaN(Number(value)) && value !== "") {
-          args[key] = Number(value);
-        } else {
-          args[key] = value;
+      const extractParameters = (str) => {
+        const params = {};
+        let currentPos = 0;
+        while (currentPos < str.length) {
+          while (currentPos < str.length && /\s|,/.test(str[currentPos])) {
+            currentPos++;
+          }
+          if (currentPos >= str.length) break;
+          const paramMatch = str.substring(currentPos).match(/^(\w+)\s*=/);
+          if (!paramMatch) {
+            console.warn("[DEBUG] No parameter name found at position", currentPos);
+            break;
+          }
+          const paramName = paramMatch[1];
+          currentPos += paramMatch[0].length;
+          while (currentPos < str.length && /\s/.test(str[currentPos])) {
+            currentPos++;
+          }
+          if (currentPos >= str.length) break;
+          let value;
+          let valueEnd;
+          if (str[currentPos] === "[") {
+            let bracketCount = 0;
+            let arrayStart = currentPos;
+            valueEnd = str.length;
+            for (let i = currentPos; i < str.length; i++) {
+              if (str[i] === "[") bracketCount++;
+              else if (str[i] === "]") bracketCount--;
+              if (bracketCount === 0) {
+                valueEnd = i + 1;
+                break;
+              }
+            }
+            if (bracketCount !== 0) {
+              console.error("[DEBUG] Unmatched brackets in array value");
+              break;
+            }
+            const arrayStr = str.substring(arrayStart, valueEnd);
+            console.log(`[DEBUG] Found array parameter: ${paramName} = ${arrayStr}`);
+            try {
+              value = JSON.parse(arrayStr);
+              console.log(`[DEBUG] Successfully parsed array ${paramName}:`, value);
+            } catch (e) {
+              console.error(`[DEBUG] Failed to parse array ${paramName}:`, e);
+              console.error(`Array value that failed:`, arrayStr);
+              value = arrayStr;
+            }
+          } else if (str[currentPos] === "{") {
+            let braceCount = 0;
+            let objectStart = currentPos;
+            valueEnd = str.length;
+            for (let i = currentPos; i < str.length; i++) {
+              if (str[i] === "{") braceCount++;
+              else if (str[i] === "}") braceCount--;
+              if (braceCount === 0) {
+                valueEnd = i + 1;
+                break;
+              }
+            }
+            if (braceCount !== 0) {
+              console.error("[DEBUG] Unmatched braces in object value");
+              break;
+            }
+            const objectStr = str.substring(objectStart, valueEnd);
+            console.log(`[DEBUG] Found object parameter: ${paramName} = ${objectStr}`);
+            try {
+              value = JSON.parse(objectStr);
+              console.log(`[DEBUG] Successfully parsed object ${paramName}:`, value);
+            } catch (e) {
+              console.error(`[DEBUG] Failed to parse object ${paramName}:`, e);
+              console.error(`Object value that failed:`, objectStr);
+              value = objectStr;
+            }
+          } else if (str[currentPos] === '"') {
+            let stringStart = currentPos + 1;
+            let stringEnd = stringStart;
+            while (stringEnd < str.length) {
+              if (str[stringEnd] === '"' && str[stringEnd - 1] !== "\\") {
+                break;
+              }
+              stringEnd++;
+            }
+            if (stringEnd >= str.length) {
+              console.error("[DEBUG] Unterminated string value");
+              valueEnd = str.length;
+              break;
+            }
+            value = str.substring(stringStart, stringEnd);
+            valueEnd = stringEnd + 1;
+            console.log(`[DEBUG] Found string parameter: ${paramName} = "${value}"`);
+          } else {
+            let valueStart = currentPos;
+            let valueEndPos = valueStart;
+            while (valueEndPos < str.length && str[valueEndPos] !== ",") {
+              valueEndPos++;
+            }
+            const rawValue = str.substring(valueStart, valueEndPos).trim();
+            valueEnd = valueEndPos;
+            if (rawValue === "true" || rawValue === "True") {
+              value = true;
+            } else if (rawValue === "false" || rawValue === "False") {
+              value = false;
+            } else if (rawValue === "null" || rawValue === "None") {
+              value = null;
+            } else if (!isNaN(Number(rawValue)) && rawValue !== "") {
+              value = Number(rawValue);
+            } else {
+              value = rawValue;
+            }
+            console.log(`[DEBUG] Found unquoted parameter: ${paramName} = ${rawValue} (parsed as ${typeof value})`);
+          }
+          params[paramName] = value;
+          currentPos = valueEnd;
         }
-      }
-      console.log("[DEBUG] Final parsed arguments:", args);
-      return args;
+        return params;
+      };
+      const result = extractParameters(argsString);
+      console.log("[DEBUG] Final parsed arguments:", result);
+      return result;
     };
     const renderChart = (chartType, args, key) => {
       console.log(`[DEBUG] Attempting to render chart type: ${chartType}`, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optifye/dashboard-core",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "description": "Reusable UI & logic for Optifye dashboard",
   "main": "dist/index.js",
   "module": "dist/index.mjs",