Move Expression to its own module

Author: mkantor

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

@@ -2,12 +2,12 @@ import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import type { Molecule } from '../../../parsing.js'
 import {
+  isExpression,
   isFunctionNode,
   makeUnelaboratedObjectNode,
+  type Expression,
 } from '../../../semantics.js'
 import {
-  isExpression,
-  type Expression,
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'

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

@@ -2,12 +2,12 @@ import { either, option, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import type { Molecule } from '../../../parsing.js'
 import {
+  isExpression,
   isFunctionNode,
   makeUnelaboratedObjectNode,
+  type Expression,
 } from '../../../semantics.js'
 import {
-  isExpression,
-  type Expression,
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'

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

@@ -3,12 +3,10 @@ import type { ElaborationError } from '../../../errors.js'
 import type { Atom, Molecule } from '../../../parsing.js'
 import {
   makeUnelaboratedObjectNode,
+  type Expression,
   type ObjectNode,
 } from '../../../semantics.js'
-import type {
-  Expression,
-  ExpressionContext,
-} from '../../../semantics/expression-elaboration.js'
+import type { ExpressionContext } from '../../../semantics/expression-elaboration.js'
 import { stringifyKeyPathForEndUser } from '../../../semantics/key-path.js'
 import { lookupPropertyOfObjectNode } from '../../../semantics/object-node.js'
 import {

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

@@ -2,16 +2,16 @@ import { either, option, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import type { Atom, Molecule } from '../../../parsing.js'
 import {
+  isExpression,
   makeFunctionNode,
   makeUnelaboratedObjectNode,
   serialize,
   types,
+  type Expression,
   type FunctionNode,
 } from '../../../semantics.js'
 import {
   elaborateWithContext,
-  isExpression,
-  type Expression,
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'

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

@@ -3,10 +3,13 @@ import type {
   ElaborationError,
   InvalidExpressionError,
 } from '../../../errors.js'
-import { isFunctionNode, type KeyPath } from '../../../semantics.js'
 import {
   isExpression,
+  isFunctionNode,
   type Expression,
+  type KeyPath,
+} from '../../../semantics.js'
+import {
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'

src/language/compiling/semantics/expressions/runtime-expression.ts

@@ -2,14 +2,14 @@ import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import {
   isAssignable,
+  isExpression,
   isFunctionNode,
   makeUnelaboratedObjectNode,
   replaceAllTypeParametersWithTheirConstraints,
   types,
+  type Expression,
 } from '../../../semantics.js'
 import {
-  isExpression,
-  type Expression,
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'

src/language/compiling/semantics/expressions/todo-expression.ts

@@ -1,7 +1,7 @@
 import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
+import type { Expression } from '../../../semantics.js'
 import {
-  type Expression,
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'

src/language/runtime/keywords.ts

@@ -9,11 +9,11 @@ import {
   makeObjectNode,
   serialize,
   types,
+  type Expression,
   type KeywordElaborationResult,
   type KeywordModule,
   type SemanticGraph,
 } from '../semantics.js'
-import type { Expression } from '../semantics/expression-elaboration.js'
 import { lookupPropertyOfObjectNode } from '../semantics/object-node.js'
 
 const unserializableFunction = () =>

src/language/semantics.ts

@@ -5,6 +5,7 @@ export {
   type KeywordElaborationResult,
   type KeywordModule,
 } from './semantics/expression-elaboration.js'
+export { isExpression, type Expression } from './semantics/expression.js'
 export {
   isFunctionNode,
   makeFunctionNode,

src/language/semantics/expression-elaboration.ts

@@ -9,6 +9,7 @@ import {
   type KeyPath,
   type ObjectNode,
 } from '../semantics.js'
+import type { Expression } from './expression.js'
 import {
   extractStringValueIfPossible,
   updateValueAtKeyPathInSemanticGraph,
@@ -19,13 +20,6 @@ declare const _elaborated: unique symbol
 type Elaborated = { readonly [_elaborated]: true }
 export type ElaboratedSemanticGraph = WithPhantomData<SemanticGraph, Elaborated>
 
-export type Expression = ObjectNode & {
-  readonly 0: `@${string}`
-}
-
-export const isExpression = (node: SemanticGraph): node is Expression =>
-  typeof node === 'object' && typeof node[0] === 'string' && node[0][0] === '@'
-
 export type ExpressionContext = {
   readonly program: SemanticGraph
   readonly location: KeyPath