lael-labs/executor

bun.lock+5−4

         "typescript": "^5.9.3",
       },
     },
+    "apps/docs": {
+      "name": "@executor/docs",
+    },
     "apps/executor": {
       "name": "executor",
       "version": "1.1.9",
         "vite": "^7.3.1",
       },
     },
-    "docs": {
-      "name": "@executor/docs",
-    },
     "packages/ai-sdk-adapter": {
       "name": "@executor/ai-sdk-adapter",
       "dependencies": {
         "drizzle-orm": "1.0.0-beta.15-859cf75",
         "effect": "catalog:",
         "graphql": "^16.12.0",
+        "jsonc-parser": "3.3.1",
         "postgres": "^3.4.7",
         "prettier": "^3.8.1",
       },
     "@executor/control-plane": ["@executor/control-plane@workspace:packages/control-plane"],
-    "@executor/docs": ["@executor/docs@workspace:docs"],
+    "@executor/docs": ["@executor/docs@workspace:apps/docs"],
     "@executor/executor-mcp": ["@executor/executor-mcp@workspace:packages/executor-mcp"],

packages/control-plane/package.json+1−0

@@ -34,6 +34,7 @@ · 33 unmodified lines
34	"drizzle-orm": "1.0.0-beta.15-859cf75",	34	"drizzle-orm": "1.0.0-beta.15-859cf75",
35	"effect": "catalog:",	35	"effect": "catalog:",
36	"graphql": "^16.12.0",	36	"graphql": "^16.12.0",
		37	"jsonc-parser": "3.3.1",
37	"postgres": "^3.4.7",	38	"postgres": "^3.4.7",
38	"prettier": "^3.8.1"	39	"prettier": "^3.8.1"
39	},	40	},

packages/control-plane/src/runtime/local-config.test.ts+96−0

@@ -0,0 +1,96 @@
	1	import { mkdtempSync } from "node:fs";
	2	import { mkdir, writeFile } from "node:fs/promises";
	3	import { tmpdir } from "node:os";
	4	import { join } from "node:path";
	5	import { describe, expect, it } from "@effect/vitest";
	6	import * as Effect from "effect/Effect";
	7
	8	import {
	9	loadLocalExecutorConfig,
	10	resolveLocalWorkspaceContext,
	11	} from "./local-config";
	12
	13	const makeWorkspaceRoot = () =>
	14	mkdtempSync(join(tmpdir(), "executor-local-config-"));
	15
	16	describe("local-config", () => {
	17	it.effect("parses jsonc project config with comments and trailing commas", () =>
	18	Effect.gen(function* () {
	19	const workspaceRoot = makeWorkspaceRoot();
	20	const configDirectory = join(workspaceRoot, ".executor");
	21	yield* Effect.promise(() => mkdir(configDirectory, { recursive: true }));
	22	yield* Effect.promise(() =>
	23	writeFile(
	24	join(configDirectory, "executor.jsonc"),
	25	`{
	26	// local workspace config
	27	"sources": {
	28	"github": {
	29	"kind": "openapi",
	30	"connection": {
	31	"endpoint": "https://api.github.com",
	32	},
	33	"binding": {
	34	"specUrl": "https://example.com/openapi.json",
	35	},
	36	},
	37	},
	38	}
	39	`,
	40	"utf8",
	41	),
	42	);
	43
	44	const context = yield* Effect.promise(() =>
	45	resolveLocalWorkspaceContext({ workspaceRoot }),
	46	);
	47	const loaded = yield* Effect.promise(() =>
	48	loadLocalExecutorConfig(context),
	49	);
	50
	51	expect(loaded.config?.sources?.github?.kind).toBe("openapi");
	52	expect(loaded.config?.sources?.github?.connection.endpoint).toBe(
	53	"https://api.github.com",
	54	);
	55	}),
	56	);
	57
	58	it.effect("reports jsonc syntax errors with line and column details", () =>
	59	Effect.gen(function* () {
	60	const workspaceRoot = makeWorkspaceRoot();
	61	const configDirectory = join(workspaceRoot, ".executor");
	62	yield* Effect.promise(() => mkdir(configDirectory, { recursive: true }));
	63	yield* Effect.promise(() =>
	64	writeFile(
	65	join(configDirectory, "executor.jsonc"),
	66	`{
	67	"sources": {
	68	"github": {
	69	"kind": "openapi"
	70	"connection": {
	71	"endpoint": "https://api.github.com"
	72	}
	73	}
	74	}
	75	}
	76	`,
	77	"utf8",
	78	),
	79	);
	80
	81	const context = yield* Effect.promise(() =>
	82	resolveLocalWorkspaceContext({ workspaceRoot }),
	83	);
	84	const failure = yield* Effect.flip(
	85	Effect.tryPromise({
	86	try: () => loadLocalExecutorConfig(context),
	87	catch: (cause) =>
	88	cause instanceof Error ? cause : new Error(String(cause)),
	89	}),
	90	);
	91
	92	expect(failure.message).toContain("Invalid executor config");
	93	expect(failure.message).toContain("line 5, column 7");
	94	}),
	95	);
	96	});

packages/control-plane/src/runtime/local-config.ts+29−60

 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { promises as fs } from "node:fs";
+import {
+  type ParseError as JsoncParseError,
+  parse as parseJsoncDocument,
+  printParseErrorCode,
+} from "jsonc-parser";
 import {
   LocalExecutorConfigSchema,
   return trimmed && trimmed.length > 0 ? trimmed : undefined;
 };
-const stripJsonComments = (input: string): string => {
+const formatJsoncParseErrors = (content: string, errors: readonly JsoncParseError[]): string => {
-  let output = "";
+  const lines = content.split("\n");
-  let inString = false;
-  let stringChar = '"';
-  let escapeNext = false;
-  let inLineComment = false;
-  let inBlockComment = false;
-  for (let index = 0; index < input.length; index += 1) {
-    const char = input[index]!;
-    const next = input[index + 1];
-    if (inLineComment) {
-      if (char === "\n") {
-        inLineComment = false;
-        output += char;
-      }
-      continue;
-    }
-    if (inBlockComment) {
+  return errors
-      if (char === "*" && next === "/") {
+    .map((error) => {
-        inBlockComment = false;
+      const beforeOffset = content.slice(0, error.offset).split("\n");
-        index += 1;
+      const line = beforeOffset.length;
-      }
+      const column = beforeOffset[beforeOffset.length - 1]?.length ?? 0;
-      continue;
+      const lineText = lines[line - 1];
-    }
+      const location = `line ${line}, column ${column + 1}`;
+      const detail = printParseErrorCode(error.error);
-    if (inString) {
+      if (!lineText) {
-      output += char;
+        return `${detail} at ${location}`;
-      if (escapeNext) {
-        escapeNext = false;
-      } else if (char === "\\") {
-        escapeNext = true;
-      } else if (char === stringChar) {
-        inString = false;
       }
-      continue;
-    }
-    if ((char === '"' || char === "'") && !inString) {
-      inString = true;
-      stringChar = char;
-      output += char;
-      continue;
-    }
-    if (char === "/" && next === "/") {
+      return `${detail} at ${location}\n${lineText}`;
-      inLineComment = true;
+    })
-      index += 1;
+    .join("\n");
-      continue;
-    }
-    if (char === "/" && next === "*") {
-      inBlockComment = true;
-      index += 1;
-      continue;
-    }
-    output += char;
-  }
-  return output;
 };
 const parseJsonc = (input: { path: string; content: string }): LocalExecutorConfig => {
+  const errors: JsoncParseError[] = [];
   try {
-    const parsed = JSON.parse(stripJsonComments(input.content)) as unknown;
+    const parsed = parseJsoncDocument(input.content, errors, {
+      allowTrailingComma: true,
+    });
+    if (errors.length > 0) {
+      throw new Error(formatJsoncParseErrors(input.content, errors));
+    }
     return decodeLocalExecutorConfig(parsed);
   } catch (cause) {
     const message = cause instanceof Error ? cause.message : String(cause);