Skip to content

Commit

Permalink
feat(typeEvaluator): rename main function to typeEvaluate
Browse files Browse the repository at this point in the history
  • Loading branch information
judofyr authored and sgulseth committed Mar 5, 2024
1 parent ec02a47 commit 9c2f345
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/typeEvaluator/evaluateQueryType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const $debug = debug('typeEvaluator:evaluate::debug')
$debug.log = console.log.bind(console) // eslint-disable-line no-console
const $warn = debug('typeEvaluator:evaluate::warn')

export function evaluateNodeType(ast: ExprNode, schema: Schema): TypeNode {
export function typeEvaluate(ast: ExprNode, schema: Schema): TypeNode {
const parsed = walk({
node: ast,
scope: createScope([], undefined, createContext(schema)),
Expand Down Expand Up @@ -87,7 +87,7 @@ export function evaluateQueryType(query: string, schema: Schema): TypeNode {

const ast = parse(query)
$debug('evaluateQueryType.ast %O', ast)
return evaluateNodeType(ast, schema)
return typeEvaluate(ast, schema)
}

function handleDerefNode(node: DerefNode, scope: Scope): TypeNode {
Expand Down
2 changes: 1 addition & 1 deletion src/typeEvaluator/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {evaluateNodeType, evaluateQueryType} from './evaluateQueryType'
export {typeEvaluate as evaluateNodeType, evaluateQueryType} from './evaluateQueryType'
export type {
ArrayTypeNode,
BooleanTypeNode,
Expand Down
6 changes: 3 additions & 3 deletions test/evaluateQueryNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {evaluate} from '../src/evaluator'
import {operators} from '../src/evaluator/operators'
import {ExprNode} from '../src/nodeTypes'
import {TypeNode} from '../src/typeEvaluator'
import {evaluateNodeType, overrideTypeForNode} from '../src/typeEvaluator/evaluateQueryType'
import {typeEvaluate, overrideTypeForNode} from '../src/typeEvaluator/evaluateQueryType'
import {satisfies} from '../src/typeEvaluator/satisfies'

/**
Expand Down Expand Up @@ -237,7 +237,7 @@ function subtestUnary({
for (const {desc, type} of annotatedValue.types) {
t.test(desc, async (t) => {
overrideTypeForNode(cachedResult.params[0], type)
const resultType = evaluateNodeType(cachedResult.node, SCHEMA)
const resultType = typeEvaluate(cachedResult.node, SCHEMA)
const result = await cachedResult.result
t.ok(satisfies(resultType, result), 'evaluation matches type', {result, resultType})
})
Expand Down Expand Up @@ -272,7 +272,7 @@ function subtestBinary({
t.test(`${desc1},${desc2}`, async (t) => {
overrideTypeForNode(cachedResult.params[0], type1)
overrideTypeForNode(cachedResult.params[1], type2)
const evaluatedNodeType = evaluateNodeType(cachedResult.node, SCHEMA)
const evaluatedNodeType = typeEvaluate(cachedResult.node, SCHEMA)
const expectedValue = await cachedResult.result
t.ok(satisfies(evaluatedNodeType, expectedValue), 'evaluation should match type', {
expectedValue,
Expand Down

0 comments on commit 9c2f345

Please sign in to comment.