Move keyPathToLookupExpression

Author: mkantor

src/language/semantics.ts

@@ -35,6 +35,7 @@ export {
   type IndexExpression,
 } from './semantics/expressions/index-expression.js'
 export {
+  keyPathToLookupExpression,
   makeLookupExpression,
   readLookupExpression,
   type LookupExpression,

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

@@ -2,6 +2,7 @@ import either, { type Either } from '@matt.kantor/either'
 import type { ElaborationError } from '../../errors.js'
 import type { Atom, Molecule } from '../../parsing.js'
 import { isExpressionWithArgument } from '../expression.js'
+import { keyPathToMolecule, type NonEmptyKeyPath } from '../key-path.js'
 import { makeObjectNode, type ObjectNode } from '../object-node.js'
 import {
   stringifySemanticGraphForEndUser,
@@ -11,6 +12,7 @@ import {
   asSemanticGraph,
   readArgumentsFromExpression,
 } from './expression-utilities.js'
+import { makeIndexExpression } from './index-expression.js'
 
 export type LookupExpression = ObjectNode & {
   readonly 0: '@lookup'
@@ -45,3 +47,16 @@ export const makeLookupExpression = (key: Atom): LookupExpression =>
     0: '@lookup',
     1: makeObjectNode({ key }),
   })
+
+export const keyPathToLookupExpression = (keyPath: NonEmptyKeyPath) => {
+  const [initialKey, ...indexes] = keyPath
+  const initialLookup = makeLookupExpression(initialKey)
+  if (indexes.length === 0) {
+    return initialLookup
+  } else {
+    return makeIndexExpression({
+      object: initialLookup,
+      query: keyPathToMolecule(indexes),
+    })
+  }
+}

src/language/semantics/key-path.ts

@@ -5,6 +5,7 @@ import { inlinePlz, unparse } from '../unparsing.js'
 import type { ObjectNode } from './object-node.js'
 
 export type KeyPath = readonly Atom[]
+export type NonEmptyKeyPath = readonly [Atom, ...KeyPath]
 
 export const stringifyKeyPathForEndUser = (keyPath: KeyPath): string =>
   either.match(unparse(keyPathToMolecule(keyPath), inlinePlz), {

src/language/semantics/stdlib/stdlib-utilities.ts

@@ -1,14 +1,12 @@
 import either, { type Either } from '@matt.kantor/either'
 import option from '@matt.kantor/option'
 import type { DependencyUnavailable, Panic } from '../../errors.js'
-import type { Atom } from '../../parsing.js'
 import {
+  keyPathToLookupExpression,
   makeApplyExpression,
-  makeIndexExpression,
-  makeLookupExpression,
 } from '../../semantics.js'
 import { makeFunctionNode } from '../function-node.js'
-import { keyPathToMolecule, type KeyPath } from '../key-path.js'
+import { type NonEmptyKeyPath } from '../key-path.js'
 import {
   containsAnyUnelaboratedNodes,
   type SemanticGraph,
@@ -34,21 +32,6 @@ const handleUnavailableDependencies =
     }
   }
 
-type NonEmptyKeyPath = readonly [Atom, ...KeyPath]
-
-const keyPathToLookupExpression = (keyPath: NonEmptyKeyPath) => {
-  const [initialKey, ...indexes] = keyPath
-  const initialLookup = makeLookupExpression(initialKey)
-  if (indexes.length === 0) {
-    return initialLookup
-  } else {
-    return makeIndexExpression({
-      object: initialLookup,
-      query: keyPathToMolecule(indexes),
-    })
-  }
-}
-
 export const serializeOnceAppliedFunction =
   (keyPath: NonEmptyKeyPath, argument: SemanticGraph) => () =>
     either.makeRight(