Move prelude out of compiler, improve many imports

Author: mkantor

src/language/compiling/semantics.test.ts

@@ -12,9 +12,9 @@ import {
   type ElaboratedSemanticGraph,
   type ObjectNode,
 } from '../semantics.js'
+import { prelude } from '../semantics/prelude.js'
 import type { SemanticGraph } from '../semantics/semantic-graph.js'
 import { keywordHandlers } from './semantics/keywords.js'
-import { prelude } from './semantics/prelude.js'
 
 const elaborationSuite = testCases(
   (input: Atom | Molecule) =>

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

@@ -2,18 +2,14 @@ import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,
+  containsAnyUnelaboratedNodes,
   isFunctionNode,
   readApplyExpression,
   type Expression,
-} from '../../../semantics.js'
-import {
   type ExpressionContext,
   type KeywordHandler,
-} from '../../../semantics/expression-elaboration.js'
-import {
-  containsAnyUnelaboratedNodes,
   type SemanticGraph,
-} from '../../../semantics/semantic-graph.js'
+} from '../../../semantics.js'
 
 export const applyKeywordHandler: KeywordHandler = (
   expression: Expression,

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

@@ -3,18 +3,14 @@ import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,
   isFunctionNode,
+  lookupPropertyOfObjectNode,
   readCheckExpression,
+  stringifySemanticGraphForEndUser,
   type Expression,
-} from '../../../semantics.js'
-import {
   type ExpressionContext,
   type KeywordHandler,
-} from '../../../semantics/expression-elaboration.js'
-import { lookupPropertyOfObjectNode } from '../../../semantics/object-node.js'
-import {
-  stringifySemanticGraphForEndUser,
   type SemanticGraph,
-} from '../../../semantics/semantic-graph.js'
+} from '../../../semantics.js'
 
 export const checkKeywordHandler: KeywordHandler = (
   expression: Expression,

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

@@ -2,24 +2,20 @@ import { either, option, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
 import {
   asSemanticGraph,
+  elaborateWithContext,
   makeFunctionNode,
+  makeObjectNode,
   readFunctionExpression,
   serialize,
   types,
+  updateValueAtKeyPathInSemanticGraph,
   type Expression,
+  type ExpressionContext,
   type FunctionExpression,
   type FunctionNode,
-} from '../../../semantics.js'
-import {
-  elaborateWithContext,
-  type ExpressionContext,
   type KeywordHandler,
-} from '../../../semantics/expression-elaboration.js'
-import { makeObjectNode } from '../../../semantics/object-node.js'
-import {
-  updateValueAtKeyPathInSemanticGraph,
   type SemanticGraph,
-} from '../../../semantics/semantic-graph.js'
+} from '../../../semantics.js'
 
 export const functionKeywordHandler: KeywordHandler = (
   expression: Expression,

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

@@ -4,30 +4,22 @@ import type {
   InvalidExpressionError,
 } from '../../../errors.js'
 import {
+  applyKeyPathToSemanticGraph,
+  isObjectNode,
+  keyPathToMolecule,
   makeLookupExpression,
+  makeObjectNode,
+  prelude,
   readFunctionExpression,
   readLookupExpression,
+  stringifyKeyPathForEndUser,
   type Expression,
-  type KeyPath,
-} from '../../../semantics.js'
-import {
   type ExpressionContext,
+  type KeyPath,
   type KeywordHandler,
-} from '../../../semantics/expression-elaboration.js'
-import {
-  keyPathToMolecule,
-  stringifyKeyPathForEndUser,
-} from '../../../semantics/key-path.js'
-import {
-  isObjectNode,
-  makeObjectNode,
   type ObjectNode,
-} from '../../../semantics/object-node.js'
-import {
-  applyKeyPathToSemanticGraph,
   type SemanticGraph,
-} from '../../../semantics/semantic-graph.js'
-import { prelude } from '../prelude.js'
+} from '../../../semantics.js'
 
 export const lookupKeywordHandler: KeywordHandler = (
   expression: Expression,

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

@@ -9,12 +9,10 @@ import {
   replaceAllTypeParametersWithTheirConstraints,
   types,
   type Expression,
-} from '../../../semantics.js'
-import {
   type ExpressionContext,
   type KeywordHandler,
-} from '../../../semantics/expression-elaboration.js'
-import { type SemanticGraph } from '../../../semantics/semantic-graph.js'
+  type SemanticGraph,
+} from '../../../semantics.js'
 
 export const runtimeKeywordHandler: KeywordHandler = (
   expression: Expression,

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

@@ -1,12 +1,12 @@
 import { either, type Either } from '../../../../adts.js'
 import type { ElaborationError } from '../../../errors.js'
-import type { Expression } from '../../../semantics.js'
 import {
+  makeObjectNode,
+  type Expression,
   type ExpressionContext,
   type KeywordHandler,
-} from '../../../semantics/expression-elaboration.js'
-import { makeObjectNode } from '../../../semantics/object-node.js'
-import { type SemanticGraph } from '../../../semantics/semantic-graph.js'
+  type SemanticGraph,
+} from '../../../semantics.js'
 
 export const todoKeywordHandler: KeywordHandler = (
   _expression: Expression,

src/language/semantics.ts

@@ -1,8 +1,10 @@
 export {
   elaborate,
+  elaborateWithContext,
   type ElaboratedSemanticGraph,
   type ExpressionContext,
   type KeywordElaborationResult,
+  type KeywordHandler,
   type KeywordHandlers,
 } from './semantics/expression-elaboration.js'
 export { isExpression, type Expression } from './semantics/expression.js'
@@ -41,16 +43,26 @@ export {
   makeFunctionNode,
   type FunctionNode,
 } from './semantics/function-node.js'
-export { type KeyPath } from './semantics/key-path.js'
+export {
+  keyPathToMolecule,
+  stringifyKeyPathForEndUser,
+  type KeyPath,
+} from './semantics/key-path.js'
 export { isKeyword, type Keyword } from './semantics/keyword.js'
 export {
   isObjectNode,
+  lookupPropertyOfObjectNode,
   makeObjectNode,
   makeUnelaboratedObjectNode,
   type ObjectNode,
 } from './semantics/object-node.js'
+export { prelude } from './semantics/prelude.js'
 export {
+  applyKeyPathToSemanticGraph,
+  containsAnyUnelaboratedNodes,
   serialize,
+  stringifySemanticGraphForEndUser,
+  updateValueAtKeyPathInSemanticGraph,
   type Output,
   type SemanticGraph,
 } from './semantics/semantic-graph.js'

…/language/compiling/semantics/prelude.ts src/language/semantics/prelude.tssrc/language/compiling/semantics/prelude.ts renamed to src/language/semantics/prelude.ts src/language/compiling/semantics/prelude.ts renamed to src/language/semantics/prelude.ts

@@ -1,29 +1,28 @@
-import { either, option, type Either } from '../../../adts.js'
-import type { DependencyUnavailable, Panic } from '../../errors.js'
-import type { Atom } from '../../parsing.js'
+import { either, option, 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'
+import { keyPathToMolecule } from './key-path.js'
 import {
-  isFunctionNode,
   isObjectNode,
-  makeFunctionNode,
+  lookupPropertyOfObjectNode,
   makeObjectNode,
   makeUnelaboratedObjectNode,
-  types,
   type ObjectNode,
-} from '../../semantics.js'
-import { keyPathToMolecule } from '../../semantics/key-path.js'
-import { lookupPropertyOfObjectNode } from '../../semantics/object-node.js'
+} from './object-node.js'
 import {
   containsAnyUnelaboratedNodes,
   isSemanticGraph,
   type SemanticGraph,
-} from '../../semantics/semantic-graph.js'
+} from './semantic-graph.js'
+import { types } from './type-system.js'
 import {
   makeFunctionType,
   makeObjectType,
   makeTypeParameter,
   makeUnionType,
   type FunctionType,
-} from '../../semantics/type-system/type-formats.js'
+} from './type-system/type-formats.js'
 
 const handleUnavailableDependencies =
   (