From 88fd0b56e8fd1379eaafc49ca99f8108a319dc1f Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 23 Jan 2025 15:15:27 -0600 Subject: [PATCH 1/5] [tb/update-locations] Rename and update orderer public option utils --- packages/perseus-core/src/index.ts | 2 +- .../src/{utils => widgets/orderer}/orderer-util.test.ts | 0 .../perseus-core/src/{utils => widgets/orderer}/orderer-util.ts | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/perseus-core/src/{utils => widgets/orderer}/orderer-util.test.ts (100%) rename packages/perseus-core/src/{utils => widgets/orderer}/orderer-util.ts (100%) diff --git a/packages/perseus-core/src/index.ts b/packages/perseus-core/src/index.ts index 508aa4e766..1da801c2f9 100644 --- a/packages/perseus-core/src/index.ts +++ b/packages/perseus-core/src/index.ts @@ -37,4 +37,4 @@ export type {ExpressionDefaultWidgetOptions} from "./widgets/expression"; export type * from "./widgets/logic-export.types"; -export {default as getOrdererPublicWidgetOptions} from "./utils/orderer-util"; +export {default as getOrdererPublicWidgetOptions} from "./widgets/orderer/orderer-util"; diff --git a/packages/perseus-core/src/utils/orderer-util.test.ts b/packages/perseus-core/src/widgets/orderer/orderer-util.test.ts similarity index 100% rename from packages/perseus-core/src/utils/orderer-util.test.ts rename to packages/perseus-core/src/widgets/orderer/orderer-util.test.ts diff --git a/packages/perseus-core/src/utils/orderer-util.ts b/packages/perseus-core/src/widgets/orderer/orderer-util.ts similarity index 100% rename from packages/perseus-core/src/utils/orderer-util.ts rename to packages/perseus-core/src/widgets/orderer/orderer-util.ts From f180c87d64f7f5abea28dbe45bf059557ad916d3 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 23 Jan 2025 15:15:53 -0600 Subject: [PATCH 2/5] [tb/update-locations] Rename and update locations for categorizer util --- packages/perseus-core/src/index.ts | 1 + .../src/widgets/categorizer/categorizer-util.test.ts} | 2 +- .../src/widgets/categorizer/categorizer-util.ts} | 0 packages/perseus/src/types.ts | 2 +- packages/perseus/src/widgets/categorizer/categorizer.tsx | 7 ++++--- 5 files changed, 7 insertions(+), 5 deletions(-) rename packages/{perseus/src/widgets/categorizer/categorizer.util.test.ts => perseus-core/src/widgets/categorizer/categorizer-util.test.ts} (94%) rename packages/{perseus/src/widgets/categorizer/categorizer.util.ts => perseus-core/src/widgets/categorizer/categorizer-util.ts} (100%) diff --git a/packages/perseus-core/src/index.ts b/packages/perseus-core/src/index.ts index 1da801c2f9..7d2db27613 100644 --- a/packages/perseus-core/src/index.ts +++ b/packages/perseus-core/src/index.ts @@ -38,3 +38,4 @@ export type {ExpressionDefaultWidgetOptions} from "./widgets/expression"; export type * from "./widgets/logic-export.types"; export {default as getOrdererPublicWidgetOptions} from "./widgets/orderer/orderer-util"; +export {default as getCategorizerPublicWidgetOptions} from "./widgets/categorizer/categorizer-util"; diff --git a/packages/perseus/src/widgets/categorizer/categorizer.util.test.ts b/packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts similarity index 94% rename from packages/perseus/src/widgets/categorizer/categorizer.util.test.ts rename to packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts index 3b95496540..422b4207eb 100644 --- a/packages/perseus/src/widgets/categorizer/categorizer.util.test.ts +++ b/packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts @@ -1,4 +1,4 @@ -import getCategorizerPublicWidgetOptions from "./categorizer.util"; +import getCategorizerPublicWidgetOptions from "./categorizer-util"; import type {PerseusCategorizerWidgetOptions} from "@khanacademy/perseus-core"; diff --git a/packages/perseus/src/widgets/categorizer/categorizer.util.ts b/packages/perseus-core/src/widgets/categorizer/categorizer-util.ts similarity index 100% rename from packages/perseus/src/widgets/categorizer/categorizer.util.ts rename to packages/perseus-core/src/widgets/categorizer/categorizer-util.ts diff --git a/packages/perseus/src/types.ts b/packages/perseus/src/types.ts index c0393217f2..634c11bce4 100644 --- a/packages/perseus/src/types.ts +++ b/packages/perseus/src/types.ts @@ -2,7 +2,6 @@ import type {ILogger} from "./logging/log"; import type {PerseusStrings} from "./strings"; import type {SizeClass} from "./util/sizing-utils"; import type {WidgetPromptJSON} from "./widget-ai-utils/prompt-types"; -import type getCategorizerPublicWidgetOptions from "./widgets/categorizer/categorizer.util"; import type {KeypadAPI} from "@khanacademy/math-input"; import type { Hint, @@ -14,6 +13,7 @@ import type { Version, WidgetOptionsUpgradeMap, getOrdererPublicWidgetOptions, + getCategorizerPublicWidgetOptions, } from "@khanacademy/perseus-core"; import type {LinterContextProps} from "@khanacademy/perseus-linter"; import type { diff --git a/packages/perseus/src/widgets/categorizer/categorizer.tsx b/packages/perseus/src/widgets/categorizer/categorizer.tsx index d982b294df..ed3d42b8e6 100644 --- a/packages/perseus/src/widgets/categorizer/categorizer.tsx +++ b/packages/perseus/src/widgets/categorizer/categorizer.tsx @@ -1,4 +1,8 @@ /* eslint-disable @khanacademy/ts-no-error-suppressions */ +import { + type PerseusCategorizerWidgetOptions, + getCategorizerPublicWidgetOptions, +} from "@khanacademy/perseus-core"; import {linterContextDefault} from "@khanacademy/perseus-linter"; import { scoreCategorizer, @@ -20,11 +24,8 @@ import sharedStyles from "../../styles/shared"; import Util from "../../util"; import {getPromptJSON as _getPromptJSON} from "../../widget-ai-utils/categorizer/categorizer-ai-utils"; -import getCategorizerPublicWidgetOptions from "./categorizer.util"; - import type {Widget, WidgetExports, WidgetProps} from "../../types"; import type {CategorizerPromptJSON} from "../../widget-ai-utils/categorizer/categorizer-ai-utils"; -import type {PerseusCategorizerWidgetOptions} from "@khanacademy/perseus-core"; import type { PerseusCategorizerScoringData, PerseusCategorizerUserInput, From c0b6268ca585085b7c884414a79ad95cdbfb8d18 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 23 Jan 2025 15:29:13 -0600 Subject: [PATCH 3/5] [tb/update-locations] Move expression util into widget folder --- packages/perseus-core/src/index.ts | 3 +-- .../src/{utils => widgets/expression}/expression-util.test.ts | 0 .../src/{utils => widgets/expression}/expression-util.ts | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename packages/perseus-core/src/{utils => widgets/expression}/expression-util.test.ts (100%) rename packages/perseus-core/src/{utils => widgets/expression}/expression-util.ts (100%) diff --git a/packages/perseus-core/src/index.ts b/packages/perseus-core/src/index.ts index bbb3ab7744..81b6172cc8 100644 --- a/packages/perseus-core/src/index.ts +++ b/packages/perseus-core/src/index.ts @@ -39,5 +39,4 @@ export type * from "./widgets/logic-export.types"; export {default as getOrdererPublicWidgetOptions} from "./widgets/orderer/orderer-util"; export {default as getCategorizerPublicWidgetOptions} from "./widgets/categorizer/categorizer-util"; - -export {default as getExpressionPublicWidgetOptions} from "./utils/expression-util"; +export {default as getExpressionPublicWidgetOptions} from "./widgets/expression/expression-util"; diff --git a/packages/perseus-core/src/utils/expression-util.test.ts b/packages/perseus-core/src/widgets/expression/expression-util.test.ts similarity index 100% rename from packages/perseus-core/src/utils/expression-util.test.ts rename to packages/perseus-core/src/widgets/expression/expression-util.test.ts diff --git a/packages/perseus-core/src/utils/expression-util.ts b/packages/perseus-core/src/widgets/expression/expression-util.ts similarity index 100% rename from packages/perseus-core/src/utils/expression-util.ts rename to packages/perseus-core/src/widgets/expression/expression-util.ts From b55cb0775bc788fe7308dbd778d92061c8240a69 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 23 Jan 2025 15:55:39 -0600 Subject: [PATCH 4/5] [tb/update-locations] Update within package import --- .../src/widgets/categorizer/categorizer-util.test.ts | 2 +- .../perseus-core/src/widgets/expression/expression-util.test.ts | 2 +- packages/perseus-core/src/widgets/orderer/orderer-util.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts b/packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts index 422b4207eb..077a603ed4 100644 --- a/packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts +++ b/packages/perseus-core/src/widgets/categorizer/categorizer-util.test.ts @@ -1,6 +1,6 @@ import getCategorizerPublicWidgetOptions from "./categorizer-util"; -import type {PerseusCategorizerWidgetOptions} from "@khanacademy/perseus-core"; +import type {PerseusCategorizerWidgetOptions} from "../../data-schema"; describe("getCategorizerPublicWidgetOptions", () => { it("returns an object without the answer data", () => { diff --git a/packages/perseus-core/src/widgets/expression/expression-util.test.ts b/packages/perseus-core/src/widgets/expression/expression-util.test.ts index c81db8f74b..8ecb1e865f 100644 --- a/packages/perseus-core/src/widgets/expression/expression-util.test.ts +++ b/packages/perseus-core/src/widgets/expression/expression-util.test.ts @@ -1,6 +1,6 @@ import getExpressionPublicWidgetOptions from "./expression-util"; -import type {PerseusExpressionWidgetOptions} from "@khanacademy/perseus-core"; +import type {PerseusExpressionWidgetOptions} from "../../data-schema"; describe("getExpressionPublicWidgetOptions", () => { it("should return the correct public options without any answer data", () => { diff --git a/packages/perseus-core/src/widgets/orderer/orderer-util.test.ts b/packages/perseus-core/src/widgets/orderer/orderer-util.test.ts index 537442a160..0dba4e5576 100644 --- a/packages/perseus-core/src/widgets/orderer/orderer-util.test.ts +++ b/packages/perseus-core/src/widgets/orderer/orderer-util.test.ts @@ -1,6 +1,6 @@ import getOrdererPublicWidgetOptions from "./orderer-util"; -import type {PerseusOrdererWidgetOptions} from "@khanacademy/perseus-core"; +import type {PerseusOrdererWidgetOptions} from "../../data-schema"; describe("getOrdererPublicWidgetOptions", () => { it("should return the correct public options without any answer data", () => { From cc2fe3127d0357216749fa31c93d50b49b02ba2b Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 23 Jan 2025 15:57:31 -0600 Subject: [PATCH 5/5] [tb/update-locations] docs(changeset): Move the categorizer, orderer, and expression public widget options functions from perseus package to their widget folders in perseus-core --- .changeset/sixty-experts-watch.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/sixty-experts-watch.md diff --git a/.changeset/sixty-experts-watch.md b/.changeset/sixty-experts-watch.md new file mode 100644 index 0000000000..32ead6054f --- /dev/null +++ b/.changeset/sixty-experts-watch.md @@ -0,0 +1,6 @@ +--- +"@khanacademy/perseus": patch +"@khanacademy/perseus-core": patch +--- + +Move the categorizer, orderer, and expression public widget options functions from perseus package to their widget folders in perseus-core