Externalize ADTs

package.json

@@ -19,6 +19,8 @@
     "typescript": "^5.6.2"
   },
   "dependencies": {
+    "@matt.kantor/either": "^1.0.0",
+    "@matt.kantor/option": "^1.0.0",
     "kleur": "^4.1.5"
   }
 }

src/end-to-end.test.ts

@@ -1,5 +1,5 @@
+import either, { type Either } from '@matt.kantor/either'
 import assert from 'node:assert'
-import { either, type Either } from './adts.js'
 import { compile } from './language/compiling.js'
 import type { Atom, Molecule } from './language/parsing.js'
 import { parse } from './language/parsing/parser.js'

src/language/cli/input.ts

@@ -1,5 +1,5 @@
+import either, { type Either } from '@matt.kantor/either'
 import { parseArgs } from 'util'
-import { either, type Either } from '../../adts.js'
 import { type JsonValueForbiddingSymbolicKeys } from '../parsing.js'
 
 export type InvalidJsonError = {

src/language/cli/output.ts

@@ -1,5 +1,5 @@
+import either, { type Either } from '@matt.kantor/either'
 import { parseArgs } from 'util'
-import { either, type Either } from '../../adts.js'
 import { type SyntaxTree } from '../parsing/syntax-tree.js'
 import { unparse, type Notation } from '../unparsing.js'
 import { prettyJson } from '../unparsing/pretty-json.js'

src/language/cli/please.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import { compile } from '../compiling.js'
 import type { Atom, Molecule } from '../parsing.js'
 import { parse } from '../parsing/parser.js'

src/language/compiling/compiler.test.ts

@@ -1,5 +1,5 @@
+import either, { type Either } from '@matt.kantor/either'
 import assert from 'node:assert'
-import { either, type Either } from '../../adts.js'
 import { withPhantomData } from '../../phantom-data.js'
 import { testCases } from '../../test-utilities.test.js'
 import type { ElaborationError } from '../errors.js'

src/language/compiling/compiler.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { CompilationError } from '../errors.js'
 import type { JsonValueForbiddingSymbolicKeys } from '../parsing.js'
 import { canonicalize } from '../parsing.js'

src/language/compiling/semantics.test.ts

@@ -1,5 +1,6 @@
+import either, { type Either } from '@matt.kantor/either'
+import option from '@matt.kantor/option'
 import assert from 'node:assert'
-import { either, option, type Either } from '../../adts.js'
 import { withPhantomData } from '../../phantom-data.js'
 import { testCases } from '../../test-utilities.test.js'
 import type { Writable } from '../../utility-types.js'

src/language/compiling/semantics/keyword-handlers/apply-handler.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,

src/language/compiling/semantics/keyword-handlers/check-handler.ts

@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
+import option from '@matt.kantor/option'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,

src/language/compiling/semantics/keyword-handlers/function-handler.ts

@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
+import option from '@matt.kantor/option'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,

src/language/compiling/semantics/keyword-handlers/lookup-handler.ts

@@ -1,4 +1,5 @@
-import { either, option, type Either, type Option } from '../../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
+import option, { type Option } from '@matt.kantor/option'
 import type {
   ElaborationError,
   InvalidExpressionError,

src/language/compiling/semantics/keyword-handlers/runtime-handler.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,

src/language/compiling/semantics/keyword-handlers/todo-handler.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../../errors.js'
 import {
   makeObjectNode,

src/language/parsing/parser.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ParseError } from '../errors.js'
 import { type SyntaxTree, syntaxTreeParser } from './syntax-tree.js'
 

src/language/parsing/syntax-tree.ts

@@ -1,4 +1,4 @@
-import { option, type Option } from '../../adts.js'
+import option, { type Option } from '@matt.kantor/option'
 import { parser, type Parser } from '../../parsing.js'
 import { withPhantomData, type WithPhantomData } from '../../phantom-data.js'
 import type {

src/language/runtime/evaluator.test.ts

@@ -1,5 +1,5 @@
+import either, { type Either } from '@matt.kantor/either'
 import assert from 'node:assert'
-import { either, type Either } from '../../adts.js'
 import { withPhantomData } from '../../phantom-data.js'
 import { testCases } from '../../test-utilities.test.js'
 import type { ElaborationError } from '../errors.js'

src/language/runtime/evaluator.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { RuntimeError } from '../errors.js'
 import type { JsonValueForbiddingSymbolicKeys } from '../parsing.js'
 import { canonicalize } from '../parsing.js'

src/language/runtime/keywords.ts

@@ -1,5 +1,6 @@
+import either from '@matt.kantor/either'
+import option, { type Option } from '@matt.kantor/option'
 import { parseArgs } from 'util'
-import { either, option, type Option } from '../../adts.js'
 import { writeOutput } from '../cli/output.js'
 import { keywordHandlers as compilerKeywordHandlers } from '../compiling.js'
 import type { Atom } from '../parsing.js'

src/language/semantics/expression-elaboration.ts

@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
+import option from '@matt.kantor/option'
 import { withPhantomData, type WithPhantomData } from '../../phantom-data.js'
 import type { Writable } from '../../utility-types.js'
 import type { ElaborationError, InvalidSyntaxTreeError } from '../errors.js'
@@ -158,23 +159,20 @@ const handleObjectNodeWhichMayBeAExpression = (
   context: ExpressionContext,
 ): Either<ElaborationError, SemanticGraph> => {
   const { 0: possibleKeyword, ...possibleArguments } = node
-  return option.match(option.fromPredicate(possibleKeyword, isKeyword), {
-    none: () =>
-      /^@[^@]/.test(possibleKeyword)
-        ? either.makeLeft({
-            kind: 'unknownKeyword',
-            message: `unknown keyword: \`${possibleKeyword}\``,
-          })
-        : either.makeRight({
-            ...node,
-            0: unescapeKeywordSigil(possibleKeyword),
-          }),
-    some: keyword =>
-      context.keywordHandlers[keyword](
-        makeObjectNode({ ...possibleArguments, 0: keyword }),
+  return isKeyword(possibleKeyword)
+    ? context.keywordHandlers[possibleKeyword](
+        makeObjectNode({ ...possibleArguments, 0: possibleKeyword }),
         context,
-      ),
-  })
+      )
+    : /^@[^@]/.test(possibleKeyword)
+    ? either.makeLeft({
+        kind: 'unknownKeyword',
+        message: `unknown keyword: \`${possibleKeyword}\``,
+      })
+    : either.makeRight({
+        ...node,
+        0: unescapeKeywordSigil(possibleKeyword),
+      })
 }
 
 const handleAtomWhichMayNotBeAKeyword = (

src/language/semantics/expressions/apply-expression.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../errors.js'
 import type { Molecule } from '../../parsing.js'
 import { isExpression } from '../expression.js'

src/language/semantics/expressions/check-expression.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../errors.js'
 import type { Molecule } from '../../parsing.js'
 import { isExpression } from '../expression.js'

src/language/semantics/expressions/expression-utilities.ts

@@ -1,4 +1,5 @@
-import { either, option, type Either, type Option } from '../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
+import option, { type Option } from '@matt.kantor/option'
 import type { ElaborationError } from '../../errors.js'
 import type { Atom, Molecule } from '../../parsing.js'
 import type { ExpressionContext } from '../expression-elaboration.js'

src/language/semantics/expressions/function-expression.ts

@@ -1,4 +1,4 @@
-import { either, type Either } from '../../../adts.js'
+import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../errors.js'
 import type { Atom, Molecule } from '../../parsing.js'
 import { isExpression } from '../expression.js'