4 files changed, 68 insertions, 2 deletions
diff --git a/src/lang/ts-lang/builtin/sbuiltin.ts b/src/lang/ts-lang/builtin/sbuiltin.ts
index c92fd6a..f089aea 100644
--- a/src/lang/ts-lang/builtin/sbuiltin.ts
+++ b/src/lang/ts-lang/builtin/sbuiltin.ts
@@ -42,6 +42,63 @@ export type SBUILTIN_Map<
       GetEvaluatedChildren<Node, Frame, Callstack>
     >}`>;
 
+type Reduce<
+  Arr extends readonly any[],
+  Fn extends FnPrim,
+  Acc,
+  IdxLen extends readonly any[] = readonly []
+> = Arr extends [infer Head, ...infer Tail]
+  ? Reduce<
+      Tail,
+      Fn,
+      CallFn<Fn, [Acc, Head, IdxLen["length"]]>,
+      [...IdxLen, any]
+    >
+  : Acc;
+
+export type SBUILTIN_Reduce<
+  Node extends ASTNode,
+  Frame extends StackFrame,
+  Callstack extends readonly string[]
+> = GetEvaluatedChildren<Node, Frame, Callstack> extends [
+  infer Arr extends readonly any[],
+  infer Fn extends FnPrim,
+  infer Acc
+]
+  ? Reduce<Arr, Fn, Acc>
+  : EvalError<`Invalid params for reduce: ${ToString<
+      GetEvaluatedChildren<Node, Frame, Callstack>
+    >}`>;
+
+type Filter<
+  Arr extends readonly any[],
+  Fn extends FnPrim,
+  Collected extends readonly any[] = [],
+  IdxLen extends readonly any[] = readonly []
+> = Arr extends [infer Head, ...infer Tail]
+  ? Filter<
+      Tail,
+      Fn,
+      CallFn<Fn, [Head, IdxLen["length"]]> extends true
+        ? [...Collected, Head]
+        : Collected,
+      [...IdxLen, any]
+    >
+  : Collected;
+
+export type SBUILTIN_Filter<
+  Node extends ASTNode,
+  Frame extends StackFrame,
+  Callstack extends readonly string[]
+> = GetEvaluatedChildren<Node, Frame, Callstack> extends [
+  infer Arr extends readonly any[],
+  infer Fn extends FnPrim
+]
+  ? Filter<Arr, Fn>
+  : EvalError<`Invalid params for filter: ${ToString<
+      GetEvaluatedChildren<Node, Frame, Callstack>
+    >}`>;
+
 export type SBUILTIN_IfElse<
   Node extends ASTNode,
   Frame extends StackFrame,
diff --git a/src/lang/ts-lang/core/eval.ts b/src/lang/ts-lang/core/eval.ts
index ebc58e7..b937c2e 100644
--- a/src/lang/ts-lang/core/eval.ts
+++ b/src/lang/ts-lang/core/eval.ts
@@ -6,8 +6,10 @@ import {
   BUILTIN_Sub,
   BUILTIN_ToString,
   SBUILTIN_Call,
+  SBUILTIN_Filter,
   SBUILTIN_IfElse,
   SBUILTIN_Map,
+  SBUILTIN_Reduce,
 } from "../builtin";
 import { ToString } from "../util";
 import {
@@ -34,6 +36,10 @@ export type MapBuiltins<
     ? SBUILTIN_Call<Node, Frame, Callstack>
     : Node["name"] extends "map"
     ? SBUILTIN_Map<Node, Frame, Callstack>
+    : Node["name"] extends "reduce"
+    ? SBUILTIN_Reduce<Node, Frame, Callstack>
+    : Node["name"] extends "filter"
+    ? SBUILTIN_Filter<Node, Frame, Callstack>
     : Node["name"] extends "?"
     ? SBUILTIN_IfElse<Node, Frame, Callstack>
     : Node["name"] extends "tostring"
diff --git a/src/lang/ts-lang/core/lexer.ts b/src/lang/ts-lang/core/lexer.ts
index bcd5785..43dc3e5 100644
--- a/src/lang/ts-lang/core/lexer.ts
+++ b/src/lang/ts-lang/core/lexer.ts
@@ -36,7 +36,7 @@ export type IsClose<T> = T extends `${TokenType.CLOSE_PAREN}` ? true : false;
 export type ChunkedLex<
   Ctx extends LexerCtx,
   Depth extends any[] = []
-> = Depth["length"] extends 50
+> = Depth["length"] extends 25
   ? Ctx & {
       endChunk: true;
     }
diff --git a/src/lang/ts-lang/util/string.ts b/src/lang/ts-lang/util/string.ts
index 5772f40..ae17c2c 100644
--- a/src/lang/ts-lang/util/string.ts
+++ b/src/lang/ts-lang/util/string.ts
@@ -5,7 +5,10 @@ export type AddStrings<
   ? AddStrings<Tail, `${Carry}${Head}`>
   : Carry;
 
-export type ToString<T, Carry extends string = ""> = T extends string | number
+export type ToString<T, Carry extends string = ""> = T extends
+  | string
+  | number
+  | boolean
   ? `${T}`
   : T extends readonly any[]
   ? T extends readonly [infer Head, ...infer Tail]