calabasas 0.24.1 → 0.24.2

package/dist/index.js

@@ -2262,9 +2262,101 @@ import * as path2 from "path";
 async function parseConfigFile(configPath) {
   const absolutePath = path2.resolve(configPath);
   const source = fs2.readFileSync(absolutePath, "utf-8");
-  const stripped = source.replace(/import\s*\{[^}]*\}\s*from\s*["']calabasas["'];?/g, "").replace(/export\s+default\s+\(?defineCalabasas(?:\s+as\s+\w+)?\)?\s*\(/, "(").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "").trim();
-  const config = new Function("return " + stripped)();
-  return config;
+  return parseConfigText(source);
+}
+function parseConfigText(source) {
+  const stripped = source.replace(/import\s*\{[^}]*\}\s*from\s*["'][^"']*["'];?/g, "").replace(/export\s+default\s+\(?defineCalabasas(?:\s+as\s+\w+)?\)?\s*\(/, "(").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "").trim();
+  const start = stripped.indexOf("{");
+  const end = stripped.lastIndexOf("}");
+  if (start === -1 || end === -1 || end <= start) {
+    throw new Error("Could not find defineCalabasas({...}) in config file. Make sure your config uses export default defineCalabasas({...})");
+  }
+  const objectText = stripped.slice(start, end + 1);
+  const json = jsObjectToJson(objectText);
+  try {
+    return JSON.parse(json);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    throw new Error(`Failed to parse config object: ${message}. Check for syntax errors in your config.`);
+  }
+}
+function jsObjectToJson(input) {
+  let result = "";
+  let i = 0;
+  let inString = null;
+  while (i < input.length) {
+    const ch = input[i];
+    if (inString) {
+      if (ch === "\\") {
+        result += ch;
+        i++;
+        if (i < input.length) {
+          result += input[i];
+          i++;
+        }
+        continue;
+      }
+      if (ch === inString) {
+        result += '"';
+        inString = null;
+        i++;
+        continue;
+      }
+      if (inString === "'" && ch === '"') {
+        result += "\\\"";
+        i++;
+        continue;
+      }
+      result += ch;
+      i++;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = ch;
+      result += '"';
+      i++;
+      continue;
+    }
+    if (/[a-zA-Z_$]/.test(ch)) {
+      let ident = "";
+      let j = i;
+      while (j < input.length && /[a-zA-Z_$0-9]/.test(input[j])) {
+        ident += input[j];
+        j++;
+      }
+      let k = j;
+      while (k < input.length && /\s/.test(input[k]))
+        k++;
+      if (k < input.length && input[k] === ":") {
+        result += '"' + ident + '"';
+        i = j;
+        continue;
+      }
+      if (ident === "true" || ident === "false" || ident === "null") {
+        result += ident;
+        i = j;
+        continue;
+      }
+      result += ident;
+      i = j;
+      continue;
+    }
+    if (ch === ",") {
+      let j = i + 1;
+      while (j < input.length && /\s/.test(input[j]))
+        j++;
+      if (j < input.length && (input[j] === "}" || input[j] === "]")) {
+        i++;
+        continue;
+      }
+      result += ch;
+      i++;
+      continue;
+    }
+    result += ch;
+    i++;
+  }
+  return result;
 }
 
 // src/lib/intents.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calabasas",
-  "version": "0.24.1",
+  "version": "0.24.2",
   "description": "CLI for Calabasas - Discord Gateway as a Service for Convex",
   "type": "module",
   "bin": {