diff --git a/src/utils/tldraw/cc-base/cc-graph/cc-graph-shapes.ts b/src/utils/tldraw/cc-base/cc-graph/cc-graph-shapes.ts index de3afda..9442eac 100644 --- a/src/utils/tldraw/cc-base/cc-graph/cc-graph-shapes.ts +++ b/src/utils/tldraw/cc-base/cc-graph/cc-graph-shapes.ts @@ -35,7 +35,6 @@ import { CCTimetableLessonNodeShape, CCTimetableLessonNodeShapeUtil } from './CC import { CCPlannedLessonNodeShape, CCPlannedLessonNodeShapeUtil } from './CCPlannedLessonNodeShapeUtil' import { CCDepartmentStructureNodeShape, CCDepartmentStructureNodeShapeUtil } from './CCDepartmentStructureNodeShapeUtil' import { CCUserTeacherTimetableNodeShape, CCUserTeacherTimetableNodeShapeUtil } from './CCUserTeacherTimetableNodeShapeUtil' -import { CCTimetableLessonNodeShape, CCTimetableLessonNodeShapeUtil } from './CCTimetableLessonNodeShapeUtil' // Create a const object with all node types export const NODE_SHAPE_TYPES = { @@ -82,7 +81,7 @@ export const NODE_SHAPE_TYPES = { export type NodeShapeType = typeof NODE_SHAPE_TYPES[keyof typeof NODE_SHAPE_TYPES]; // Define AllNodeShapes as a union type of all shape types -export type AllNodeShapes = +export type AllNodeShapes = | CCUserNodeShape | CCTeacherNodeShape | CCStudentNodeShape @@ -118,8 +117,7 @@ export type AllNodeShapes = | CCTimetableLessonNodeShape | CCPlannedLessonNodeShape | CCDepartmentStructureNodeShape - | CCUserTeacherTimetableNodeShape - | CCTimetableLessonNodeShape; + | CCUserTeacherTimetableNodeShape; // Export all shape utils in an object for easy access export const ShapeUtils = { @@ -159,17 +157,16 @@ export const ShapeUtils = { [CCPlannedLessonNodeShapeUtil.type]: CCPlannedLessonNodeShapeUtil, [CCDepartmentStructureNodeShapeUtil.type]: CCDepartmentStructureNodeShapeUtil, [CCUserTeacherTimetableNodeShapeUtil.type]: CCUserTeacherTimetableNodeShapeUtil, - [CCTimetableLessonNodeShapeUtil.type]: CCTimetableLessonNodeShapeUtil, } as const; // Add a type guard to check if a shape is a valid node shape export const isValidNodeShape = (shape: TLShape): shape is AllNodeShapes => { - return shape && - typeof shape.type === 'string' && + return shape && + typeof shape.type === 'string' && Object.values(NODE_SHAPE_TYPES).includes(shape.type as NodeShapeType); }; // Add a type guard to check if a type string is a valid node type export const isValidNodeType = (type: string): type is NodeShapeType => { return Object.values(NODE_SHAPE_TYPES).includes(type as NodeShapeType); -}; \ No newline at end of file +};