Skip to content

fix(toLeopard): don't convert InputShape.Any literals to numbers #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adroitwhiz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(toLeopard): don't convert InputShape.Any literals to numbers #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions src/io/leopard/toLeopard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,23 +510,33 @@ export default function toLeopard(
value: string | number | boolean | object | null,
desiredInputShape?: InputShape
): string {
// Short-circuit for string inputs. These must never return number syntax.
if (desiredInputShape === InputShape.String) {
return JSON.stringify(value);
}
switch (desiredInputShape) {
// Return these as-is.
case InputShape.Any:
case InputShape.String:
case InputShape.Boolean:
case undefined:
return JSON.stringify(value);

// Other input shapes which static inputs may fulfill: number, index, any.
// These are all OK to return JavaScript number literals for.
const asNum = Number(value as string);
if (!isNaN(asNum) && value !== "") {
if (desiredInputShape === InputShape.Index) {
return JSON.stringify(asNum - 1);
} else {
// Cast to a number.
case InputShape.Index:
case InputShape.Number: {
let asNum = Number(value);
// Convert 1-indexes to 0-indexes.
if (desiredInputShape === InputShape.Index) {
asNum--;
}
// Scratch casts NaN to 0. This is done *after* the index
// conversion--"switch costume to (0 / 0)" switches to the first
// costume, not the last one.
if (Number.isNaN(asNum)) {
asNum = 0;
}
return JSON.stringify(asNum);
}
case InputShape.Stack:
throw new Error("Cannot convert a stack input to a literal");
}

return JSON.stringify(value);
}

function triggerInitCode(script: Script, target: Target): string | null {
Expand Down
Loading