wip

jest.config.json

@@ -1,7 +1,7 @@
 {
   "testEnvironment": "node",
   "testMatch": [
-    "<rootDir>/src/(*.)test.ts"
+    "<rootDir>/src/**/*.test.ts"
   ],
   "transform": {
     "^.+\\.(t|j)sx?$": ["@swc/jest"]

src/all.ts

@@ -20,7 +20,7 @@ export function all<T>(parser: Parser.t<T>) {
       values.push(result.value)
       reader_ = result.reader
     }
-    return Result.ok(Reader.of(reader.input, reader.input.length), values)
+    return Result.ok(reader, Reader.length(reader), values)
   }
 }
 

src/any.ts

@@ -7,9 +7,9 @@ export const any: Parser.t<string> =
   (reader: Reader.t) => {
     const char = Reader.peek(reader)
     if (char === undefined) {
-      return Result.fail(reader, 'end of input')
+      return Result.fail(reader, Reader.length(reader), 'end of input')
     }
-    return Result.ok(reader, char, 1)
+    return Result.ok(reader, char.length, char)
   }
 
 export default any

src/between-literals.test.ts

@@ -3,14 +3,14 @@ import * as P from './index.js'
 test('betweenLiterals', () => {
   const p = P.betweenLiterals('<!--', '-->')
   expect(p(P.Reader.of('<!--abc-->'))).toEqual(
-    P.Result.ok(P.Reader.of('<!--abc-->', 10), 'abc')
+    P.Result.ok(P.Reader.of('<!--abc-->', 10), 3, 'abc')
   )
 })
 
 test('str', () => {
   const p = P.betweenLiterals('"', '"')
   expect(p(P.Reader.of('"abc"'))).toEqual(
-    P.Result.ok(P.Reader.of('"abc"', 5), 'abc')
+    P.Result.ok(P.Reader.of('"abc"', 5), 3, 'abc')
   )
 })
 

src/between-literals.ts

@@ -5,13 +5,13 @@ import * as Result from './result.js'
 export function betweenLiterals(start: string, end: string) {
   return function (reader: Reader.t) {
     if (!Reader.startsWith(reader, start)) {
-      return Result.fail(reader, `expected start literal ${start}`)
+      return Result.fail(reader, 0, `expected start literal ${start}`)
     }
     const offset = Reader.offsetOf(reader, end, start.length)
     if (offset === -1) {
-      return Result.fail(reader, `expected end literal ${end}`)
+      return Result.fail(reader, 0, `expected end literal ${end}`)
     }
-    return Result.ok(reader, Reader.slice(reader, start.length, offset), offset + end.length)
+    return Result.ok(reader, offset + end.length, Reader.slice(reader, start.length, offset))
   }
 }
 

src/char-range.ts

@@ -15,10 +15,10 @@ export function charRange(ranges: string): Parser.t<string> {
     }
     for (let i = 0; i < ranges.length; i += 2) {
       if (ranges[i] <= c && c <= ranges[i + 1]) {
-        return Result.ok(reader, c, 1)
+        return Result.ok(reader, 1, c)
       }
     }
-    return Result.fail(reader, `Not in char range ${ranges}.`)
+    return Result.fail(reader, 0, `Not in char range ${ranges}.`)
   }
 }
 

src/end.ts

@@ -2,10 +2,10 @@ import * as Reader from './reader.js'
 import * as Result from './result.js'
 
 /** @returns parser that matches end of input. */
-export function end(reader: Reader.t): Result.t<null> {
+export function end(reader: Reader.t): Result.t<''> {
   return Reader.end(reader) ?
-    Result.ok(reader, null) :
-    Result.fail(reader, 'expected end of input')
+    Result.ok(reader, 0, '') :
+    Result.fail(reader, 0, 'expected end of input')
 }
 
 export default end

src/example.ts

@@ -0,0 +1,12 @@
+
+import * as P from './index.js'
+
+const pp =
+  (...args: unknown[]) =>
+    console.log(...args.map(_ => JSON.stringify(_, null, 2)))
+
+// const p = P.lift('END')
+const p = P.until('END')
+pp(p(P.Reader.of('END')))
+
+console.log('---')

src/index.ts

@@ -20,6 +20,7 @@ export * from './from-until.js'
 export * from './join.js'
 export * from './lazy.js'
 export * from './left.js'
+export * from './lift.js'
 export * from './lit.js'
 export * from './longest-reentrant.js'
 export * from './longest.js'
@@ -35,6 +36,7 @@ export * from './parser.js'
 export * from './predicate.js'
 export * from './refute.js'
 export * from './regexp.js'
+export * from './replacer.js'
 export * from './rescue.js'
 export * from './right.js'
 export * from './sep0.js'
@@ -48,4 +50,3 @@ export * from './until.js'
 export * from './while-chars.js'
 export * from './ws0.js'
 export * from './ws1.js'
-export * from './lift.js'