Adopt @matt.kantor/option package

mkantor · mkantor · commit 64ee2b9f0a4b · 2025-01-21T11:10:46.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "typescript": "^5.6.2"
   },
   "dependencies": {
+    "@matt.kantor/option": "^1.0.0",
     "kleur": "^4.1.5"
   }
 }
diff --git a/src/adts.ts b/src/adts.ts
@@ -1,9 +1,5 @@
 import * as eitherUtilities from './adts/either-utilities.js'
 import * as eitherAdt from './adts/either.js'
-import * as optionUtilities from './adts/option-utilities.js'
-import * as optionAdt from './adts/option.js'
 
 export type { Either } from './adts/either.js'
-export type { Option } from './adts/option.js'
 export const either = { ...eitherAdt, ...eitherUtilities }
-export const option = { ...optionAdt, ...optionUtilities }
diff --git a/src/adts/option-utilities.ts b/src/adts/option-utilities.ts
diff --git a/src/adts/option.ts b/src/adts/option.ts
diff --git a/src/language/compiling/semantics.test.ts b/src/language/compiling/semantics.test.ts
@@ -1,5 +1,6 @@
+import option from '@matt.kantor/option'
 import assert from 'node:assert'
-import { either, option, type Either } from '../../adts.js'
+import { either, 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'
diff --git a/src/language/compiling/semantics/keyword-handlers/check-handler.ts b/src/language/compiling/semantics/keyword-handlers/check-handler.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../../../adts.js'
+import option from '@matt.kantor/option'
+import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,
diff --git a/src/language/compiling/semantics/keyword-handlers/function-handler.ts b/src/language/compiling/semantics/keyword-handlers/function-handler.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../../../adts.js'
+import option from '@matt.kantor/option'
+import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,
diff --git a/src/language/compiling/semantics/keyword-handlers/lookup-handler.ts b/src/language/compiling/semantics/keyword-handlers/lookup-handler.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either, type Option } from '../../../../adts.js'
+import option, { type Option } from '@matt.kantor/option'
+import { either, type Either } from '../../../../adts.js'
 import type {
   ElaborationError,
   InvalidExpressionError,
diff --git a/src/language/parsing/syntax-tree.ts b/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 {
diff --git a/src/language/runtime/keywords.ts b/src/language/runtime/keywords.ts
@@ -1,5 +1,6 @@
+import option, { type Option } from '@matt.kantor/option'
 import { parseArgs } from 'util'
-import { either, option, type Option } from '../../adts.js'
+import { either } from '../../adts.js'
 import { writeOutput } from '../cli/output.js'
 import { keywordHandlers as compilerKeywordHandlers } from '../compiling.js'
 import type { Atom } from '../parsing.js'
diff --git a/src/language/semantics/expression-elaboration.ts b/src/language/semantics/expression-elaboration.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../adts.js'
+import option from '@matt.kantor/option'
+import { either, type Either } from '../../adts.js'
 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 = (
diff --git a/src/language/semantics/expressions/expression-utilities.ts b/src/language/semantics/expressions/expression-utilities.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either, type Option } from '../../../adts.js'
+import option, { type Option } from '@matt.kantor/option'
+import { either, type Either } from '../../../adts.js'
 import type { ElaborationError } from '../../errors.js'
 import type { Atom, Molecule } from '../../parsing.js'
 import type { ExpressionContext } from '../expression-elaboration.js'
diff --git a/src/language/semantics/function-node.ts b/src/language/semantics/function-node.ts
@@ -1,4 +1,5 @@
-import { either, type Either, type Option } from '../../adts.js'
+import { type Option } from '@matt.kantor/option'
+import { either, type Either } from '../../adts.js'
 import type { Writable } from '../../utility-types.js'
 import type {
   DependencyUnavailable,
diff --git a/src/language/semantics/object-node.ts b/src/language/semantics/object-node.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either, type Option } from '../../adts.js'
+import option, { type Option } from '@matt.kantor/option'
+import { either, type Either } from '../../adts.js'
 import type { Writable } from '../../utility-types.js'
 import type { UnserializableValueError } from '../errors.js'
 import type { Atom, Molecule } from '../parsing.js'
diff --git a/src/language/semantics/prelude.ts b/src/language/semantics/prelude.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either } from '../../adts.js'
+import option from '@matt.kantor/option'
+import { either, type Either } from '../../adts.js'
 import type { DependencyUnavailable, Panic } from '../errors.js'
 import type { Atom } from '../parsing.js'
 import { isFunctionNode, makeFunctionNode } from './function-node.js'
diff --git a/src/language/semantics/semantic-graph.ts b/src/language/semantics/semantic-graph.ts
@@ -1,4 +1,5 @@
-import { either, option, type Either, type Option } from '../../adts.js'
+import option, { type Option } from '@matt.kantor/option'
+import { either, type Either } from '../../adts.js'
 import { withPhantomData, type WithPhantomData } from '../../phantom-data.js'
 import type {
   InvalidExpressionError,
diff --git a/src/language/semantics/type-system/prelude-types.ts b/src/language/semantics/type-system/prelude-types.ts
@@ -1,4 +1,4 @@
-import { option as optionAdt } from '../../../adts.js'
+import optionAdt from '@matt.kantor/option'
 import {
   makeFunctionType,
   makeObjectType,
diff --git a/src/language/semantics/type-system/type-formats.ts b/src/language/semantics/type-system/type-formats.ts
@@ -1,5 +1,5 @@
-import { option } from '../../../adts.js'
-import type { None, Some } from '../../../adts/option.js'
+import type { None, Some } from '@matt.kantor/option'
+import option from '@matt.kantor/option'
 import type { Atom } from '../../parsing.js'
 
 export type FunctionType = {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"typescript": "^5.6.2"`
`20`	`20`	`},`
`21`	`21`	`"dependencies": {`
	`22`	`+ "@matt.kantor/option": "^1.0.0",`
`22`	`23`	`"kleur": "^4.1.5"`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { option, type Option } from '../../adts.js'`
	`1`	`+import option, { type Option } from '@matt.kantor/option'`
`2`	`2`	`import { parser, type Parser } from '../../parsing.js'`
`3`	`3`	`import { withPhantomData, type WithPhantomData } from '../../phantom-data.js'`
`4`	`4`	`import type {`