@stackables/bridge 1.7.0 → 1.8.0

package/build/index.d.ts

@@ -1,4 +1,5 @@
-export { parseBridgeChevrotain, parseBridgeChevrotain as parseBridge } from "./parser/index.js";
+export { parseBridgeChevrotain, parseBridgeChevrotain as parseBridge, parseBridgeDiagnostics } from "./parser/index.js";
+export type { BridgeDiagnostic, BridgeParseResult } from "./parser/index.js";
 export { bridgeTransform, getBridgeTraces, useBridgeTracing } from "./bridge-transform.js";
 export type { BridgeOptions, InstructionSource } from "./bridge-transform.js";
 export { builtinTools, std, createHttpCall } from "./tools/index.js";

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC3F,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,IAAI,WAAW,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACxH,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC3F,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC"}

package/build/index.js

@@ -1,3 +1,3 @@
-export { parseBridgeChevrotain, parseBridgeChevrotain as parseBridge } from "./parser/index.js";
+export { parseBridgeChevrotain, parseBridgeChevrotain as parseBridge, parseBridgeDiagnostics } from "./parser/index.js";
 export { bridgeTransform, getBridgeTraces, useBridgeTracing } from "./bridge-transform.js";
 export { builtinTools, std, createHttpCall } from "./tools/index.js";

package/build/parser/index.d.ts

@@ -3,6 +3,7 @@
  *
  * Re-exports the public parse function as well as the lexer for direct access.
  */
-export { parseBridgeChevrotain } from "./parser.js";
+export { parseBridgeChevrotain, parseBridgeDiagnostics } from "./parser.js";
+export type { BridgeDiagnostic, BridgeParseResult } from "./parser.js";
 export { BridgeLexer, allTokens } from "./lexer.js";
 //# sourceMappingURL=index.d.ts.map

package/build/parser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC5E,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC"}

package/build/parser/index.js

@@ -3,5 +3,5 @@
  *
  * Re-exports the public parse function as well as the lexer for direct access.
  */
-export { parseBridgeChevrotain } from "./parser.js";
+export { parseBridgeChevrotain, parseBridgeDiagnostics } from "./parser.js";
 export { BridgeLexer, allTokens } from "./lexer.js";

package/build/parser/parser.d.ts

@@ -1,3 +1,29 @@
 import type { Instruction } from "../types.js";
 export declare function parseBridgeChevrotain(text: string): Instruction[];
+export type BridgeDiagnostic = {
+    message: string;
+    severity: "error" | "warning";
+    range: {
+        start: {
+            line: number;
+            character: number;
+        };
+        end: {
+            line: number;
+            character: number;
+        };
+    };
+};
+export type BridgeParseResult = {
+    instructions: Instruction[];
+    diagnostics: BridgeDiagnostic[];
+    /** 1-based start line for each top-level instruction */
+    startLines: Map<Instruction, number>;
+};
+/**
+ * Parse a Bridge DSL text and return both the AST and all diagnostics.
+ * Uses Chevrotain's error recovery — always returns a (possibly partial) AST
+ * even when the file has errors. Designed for LSP/IDE use.
+ */
+export declare function parseBridgeDiagnostics(text: string): BridgeParseResult;
 //# sourceMappingURL=parser.d.ts.map

package/build/parser/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AA4CA,OAAO,KAAK,EAKV,WAAW,EAMZ,MAAM,aAAa,CAAC;AA0oBrB,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAEjE"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AA4CA,OAAO,KAAK,EAKV,WAAW,EAMZ,MAAM,aAAa,CAAC;AA6oBrB,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAEjE;AAID,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE;QACL,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;QAC3C,GAAG,EAAI;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;KAC5C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,wDAAwD;IACxD,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAqDtE"}

package/build/parser/parser.js

@@ -24,9 +24,9 @@ function assertNotReserved(name, lineNum, label) {
 //  Grammar (CstParser)
 // ═══════════════════════════════════════════════════════════════════════════
 class BridgeParser extends CstParser {
-    constructor() {
+    constructor(opts = {}) {
         super(allTokens, {
-            recoveryEnabled: false,
+            recoveryEnabled: opts.recovery ?? false,
             maxLookahead: 4,
         });
         this.performSelfAnalysis();
@@ -607,8 +607,11 @@ class BridgeParser extends CstParser {
         this.CONSUME(RCurly);
     });
 }
-// Singleton parser instance (Chevrotain best practice)
+// Singleton parser instances (Chevrotain best practice)
+// Strict instance: throws on first error (used by parseBridgeChevrotain)
 const parserInstance = new BridgeParser();
+// Lenient instance: error recovery enabled (used by parseBridgeDiagnostics)
+const diagParserInstance = new BridgeParser({ recovery: true });
 const BRIDGE_VERSION = "1.4";
 // ═══════════════════════════════════════════════════════════════════════════
 //  Public API
@@ -616,6 +619,62 @@ const BRIDGE_VERSION = "1.4";
 export function parseBridgeChevrotain(text) {
     return internalParse(text);
 }
+/**
+ * Parse a Bridge DSL text and return both the AST and all diagnostics.
+ * Uses Chevrotain's error recovery — always returns a (possibly partial) AST
+ * even when the file has errors. Designed for LSP/IDE use.
+ */
+export function parseBridgeDiagnostics(text) {
+    const diagnostics = [];
+    // 1. Lex
+    const lexResult = BridgeLexer.tokenize(text);
+    for (const e of lexResult.errors) {
+        diagnostics.push({
+            message: e.message,
+            severity: "error",
+            range: {
+                start: { line: (e.line ?? 1) - 1, character: (e.column ?? 1) - 1 },
+                end: { line: (e.line ?? 1) - 1, character: (e.column ?? 1) - 1 + e.length },
+            },
+        });
+    }
+    // 2. Parse with Chevrotain error recovery (builds partial CST past errors)
+    diagParserInstance.input = lexResult.tokens;
+    const cst = diagParserInstance.program();
+    for (const e of diagParserInstance.errors) {
+        const t = e.token;
+        diagnostics.push({
+            message: e.message,
+            severity: "error",
+            range: {
+                start: { line: (t.startLine ?? 1) - 1, character: (t.startColumn ?? 1) - 1 },
+                end: { line: (t.endLine ?? t.startLine ?? 1) - 1, character: t.endColumn ?? t.startColumn ?? 1 },
+            },
+        });
+    }
+    // 3. Visit → AST (semantic errors thrown as "Line N: ..." messages)
+    let instructions = [];
+    let startLines = new Map();
+    try {
+        const result = toBridgeAst(cst, []);
+        instructions = result.instructions;
+        startLines = result.startLines;
+    }
+    catch (err) {
+        const msg = String(err?.message ?? err);
+        const m = msg.match(/^Line (\d+):/);
+        const errorLine = m ? parseInt(m[1]) - 1 : 0;
+        diagnostics.push({
+            message: msg.replace(/^Line \d+:\s*/, ""),
+            severity: "error",
+            range: {
+                start: { line: errorLine, character: 0 },
+                end: { line: errorLine, character: 999 },
+            },
+        });
+    }
+    return { instructions, diagnostics, startLines };
+}
 function internalParse(text, previousInstructions) {
     // 1. Lex
     const lexResult = BridgeLexer.tokenize(text);
@@ -631,7 +690,7 @@ function internalParse(text, previousInstructions) {
         throw new Error(e.message);
     }
     // 3. Visit → AST
-    return toBridgeAst(cst, previousInstructions);
+    return toBridgeAst(cst, previousInstructions).instructions;
 }
 // ═══════════════════════════════════════════════════════════════════════════
 //  CST → AST transformation (imperative visitor)
@@ -826,6 +885,7 @@ function extractJsonValueStripped(node) {
 // ═══════════════════════════════════════════════════════════════════════════
 function toBridgeAst(cst, previousInstructions) {
     const instructions = [];
+    const startLines = new Map();
     // If called from passthrough expansion, seed with prior context
     const contextInstructions = previousInstructions
         ? [...previousInstructions]
@@ -851,22 +911,37 @@ function toBridgeAst(cst, previousInstructions) {
         tagged.push({ offset: findFirstToken(n)?.startOffset ?? 0, kind: "bridge", node: n });
     tagged.sort((a, b) => a.offset - b.offset);
     for (const item of tagged) {
+        const startLine = findFirstToken(item.node)?.startLine ?? 1;
         switch (item.kind) {
-            case "const":
-                instructions.push(buildConstDef(item.node));
+            case "const": {
+                const inst = buildConstDef(item.node);
+                instructions.push(inst);
+                startLines.set(inst, startLine);
                 break;
-            case "tool":
-                instructions.push(buildToolDef(item.node, [...contextInstructions, ...instructions]));
+            }
+            case "tool": {
+                const inst = buildToolDef(item.node, [...contextInstructions, ...instructions]);
+                instructions.push(inst);
+                startLines.set(inst, startLine);
                 break;
-            case "define":
-                instructions.push(buildDefineDef(item.node));
+            }
+            case "define": {
+                const inst = buildDefineDef(item.node);
+                instructions.push(inst);
+                startLines.set(inst, startLine);
                 break;
-            case "bridge":
-                instructions.push(...buildBridge(item.node, [...contextInstructions, ...instructions]));
+            }
+            case "bridge": {
+                const newInsts = buildBridge(item.node, [...contextInstructions, ...instructions]);
+                for (const bi of newInsts) {
+                    instructions.push(bi);
+                    startLines.set(bi, startLine);
+                }
                 break;
+            }
         }
     }
-    return instructions;
+    return { instructions, startLines };
 }
 // ── Const ───────────────────────────────────────────────────────────────
 function buildConstDef(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackables/bridge",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Declarative dataflow for GraphQL",
   "main": "./build/index.js",
   "type": "module",