extra-parser 0.6.4 → 0.6.6

package/README.md

@@ -54,12 +54,12 @@ type MapSequenceToPatterns<
 , Node extends INode = INode
 > = {
   [Index in keyof Sequence]:
-    [Sequence[Index]] extends [infer Element]
+    [Sequence[Index]] extends [infer TokenOrNode]
   ? (
-      Element extends Token
+      TokenOrNode extends Token
       ? string
-    : Element extends Node
-      ? INodePattern<Token, Element>
+    : TokenOrNode extends Node
+      ? INodePattern<Token, TokenOrNode>
     : never
     )
   : never
@@ -71,12 +71,12 @@ type MapSequenceToMatches<
 , Node extends INode = INode
 > = {
   [Index in keyof Sequence]:
-    [Sequence[Index]] extends [infer Element]
+    [Sequence[Index]] extends [infer TokenOrNode]
   ? (
-      Element extends IToken
+      TokenOrNode extends IToken
       ? Token
-    : Element extends INode
-      ? INodePatternMatch<Element>
+    : TokenOrNode extends INode
+      ? INodePatternMatch<TokenOrNode>
     : never
     )
   : never
@@ -154,7 +154,7 @@ function matchRepetitions<
     minimumRepetitions?: number = 1
     maximumRepetitions?: number = Infinity
   }
-): Promise<Flatten<Array<MapSequenceToMatches<Sequence, Token, Node>>> | Falsy>
+): Promise<Array<Token | INodePatternMatch<Node>> | Falsy>
 ```
 
 ### createTokenPatternFromRegExp

package/lib/match-repetitions.d.ts

@@ -1,7 +1,6 @@
 import { Falsy } from '@blackglory/prelude';
-import { Flatten } from 'hotypes';
-import { IToken, INode, MapSequenceToPatterns, MapSequenceToMatches } from './types';
+import { IToken, INode, MapSequenceToPatterns, INodePatternMatch } from './types';
 export declare function matchRepetitions<Sequence extends ReadonlyArray<Token | Node>, Token extends IToken = IToken, Node extends INode = INode>(patterns: MapSequenceToPatterns<Sequence, Token, Node>, tokens: ReadonlyArray<Token>, { minimumRepetitions, maximumRepetitions }?: {
     minimumRepetitions?: number;
     maximumRepetitions?: number;
-}): Promise<Flatten<Array<MapSequenceToMatches<Sequence, Token, Node>>> | Falsy>;
+}): Promise<Array<Token | INodePatternMatch<Node>> | Falsy>;

package/lib/match-repetitions.js

@@ -13,8 +13,7 @@ async function matchRepetitions(patterns, tokens, { minimumRepetitions = 1, maxi
     for (let i = 0; i < minimumRepetitions; i++) {
         const matches = await (0, match_sequence_1.matchSequence)(patterns, mutableTokens);
         if ((0, prelude_1.isntFalsy)(matches)) {
-            results.push(matches);
-            mutableTokens.splice(0, matches.length);
+            handleMatches(matches);
         }
         else {
             return;
@@ -23,14 +22,22 @@ async function matchRepetitions(patterns, tokens, { minimumRepetitions = 1, maxi
     for (let i = minimumRepetitions; i < maximumRepetitions; i++) {
         const matches = await (0, match_sequence_1.matchSequence)(patterns, mutableTokens);
         if ((0, prelude_1.isntFalsy)(matches)) {
-            results.push(matches);
-            mutableTokens.splice(0, matches.length);
+            handleMatches(matches);
         }
         else {
             break;
         }
     }
-    return results.flat();
+    return results;
+    function handleMatches(matches) {
+        results.push(...matches);
+        mutableTokens.splice(0, getConsumed(matches));
+    }
 }
 exports.matchRepetitions = matchRepetitions;
+function getConsumed(matches) {
+    return matches
+        .map(match => 'consumed' in match ? match.consumed : 1)
+        .reduce((acc, cur) => acc + cur);
+}
 //# sourceMappingURL=match-repetitions.js.map

package/lib/match-repetitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"match-repetitions.js","sourceRoot":"","sources":["../src/match-repetitions.ts"],"names":[],"mappings":";;;AAAA,iDAAuE;AAGvE,qDAAgD;AAEzC,KAAK,UAAU,gBAAgB,CAKpC,QAAsD,EACtD,MAA4B,EAC5B,EACE,kBAAkB,GAAG,CAAC,EACtB,kBAAkB,GAAG,QAAQ,KAI3B,EAAE;IAEN,IAAA,gBAAM,EAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,2CAA2C,CAAC,CAAA;IACzF,IAAA,gBAAM,EACJ,kBAAkB,IAAI,CAAC,EACvB,4DAA4D,CAC7D,CAAA;IACD,IAAA,gBAAM,EACJ,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,KAAK,QAAQ,EACvE,0DAA0D,CAC3D,CAAA;IACD,IAAA,gBAAM,EACJ,kBAAkB,IAAI,kBAAkB,EACxC,kFAAkF,CACnF,CAAA;IAED,MAAM,OAAO,GAAuD,EAAE,CAAA;IACtE,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAA;IAErC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAa,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC5D,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,EAAE;YACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrB,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;SACxC;aAAM;YACL,OAAM;SACP;KACF;IAED,KAAK,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;QAC5D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAa,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC5D,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,EAAE;YACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrB,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;SACxC;aAAM;YACL,MAAK;SACN;KACF;IAED,OAAO,OAAO,CAAC,IAAI,EAAiE,CAAA;AACtF,CAAC;AArDD,4CAqDC"}
+{"version":3,"file":"match-repetitions.js","sourceRoot":"","sources":["../src/match-repetitions.ts"],"names":[],"mappings":";;;AAAA,iDAAuE;AAEvE,qDAAgD;AAEzC,KAAK,UAAU,gBAAgB,CAKpC,QAAsD,EACtD,MAA4B,EAC5B,EACE,kBAAkB,GAAG,CAAC,EACtB,kBAAkB,GAAG,QAAQ,KAI3B,EAAE;IAEN,IAAA,gBAAM,EAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,2CAA2C,CAAC,CAAA;IACzF,IAAA,gBAAM,EACJ,kBAAkB,IAAI,CAAC,EACvB,4DAA4D,CAC7D,CAAA;IACD,IAAA,gBAAM,EACJ,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,KAAK,QAAQ,EACvE,0DAA0D,CAC3D,CAAA;IACD,IAAA,gBAAM,EACJ,kBAAkB,IAAI,kBAAkB,EACxC,kFAAkF,CACnF,CAAA;IAED,MAAM,OAAO,GAA2C,EAAE,CAAA;IAC1D,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAA;IAErC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAa,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC5D,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,EAAE;YACtB,aAAa,CAAC,OAAO,CAAC,CAAA;SACvB;aAAM;YACL,OAAM;SACP;KACF;IAED,KAAK,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;QAC5D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAa,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC5D,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,EAAE;YACtB,aAAa,CAAC,OAAO,CAAC,CAAA;SACvB;aAAM;YACL,MAAK;SACN;KACF;IAED,OAAO,OAAO,CAAA;IAEd,SAAS,aAAa,CACpB,OAAoD;QAEpD,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA;QACxB,aAAa,CAAC,MAAM,CAClB,CAAC,EACD,WAAW,CAAC,OAAiD,CAAC,CAC/D,CAAA;IACH,CAAC;AACH,CAAC;AA7DD,4CA6DC;AAED,SAAS,WAAW,CAAC,OAAiD;IACpE,OAAO,OAAO;SACX,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;SACtD,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;AACpC,CAAC"}

package/lib/types.d.ts

@@ -23,10 +23,10 @@ export interface INodePattern<Token extends IToken = IToken, Node extends INode
 export declare type MapSequenceToPatterns<Sequence extends ReadonlyArray<Token | Node>, Token extends IToken = IToken, Node extends INode = INode> = {
     [Index in keyof Sequence]: [
         Sequence[Index]
-    ] extends [infer Element] ? (Element extends Token ? string : Element extends Node ? INodePattern<Token, Element> : never) : never;
+    ] extends [infer TokenOrNode] ? (TokenOrNode extends Token ? string : TokenOrNode extends Node ? INodePattern<Token, TokenOrNode> : never) : never;
 };
 export declare type MapSequenceToMatches<Sequence extends ReadonlyArray<Token | Node>, Token extends IToken = IToken, Node extends INode = INode> = {
     [Index in keyof Sequence]: [
         Sequence[Index]
-    ] extends [infer Element] ? (Element extends IToken ? Token : Element extends INode ? INodePatternMatch<Element> : never) : never;
+    ] extends [infer TokenOrNode] ? (TokenOrNode extends IToken ? Token : TokenOrNode extends INode ? INodePatternMatch<TokenOrNode> : never) : never;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-parser",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "A functional parser toolkit",
   "keywords": [],
   "files": [
@@ -51,7 +51,6 @@
   },
   "dependencies": {
     "@blackglory/prelude": "^0.1.8",
-    "hotypes": "^0.5.1",
     "iterable-operator": "^2.3.0"
   }
 }

package/src/match-repetitions.ts

@@ -1,6 +1,5 @@
 import { assert, Falsy, isntFalsy, toArray } from '@blackglory/prelude'
-import { Flatten } from 'hotypes'
-import { IToken, INode, MapSequenceToPatterns, MapSequenceToMatches } from './types'
+import { IToken, INode, MapSequenceToPatterns, MapSequenceToMatches, INodePatternMatch } from './types'
 import { matchSequence } from './match-sequence'
 
 export async function matchRepetitions<
@@ -17,7 +16,7 @@ export async function matchRepetitions<
     minimumRepetitions?: number
     maximumRepetitions?: number
   } = {}
-): Promise<Flatten<Array<MapSequenceToMatches<Sequence, Token, Node>>> | Falsy> {
+): Promise<Array<Token | INodePatternMatch<Node>> | Falsy> {
   assert(Number.isInteger(minimumRepetitions), 'The minimum repetiions must be an integer')
   assert(
     minimumRepetitions >= 0
@@ -32,14 +31,13 @@ export async function matchRepetitions<
   , 'The maximum repetitions must be greater than or equal to the minimum repetitions'
   )
 
-  const results: Array<MapSequenceToMatches<Sequence, Token, Node>> = []
+  const results: Array<Token | INodePatternMatch<Node>> = []
   const mutableTokens = toArray(tokens)
 
   for (let i = 0; i < minimumRepetitions; i++) {
     const matches = await matchSequence(patterns, mutableTokens)
     if (isntFalsy(matches)) {
-      results.push(matches)
-      mutableTokens.splice(0, matches.length)
+      handleMatches(matches)
     } else {
       return
     }
@@ -48,12 +46,27 @@ export async function matchRepetitions<
   for (let i = minimumRepetitions; i < maximumRepetitions; i++) {
     const matches = await matchSequence(patterns, mutableTokens)
     if (isntFalsy(matches)) {
-      results.push(matches)
-      mutableTokens.splice(0, matches.length)
+      handleMatches(matches)
     } else {
       break
     }
   }
 
-  return results.flat() as Flatten<Array<MapSequenceToMatches<Sequence, Token, Node>>>
+  return results
+
+  function handleMatches(
+    matches: MapSequenceToMatches<Sequence, Token, Node>
+  ): void {
+    results.push(...matches)
+    mutableTokens.splice(
+      0
+    , getConsumed(matches as Array<Token | INodePatternMatch<Node>>)
+    )
+  }
+}
+
+function getConsumed(matches: Array<IToken | INodePatternMatch<INode>>): number {
+  return matches
+    .map(match => 'consumed' in match ? match.consumed : 1)
+    .reduce((acc, cur) => acc + cur)
 }

package/src/types.ts

@@ -36,12 +36,12 @@ export type MapSequenceToPatterns<
 , Node extends INode = INode
 > = {
   [Index in keyof Sequence]:
-    [Sequence[Index]] extends [infer Element]
+    [Sequence[Index]] extends [infer TokenOrNode]
   ? (
-      Element extends Token
+      TokenOrNode extends Token
       ? string
-    : Element extends Node
-      ? INodePattern<Token, Element>
+    : TokenOrNode extends Node
+      ? INodePattern<Token, TokenOrNode>
     : never
     )
   : never
@@ -53,12 +53,12 @@ export type MapSequenceToMatches<
 , Node extends INode = INode
 > = {
   [Index in keyof Sequence]:
-    [Sequence[Index]] extends [infer Element]
+    [Sequence[Index]] extends [infer TokenOrNode]
   ? (
-      Element extends IToken
+      TokenOrNode extends IToken
       ? Token
-    : Element extends INode
-      ? INodePatternMatch<Element>
+    : TokenOrNode extends INode
+      ? INodePatternMatch<TokenOrNode>
     : never
     )
   : never