From af1a3d5b76b47af5d2ba8a6ea9684525576c2732 Mon Sep 17 00:00:00 2001
From: Aakansha Doshi <aakansha1216@gmail.com>
Date: Wed, 28 Feb 2024 11:14:57 +0530
Subject: [PATCH] fix: export utils from excalidraw package in excalidraw
 library (#7731)

* fix: export utils from excalidraw package in excalidraw library

* don't export utils utilities

* fix import path

* fix export

* don't export export utilites

* fix export paths

* reexport utils from excalidraw package

* add exports from withinBounds

* fix path
---
 packages/excalidraw/frame.ts  |  5 +----
 packages/excalidraw/index.tsx | 19 +++++++++++--------
 packages/utils/export.ts      | 18 ------------------
 packages/utils/index.js       |  1 -
 packages/utils/index.ts       |  3 +++
 5 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100644 packages/utils/index.js
 create mode 100644 packages/utils/index.ts

diff --git a/packages/excalidraw/frame.ts b/packages/excalidraw/frame.ts
index cc80531ee..d627fc4c9 100644
--- a/packages/excalidraw/frame.ts
+++ b/packages/excalidraw/frame.ts
@@ -23,10 +23,7 @@ import { getElementsWithinSelection, getSelectedElements } from "./scene";
 import { getElementsInGroup, selectGroupsFromGivenElements } from "./groups";
 import type { ExcalidrawElementsIncludingDeleted } from "./scene/Scene";
 import { getElementLineSegments } from "./element/bounds";
-import {
-  doLineSegmentsIntersect,
-  elementsOverlappingBBox,
-} from "../utils/export";
+import { doLineSegmentsIntersect, elementsOverlappingBBox } from "../utils/";
 import { isFrameElement, isFrameLikeElement } from "./element/typeChecks";
 import { ReadonlySetLike } from "./utility-types";
 
diff --git a/packages/excalidraw/index.tsx b/packages/excalidraw/index.tsx
index f7be8affc..2dae37c6b 100644
--- a/packages/excalidraw/index.tsx
+++ b/packages/excalidraw/index.tsx
@@ -217,19 +217,22 @@ export {
   restoreElements,
   restoreLibraryItems,
 } from "./data/restore";
+
 export {
   exportToCanvas,
   exportToBlob,
   exportToSvg,
-  serializeAsJSON,
-  serializeLibraryAsJSON,
-  loadLibraryFromBlob,
+  exportToClipboard,
+} from "../utils/export";
+
+export { serializeAsJSON, serializeLibraryAsJSON } from "./data/json";
+export {
   loadFromBlob,
   loadSceneOrLibraryFromBlob,
-  getFreeDrawSvgPath,
-  exportToClipboard,
-  mergeLibraryItems,
-} from "../utils/export";
+  loadLibraryFromBlob,
+} from "./data/blob";
+export { getFreeDrawSvgPath } from "./renderer/renderElement";
+export { mergeLibraryItems } from "./data/library";
 export { isLinearElement } from "./element/typeChecks";
 
 export { FONT_FAMILY, THEME, MIME_TYPES, ROUNDNESS } from "./constants";
@@ -268,4 +271,4 @@ export {
   elementsOverlappingBBox,
   isElementInsideBBox,
   elementPartiallyOverlapsWithOrContainsBBox,
-} from "../utils/export";
+} from "../utils/withinBounds";
diff --git a/packages/utils/export.ts b/packages/utils/export.ts
index ceb733881..5bdddba4f 100644
--- a/packages/utils/export.ts
+++ b/packages/utils/export.ts
@@ -205,21 +205,3 @@ export const exportToClipboard = async (
     throw new Error("Invalid export type");
   }
 };
-
-export * from "./bbox";
-export {
-  elementsOverlappingBBox,
-  isElementInsideBBox,
-  elementPartiallyOverlapsWithOrContainsBBox,
-} from "./withinBounds";
-export {
-  serializeAsJSON,
-  serializeLibraryAsJSON,
-} from "../excalidraw/data/json";
-export {
-  loadFromBlob,
-  loadSceneOrLibraryFromBlob,
-  loadLibraryFromBlob,
-} from "../excalidraw/data/blob";
-export { getFreeDrawSvgPath } from "../excalidraw/renderer/renderElement";
-export { mergeLibraryItems } from "../excalidraw/data/library";
diff --git a/packages/utils/index.js b/packages/utils/index.js
deleted file mode 100644
index ffea9c3cf..000000000
--- a/packages/utils/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./export";
diff --git a/packages/utils/index.ts b/packages/utils/index.ts
new file mode 100644
index 000000000..d199849eb
--- /dev/null
+++ b/packages/utils/index.ts
@@ -0,0 +1,3 @@
+export * from "./export";
+export * from "./withinBounds";
+export * from "./bbox";