Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(typeEvlauator): handle rest on object splat operations #232

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix(typeEvlauator): handle rest on object splat operations #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b60e33
fix(typeEvaluator): handle rest on object splat operations
sgulseth May 6, 2024
fd9b686
fix(typeEvaluator): properly handle object splats with non-concrete t…
sgulseth May 7, 2024
898611e
fix(typeEvaluator): move object splat into separate methods to ensure…
sgulseth May 16, 2024
46691a8
fix(typeEvaluator): map over concrete values and return them as alter…
sgulseth Jun 3, 2024
04251bc
test(typeEvaluator): add tests for objects and assert types
sgulseth Jun 4, 2024
ce44721
fix(typeEvaluator): bail early if splatting over a non-union/object
sgulseth Jun 11, 2024
3c2908b
feat(typeEvaluator): expand all unions inside a object
sgulseth Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 27 additions & 5 deletions src/typeEvaluator/optimizations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import type {TypeNode} from './types'

const {compare} = new Intl.Collator('en')
function typeNodesSorter(a: TypeNode, b: TypeNode): number {
if (a.type === 'null') {
return 1
}
return compare(hashField(a), hashField(b))
}

export function hashField(field: TypeNode): string {
switch (field.type) {
case 'string':
Expand All @@ -21,13 +29,21 @@ export function hashField(field: TypeNode): string {
}

case 'object': {
return `${field.type}:(${Object.entries(field.attributes)
.map(([key, value]) => `${key}:${hashField(value.value)}`)
const attributes = Object.entries(field.attributes)
attributes.sort(([a], [b]) => compare(a, b)) // sort them by name

return `${field.type}:(${attributes
.map(
([key, value]) =>
`${key}:${hashField(value.value)}(${value.optional ? 'optional' : 'non-optional'})`,
)
.join(',')}):ref-${field.dereferencesTo}:${field.rest ? hashField(field.rest) : 'no-rest'}`
}

case 'union': {
return `${field.type}(${field.of.map(hashField).join(',')})`
const sorted = [...field.of]
sorted.sort(typeNodesSorter)
return `${field.type}(${sorted.map(hashField).join(',')})`
}

case 'inline': {
Expand All @@ -45,7 +61,10 @@ export function removeDuplicateTypeNodes(typeNodes: TypeNode[]): TypeNode[] {
const seenTypes = new Set<string>()
const newTypeNodes = []

for (const typeNode of typeNodes) {
const sortedTypeNodes = [...typeNodes]
sortedTypeNodes.sort(typeNodesSorter)

for (const typeNode of sortedTypeNodes) {
const hash = hashField(typeNode)
if (hash === null) {
newTypeNodes.push(typeNode)
Expand All @@ -64,6 +83,10 @@ export function removeDuplicateTypeNodes(typeNodes: TypeNode[]): TypeNode[] {

export function optimizeUnions(field: TypeNode): TypeNode {
if (field.type === 'union') {
if (field.of.length === 0) {
return field
}

field.of = removeDuplicateTypeNodes(field.of)

if (field.of.length === 1) {
Expand All @@ -82,7 +105,6 @@ export function optimizeUnions(field: TypeNode): TypeNode {
field.of[idx] = optimizeUnions(subField)
}

const compare = new Intl.Collator('en').compare
field.of.sort((a, b) => {
if (a.type === 'null') {
return 1
Expand Down