fix: add warnings for no shape data back

bertyhell · bertyhell · commit 114c1ace977c · 2025-05-24T10:05:42.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,17 +11,20 @@
     "preview": "vite preview",
     "stats": "npx cloc ./src",
     "check-types": "tsc -p tsconfig.app.json --noEmit",
-    "test": "vitest"
+    "test": "vitest",
+    "postinstall": "npx patch-package"
   },
   "dependencies": {
-    "@flatten-js/core": "^1.6.1",
+    "@flatten-js/core": "^1.6.2",
+    "blend-promise-utils": "^1.29.2",
     "blob-stream": "^0.1.3",
     "clsx": "^2.1.1",
     "es-toolkit": "^1.16.0",
     "file-saver": "^2.0.5",
-    "jspdf": "^2.5.2",
+    "jspdf": "^3.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-toastify": "^11.0.5",
     "svg-parser": "^2.0.4",
     "svg2pdf.js": "^2.5.0",
     "teenyicons": "^0.4.1",
diff --git a/patches/@flatten-js+core+1.6.2.patch b/patches/@flatten-js+core+1.6.2.patch
@@ -0,0 +1,52 @@
+diff --git a/node_modules/@flatten-js/core/dist/main.cjs b/node_modules/@flatten-js/core/dist/main.cjs
+index 9ed46e1..d6b1b59 100644
+--- a/node_modules/@flatten-js/core/dist/main.cjs
++++ b/node_modules/@flatten-js/core/dist/main.cjs
+@@ -6601,7 +6601,7 @@ class Box extends Shape {
+ 
+         if (shape instanceof Flatten.Arc) {
+             return shape.vertices.every(vertex => this.contains(vertex)) &&
+-                shape.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
++                this.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
+         }
+ 
+         if (shape instanceof Flatten.Line || shape instanceof Flatten.Ray) {
+diff --git a/node_modules/@flatten-js/core/dist/main.mjs b/node_modules/@flatten-js/core/dist/main.mjs
+index 0d1bec8..12eb0a2 100644
+--- a/node_modules/@flatten-js/core/dist/main.mjs
++++ b/node_modules/@flatten-js/core/dist/main.mjs
+@@ -6597,7 +6597,7 @@ class Box extends Shape {
+ 
+         if (shape instanceof Flatten.Arc) {
+             return shape.vertices.every(vertex => this.contains(vertex)) &&
+-                shape.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
++                this.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
+         }
+ 
+         if (shape instanceof Flatten.Line || shape instanceof Flatten.Ray) {
+diff --git a/node_modules/@flatten-js/core/dist/main.umd.js b/node_modules/@flatten-js/core/dist/main.umd.js
+index a886341..8a0b6bb 100644
+--- a/node_modules/@flatten-js/core/dist/main.umd.js
++++ b/node_modules/@flatten-js/core/dist/main.umd.js
+@@ -6603,7 +6603,7 @@
+ 
+             if (shape instanceof Flatten.Arc) {
+                 return shape.vertices.every(vertex => this.contains(vertex)) &&
+-                    shape.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
++                    this.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
+             }
+ 
+             if (shape instanceof Flatten.Line || shape instanceof Flatten.Ray) {
+diff --git a/node_modules/@flatten-js/core/src/classes/box.js b/node_modules/@flatten-js/core/src/classes/box.js
+index af21b93..be48775 100644
+--- a/node_modules/@flatten-js/core/src/classes/box.js
++++ b/node_modules/@flatten-js/core/src/classes/box.js
+@@ -269,7 +269,7 @@ export class Box extends Shape {
+ 
+         if (shape instanceof Flatten.Arc) {
+             return shape.vertices.every(vertex => this.contains(vertex)) &&
+-                shape.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
++                this.toSegments().every(segment => intersectSegment2Arc(segment, shape).length === 0)
+         }
+ 
+         if (shape instanceof Flatten.Line || shape instanceof Flatten.Ray) {
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,10 +1,12 @@
 import './App.css';
+import {ToastContainer} from 'react-toastify';
 import {Toolbar} from './components/Toolbar.tsx';
 
 function App() {
 	return (
 		<div className="overflow-y-scroll h-lvh pb-12 w-80" style={{ scrollbarWidth: 'none' }}>
 			<Toolbar />
+			<ToastContainer position="bottom-right" theme="light" />
 		</div>
 	);
 }
diff --git a/src/entities/ArcEntity.ts b/src/entities/ArcEntity.ts
@@ -239,6 +239,10 @@ export class ArcEntity implements Entity {
             throw new Error('Invalid Entity type in JSON');
         }
 
+        if (!jsonEntity.shapeData) {
+            throw new Error('Invalid JSON entity of type Arc: missing shapeData');
+        }
+
         const center = new Point(
             jsonEntity.shapeData.center.x,
             jsonEntity.shapeData.center.y,
diff --git a/src/entities/ArrowHeadEntity.ts b/src/entities/ArrowHeadEntity.ts
@@ -140,6 +140,9 @@ export class ArrowHeadEntity implements Entity {
 	public static async fromJson(
 		jsonEntity: JsonEntity<ArrowHeadJsonData>
 	): Promise<ArrowHeadEntity> {
+		if (!jsonEntity.shapeData) {
+			throw new Error('Invalid JSON entity of type Arrow: missing shapeData');
+		}
 		const p1 = new Point(jsonEntity.shapeData.p1.x, jsonEntity.shapeData.p1.y);
 		const p2 = new Point(jsonEntity.shapeData.p2.x, jsonEntity.shapeData.p2.y);
 		const p3 = new Point(jsonEntity.shapeData.p3.x, jsonEntity.shapeData.p3.y);
diff --git a/src/entities/CircleEntity.ts b/src/entities/CircleEntity.ts
@@ -205,6 +205,9 @@ export class CircleEntity implements Entity {
 	public static async fromJson(
 		jsonEntity: JsonEntity<CircleJsonData>,
 	): Promise<CircleEntity> {
+		if (!jsonEntity.shapeData) {
+			throw new Error('Invalid JSON entity of type Circle: missing shapeData');
+		}
 		const center = new Point(
 			jsonEntity.shapeData.center.x,
 			jsonEntity.shapeData.center.y,
diff --git a/src/entities/ImageEntity.ts b/src/entities/ImageEntity.ts
@@ -221,6 +221,9 @@ export class ImageEntity implements Entity {
 	}
 
 	public static async fromJson(jsonEntity: JsonEntity<ImageJsonData>): Promise<ImageEntity> {
+		if (!jsonEntity.shapeData) {
+			throw new Error('Invalid JSON entity of type Image: missing shapeData');
+		}
 		const rectangle = new Polygon(
 			jsonEntity.shapeData.points.map((point) => new Point(point.x, point.y))
 		);
diff --git a/src/entities/LineEntity.ts b/src/entities/LineEntity.ts
@@ -186,6 +186,9 @@ export class LineEntity implements Entity {
 	}
 
 	public static async fromJson(jsonEntity: JsonEntity<LineJsonData>): Promise<LineEntity> {
+		if (!jsonEntity.shapeData) {
+			throw new Error('Invalid JSON entity of type Line: missing shapeData');
+		}
 		const startPoint = new Point(
 			jsonEntity.shapeData.startPoint.x,
 			jsonEntity.shapeData.startPoint.y
diff --git a/src/entities/MeasurementEntity.ts b/src/entities/MeasurementEntity.ts
@@ -2,14 +2,14 @@ import {Box, Line, Point, Segment, Vector} from '@flatten-js/core';
 import {minBy, round} from 'es-toolkit';
 import {max, min} from 'es-toolkit/compat';
 import {
-    ARROW_HEAD_LENGTH,
-    ARROW_HEAD_WIDTH,
-    MEASUREMENT_DECIMAL_PLACES,
-    MEASUREMENT_EXTENSION_LENGTH,
-    MEASUREMENT_FONT_SIZE,
-    MEASUREMENT_LABEL_OFFSET,
-    MEASUREMENT_ORIGIN_MARGIN,
-    TO_RADIANS,
+	ARROW_HEAD_LENGTH,
+	ARROW_HEAD_WIDTH,
+	MEASUREMENT_DECIMAL_PLACES,
+	MEASUREMENT_EXTENSION_LENGTH,
+	MEASUREMENT_FONT_SIZE,
+	MEASUREMENT_LABEL_OFFSET,
+	MEASUREMENT_ORIGIN_MARGIN,
+	TO_RADIANS,
 } from '../App.consts';
 import type {Shape, SnapPoint} from '../App.types';
 import type {DrawController} from '../drawControllers/DrawController';
@@ -381,6 +381,9 @@ export class MeasurementEntity implements Entity {
 	public static async fromJson(
 		jsonEntity: JsonEntity<MeasurementJsonData>
 	): Promise<MeasurementEntity> {
+		if (!jsonEntity.shapeData) {
+			throw new Error('Invalid JSON entity of type Measurement: missing shapeData');
+		}
 		const startPoint = new Point(
 			jsonEntity.shapeData.startPoint.x,
 			jsonEntity.shapeData.startPoint.y
diff --git a/src/entities/PointEntity.ts b/src/entities/PointEntity.ts
@@ -133,6 +133,9 @@ export class PointEntity implements Entity {
   public static async fromJson(
     jsonEntity: JsonEntity<PointJsonData>,
   ): Promise<PointEntity> {
+    if (!jsonEntity.shapeData) {
+      throw new Error('Invalid JSON entity of type Point: missing shapeData');
+    }
     const point = new Point(
       jsonEntity.shapeData.point.x,
       jsonEntity.shapeData.point.y,
diff --git a/src/entities/RectangleEntity.ts b/src/entities/RectangleEntity.ts
@@ -185,6 +185,9 @@ export class RectangleEntity implements Entity {
 	public static async fromJson(
 		jsonEntity: JsonEntity<RectangleJsonData>
 	): Promise<RectangleEntity> {
+		if (!jsonEntity.shapeData) {
+			throw new Error('Invalid JSON entity of type Rectangle: missing shapeData');
+		}
 		const rectangle = new Polygon(
 			jsonEntity.shapeData.points.map((point) => new Point(point.x, point.y))
 		);
diff --git a/src/entities/TextEntity.ts b/src/entities/TextEntity.ts
diff --git a/src/helpers/import-export-handlers/import-entities-from-json.ts b/src/helpers/import-export-handlers/import-entities-from-json.ts
diff --git a/src/main.tsx b/src/main.tsx
diff --git a/src/state.ts b/src/state.ts

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,9 @@ export class ImageEntity implements Entity {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public static async fromJson(jsonEntity: JsonEntity<ImageJsonData>): Promise<ImageEntity> {`
	`224`	`+ if (!jsonEntity.shapeData) {`
	`225`	`+ throw new Error('Invalid JSON entity of type Image: missing shapeData');`
	`226`	`+ }`
`224`	`227`	`const rectangle = new Polygon(`
`225`	`228`	`jsonEntity.shapeData.points.map((point) => new Point(point.x, point.y))`
`226`	`229`	`);`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,9 @@ export class LineEntity implements Entity {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`public static async fromJson(jsonEntity: JsonEntity<LineJsonData>): Promise<LineEntity> {`
	`189`	`+ if (!jsonEntity.shapeData) {`
	`190`	`+ throw new Error('Invalid JSON entity of type Line: missing shapeData');`
	`191`	`+ }`
`189`	`192`	`const startPoint = new Point(`
`190`	`193`	`jsonEntity.shapeData.startPoint.x,`
`191`	`194`	`jsonEntity.shapeData.startPoint.y`