CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-04 23:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update javascript block generators to const and let (#5661)

Browse Source
This commit is contained in:
Rachel Fenichel
2021-11-03 10:27:13 -07:00
committed by GitHub
parent 6c0c81d2f8
commit de95ffd133
9 changed files with 337 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
generators/javascript/text.js
View File

@@ -16,14 +16,14 @@ goog.require('Blockly.JavaScript');
Blockly.JavaScript['text'] = function(block) {
// Text value.
var code = Blockly.JavaScript.quote_(block.getFieldValue('TEXT'));
const code = Blockly.JavaScript.quote_(block.getFieldValue('TEXT'));
return [code, Blockly.JavaScript.ORDER_ATOMIC];
};
Blockly.JavaScript['text_multiline'] = function(block) {
// Text value.
var code = Blockly.JavaScript.multiline_quote_(block.getFieldValue('TEXT'));
var order = code.indexOf('+') !== -1 ? Blockly.JavaScript.ORDER_ADDITION :
const code = Blockly.JavaScript.multiline_quote_(block.getFieldValue('TEXT'));
const order = code.indexOf('+') !== -1 ? Blockly.JavaScript.ORDER_ADDITION :
Blockly.JavaScript.ORDER_ATOMIC;
return [code, order];
};
@@ -53,64 +53,67 @@ Blockly.JavaScript['text_join'] = function(block) {
switch (block.itemCount_) {
case 0:
return ['\'\'', Blockly.JavaScript.ORDER_ATOMIC];
case 1:
var element = Blockly.JavaScript.valueToCode(block, 'ADD0',
case 1: {
const element = Blockly.JavaScript.valueToCode(block, 'ADD0',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var codeAndOrder = Blockly.JavaScript.text.forceString_(element);
const codeAndOrder = Blockly.JavaScript.text.forceString_(element);
return codeAndOrder;
case 2:
var element0 = Blockly.JavaScript.valueToCode(block, 'ADD0',
}
case 2: {
const element0 = Blockly.JavaScript.valueToCode(block, 'ADD0',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var element1 = Blockly.JavaScript.valueToCode(block, 'ADD1',
const element1 = Blockly.JavaScript.valueToCode(block, 'ADD1',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var code = Blockly.JavaScript.text.forceString_(element0)[0] +
const code = Blockly.JavaScript.text.forceString_(element0)[0] +
' + ' + Blockly.JavaScript.text.forceString_(element1)[0];
return [code, Blockly.JavaScript.ORDER_ADDITION];
default:
var elements = new Array(block.itemCount_);
for (var i = 0; i < block.itemCount_; i++) {
}
default: {
const elements = new Array(block.itemCount_);
for (let i = 0; i < block.itemCount_; i++) {
elements[i] = Blockly.JavaScript.valueToCode(block, 'ADD' + i,
Blockly.JavaScript.ORDER_NONE) || '\'\'';
}
var code = '[' + elements.join(',') + '].join(\'\')';
const code = '[' + elements.join(',') + '].join(\'\')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
}
}
};
Blockly.JavaScript['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.JavaScript.nameDB_.getName(
const varName = Blockly.JavaScript.nameDB_.getName(
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var value = Blockly.JavaScript.valueToCode(block, 'TEXT',
const value = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var code = varName + ' += ' +
const code = varName + ' += ' +
Blockly.JavaScript.text.forceString_(value)[0] + ';\n';
return code;
};
Blockly.JavaScript['text_length'] = function(block) {
// String or array length.
var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
const text = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
return [text + '.length', Blockly.JavaScript.ORDER_MEMBER];
};
Blockly.JavaScript['text_isEmpty'] = function(block) {
// Is the string null or array empty?
var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
const text = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
return ['!' + text + '.length', Blockly.JavaScript.ORDER_LOGICAL_NOT];
};
Blockly.JavaScript['text_indexOf'] = function(block) {
// Search the text for a substring.
var operator = block.getFieldValue('END') === 'FIRST' ?
const operator = block.getFieldValue('END') === 'FIRST' ?
'indexOf' : 'lastIndexOf';
var substring = Blockly.JavaScript.valueToCode(block, 'FIND',
const substring = Blockly.JavaScript.valueToCode(block, 'FIND',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
const text = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
var code = text + '.' + operator + '(' + substring + ')';
const code = text + '.' + operator + '(' + substring + ')';
// Adjust index if using one-based indices.
if (block.workspace.options.oneBasedIndex) {
return [code + ' + 1', Blockly.JavaScript.ORDER_ADDITION];
@@ -121,37 +124,42 @@ Blockly.JavaScript['text_indexOf'] = function(block) {
Blockly.JavaScript['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
var where = block.getFieldValue('WHERE') || 'FROM_START';
var textOrder = (where === 'RANDOM') ? Blockly.JavaScript.ORDER_NONE :
const where = block.getFieldValue('WHERE') || 'FROM_START';
const textOrder = (where === 'RANDOM') ? Blockly.JavaScript.ORDER_NONE :
Blockly.JavaScript.ORDER_MEMBER;
var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
const text = Blockly.JavaScript.valueToCode(block, 'VALUE',
textOrder) || '\'\'';
switch (where) {
case 'FIRST':
var code = text + '.charAt(0)';
case 'FIRST': {
const code = text + '.charAt(0)';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'LAST':
var code = text + '.slice(-1)';
}
case 'LAST': {
const code = text + '.slice(-1)';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'FROM_START':
var at = Blockly.JavaScript.getAdjusted(block, 'AT');
}
case 'FROM_START': {
const at = Blockly.JavaScript.getAdjusted(block, 'AT');
// Adjust index if using one-based indices.
var code = text + '.charAt(' + at + ')';
const code = text + '.charAt(' + at + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'FROM_END':
var at = Blockly.JavaScript.getAdjusted(block, 'AT', 1, true);
var code = text + '.slice(' + at + ').charAt(0)';
}
case 'FROM_END': {
const at = Blockly.JavaScript.getAdjusted(block, 'AT', 1, true);
const code = text + '.slice(' + at + ').charAt(0)';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'RANDOM':
var functionName = Blockly.JavaScript.provideFunction_(
}
case 'RANDOM': {
const functionName = Blockly.JavaScript.provideFunction_(
'textRandomLetter',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(text) {',
' var x = Math.floor(Math.random() * text.length);',
' return text[x];',
'}']);
var code = functionName + '(' + text + ')';
const code = functionName + '(' + text + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
}
}
throw Error('Unhandled option (text_charAt).');
};
@@ -178,58 +186,61 @@ Blockly.JavaScript.text.getIndex_ = function(stringName, where, opt_at) {
Blockly.JavaScript['text_getSubstring'] = function(block) {
// Get substring.
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
var requiresLengthCall = (where1 !== 'FROM_END' && where1 !== 'LAST' &&
const where1 = block.getFieldValue('WHERE1');
const where2 = block.getFieldValue('WHERE2');
const requiresLengthCall = (where1 !== 'FROM_END' && where1 !== 'LAST' &&
where2 !== 'FROM_END' && where2 !== 'LAST');
var textOrder = requiresLengthCall ? Blockly.JavaScript.ORDER_MEMBER :
const textOrder = requiresLengthCall ? Blockly.JavaScript.ORDER_MEMBER :
Blockly.JavaScript.ORDER_NONE;
var text = Blockly.JavaScript.valueToCode(block, 'STRING',
const text = Blockly.JavaScript.valueToCode(block, 'STRING',
textOrder) || '\'\'';
let code;
if (where1 === 'FIRST' && where2 === 'LAST') {
var code = text;
code = text;
return [code, Blockly.JavaScript.ORDER_NONE];
} else if (text.match(/^'?\w+'?$/) || requiresLengthCall) {
// If the text is a variable or literal or doesn't require a call for
// length, don't generate a helper function.
let at1;
switch (where1) {
case 'FROM_START':
var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
break;
case 'FROM_END':
var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1', 1, false,
at1 = Blockly.JavaScript.getAdjusted(block, 'AT1', 1, false,
Blockly.JavaScript.ORDER_SUBTRACTION);
at1 = text + '.length - ' + at1;
break;
case 'FIRST':
var at1 = '0';
at1 = '0';
break;
default:
throw Error('Unhandled option (text_getSubstring).');
}
let at2;
switch (where2) {
case 'FROM_START':
var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 1);
at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 1);
break;
case 'FROM_END':
var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 0, false,
at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 0, false,
Blockly.JavaScript.ORDER_SUBTRACTION);
at2 = text + '.length - ' + at2;
break;
case 'LAST':
var at2 = text + '.length';
at2 = text + '.length';
break;
default:
throw Error('Unhandled option (text_getSubstring).');
}
code = text + '.slice(' + at1 + ', ' + at2 + ')';
} else {
var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2');
var getIndex_ = Blockly.JavaScript.text.getIndex_;
var wherePascalCase = {'FIRST': 'First', 'LAST': 'Last',
const at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
const at2 = Blockly.JavaScript.getAdjusted(block, 'AT2');
const getIndex_ = Blockly.JavaScript.text.getIndex_;
const wherePascalCase = {'FIRST': 'First', 'LAST': 'Last',
'FROM_START': 'FromStart', 'FROM_END': 'FromEnd'};
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'subsequence' + wherePascalCase[where1] + wherePascalCase[where2],
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(sequence' +
@@ -242,7 +253,7 @@ Blockly.JavaScript['text_getSubstring'] = function(block) {
' var end = ' + getIndex_('sequence', where2, 'at2') + ' + 1;',
' return sequence.slice(start, end);',
'}']);
var code = functionName + '(' + text +
code = functionName + '(' + text +
// The value for 'FROM_END' and 'FROM_START' depends on `at` so we
// pass it.
((where1 === 'FROM_END' || where1 === 'FROM_START') ? ', ' + at1 : '') +
@@ -254,22 +265,23 @@ Blockly.JavaScript['text_getSubstring'] = function(block) {
Blockly.JavaScript['text_changeCase'] = function(block) {
// Change capitalization.
var OPERATORS = {
const OPERATORS = {
'UPPERCASE': '.toUpperCase()',
'LOWERCASE': '.toLowerCase()',
'TITLECASE': null
};
var operator = OPERATORS[block.getFieldValue('CASE')];
var textOrder = operator ? Blockly.JavaScript.ORDER_MEMBER :
const operator = OPERATORS[block.getFieldValue('CASE')];
const textOrder = operator ? Blockly.JavaScript.ORDER_MEMBER :
Blockly.JavaScript.ORDER_NONE;
var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
const text = Blockly.JavaScript.valueToCode(block, 'TEXT',
textOrder) || '\'\'';
let code;
if (operator) {
// Upper and lower case are functions built into JavaScript.
var code = text + operator;
code = text + operator;
} else {
// Title case is not a native JavaScript function. Define one.
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'textToTitleCase',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(str) {',
@@ -277,43 +289,44 @@ Blockly.JavaScript['text_changeCase'] = function(block) {
' function(txt) {return txt[0].toUpperCase() + ' +
'txt.substring(1).toLowerCase();});',
'}']);
var code = functionName + '(' + text + ')';
code = functionName + '(' + text + ')';
}
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_trim'] = function(block) {
// Trim spaces.
var OPERATORS = {
const OPERATORS = {
'LEFT': ".replace(/^[\\s\\xa0]+/, '')",
'RIGHT': ".replace(/[\\s\\xa0]+$/, '')",
'BOTH': '.trim()'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
const operator = OPERATORS[block.getFieldValue('MODE')];
const text = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
return [text + operator, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_print'] = function(block) {
// Print statement.
var msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
const msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
return 'window.alert(' + msg + ');\n';
};
Blockly.JavaScript['text_prompt_ext'] = function(block) {
// Prompt function.
let msg;
if (block.getField('TEXT')) {
// Internal message.
var msg = Blockly.JavaScript.quote_(block.getFieldValue('TEXT'));
msg = Blockly.JavaScript.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
var msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
}
var code = 'window.prompt(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') === 'NUMBER';
let code = 'window.prompt(' + msg + ')';
const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
if (toNumber) {
code = 'Number(' + code + ')';
}
@@ -323,11 +336,11 @@ Blockly.JavaScript['text_prompt_ext'] = function(block) {
Blockly.JavaScript['text_prompt'] = Blockly.JavaScript['text_prompt_ext'];
Blockly.JavaScript['text_count'] = function(block) {
var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
const text = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var sub = Blockly.JavaScript.valueToCode(block, 'SUB',
const sub = Blockly.JavaScript.valueToCode(block, 'SUB',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'textCount',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(haystack, needle) {',
@@ -337,20 +350,20 @@ Blockly.JavaScript['text_count'] = function(block) {
' return haystack.split(needle).length - 1;',
' }',
'}']);
var code = functionName + '(' + text + ', ' + sub + ')';
const code = functionName + '(' + text + ', ' + sub + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_replace'] = function(block) {
var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
const text = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var from = Blockly.JavaScript.valueToCode(block, 'FROM',
const from = Blockly.JavaScript.valueToCode(block, 'FROM',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var to = Blockly.JavaScript.valueToCode(block, 'TO',
const to = Blockly.JavaScript.valueToCode(block, 'TO',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
// The regex escaping code below is taken from the implementation of
// goog.string.regExpEscape.
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'textReplace',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(haystack, needle, replacement) {',
@@ -359,13 +372,13 @@ Blockly.JavaScript['text_replace'] = function(block) {
' .replace(/\\x08/g,"\\\\x08");',
' return haystack.replace(new RegExp(needle, \'g\'), replacement);',
'}']);
var code = functionName + '(' + text + ', ' + from + ', ' + to + ')';
const code = functionName + '(' + text + ', ' + from + ', ' + to + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_reverse'] = function(block) {
var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
const text = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
var code = text + '.split(\'\').reverse().join(\'\')';
const code = text + '.split(\'\').reverse().join(\'\')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};