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.

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

Fixed types for snap & generalize functions #1331

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion packages/modeling/src/index.test-d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { expectType, expectNotType, expectError } from 'tsd'
import { expectType, expectNotType, expectError, expectAssignable } from 'tsd'

import { geometries } from './'
import { snap, generalize } from './operations/modifiers'

const { geom2 } = geometries

expectAssignable<Function>(snap)
expectAssignable<Function>(generalize)
expectType(geom2.create())
expectType<geom2.Geom2>(geom2.create([]))
expectType<geom2.Geom2>(
Expand Down
6 changes: 3 additions & 3 deletions packages/modeling/src/operations/modifiers/generalize.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export interface GeneralizeOptions {
triangulate?: boolean
}

export function generalize<T extends Geometry>(options: GeneralizeOptions, geometry: T): T
export function generalize<T extends Geometry>(options: GeneralizeOptions, ...geometries: RecursiveArray<T>): Array<T>
export function generalize(options: GeneralizeOptions, ...geometries: RecursiveArray<Geometry>): Array<Geometry>
export default function generalize<T extends Geometry>(options: GeneralizeOptions, geometry: T): T
export default function generalize<T extends Geometry>(options: GeneralizeOptions, ...geometries: RecursiveArray<T>): Array<T>
export default function generalize(options: GeneralizeOptions, ...geometries: RecursiveArray<Geometry>): Array<Geometry>
6 changes: 3 additions & 3 deletions packages/modeling/src/operations/modifiers/snap.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Geometry } from '../../geometries/types'
import RecursiveArray from '../../utils/recursiveArray'

export function snap<T extends Geometry>(geometry: T): T
export function snap<T extends Geometry>(...geometries: RecursiveArray<T>): Array<T>
export function snap(...geometries: RecursiveArray<Geometry>): Array<Geometry>
export default function snap<T extends Geometry>(geometry: T): T
export default function snap<T extends Geometry>(...geometries: RecursiveArray<T>): Array<T>
export default function snap(...geometries: RecursiveArray<Geometry>): Array<Geometry>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't even know what happens if the default is defined multiple times. I suggest reverting.