matryoshka-rlm 0.2.21 → 0.2.23

package/dist/logic/bm25.js

@@ -43,7 +43,8 @@ export function buildBM25Index(lines) {
             lineMap.set(lineNum, count);
         }
     }
-    const totalLength = Array.from(docLengths.values()).reduce((a, b) => a + b, 0);
+    let totalLength = 0;
+    docLengths.forEach(v => { totalLength += v; });
     const avgDocLength = lines.length > 0 ? totalLength / lines.length : 0;
     return {
         termFreqs,

package/dist/logic/bm25.js.map

@@ -1 +1 @@
-{"version":3,"file":"bm25.js","sourceRoot":"","sources":["../../src/logic/bm25.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bm25.js","sourceRoot":"","sources":["../../src/logic/bm25.ts"],"names":[],"mappings":"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"}

package/dist/logic/lc-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lc-parser.d.ts","sourceRoot":"","sources":["../../src/logic/lc-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EACV,MAAM,EAqBN,WAAW,EAEZ,MAAM,YAAY,CAAC;AA01BpB;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAmDhD;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAmDrD;AAUD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoEhD"}
+{"version":3,"file":"lc-parser.d.ts","sourceRoot":"","sources":["../../src/logic/lc-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EACV,MAAM,EAqBN,WAAW,EAEZ,MAAM,YAAY,CAAC;AAi0BpB;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAmDhD;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAmDrD;AAUD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoEhD"}

package/dist/logic/lc-parser.js

@@ -305,7 +305,7 @@ function parseTerm(state, depth = 0) {
         if (!tensor || tensor.type !== "tensor") {
             return null;
         }
-        const term = parseTerm(state);
+        const term = parseTerm(state, depth + 1);
         if (!term)
             return null;
         return { tag: "constrained", constraint, term };
@@ -313,7 +313,7 @@ function parseTerm(state, depth = 0) {
     // List: (op args...)
     if (token.type === "lparen") {
         consume(state); // (
-        const list = parseList(state);
+        const list = parseList(state, depth + 1);
         const rparen = consume(state);
         if (!rparen || rparen.type !== "rparen") {
             return null;
@@ -346,7 +346,9 @@ function parseTerm(state, depth = 0) {
 /**
  * Parse list contents after opening paren
  */
-function parseList(state) {
+function parseList(state, depth = 0) {
+    if (depth > MAX_PARSE_DEPTH)
+        return null;
     const first = peek(state);
     if (!first)
         return null;
@@ -356,26 +358,26 @@ function parseList(state) {
     }
     consume(state);
     const op = first.value;
+    const d = depth + 1;
     switch (op) {
         case "input":
             return { tag: "input" };
         case "lit": {
-            const val = parseTerm(state);
+            const val = parseTerm(state, d);
             if (!val || val.tag !== "lit")
                 return null;
             return val;
         }
         case "grep": {
-            const pattern = parseTerm(state);
+            const pattern = parseTerm(state, d);
             if (!pattern || pattern.tag !== "lit" || typeof pattern.value !== "string")
                 return null;
             return { tag: "grep", pattern: pattern.value };
         }
         case "fuzzy_search": {
-            const query = parseTerm(state);
+            const query = parseTerm(state, d);
             if (!query || query.tag !== "lit" || typeof query.value !== "string")
                 return null;
-            // Optional limit
             const limitTerm = peek(state);
             let limit;
             if (limitTerm && limitTerm.type === "number") {
@@ -385,10 +387,9 @@ function parseList(state) {
             return { tag: "fuzzy_search", query: query.value, limit };
         }
         case "bm25": {
-            const query = parseTerm(state);
+            const query = parseTerm(state, d);
             if (!query || query.tag !== "lit" || typeof query.value !== "string")
                 return null;
-            // Optional limit
             const limitTerm = peek(state);
             let limit;
             if (limitTerm && limitTerm.type === "number") {
@@ -398,11 +399,10 @@ function parseList(state) {
             return { tag: "bm25", query: query.value, limit };
         }
         case "fuse": {
-            // (fuse <coll1> <coll2> [<coll3> ...]) — requires at least 2
             const MAX_FUSE_ARGS = 10;
             const collections = [];
             while (peek(state) && peek(state)?.type !== "rparen" && collections.length < MAX_FUSE_ARGS) {
-                const coll = parseTerm(state);
+                const coll = parseTerm(state, d);
                 if (!coll)
                     break;
                 collections.push(coll);
@@ -412,22 +412,22 @@ function parseList(state) {
             return { tag: "fuse", collections };
         }
         case "dampen": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
-            const query = parseTerm(state);
+            const query = parseTerm(state, d);
             if (!query || query.tag !== "lit" || typeof query.value !== "string")
                 return null;
             return { tag: "dampen", collection, query: query.value };
         }
         case "rerank": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
             return { tag: "rerank", collection };
         }
         case "semantic": {
-            const query = parseTerm(state);
+            const query = parseTerm(state, d);
             if (!query || query.tag !== "lit" || typeof query.value !== "string")
                 return null;
             const limitTerm = peek(state);
@@ -442,75 +442,75 @@ function parseList(state) {
             return { tag: "text_stats" };
         }
         case "lines": {
-            const startTerm = parseTerm(state);
+            const startTerm = parseTerm(state, d);
             if (!startTerm || startTerm.tag !== "lit" || typeof startTerm.value !== "number") {
                 return null;
             }
-            const endTerm = parseTerm(state);
+            const endTerm = parseTerm(state, d);
             if (!endTerm || endTerm.tag !== "lit" || typeof endTerm.value !== "number") {
                 return null;
             }
             return { tag: "lines", start: startTerm.value, end: endTerm.value };
         }
         case "filter": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
-            const predicate = parseTerm(state);
+            const predicate = parseTerm(state, d);
             if (!predicate)
                 return null;
             return { tag: "filter", collection, predicate };
         }
         case "map": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
-            const transform = parseTerm(state);
+            const transform = parseTerm(state, d);
             if (!transform)
                 return null;
             return { tag: "map", collection, transform };
         }
         case "reduce": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
-            const init = parseTerm(state);
+            const init = parseTerm(state, d);
             if (!init)
                 return null;
-            const fn = parseTerm(state);
+            const fn = parseTerm(state, d);
             if (!fn)
                 return null;
             return { tag: "reduce", collection, init, fn };
         }
         case "sum": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
             return { tag: "sum", collection };
         }
         case "count": {
-            const collection = parseTerm(state);
+            const collection = parseTerm(state, d);
             if (!collection)
                 return null;
             return { tag: "count", collection };
         }
         case "add": {
-            const left = parseTerm(state);
+            const left = parseTerm(state, d);
             if (!left)
                 return null;
-            const right = parseTerm(state);
+            const right = parseTerm(state, d);
             if (!right)
                 return null;
             return { tag: "add", left, right };
         }
         case "match": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
-            const pattern = parseTerm(state);
+            const pattern = parseTerm(state, d);
             if (!pattern || pattern.tag !== "lit" || typeof pattern.value !== "string")
                 return null;
-            const group = parseTerm(state);
+            const group = parseTerm(state, d);
             if (!group || group.tag !== "lit" || typeof group.value !== "number")
                 return null;
             if (!Number.isSafeInteger(group.value) || group.value < 0 || group.value > 99)
@@ -518,46 +518,45 @@ function parseList(state) {
             return { tag: "match", str, pattern: pattern.value, group: group.value };
         }
         case "replace": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
-            const from = parseTerm(state);
+            const from = parseTerm(state, d);
             if (!from || from.tag !== "lit" || typeof from.value !== "string")
                 return null;
-            const to = parseTerm(state);
+            const to = parseTerm(state, d);
             if (!to || to.tag !== "lit" || typeof to.value !== "string")
                 return null;
             return { tag: "replace", str, from: from.value, to: to.value };
         }
         case "split": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
-            const delim = parseTerm(state);
+            const delim = parseTerm(state, d);
             if (!delim || delim.tag !== "lit" || typeof delim.value !== "string")
                 return null;
-            const index = parseTerm(state);
+            const index = parseTerm(state, d);
             if (!index || index.tag !== "lit" || typeof index.value !== "number" || !Number.isSafeInteger(index.value))
                 return null;
             return { tag: "split", str, delim: delim.value, index: index.value };
         }
         case "parseInt": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
             return { tag: "parseInt", str };
         }
         case "parseFloat": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
             return { tag: "parseFloat", str };
         }
         case "parseDate": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
-            // Optional format hint
             const formatTerm = peek(state);
             let format;
             if (formatTerm && formatTerm.type === "string") {
@@ -568,14 +567,14 @@ function parseList(state) {
             return { tag: "parseDate", str, format, examples };
         }
         case "parseCurrency": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
             const examples = parseExamplesKeyword(state);
             return { tag: "parseCurrency", str, examples };
         }
         case "parseNumber": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
             const examples = parseExamplesKeyword(state);
@@ -583,26 +582,25 @@ function parseList(state) {
         }
         case "coerce":
         case "as": {
-            const term = parseTerm(state);
+            const term = parseTerm(state, d);
             if (!term)
                 return null;
-            const typeTerm = parseTerm(state);
+            const typeTerm = parseTerm(state, d);
             if (!typeTerm || typeTerm.tag !== "lit" || typeof typeTerm.value !== "string")
                 return null;
             const targetType = typeTerm.value;
             return { tag: "coerce", term, targetType };
         }
         case "extract": {
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
-            const pattern = parseTerm(state);
+            const pattern = parseTerm(state, d);
             if (!pattern || pattern.tag !== "lit" || typeof pattern.value !== "string")
                 return null;
-            const group = parseTerm(state);
+            const group = parseTerm(state, d);
             if (!group || group.tag !== "lit" || typeof group.value !== "number")
                 return null;
-            // Optional type hint (string or :type keyword)
             let targetType;
             const nextToken = peek(state);
             if (nextToken && nextToken.type === "string") {
@@ -610,55 +608,48 @@ function parseList(state) {
                 targetType = nextToken.value;
             }
             else if (nextToken?.type === "keyword" && nextToken.value === "type") {
-                consume(state); // :type
-                const typeVal = parseTerm(state);
+                consume(state);
+                const typeVal = parseTerm(state, d);
                 if (typeVal?.tag === "lit" && typeof typeVal.value === "string") {
                     targetType = typeVal.value;
                 }
             }
-            // Optional :examples
             const examples = parseExamplesKeyword(state);
-            // Optional :constraints
             let constraints;
             const constraintKw = peek(state);
             if (constraintKw?.type === "keyword" && constraintKw.value === "constraints") {
-                consume(state); // :constraints
+                consume(state);
                 constraints = parseConstraintObject(state) ?? undefined;
             }
             return { tag: "extract", str, pattern: pattern.value, group: group.value, targetType, examples, constraints };
         }
         case "synthesize": {
-            // Parse list of [input output] pairs
-            // Supports: (synthesize ("in" out) ...) or (synthesize (example "in" out) ...)
             const MAX_SYNTH_EXAMPLES = 1000;
             const examples = [];
             while (peek(state) && peek(state)?.type !== "rparen" && examples.length < MAX_SYNTH_EXAMPLES) {
-                // Expect (input output) pair or [input output] or (example input output)
                 const pairStart = peek(state);
                 if (pairStart?.type === "lparen" || pairStart?.type === "lbracket") {
-                    consume(state); // ( or [
-                    // Check for optional "example" keyword
+                    consume(state);
                     const maybeExample = peek(state);
                     if (maybeExample?.type === "symbol" && maybeExample.value === "example") {
-                        consume(state); // skip "example" keyword
+                        consume(state);
                     }
-                    const input = parseTerm(state);
+                    const input = parseTerm(state, d);
                     if (!input || input.tag !== "lit" || typeof input.value !== "string")
                         break;
-                    const output = parseTerm(state);
+                    const output = parseTerm(state, d);
                     if (!output || output.tag !== "lit")
                         break;
-                    const pairEnd = consume(state); // ) or ]
+                    const pairEnd = consume(state);
                     if (!pairEnd || (pairEnd.type !== "rparen" && pairEnd.type !== "rbracket"))
                         break;
                     examples.push({ input: input.value, output: output.value });
                 }
                 else {
-                    // Also support flat pairs: "input1" output1 "input2" output2
-                    const input = parseTerm(state);
+                    const input = parseTerm(state, d);
                     if (!input || input.tag !== "lit" || typeof input.value !== "string")
                         break;
-                    const output = parseTerm(state);
+                    const output = parseTerm(state, d);
                     if (!output || output.tag !== "lit")
                         break;
                     examples.push({ input: input.value, output: output.value });
@@ -669,21 +660,19 @@ function parseList(state) {
             return { tag: "synthesize", examples };
         }
         case "if": {
-            const cond = parseTerm(state);
+            const cond = parseTerm(state, d);
             if (!cond)
                 return null;
-            const thenBranch = parseTerm(state);
+            const thenBranch = parseTerm(state, d);
             if (!thenBranch)
                 return null;
-            const elseBranch = parseTerm(state);
+            const elseBranch = parseTerm(state, d);
             if (!elseBranch)
                 return null;
             return { tag: "if", cond, then: thenBranch, else: elseBranch };
         }
         case "classify": {
-            // Parse :examples keyword or pairs of (input output)
             const examples = [];
-            // Check for :examples keyword
             const maybeKeywordExamples = parseExamplesKeyword(state);
             if (maybeKeywordExamples) {
                 for (const ex of maybeKeywordExamples) {
@@ -691,13 +680,12 @@ function parseList(state) {
                 }
             }
             else {
-                // Fallback to inline pairs
                 const MAX_CLASSIFY_EXAMPLES = 1000;
                 while (peek(state) && peek(state)?.type !== "rparen" && examples.length < MAX_CLASSIFY_EXAMPLES) {
-                    const input = parseTerm(state);
+                    const input = parseTerm(state, d);
                     if (!input || input.tag !== "lit" || typeof input.value !== "string")
                         break;
-                    const output = parseTerm(state);
+                    const output = parseTerm(state, d);
                     if (!output || output.tag !== "lit" || output.value === null)
                         break;
                     examples.push({ input: input.value, output: output.value });
@@ -713,14 +701,13 @@ function parseList(state) {
             if (!param || param.type !== "symbol")
                 return null;
             consume(state);
-            const body = parseTerm(state);
+            const body = parseTerm(state, d);
             if (!body)
                 return null;
             return { tag: "lambda", param: param.value, body };
         }
         case "define-fn": {
-            // (define-fn "name" :examples [...])
-            const nameTerm = parseTerm(state);
+            const nameTerm = parseTerm(state, d);
             if (!nameTerm || nameTerm.tag !== "lit" || typeof nameTerm.value !== "string")
                 return null;
             const examples = parseExamplesKeyword(state);
@@ -729,25 +716,22 @@ function parseList(state) {
             return { tag: "define-fn", name: nameTerm.value, examples };
         }
         case "apply-fn": {
-            // (apply-fn "name" arg)
-            const nameTerm = parseTerm(state);
+            const nameTerm = parseTerm(state, d);
             if (!nameTerm || nameTerm.tag !== "lit" || typeof nameTerm.value !== "string")
                 return null;
-            const arg = parseTerm(state);
+            const arg = parseTerm(state, d);
             if (!arg)
                 return null;
             return { tag: "apply-fn", name: nameTerm.value, arg };
         }
         case "predicate": {
-            // (predicate term :examples [...])
-            const str = parseTerm(state);
+            const str = parseTerm(state, d);
             if (!str)
                 return null;
             const examples = parseExamplesKeyword(state);
             return { tag: "predicate", str, examples };
         }
         case "list_symbols": {
-            // (list_symbols) or (list_symbols "kind")
             const kindTerm = peek(state);
             if (kindTerm && kindTerm.type === "string") {
                 consume(state);
@@ -756,15 +740,13 @@ function parseList(state) {
             return { tag: "list_symbols" };
         }
         case "get_symbol_body": {
-            // (get_symbol_body <symbol>)
-            const symbol = parseTerm(state);
+            const symbol = parseTerm(state, d);
             if (!symbol)
                 return null;
             return { tag: "get_symbol_body", symbol };
         }
         case "find_references": {
-            // (find_references "name")
-            const nameTerm = parseTerm(state);
+            const nameTerm = parseTerm(state, d);
             if (!nameTerm || nameTerm.tag !== "lit" || typeof nameTerm.value !== "string") {
                 return null;
             }
@@ -775,16 +757,14 @@ function parseList(state) {
         case "ancestors":
         case "descendants":
         case "implementations": {
-            // (callers "name"), (callees "name"), etc.
-            const graphNameTerm = parseTerm(state);
+            const graphNameTerm = parseTerm(state, d);
             if (!graphNameTerm || graphNameTerm.tag !== "lit" || typeof graphNameTerm.value !== "string") {
                 return null;
             }
             return { tag: op, name: graphNameTerm.value };
         }
         case "dependents": {
-            // (dependents "name" [depth])
-            const depNameTerm = parseTerm(state);
+            const depNameTerm = parseTerm(state, d);
             if (!depNameTerm || depNameTerm.tag !== "lit" || typeof depNameTerm.value !== "string") {
                 return null;
             }
@@ -796,8 +776,7 @@ function parseList(state) {
             return { tag: "dependents", name: depNameTerm.value };
         }
         case "symbol_graph": {
-            // (symbol_graph "name" [depth])
-            const sgNameTerm = parseTerm(state);
+            const sgNameTerm = parseTerm(state, d);
             if (!sgNameTerm || sgNameTerm.tag !== "lit" || typeof sgNameTerm.value !== "string") {
                 return null;
             }
@@ -808,14 +787,14 @@ function parseList(state) {
             }
             return { tag: "symbol_graph", name: sgNameTerm.value };
         }
-        default:
-            // Function application or variable
+        default: {
             const fn = { tag: "var", name: op };
-            const arg = parseTerm(state);
+            const arg = parseTerm(state, d);
             if (arg) {
                 return { tag: "app", fn, arg };
             }
             return fn;
+        }
     }
 }
 /**
@@ -902,12 +881,12 @@ export function parseAll(input) {
         }
         if (inString)
             continue;
-        if (ch === "(") {
+        if (ch === "(" || ch === "[" || ch === "{") {
             if (depth === 0)
                 start = i;
             depth++;
         }
-        else if (ch === ")") {
+        else if (ch === ")" || ch === "]" || ch === "}") {
             depth--;
             if (depth === 0 && start >= 0) {
                 const expr = trimmed.slice(start, i + 1);