From abe9e96420fd76c3d09b33b903d7ed5e7a9a416a Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Sat, 30 Mar 2024 17:32:00 +0300 Subject: [PATCH 1/2] fix types --- packages/modeling/src/index.test-d.ts | 36 +++++++++++-------- .../src/operations/modifiers/generalize.d.ts | 6 ++-- .../src/operations/modifiers/snap.d.ts | 6 ++-- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/packages/modeling/src/index.test-d.ts b/packages/modeling/src/index.test-d.ts index 56fa87b60..6882b4e24 100644 --- a/packages/modeling/src/index.test-d.ts +++ b/packages/modeling/src/index.test-d.ts @@ -1,26 +1,34 @@ -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(snap) +expectAssignable(generalize) expectType(geom2.create()) expectType(geom2.create([])) expectType( - geom2.create( + geom2.create([ [ - [[0, 0], [1, 1]], - [[1, 1], [2, 2]] - ] - ) + [0, 0], + [1, 1], + ], + [ + [1, 1], + [2, 2], + ], + ]) ) expectError(geom2.create([null])) -expectNotType< - Parameters[0] ->( +expectNotType[0]>([ [ - [[0, 0, 0], [1, 1, 1]], - [[1, 1, 1], [2, 2, 2]] - ] -) - + [0, 0, 0], + [1, 1, 1], + ], + [ + [1, 1, 1], + [2, 2, 2], + ], +]) diff --git a/packages/modeling/src/operations/modifiers/generalize.d.ts b/packages/modeling/src/operations/modifiers/generalize.d.ts index 5ab0a4432..70e92e535 100644 --- a/packages/modeling/src/operations/modifiers/generalize.d.ts +++ b/packages/modeling/src/operations/modifiers/generalize.d.ts @@ -7,6 +7,6 @@ export interface GeneralizeOptions { triangulate?: boolean } -export function generalize(options: GeneralizeOptions, geometry: T): T -export function generalize(options: GeneralizeOptions, ...geometries: RecursiveArray): Array -export function generalize(options: GeneralizeOptions, ...geometries: RecursiveArray): Array +export default function generalize(options: GeneralizeOptions, geometry: T): T +export default function generalize(options: GeneralizeOptions, ...geometries: RecursiveArray): Array +export default function generalize(options: GeneralizeOptions, ...geometries: RecursiveArray): Array diff --git a/packages/modeling/src/operations/modifiers/snap.d.ts b/packages/modeling/src/operations/modifiers/snap.d.ts index 98c01c401..01010f0f8 100644 --- a/packages/modeling/src/operations/modifiers/snap.d.ts +++ b/packages/modeling/src/operations/modifiers/snap.d.ts @@ -1,6 +1,6 @@ import { Geometry } from '../../geometries/types' import RecursiveArray from '../../utils/recursiveArray' -export function snap(geometry: T): T -export function snap(...geometries: RecursiveArray): Array -export function snap(...geometries: RecursiveArray): Array +export default function snap(geometry: T): T +export default function snap(...geometries: RecursiveArray): Array +export default function snap(...geometries: RecursiveArray): Array From 6710d0025de8b3b251305c72f021c44741d4b260 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Sat, 30 Mar 2024 17:35:55 +0300 Subject: [PATCH 2/2] rollback format --- packages/modeling/src/index.test-d.ts | 31 +++++++++++---------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/packages/modeling/src/index.test-d.ts b/packages/modeling/src/index.test-d.ts index 6882b4e24..85ea14da6 100644 --- a/packages/modeling/src/index.test-d.ts +++ b/packages/modeling/src/index.test-d.ts @@ -10,25 +10,20 @@ expectAssignable(generalize) expectType(geom2.create()) expectType(geom2.create([])) expectType( - geom2.create([ + geom2.create( [ - [0, 0], - [1, 1], - ], - [ - [1, 1], - [2, 2], - ], - ]) + [[0, 0], [1, 1]], + [[1, 1], [2, 2]] + ] + ) ) expectError(geom2.create([null])) -expectNotType[0]>([ - [ - [0, 0, 0], - [1, 1, 1], - ], +expectNotType< + Parameters[0] +>( [ - [1, 1, 1], - [2, 2, 2], - ], -]) + [[0, 0, 0], [1, 1, 1]], + [[1, 1, 1], [2, 2, 2]] + ] +) +