Skip to content
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

Jump to bottom

Add boolean argument support to ScratchX compatibility layer #208

Merged
merged 5 commits into from
May 9, 2024
Merged

Add boolean argument support to ScratchX compatibility layer #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96f8df0
Update tw-scratchx-compatibility-layer.js
KyleKart Apr 30, 2024
4ad2522
Ignore default value entirely
GarboMuffin May 9, 2024
8dd9e64
add test
GarboMuffin May 9, 2024
4d38c9c
remove the TODO if you fixed it
GarboMuffin May 9, 2024
af2cb18
update test
GarboMuffin May 9, 2024
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
8 changes: 6 additions & 2 deletions src/extension-support/tw-scratchx-compatibility-layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@ const isScratchCompatibleValue = v => typeof v === 'string' || typeof v === 'num
const parseScratchXArgument = (argument, defaultValue) => {
const result = {};
const hasDefaultValue = isScratchCompatibleValue(defaultValue);
if (hasDefaultValue) {

// defaultValue is ignored for booleans in Scratch 3
if (hasDefaultValue && argument !== 'b') {
result.defaultValue = defaultValue;
}
// TODO: ScratchX docs don't mention support for boolean arguments?

if (argument === 's') {
result.type = ArgumentType.STRING;
if (!hasDefaultValue) {
Expand All @@ -79,6 +81,8 @@ const parseScratchXArgument = (argument, defaultValue) => {
const split = argument.split(/\.|:/);
const menuName = split[1];
result.menu = menuName;
} else if (argument === 'b') {
result.type = ArgumentType.BOOLEAN;
} else {
throw new Error(`Unknown ScratchX argument type: ${argument}`);
}
Expand Down
19 changes: 14 additions & 5 deletions test/unit/tw_scratchx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test('complex extension', async t => {
return 'This value should be ignored.';
};

const touching = sprite => sprite === 'Sprite9';
const touching = (sprite, bool) => sprite === 'Sprite9' && bool === true;

const converted = convert(
'My Extension',
Expand All @@ -87,7 +87,7 @@ test('complex extension', async t => {
['r', 'multiply %n by %n and append %s', 'multiplyAndAppend'],
['R', 'repeat %m.myMenu %n', 'repeat', ''],
['-'],
['b', 'touching %s', 'touching', 'Sprite1']
['b', 'touching %s %b', 'touching', 'Sprite1', 'ignored']
],
menus: {
myMenu: ['abc', 'def', 123, true, false],
Expand Down Expand Up @@ -178,12 +178,15 @@ test('complex extension', async t => {
'---',
{
opcode: 'touching',
text: 'touching [0]',
text: 'touching [0] [1]',
blockType: 'Boolean',
arguments: [
{
type: 'string',
defaultValue: 'Sprite1'
},
{
type: 'Boolean'
}
]
}
Expand Down Expand Up @@ -232,11 +235,17 @@ test('complex extension', async t => {
}), 'scratchxscratchxscratchx');

t.equal(converted.touching({
0: 'Sprite1'
0: 'Sprite1',
1: true
}), false);
t.equal(converted.touching({
0: 'Sprite9'
0: 'Sprite9',
1: true
}), true);
t.equal(converted.touching({
0: 'Sprite9',
1: false
}), false);

t.end();
});
Expand Down