-
Notifications
You must be signed in to change notification settings - Fork 350
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert backgroundImage dimensions to numbers during parsing (#1923)
Issue: LEMS-2582 ## Test plan: `yarn test` Author: benchristel Reviewers: jeremywiebe, benchristel Required Reviewers: Approved By: jeremywiebe Checks: ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ gerald Pull Request URL: #1923
- Loading branch information
1 parent
1d2b4e7
commit be8c06c
Showing
6 changed files
with
359 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@khanacademy/perseus": patch | ||
| --- | ||
|
|
||
| Internal: convert backgroundImage dimensions to numbers during parsing. |
40 changes: 40 additions & 0 deletions
40
...ages/perseus/src/util/parse-perseus-json/general-purpose-parsers/string-to-number.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import {success} from "../result"; | ||
|
|
||
| import {stringToNumber} from "./string-to-number"; | ||
| import {ctx, parseFailureWith} from "./test-helpers"; | ||
|
|
||
| describe("stringToNumber", () => { | ||
| it("accepts a number", () => { | ||
| expect(stringToNumber(42, ctx())).toEqual(success(42)); | ||
| }); | ||
|
|
||
| it("accepts a numeric string", () => { | ||
| expect(stringToNumber("7", ctx())).toEqual(success(7)); | ||
| }); | ||
|
|
||
| it("parses a decimal", () => { | ||
| expect(stringToNumber("5.5", ctx())).toEqual(success(5.5)); | ||
| }); | ||
|
|
||
| it("parses a negative number", () => { | ||
| expect(stringToNumber("-2", ctx())).toEqual(success(-2)); | ||
| }); | ||
|
|
||
| it("rejects the empty string", () => { | ||
| expect(stringToNumber("", ctx())).toEqual( | ||
| parseFailureWith({ | ||
| badValue: "", | ||
| expected: ["a number or numeric string"], | ||
| }), | ||
| ); | ||
| }); | ||
|
|
||
| it("rejects a non-numeric string", () => { | ||
| expect(stringToNumber("3a", ctx())).toEqual( | ||
| parseFailureWith({ | ||
| badValue: "3a", | ||
| expected: ["a number or numeric string"], | ||
| }), | ||
| ); | ||
| }); | ||
| }); |
17 changes: 17 additions & 0 deletions
17
packages/perseus/src/util/parse-perseus-json/general-purpose-parsers/string-to-number.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import type {PartialParser} from "../parser-types"; | ||
|
|
||
| export const stringToNumber: PartialParser<string | number, number> = ( | ||
| rawValue, | ||
| ctx, | ||
| ) => { | ||
| if (typeof rawValue === "number") { | ||
| return ctx.success(rawValue); | ||
| } | ||
|
|
||
| const parsedNumber = +rawValue; | ||
| if (rawValue === "" || isNaN(parsedNumber)) { | ||
| return ctx.failure("a number or numeric string", rawValue); | ||
| } | ||
|
|
||
| return ctx.success(parsedNumber); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
...erseus-json/regression-tests/data/interactive-graph-with-string-backgroundImage-left.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| { | ||
| "question": { | ||
| "content": "Ally is excited to compete in a $6$-mile race. The race organizers plotted the course on a coordinate map. The starting point is at $(4,3)$, and the ending point is at $(4,9)$. Ally's family decides to stand at $(4,6)$ on the map.\n\n**Plot the starting point, ending point, and place where Ally's family stands on the map.**\n\n[[☃ interactive-graph 1]]\n\n**How far along will Ally be in the race when she reaches her family?** \n[[☃ radio 1]]", | ||
| "images": {}, | ||
| "widgets": { | ||
| "interactive-graph 1": { | ||
| "type": "interactive-graph", | ||
| "alignment": "default", | ||
| "static": false, | ||
| "graded": true, | ||
| "options": { | ||
| "step": [ | ||
| 1, | ||
| 1 | ||
| ], | ||
| "backgroundImage": { | ||
| "url": "", | ||
| "scale": "1", | ||
| "bottom": "4", | ||
| "left": "0", | ||
| "width": 0, | ||
| "height": 0 | ||
| }, | ||
| "markings": "graph", | ||
| "labels": [ | ||
| "x", | ||
| "y" | ||
| ], | ||
| "showProtractor": false, | ||
| "showRuler": false, | ||
| "showTooltips": false, | ||
| "rulerLabel": "", | ||
| "rulerTicks": 10, | ||
| "range": [ | ||
| [ | ||
| -1, | ||
| 10 | ||
| ], | ||
| [ | ||
| -1, | ||
| 10 | ||
| ] | ||
| ], | ||
| "gridStep": [ | ||
| 1, | ||
| 1 | ||
| ], | ||
| "snapStep": [ | ||
| 0.5, | ||
| 0.5 | ||
| ], | ||
| "graph": { | ||
| "type": "point", | ||
| "numPoints": 3 | ||
| }, | ||
| "correct": { | ||
| "type": "point", | ||
| "coords": [ | ||
| [ | ||
| 4, | ||
| 3 | ||
| ], | ||
| [ | ||
| 4, | ||
| 6 | ||
| ], | ||
| [ | ||
| 4, | ||
| 9 | ||
| ] | ||
| ], | ||
| "numPoints": 3 | ||
| } | ||
| }, | ||
| "version": { | ||
| "major": 0, | ||
| "minor": 0 | ||
| } | ||
| }, | ||
| "radio 1": { | ||
| "type": "radio", | ||
| "alignment": "default", | ||
| "static": false, | ||
| "graded": true, | ||
| "options": { | ||
| "choices": [ | ||
| { | ||
| "correct": false, | ||
| "content": "Less than halfway through the race" | ||
| }, | ||
| { | ||
| "correct": true, | ||
| "content": "Halfway through the race" | ||
| }, | ||
| { | ||
| "content": "More than halfway through the race" | ||
| } | ||
| ], | ||
| "randomize": false, | ||
| "multipleSelect": false, | ||
| "countChoices": false, | ||
| "displayCount": null, | ||
| "hasNoneOfTheAbove": false, | ||
| "deselectEnabled": false | ||
| }, | ||
| "version": { | ||
| "major": 1, | ||
| "minor": 0 | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "answerArea": { | ||
| "calculator": false, | ||
| "chi2Table": false, | ||
| "periodicTable": false, | ||
| "tTable": false, | ||
| "zTable": false | ||
| }, | ||
| "itemDataVersion": { | ||
| "major": 0, | ||
| "minor": 1 | ||
| }, | ||
| "hints": [] | ||
| } |