From cddd37e468b630134abe2fa8cebd185735ffa611 Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:05:13 -0400 Subject: [PATCH 1/7] move ts-expect-error --- client/src/shapes/animation/timeline/compile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/shapes/animation/timeline/compile.ts b/client/src/shapes/animation/timeline/compile.ts index 9f51c2d0..6e4579c0 100644 --- a/client/src/shapes/animation/timeline/compile.ts +++ b/client/src/shapes/animation/timeline/compile.ts @@ -200,10 +200,10 @@ export const compileTimeline = (timeline: Timeline): CompiledTimeline => { }; }); - // @ts-expect-error could make TS happy, but would make this verbose unfortunately return interpolation.fn( keyframes, getDefaultEasing(propName), + // @ts-expect-error could make TS happy, but would make this verbose unfortunately rawPropVal, )(progress); }; From b0afb9314ea13cbc291da738cd22846db1c2759c Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:08:27 -0400 Subject: [PATCH 2/7] update fontweight import --- client/src/graphs/themes/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/graphs/themes/types.ts b/client/src/graphs/themes/types.ts index 898c6b00..3444bca3 100644 --- a/client/src/graphs/themes/types.ts +++ b/client/src/graphs/themes/types.ts @@ -1,7 +1,7 @@ import type { NodeAnchor } from '@graph/plugins/anchors/types'; import type { SupportedNodeShapes } from '@graph/schematics/node'; import type { EdgeGetterOrValue, GNode, NodeGetterOrValue } from '@graph/types'; -import type { FontWeight } from '@shape/types/utility'; +import type { FontWeight } from '@shape/text/types'; import type { MaybeGetter, MaybeGetterParams, From 6eaa78d727fdccc261a6475cd59d71a27fb492a2 Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:09:34 -0400 Subject: [PATCH 3/7] update magic canvas options type --- client/src/utils/localStorage.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/src/utils/localStorage.ts b/client/src/utils/localStorage.ts index 005287b3..316bd184 100644 --- a/client/src/utils/localStorage.ts +++ b/client/src/utils/localStorage.ts @@ -1,5 +1,4 @@ -import type { Camera } from '@canvas/camera'; -import type { MagicCanvasOptions } from '@canvas/index'; +import type { MagicCanvasOptions } from '@canvas/types'; // @typescript-eslint/no-unused-vars reports unused even if referenced in jsdoc /* eslint-disable */ import type { Graph } from '@graph/types'; From 939e6ef9732ed7debae08116f30da8fd9e81b828 Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:10:14 -0400 Subject: [PATCH 4/7] update scribbleschema type import --- client/src/graphs/plugins/annotations/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/graphs/plugins/annotations/types.ts b/client/src/graphs/plugins/annotations/types.ts index 836bc45b..0e70f7ef 100644 --- a/client/src/graphs/plugins/annotations/types.ts +++ b/client/src/graphs/plugins/annotations/types.ts @@ -1,4 +1,4 @@ -import type { ScribbleSchema } from '@shape/shapes/scribble'; +import type { ScribbleSchema } from '@shape/shapes/scribble/types'; /** * a scribble that is on the graph as an annotation From 458b92889122d2b75c3ba8fe646d0ef83fb050c0 Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:15:58 -0400 Subject: [PATCH 5/7] update schema imports --- client/src/graphs/collab/collabTag.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/graphs/collab/collabTag.ts b/client/src/graphs/collab/collabTag.ts index 03694f7a..8761fac0 100644 --- a/client/src/graphs/collab/collabTag.ts +++ b/client/src/graphs/collab/collabTag.ts @@ -1,7 +1,9 @@ import colors from '@colors'; import type { Collaborator, CollaboratorMap } from '@graph/collab/types'; -import { type CircleSchema, circle } from '@shape/shapes/circle'; -import { type RectSchema, rect } from '@shape/shapes/rect'; +import { circle } from '@shape/shapes/circle'; +import type { CircleSchema } from '@shape/shapes/circle/types'; +import { rect } from '@shape/shapes/rect'; +import type { RectSchema } from '@shape/shapes/rect/types'; import type { Ref } from 'vue'; From f82b791481935cda0a57bd5ff3e5109405534262 Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:34:16 -0400 Subject: [PATCH 6/7] fix imports --- client/src/graphs/plugins/annotations/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/graphs/plugins/annotations/index.ts b/client/src/graphs/plugins/annotations/index.ts index 6469db30..ad919251 100644 --- a/client/src/graphs/plugins/annotations/index.ts +++ b/client/src/graphs/plugins/annotations/index.ts @@ -2,9 +2,9 @@ import type { BaseGraph } from '@graph/base'; import type { GraphMouseEvent } from '@graph/base/types'; import { useNonNullGraphColors } from '@graph/themes/useGraphColors'; import type { Aggregator } from '@graph/types'; -import type { WithId } from '@shape/cacher'; import { circle } from '@shape/shapes/circle'; -import type { ScribbleSchema } from '@shape/shapes/scribble'; +import type { ScribbleSchema } from '@shape/shapes/scribble/types'; +import type { WithId } from '@shape/types'; import type { Coordinate } from '@shape/types/utility'; import colors from '@utils/colors'; import type { Color } from '@utils/colors'; From 09678d340cff8150e48d504f90c159012a05585e Mon Sep 17 00:00:00 2001 From: teykamp Date: Fri, 8 Aug 2025 15:35:09 -0400 Subject: [PATCH 7/7] fix type error --- client/src/products/binary-trees/ui/AddNodePanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/products/binary-trees/ui/AddNodePanel.vue b/client/src/products/binary-trees/ui/AddNodePanel.vue index 93f4bf17..58936bc3 100644 --- a/client/src/products/binary-trees/ui/AddNodePanel.vue +++ b/client/src/products/binary-trees/ui/AddNodePanel.vue @@ -14,7 +14,7 @@ const getNumbers = () => { const treeArr = props.tree.tree .toArray() - .filter((num) => num !== undefined); + .filter((num): num is number => num !== undefined); if (treeArr.length === 0) return [1, 2, 3, 4, 5]; const min = Math.min(...treeArr);