idk

packages/perseus-core/src/index.ts

@@ -16,6 +16,6 @@ export {PerseusError} from "./error/perseus-error";
 
 export * from "./data-schema";
 
-export {pluck, mapObject, clone} from "./utils/object-utils";
+export {pluck, mapObject} from "./utils/objective_";
 export {default as Util} from "./utils/util";
 export type {GridDimensions, Position} from "./utils/util";

packages/perseus-core/src/utils/objective_.ts

@@ -1,9 +1,5 @@
 /**
-<<<<<<<< HEAD:packages/perseus-core/src/utils/object-utils.ts
- * Utilities for objects
-========
  * _ utilities for objects
->>>>>>>> main:packages/perseus-core/src/utils/objective_.ts
  */
 
 import _ from "underscore";
@@ -52,13 +48,3 @@ export const mapObject = function <K extends string, V, U>(
     });
     return result;
 };
-
-// Performs a deep copy of the given object. If there are cycles in the object
-// tree, an error is thrown.
-export const clone = <T>(obj: T): T => {
-    const json = JSON.stringify(obj);
-    if (!json) {
-        throw new Error("Oops, couldn't clone given object!");
-    }
-    return JSON.parse(json);
-};

packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-settings.test.tsx

@@ -1,10 +1,10 @@
 import {Dependencies} from "@khanacademy/perseus";
-import {clone} from "@khanacademy/perseus-core";
 import {RenderStateRoot} from "@khanacademy/wonder-blocks-core";
 import {render, screen} from "@testing-library/react";
 import {userEvent as userEventLib} from "@testing-library/user-event";
 import * as React from "react";
 
+import {clone} from "../../../../../../testing/object-utils";
 import {testDependencies} from "../../../../../../testing/test-dependencies";
 
 import StartCoordsSettings from "./start-coords-settings";

packages/perseus/src/__tests__/renderer.test.tsx

@@ -1,9 +1,10 @@
 import {describe, beforeAll, beforeEach, it} from "@jest/globals";
-import {Errors, clone} from "@khanacademy/perseus-core";
+import {Errors} from "@khanacademy/perseus-core";
 import {act, screen, waitFor, within} from "@testing-library/react";
 import {userEvent as userEventLib} from "@testing-library/user-event";
 import * as React from "react";
 
+import {clone} from "../../../../testing/object-utils";
 import {testDependencies} from "../../../../testing/test-dependencies";
 import {
     dropdownWidget,

packages/perseus/src/widgets/interactive-graphs/interactive-graph.test.tsx

@@ -1,12 +1,13 @@
 import {describe, beforeEach, it} from "@jest/globals";
-import {lockedFigureColors, clone} from "@khanacademy/perseus-core";
+import {lockedFigureColors} from "@khanacademy/perseus-core";
 import {color as wbColor} from "@khanacademy/wonder-blocks-tokens";
 import {act, waitFor} from "@testing-library/react";
 import {userEvent as userEventLib} from "@testing-library/user-event";
 import {Plot} from "mafs";
 import * as React from "react";
 import invariant from "tiny-invariant";
 
+import {clone} from "../../../../../testing/object-utils";
 import {testDependencies} from "../../../../../testing/test-dependencies";
 import {waitForInitialGraphieRender} from "../../../../../testing/wait";
 import {getDefaultFigureForType} from "../../../../perseus-editor/src/widgets/interactive-graph-editor/locked-figures/util";

packages/perseus/src/widgets/interactive-graphs/score-interactive-graph.test.ts

@@ -1,6 +1,7 @@
-import {clone} from "@khanacademy/perseus-core";
 import invariant from "tiny-invariant";
 
+import {clone} from "../../../../../testing/object-utils";
+
 import scoreInteractiveGraph from "./score-interactive-graph";
 
 import type {PerseusInteractiveGraphRubric} from "../../validation.types";

packages/perseus/src/widgets/radio/__tests__/radio.test.ts

@@ -1,8 +1,8 @@
 import {describe, beforeEach, it} from "@jest/globals";
-import {clone} from "@khanacademy/perseus-core";
 import {act, screen, fireEvent, waitFor} from "@testing-library/react";
 import {userEvent as userEventLib} from "@testing-library/user-event";
 
+import {clone} from "../../../../../../testing/object-utils";
 import {testDependencies} from "../../../../../../testing/test-dependencies";
 import * as Dependencies from "../../../dependencies";
 import {mockStrings} from "../../../strings";

testing/object-utils.ts

@@ -0,0 +1,9 @@
+// Performs a deep copy of the given object. If there are cycles in the object
+// tree, an error is thrown.
+export const clone = <T>(obj: T): T => {
+    const json = JSON.stringify(obj);
+    if (!json) {
+        throw new Error("Oops, couldn't clone given object!");
+    }
+    return JSON.parse(json);
+};