Merge pull request #30 from mkantor/update-parsing-package

Update parsing package

Author: mkantor

package-lock.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@matt.kantor/either": "^1.0.0",
     "@matt.kantor/option": "^1.0.0",
-    "@matt.kantor/parsing": "^1.0.0",
+    "@matt.kantor/parsing": "^1.1.0",
     "kleur": "^4.1.5"
   }
 }

package.json

@@ -1,16 +1,10 @@
 import either, { type Either } from '@matt.kantor/either'
+import parsing from '@matt.kantor/parsing'
 import type { ParseError } from '../errors.js'
 import { type SyntaxTree, syntaxTreeParser } from './syntax-tree.js'
 
 export const parse = (input: string): Either<ParseError, SyntaxTree> =>
-  either.match(syntaxTreeParser(input.trim()), {
-    left: error => either.makeLeft({ ...error, kind: 'badSyntax' }),
-    right: ({ remainingInput, output }) =>
-      remainingInput.length !== 0
-        ? either.makeLeft({
-            kind: 'badSyntax',
-            message: 'excess content followed valid input',
-            remainingInput,
-          })
-        : either.makeRight(output),
-  })
+  either.mapLeft(parsing.parse(syntaxTreeParser, input.trim()), error => ({
+    ...error,
+    kind: 'badSyntax',
+  }))

src/language/parsing/parser.ts

@@ -1,4 +1,5 @@
 import either, { type Either, type Right } from '@matt.kantor/either'
+import parsing from '@matt.kantor/parsing'
 import kleur from 'kleur'
 import type { UnserializableValueError } from '../errors.js'
 import type { Atom, Molecule } from '../parsing.js'
@@ -63,11 +64,8 @@ export const moleculeUnparser =
   }
 
 export const quoteIfNecessary = (value: string): string => {
-  const unquotedAtomResult = unquotedAtomParser(value)
-  if (
-    either.isLeft(unquotedAtomResult) ||
-    unquotedAtomResult.value.remainingInput.length !== 0
-  ) {
+  const unquotedAtomResult = parsing.parse(unquotedAtomParser, value)
+  if (either.isLeft(unquotedAtomResult)) {
     return quote.concat(escapeStringContents(value)).concat(quote)
   } else {
     return value