extra-parser 0.1.0 → 0.2.1

package/README.md

@@ -8,53 +8,61 @@ yarn add extra-parser
 
 ## API
 ```ts
-interface IToken<T extends string> {
-  type: T
+interface IToken<Type extends string> {
+  type: Type
   value: string
 }
 
-interface INode<T extends string> {
-  type: T
+interface INode<Type extends string> {
+  type: Type
 }
 
-interface ITokenPattern<T extends IToken<any>> {
-  tokenType: T['type']
+interface ITokenPatternMatch<Token extends IToken<string>> {
+  consumed: number
+  token: Token
+}
 
-  match: (text: string) => {
-    consumed: number
-  }
+interface INodePatternMatch<Node extends INode<string>> {
+  consumed: number
+  node: Node
 }
 
-interface INodePattern<T extends INode<any>> {
-  nodeType: T['type']
+type TokenPattern<Token extends IToken<string>> =
+  (text: string) => ITokenPatternMatch<Token> | Falsy
 
-  parse: (tokens: Array<IToken<any>>) => {
-    consumed: number
-    result?: Omit<T, 'type'>
-  }
-}
+type NodePattern<
+  Token extends IToken<string>
+, Node extends INode<string>
+> = (tokens: Array<Token>) => INodePatternMatch<Node> | Falsy
 ```
 
 ### tokenize
 ```ts
-function tokenize<T extends string>(
-  patterns: Array<ITokenPattern<IToken<T>>>
-, text: string
-): IterableIterator<IToken<T>>
+function tokenize<
+  Token extends IToken<string>
+, TokenPattern extends ITokenPattern<Token>
+>(
+  text: string
+, patterns: Array<TokenPattern>
+): IterableIterator<Token>
 ```
 
 ### parse
 ```ts
-function parse<T extends string, U extends string>(
-  patterns: Array<INodePattern<INode<T>>>
-, tokens: Array<IToken<U>>
-): IterableIterator<INode<T>>
+function parse<
+  Token extends IToken<string>
+, Node extends INode<string>
+, NodePattern extends INodePattern<Token, Node>
+>(
+  tokens: Array<Token>
+, patterns: Array<NodePattern>
+): IterableIterator<Node>
 ```
 
 ### createTokenPatternFromRegExp
 ```ts
-function createTokenPatternFromRegExp<T extends string>(
-  tokenType: T
+function createTokenPatternFromRegExp<TokenType extends string>(
+  tokenType: TokenType
 , regExp: RegExp
-): ITokenPattern<IToken<T>>
+): TokenPattern<IToken<TokenType>>
 ```

package/lib/create-token-pattern-from-regexp.d.ts

@@ -1,2 +1,2 @@
-import { ITokenPattern, IToken } from './types';
-export declare function createTokenPatternFromRegExp<T extends string>(tokenType: T, regExp: RegExp): ITokenPattern<IToken<T>>;
+import { IToken, ITokenPattern } from './types';
+export declare function createTokenPatternFromRegExp<TokenType extends string>(tokenType: TokenType, regExp: RegExp): ITokenPattern<IToken<TokenType>>;

package/lib/create-token-pattern-from-regexp.js

@@ -4,20 +4,22 @@ exports.createTokenPatternFromRegExp = void 0;
 const types_1 = require("@blackglory/types");
 function createTokenPatternFromRegExp(tokenType, regExp) {
     const startsWithRegExp = convertToStartsWithRegExp(regExp);
-    const pattern = {
-        tokenType,
-        match(text) {
-            const result = startsWithRegExp.exec(text);
-            if ((0, types_1.isntNull)(result)) {
-                const [matchedText] = result;
-                return { consumed: matchedText.length };
-            }
-            else {
-                return { consumed: 0 };
-            }
+    return (text) => {
+        const result = startsWithRegExp.exec(text);
+        if ((0, types_1.isntNull)(result)) {
+            const [matchedText] = result;
+            return {
+                consumed: matchedText.length,
+                token: {
+                    type: tokenType,
+                    value: matchedText
+                }
+            };
+        }
+        else {
+            return false;
         }
     };
-    return pattern;
 }
 exports.createTokenPatternFromRegExp = createTokenPatternFromRegExp;
 function convertToStartsWithRegExp(re) {

package/lib/create-token-pattern-from-regexp.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-token-pattern-from-regexp.js","sourceRoot":"","sources":["../src/create-token-pattern-from-regexp.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG5C,SAAgB,4BAA4B,CAC1C,SAAY,EACZ,MAAc;IAEd,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAE1D,MAAM,OAAO,GAA6B;QACxC,SAAS;QACT,KAAK,CAAC,IAAI;YACR,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC1C,IAAI,IAAA,gBAAQ,EAAC,MAAM,CAAC,EAAE;gBACpB,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAA;gBAC5B,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAA;aACxC;iBAAM;gBACL,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAA;aACvB;QACH,CAAC;KACF,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AApBD,oEAoBC;AAED,SAAS,yBAAyB,CAAC,EAAU;IAC3C,OAAO,IAAI,MAAM,CACf,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EACvD,EAAE,CAAC,KAAK,CACT,CAAA;AACH,CAAC"}
+{"version":3,"file":"create-token-pattern-from-regexp.js","sourceRoot":"","sources":["../src/create-token-pattern-from-regexp.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAG5C,SAAgB,4BAA4B,CAC1C,SAAoB,EACpB,MAAc;IAEd,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAE1D,OAAO,CAAC,IAAY,EAAiD,EAAE;QACrE,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC1C,IAAI,IAAA,gBAAQ,EAAC,MAAM,CAAC,EAAE;YACpB,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAA;YAC5B,OAAO;gBACL,QAAQ,EAAE,WAAW,CAAC,MAAM;gBAC5B,KAAK,EAAE;oBACL,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,WAAW;iBACnB;aACF,CAAA;SACF;aAAM;YACL,OAAO,KAAK,CAAA;SACb;IACH,CAAC,CAAA;AACH,CAAC;AArBD,oEAqBC;AAED,SAAS,yBAAyB,CAAC,EAAU;IAC3C,OAAO,IAAI,MAAM,CACf,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EACvD,EAAE,CAAC,KAAK,CACT,CAAA;AACH,CAAC"}

package/lib/parse.d.ts

@@ -1,2 +1,2 @@
 import { IToken, INodePattern, INode } from './types';
-export declare function parse<T extends string, U extends string>(patterns: Array<INodePattern<INode<T>>>, tokens: Array<IToken<U>>): IterableIterator<INode<T>>;
+export declare function parse<Token extends IToken<string>, Node extends INode<string>, NodePattern extends INodePattern<Token, Node>>(tokens: Array<Token>, patterns: Array<NodePattern>): IterableIterator<Node>;

package/lib/parse.js

@@ -1,18 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = void 0;
-function* parse(patterns, tokens) {
+const prelude_1 = require("@blackglory/prelude");
+function* parse(tokens, patterns) {
     let i = 0;
     loop: while (i < tokens.length) {
         const remainingTokens = tokens.slice(i);
-        for (const { nodeType, parse } of patterns) {
-            const result = parse(remainingTokens);
-            if (result.consumed > 0) {
-                const node = {
-                    type: nodeType,
-                    ...result.result
-                };
-                yield node;
+        for (const pattern of patterns) {
+            const result = pattern(remainingTokens);
+            if ((0, prelude_1.isntFalsy)(result)) {
+                yield result.node;
                 i += result.consumed;
                 continue loop;
             }

package/lib/parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":";;;AAEA,QAAe,CAAC,CAAC,KAAK,CACpB,QAAuC,EACvC,MAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,IAAI,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;QAC9B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEvC,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,QAAQ,EAAE;YAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;YACrC,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE;gBACvB,MAAM,IAAI,GAAa;oBACrB,IAAI,EAAE,QAAQ;oBACd,GAAG,MAAM,CAAC,MAAM;iBACjB,CAAA;gBACD,MAAM,IAAI,CAAA;gBAEV,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAA;gBACpB,SAAS,IAAI,CAAA;aACd;SACF;QAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KAC7D;AACH,CAAC;AAxBD,sBAwBC"}
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAG/C,QAAe,CAAC,CAAC,KAAK,CAKpB,MAAoB,EACpB,QAA4B;IAE5B,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,IAAI,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;QAC9B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;YACvC,IAAI,IAAA,mBAAS,EAAC,MAAM,CAAC,EAAE;gBACrB,MAAM,MAAM,CAAC,IAAI,CAAA;gBACjB,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAA;gBACpB,SAAS,IAAI,CAAA;aACd;SACF;QAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KAC7D;AACH,CAAC;AAvBD,sBAuBC"}

package/lib/tokenize.d.ts

@@ -1,2 +1,2 @@
 import { ITokenPattern, IToken } from './types';
-export declare function tokenize<T extends string>(patterns: Array<ITokenPattern<IToken<T>>>, text: string): IterableIterator<IToken<T>>;
+export declare function tokenize<Token extends IToken<string>, TokenPattern extends ITokenPattern<Token>>(text: string, patterns: Array<TokenPattern>): IterableIterator<Token>;

package/lib/tokenize.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokenize = void 0;
-function* tokenize(patterns, text) {
+const prelude_1 = require("@blackglory/prelude");
+function* tokenize(text, patterns) {
     let i = 0;
     loop: while (i < text.length) {
         const remainingText = text.slice(i);
-        for (const { tokenType, match } of patterns) {
-            const result = match(remainingText);
-            if (result.consumed > 0) {
-                const token = {
-                    type: tokenType,
-                    value: remainingText.slice(0, result.consumed)
-                };
-                yield token;
+        for (const pattern of patterns) {
+            const result = pattern(remainingText);
+            if ((0, prelude_1.isntFalsy)(result)) {
+                yield result.token;
                 i += result.consumed;
                 continue loop;
             }
         }
-        throw new Error(`Unknown text: ${remainingText}`);
+        throw new Error(`Unknown text: ${JSON.stringify(remainingText)}`);
     }
 }
 exports.tokenize = tokenize;

package/lib/tokenize.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenize.js","sourceRoot":"","sources":["../src/tokenize.ts"],"names":[],"mappings":";;;AAEA,QAAe,CAAC,CAAC,QAAQ,CACvB,QAAyC,EACzC,IAAY;IAEZ,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEnC,KAAK,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,QAAQ,EAAE;YAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAA;YACnC,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE;gBACvB,MAAM,KAAK,GAAc;oBACvB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;iBAC/C,CAAA;gBACD,MAAM,KAAK,CAAA;gBAEX,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAA;gBACpB,SAAS,IAAI,CAAA;aACd;SACF;QAED,MAAM,IAAI,KAAK,CAAC,iBAAiB,aAAa,EAAE,CAAC,CAAA;KAClD;AACH,CAAC;AAxBD,4BAwBC"}
+{"version":3,"file":"tokenize.js","sourceRoot":"","sources":["../src/tokenize.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAG/C,QAAe,CAAC,CAAC,QAAQ,CAIvB,IAAY,EACZ,QAA6B;IAE7B,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEnC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;YACrC,IAAI,IAAA,mBAAS,EAAC,MAAM,CAAC,EAAE;gBACrB,MAAM,MAAM,CAAC,KAAK,CAAA;gBAClB,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAA;gBACpB,SAAS,IAAI,CAAA;aACd;SACF;QAED,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;KAClE;AACH,CAAC;AAtBD,4BAsBC"}

package/lib/types.d.ts

@@ -1,20 +1,22 @@
-export interface IToken<T extends string> {
-    type: T;
+import { Falsy } from '@blackglory/prelude';
+export interface IToken<Type extends string> {
+    type: Type;
     value: string;
 }
-export interface INode<T extends string> {
-    type: T;
+export interface INode<Type extends string> {
+    type: Type;
 }
-export interface ITokenPattern<T extends IToken<any>> {
-    tokenType: T['type'];
-    match: (text: string) => {
-        consumed: number;
-    };
+export interface ITokenPatternMatch<Token extends IToken<string>> {
+    consumed: number;
+    token: Token;
 }
-export interface INodePattern<T extends INode<any>> {
-    nodeType: T['type'];
-    parse: (tokens: Array<IToken<any>>) => {
-        consumed: number;
-        result?: Omit<T, 'type'>;
-    };
+export interface INodePatternMatch<Node extends INode<string>> {
+    consumed: number;
+    node: Node;
+}
+export interface ITokenPattern<Token extends IToken<string>> {
+    (text: string): ITokenPatternMatch<Token> | Falsy;
+}
+export interface INodePattern<Token extends IToken<string>, Node extends INode<string>> {
+    (tokens: Array<Token>): INodePatternMatch<Node> | Falsy;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-parser",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "",
   "keywords": [],
   "files": [