Some types fixes

barsdeveloper · Jan 24, 2024 · 4c59cb0 · 4c59cb0
1 parent 674093c
commit 4c59cb0
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 101 deletions.
diff --git a/dist/parsernostrum.js b/dist/parsernostrum.js
@@ -31,7 +31,7 @@ class Reply {
         }
     }
 
-    /** @param {Parsernostrum<Parser<any>>} parsernostrum */
+    /** @param {Parsernostrum<Parser>} parsernostrum */
     static makeContext(parsernostrum = null, input = "") {
         return /** @type {Context} */({
             parsernostrum,
@@ -49,7 +49,6 @@ class Reply {
     }
 }
 
-/** @template T */
 class Parser {
 
     static indentation = "    "
@@ -149,7 +148,7 @@ class Parser {
      * @param {Context} context
      * @param {Number} position
      * @param {PathNode} path
-     * @returns {Result<T>}
+     * @returns {Result<ParserValue<any>>}
      */
     parse(context, position, path) {
         return null
@@ -175,10 +174,7 @@ class Parser {
     }
 }
 
-/**
- * @template {String} T
- * @extends {Parser<T>}
- */
+/** @template {String} T */
 class StringParser extends Parser {
 
     #value
@@ -224,7 +220,6 @@ class StringParser extends Parser {
     }
 }
 
-/** @extends Parser<String> */
 class SuccessParser extends Parser {
 
     static instance = new SuccessParser()
@@ -253,10 +248,7 @@ class SuccessParser extends Parser {
     }
 }
 
-/**
- * @template {Parser<any>[]} T
- * @extends Parser<ParserValue<T>>
- */
+/** @template {Parser[]} T */
 class AlternativeParser extends Parser {
 
     static highlightRegexp = new RegExp(
@@ -340,9 +332,8 @@ class AlternativeParser extends Parser {
 }
 
 /**
- * @template {Parser<any>} T
- * @template {(v: ParserValue<T>, input: String, position: Number) => Parsernostrum<Parser<any>>} C
- * @extends Parser<ReturnType<C>>
+ * @template {Parser} T
+ * @template {(v: ParserValue<T>, input: String, position: Number) => Parsernostrum<Parser>} C
  */
 class ChainedParser extends Parser {
 
@@ -367,12 +358,15 @@ class ChainedParser extends Parser {
      * @param {Context} context
      * @param {Number} position
      * @param {PathNode} path
+     * @returns {Result<ParserValue<UnwrapParser<ReturnType<C>>>>}
      */
     parse(context, position, path) {
         const outcome = this.#parser.parse(context, position, { parent: path, parser: this.#parser, index: 0 });
         if (!outcome.status) {
+            // @ts-expect-error
             return outcome
         }
+        // @ts-expect-error
         const result = this.#fn(outcome.value, context.input, outcome.position)
             .getParser()
             .parse(context, outcome.position);
@@ -410,7 +404,6 @@ class ChainedParser extends Parser {
     }
 }
 
-/** @extends Parser<any> */
 class FailureParser extends Parser {
 
     static instance = new FailureParser()
@@ -440,10 +433,7 @@ class FailureParser extends Parser {
     }
 }
 
-/**
- * @template {Parser<any>} T
- * @extends Parser<ParserValue<T>>
- */
+/** @template {Parser} T */
 class LazyParser extends Parser {
 
     #parser
@@ -489,7 +479,7 @@ class LazyParser extends Parser {
     }
 }
 
-/** @template {Parser<any>} T */
+/** @template {Parser} T */
 class Lookahead extends Parser {
 
     #parser
@@ -562,10 +552,7 @@ class Lookahead extends Parser {
     }
 }
 
-/**
- * @template T
- * @extends {Parser<T>}
- */
+/** @template T */
 class RegExpParser extends Parser {
 
     /** @type {RegExp} */
@@ -646,9 +633,8 @@ class RegExpParser extends Parser {
 }
 
 /**
- * @template {Parser<any>} T
+ * @template {Parser} T
  * @template P
- * @extends Parser<P>
  */
 class MapParser extends Parser {
 
@@ -744,10 +730,7 @@ class RegExpValueParser extends RegExpParser {
     }
 }
 
-/**
- * @template {Parser<any>[]} T
- * @extends Parser<ParserValue<T>>
- */
+/** @template {Parser[]} T */
 class SequenceParser extends Parser {
 
     #parsers
@@ -809,10 +792,7 @@ class SequenceParser extends Parser {
     }
 }
 
-/**
- * @template {Parser<any>} T
- * @extends {Parser<ParserValue<T>[]>}
- */
+/** @template {Parser} T */
 class TimesParser extends Parser {
 
     #parser
@@ -903,12 +883,12 @@ class TimesParser extends Parser {
     }
 }
 
-/** @template {Parser<any>} T */
+/** @template {Parser} T */
 class Parsernostrum {
 
     #parser
 
-    /** @type {(new (parser: Parser<any>) => Parsernostrum<typeof parser>) & typeof Parsernostrum} */
+    /** @type {(new (parser: Parser) => Parsernostrum<typeof parser>) & typeof Parsernostrum} */
     Self
 
     static lineColumnFromOffset(string, offset) {
@@ -1149,7 +1129,7 @@ class Parsernostrum {
     }
 
     /**
-     * @template {Parsernostrum<Parser<any>>} P
+     * @template {Parsernostrum<Parser>} P
      * @param {P} separator
      */
     sepBy(separator, allowTrailing = false) {
@@ -1176,7 +1156,7 @@ class Parsernostrum {
     }
 
     /**
-     * @template {Parsernostrum<any>} P
+     * @template {Parsernostrum<Parser>} P
      * @param {(v: ParserValue<T>, input: String, position: Number) => P} fn
      */
     chain(fn) {
@@ -1199,7 +1179,7 @@ class Parsernostrum {
         return this.map(Parsernostrum.#joiner)
     }
 
-    /** @param {Parsernostrum<Parser<any>> | Parser<any> | PathNode} highlight */
+    /** @param {Parsernostrum<Parser> | Parser | PathNode} highlight */
     toString(indent = 0, newline = false, highlight = null) {
         if (highlight instanceof Parsernostrum) {
             highlight = highlight.getParser();

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "parsernostrum",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A tiny LL parser combinator library for javascript",
   "main": "src/Parsernostrum.js",
   "types": "src/types.js",

diff --git a/src/Parsernostrum.js b/src/Parsernostrum.js
@@ -14,12 +14,12 @@ import StringParser from "./parser/StringParser.js"
 import SuccessParser from "./parser/SuccessParser.js"
 import TimesParser from "./parser/TimesParser.js"
 
-/** @template {Parser<any>} T */
+/** @template {Parser} T */
 export default class Parsernostrum {
 
     #parser
 
-    /** @type {(new (parser: Parser<any>) => Parsernostrum<typeof parser>) & typeof Parsernostrum} */
+    /** @type {(new (parser: Parser) => Parsernostrum<typeof parser>) & typeof Parsernostrum} */
     Self
 
     static lineColumnFromOffset(string, offset) {
@@ -260,7 +260,7 @@ export default class Parsernostrum {
     }
 
     /**
-     * @template {Parsernostrum<Parser<any>>} P
+     * @template {Parsernostrum<Parser>} P
      * @param {P} separator
      */
     sepBy(separator, allowTrailing = false) {
@@ -287,7 +287,7 @@ export default class Parsernostrum {
     }
 
     /**
-     * @template {Parsernostrum<any>} P
+     * @template {Parsernostrum<Parser>} P
      * @param {(v: ParserValue<T>, input: String, position: Number) => P} fn
      */
     chain(fn) {
@@ -310,7 +310,7 @@ export default class Parsernostrum {
         return this.map(Parsernostrum.#joiner)
     }
 
-    /** @param {Parsernostrum<Parser<any>> | Parser<any> | PathNode} highlight */
+    /** @param {Parsernostrum<Parser> | Parser | PathNode} highlight */
     toString(indent = 0, newline = false, highlight = null) {
         if (highlight instanceof Parsernostrum) {
             highlight = highlight.getParser()

diff --git a/src/Reply.js b/src/Reply.js
@@ -31,7 +31,7 @@ export default class Reply {
         }
     }
 
-    /** @param {Parsernostrum<Parser<any>>} parsernostrum */
+    /** @param {Parsernostrum<Parser>} parsernostrum */
     static makeContext(parsernostrum = null, input = "") {
         return /** @type {Context} */({
             parsernostrum,

diff --git a/src/grammars/JsonGrammar.js b/src/grammars/JsonGrammar.js
@@ -10,13 +10,13 @@ export default class JsonGrammar {
     static #false = P.str("false").map(() => false)
     static #string = P.doubleQuotedString
     static #number = P.numberExponential
-    /** @type {Parsernostrum<Parser<any[]>>} */
+    /** @type {Parsernostrum<Parser>} */
     static #array = P.seq(
         P.reg(/\[\s*/),
         P.lazy(() => this.json).sepBy(P.reg(/\s*,\s*/)),
         P.reg(/\s*\]/)
     ).map(([_0, values, _2]) => values)
-    /** @type {Parsernostrum<Parser<Object>>} */
+    /** @type {Parsernostrum<Parser>} */
     static #object = P.seq(
         P.reg(/\{\s*/),
         P.seq(

diff --git a/src/parser/AlternativeParser.js b/src/parser/AlternativeParser.js
@@ -3,10 +3,7 @@ import Reply from "../Reply.js"
 import StringParser from "./StringParser.js"
 import SuccessParser from "./SuccessParser.js"
 
-/**
- * @template {Parser<any>[]} T
- * @extends Parser<ParserValue<T>>
- */
+/** @template {Parser[]} T */
 export default class AlternativeParser extends Parser {
 
     static highlightRegexp = new RegExp(

diff --git a/src/parser/ChainedParser.js b/src/parser/ChainedParser.js
@@ -1,10 +1,8 @@
 import Parser from "./Parser.js"
-import Reply from "../Reply.js"
 
 /**
- * @template {Parser<any>} T
- * @template {(v: ParserValue<T>, input: String, position: Number) => Parsernostrum<Parser<any>>} C
- * @extends Parser<ReturnType<C>>
+ * @template {Parser} T
+ * @template {(v: ParserValue<T>, input: String, position: Number) => Parsernostrum<Parser>} C
  */
 export default class ChainedParser extends Parser {
 
@@ -29,12 +27,15 @@ export default class ChainedParser extends Parser {
      * @param {Context} context
      * @param {Number} position
      * @param {PathNode} path
+     * @returns {Result<ParserValue<UnwrapParser<ReturnType<C>>>>}
      */
     parse(context, position, path) {
         const outcome = this.#parser.parse(context, position, { parent: path, parser: this.#parser, index: 0 })
         if (!outcome.status) {
+            // @ts-expect-error
             return outcome
         }
+        // @ts-expect-error
         const result = this.#fn(outcome.value, context.input, outcome.position)
             .getParser()
             .parse(context, outcome.position)

diff --git a/src/parser/FailureParser.js b/src/parser/FailureParser.js
@@ -1,7 +1,6 @@
 import Parser from "./Parser.js"
 import Reply from "../Reply.js"
 
-/** @extends Parser<any> */
 export default class FailureParser extends Parser {
 
     static instance = new FailureParser()

diff --git a/src/parser/LazyParser.js b/src/parser/LazyParser.js
@@ -1,9 +1,6 @@
 import Parser from "./Parser.js"
 
-/**
- * @template {Parser<any>} T
- * @extends Parser<ParserValue<T>>
- */
+/** @template {Parser} T */
 export default class LazyParser extends Parser {
 
     #parser

diff --git a/src/parser/Lookahead.js b/src/parser/Lookahead.js
@@ -1,7 +1,7 @@
 import Parser from "./Parser.js"
 import Reply from "../Reply.js"
 
-/** @template {Parser<any>} T */
+/** @template {Parser} T */
 export default class Lookahead extends Parser {
 
     #parser

diff --git a/src/parser/MapParser.js b/src/parser/MapParser.js
@@ -2,9 +2,8 @@ import Parser from "./Parser.js"
 import RegExpParser from "./RegExpParser.js"
 
 /**
- * @template {Parser<any>} T
+ * @template {Parser} T
  * @template P
- * @extends Parser<P>
  */
 export default class MapParser extends Parser {
 

diff --git a/src/parser/Parser.js b/src/parser/Parser.js
@@ -1,6 +1,5 @@
 import Reply from "../Reply.js"
 
-/** @template T */
 export default class Parser {
 
     static indentation = "    "
@@ -100,7 +99,7 @@ export default class Parser {
      * @param {Context} context
      * @param {Number} position
      * @param {PathNode} path
-     * @returns {Result<T>}
+     * @returns {Result<ParserValue<any>>}
      */
     parse(context, position, path) {
         return null

diff --git a/src/parser/RegExpParser.js b/src/parser/RegExpParser.js
@@ -1,10 +1,7 @@
 import Parser from "./Parser.js"
 import Reply from "../Reply.js"
 
-/**
- * @template T
- * @extends {Parser<T>}
- */
+/** @template T */
 export default class RegExpParser extends Parser {
 
     /** @type {RegExp} */

diff --git a/src/parser/SequenceParser.js b/src/parser/SequenceParser.js
@@ -1,10 +1,7 @@
 import Parser from "./Parser.js"
 import Reply from "../Reply.js"
 
-/**
- * @template {Parser<any>[]} T
- * @extends Parser<ParserValue<T>>
- */
+/** @template {Parser[]} T */
 export default class SequenceParser extends Parser {
 
     #parsers