@mattwca/little-parser-lib 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mattwca/little-parser-lib",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/src/parsers/parsers.ts

@@ -6,8 +6,11 @@ import { FailedParserResult, isFailedResult, isSuccessfulResult, ParseFn, Parser
 /**
  * Combines multiple parsers in sequence, returning an array of their results.
  * If one of the parsers fails, the entire sequence fails.
+ * @param parsers The parsers to run in sequence.
  */
-export function and(...parsers: ParseFn<any>[]): ParseFn<any[]> {
+export function and<Parsers extends ParseFn<any>[]>(
+  ...parsers: Parsers
+): ParseFn<{ [K in keyof Parsers]: Parsers[K] extends ParseFn<infer R> ? R : never }> {
   return (tokenStream: TokenStream) => {
     const results: any[] = [];
 
@@ -21,7 +24,7 @@ export function and(...parsers: ParseFn<any>[]): ParseFn<any[]> {
       results.push(parseResult.result);
     }
 
-    return { result: results };
+    return { result: results } as any;
   };
 }
 
@@ -92,20 +95,30 @@ export function or<T>(...parsers: ParseFn<T>[]): ParseFn<T> {
 }
 
 /**
- * Applies a parser repeatedly until it fails, collecting all successful results into an array.
- * If the parser fails on the first attempt, returns a failure.
+ * Applies a parser repeatedly until it fails or doesn't make progress (move the position), collecting
+ * all successful results into an array. If the parser fails on the first attempt, returns a failure.
  */
-export function many(parser: ParseFn<any>): ParseFn<any> {
+export function many<T>(parser: ParseFn<T>): ParseFn<T[]> {
   return (tokenStream: TokenStream) => {
-    const results: any[] = [];
+    const results: T[] = [];
 
     let parseFailure = null;
 
     while (true) {
+      const positionBefore = tokenStream.position;
       tokenStream.storePosition();
 
       const result = parser(tokenStream);
+
       if (isSuccessfulResult(result)) {
+        const positionAfter = tokenStream.position;
+
+        // Check if the parser made any progress - if it didn't, we break out to avoid infinite loops.
+        if (positionAfter === positionBefore) {
+          tokenStream.restorePosition();
+          break;
+        }
+
         results.push(result.result);
         tokenStream.clearPosition();
       } else {