refactor!(generators): Update generator definitions to use dictionary

BREAKING CHANGE: this PR moves the generator functions we provide
from their previous location directly on the CodeGenerator instances
to the new .forBlock dictionary on each instance.

The change in the previous commit does not oblige external
developers to do the same for their custom generators, but
they will need to update any code that references the generator
functions we provide in generators/*/* (e.g. to reuse one of
our functions for a different block type).

generators/dart/colour.js

@@ -16,13 +16,13 @@ import {dartGenerator as Dart} from '../dart.js';
 
 Dart.addReservedWords('Math');
 
-Dart['colour_picker'] = function(block) {
+Dart.forBlock['colour_picker'] = function(block) {
   // Colour picker.
   const code = Dart.quote_(block.getFieldValue('COLOUR'));
   return [code, Dart.ORDER_ATOMIC];
 };
 
-Dart['colour_random'] = function(block) {
+Dart.forBlock['colour_random'] = function(block) {
   // Generate a random colour.
   Dart.definitions_['import_dart_math'] = "import 'dart:math' as Math;";
   const functionName = Dart.provideFunction_('colour_random', `
@@ -38,7 +38,7 @@ String ${Dart.FUNCTION_NAME_PLACEHOLDER_}() {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['colour_rgb'] = function(block) {
+Dart.forBlock['colour_rgb'] = function(block) {
   // Compose a colour from RGB components expressed as percentages.
   const red = Dart.valueToCode(block, 'RED',
       Dart.ORDER_NONE) || 0;
@@ -69,7 +69,7 @@ String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['colour_blend'] = function(block) {
+Dart.forBlock['colour_blend'] = function(block) {
   // Blend two colours together.
   const c1 = Dart.valueToCode(block, 'COLOUR1', Dart.ORDER_NONE) || "'#000000'";
   const c2 = Dart.valueToCode(block, 'COLOUR2', Dart.ORDER_NONE) || "'#000000'";

generators/dart/lists.js

@@ -17,12 +17,12 @@ import {dartGenerator as Dart} from '../dart.js';
 
 Dart.addReservedWords('Math');
 
-Dart['lists_create_empty'] = function(block) {
+Dart.forBlock['lists_create_empty'] = function(block) {
   // Create an empty list.
   return ['[]', Dart.ORDER_ATOMIC];
 };
 
-Dart['lists_create_with'] = function(block) {
+Dart.forBlock['lists_create_with'] = function(block) {
   // Create a list with any number of elements of any type.
   const elements = new Array(block.itemCount_);
   for (let i = 0; i < block.itemCount_; i++) {
@@ -32,29 +32,29 @@ Dart['lists_create_with'] = function(block) {
   return [code, Dart.ORDER_ATOMIC];
 };
 
-Dart['lists_repeat'] = function(block) {
+Dart.forBlock['lists_repeat'] = function(block) {
   // Create a list with one element repeated.
   const element = Dart.valueToCode(block, 'ITEM', Dart.ORDER_NONE) || 'null';
   const repeatCount = Dart.valueToCode(block, 'NUM', Dart.ORDER_NONE) || '0';
   const code = 'new List.filled(' + repeatCount + ', ' + element + ')';
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['lists_length'] = function(block) {
+Dart.forBlock['lists_length'] = function(block) {
   // String or array length.
   const list =
       Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || '[]';
   return [list + '.length', Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['lists_isEmpty'] = function(block) {
+Dart.forBlock['lists_isEmpty'] = function(block) {
   // Is the string null or array empty?
   const list =
       Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || '[]';
   return [list + '.isEmpty', Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['lists_indexOf'] = function(block) {
+Dart.forBlock['lists_indexOf'] = function(block) {
   // Find an item in the list.
   const operator =
       block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
@@ -68,7 +68,7 @@ Dart['lists_indexOf'] = function(block) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['lists_getIndex'] = function(block) {
+Dart.forBlock['lists_getIndex'] = function(block) {
   // Get element at index.
   // Note: Until January 2013 this block did not have MODE or WHERE inputs.
   const mode = block.getFieldValue('MODE') || 'GET';
@@ -222,7 +222,7 @@ dynamic ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
   throw Error('Unhandled combination (lists_getIndex).');
 };
 
-Dart['lists_setIndex'] = function(block) {
+Dart.forBlock['lists_setIndex'] = function(block) {
   // Set element at index.
   // Note: Until February 2013 this block did not have MODE or WHERE inputs.
   const mode = block.getFieldValue('MODE') || 'GET';
@@ -298,7 +298,7 @@ Dart['lists_setIndex'] = function(block) {
   throw Error('Unhandled combination (lists_setIndex).');
 };
 
-Dart['lists_getSublist'] = function(block) {
+Dart.forBlock['lists_getSublist'] = function(block) {
   // Get sublist.
   const list =
       Dart.valueToCode(block, 'LIST', Dart.ORDER_UNARY_POSTFIX) || '[]';
@@ -372,7 +372,7 @@ List ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List list, String where1, num at1, Strin
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['lists_sort'] = function(block) {
+Dart.forBlock['lists_sort'] = function(block) {
   // Block for sorting a list.
   const list = Dart.valueToCode(block, 'LIST', Dart.ORDER_NONE) || '[]';
   const direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
@@ -399,7 +399,7 @@ List ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List list, String type, int direction) {
   ];
 };
 
-Dart['lists_split'] = function(block) {
+Dart.forBlock['lists_split'] = function(block) {
   // Block for splitting text into a list, or joining a list into text.
   let input = Dart.valueToCode(block, 'INPUT', Dart.ORDER_UNARY_POSTFIX);
   const delimiter = Dart.valueToCode(block, 'DELIM', Dart.ORDER_NONE) || "''";
@@ -422,7 +422,7 @@ Dart['lists_split'] = function(block) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['lists_reverse'] = function(block) {
+Dart.forBlock['lists_reverse'] = function(block) {
   // Block for reversing a list.
   const list = Dart.valueToCode(block, 'LIST', Dart.ORDER_NONE) || '[]';
   // XXX What should the operator precedence be for a `new`?

generators/dart/logic.js

@@ -14,7 +14,7 @@ goog.declareModuleId('Blockly.Dart.logic');
 import {dartGenerator as Dart} from '../dart.js';
 
 
-Dart['controls_if'] = function(block) {
+Dart.forBlock['controls_if'] = function(block) {
   // If/elseif/else condition.
   let n = 0;
   let code = '', branchCode, conditionCode;
@@ -50,9 +50,9 @@ Dart['controls_if'] = function(block) {
   return code + '\n';
 };
 
-Dart['controls_ifelse'] = Dart['controls_if'];
+Dart.forBlock['controls_ifelse'] = Dart.forBlock['controls_if'];
 
-Dart['logic_compare'] = function(block) {
+Dart.forBlock['logic_compare'] = function(block) {
   // Comparison operator.
   const OPERATORS =
       {'EQ': '==', 'NEQ': '!=', 'LT': '<', 'LTE': '<=', 'GT': '>', 'GTE': '>='};
@@ -66,7 +66,7 @@ Dart['logic_compare'] = function(block) {
   return [code, order];
 };
 
-Dart['logic_operation'] = function(block) {
+Dart.forBlock['logic_operation'] = function(block) {
   // Operations 'and', 'or'.
   const operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
   const order =
@@ -91,26 +91,26 @@ Dart['logic_operation'] = function(block) {
   return [code, order];
 };
 
-Dart['logic_negate'] = function(block) {
+Dart.forBlock['logic_negate'] = function(block) {
   // Negation.
   const order = Dart.ORDER_UNARY_PREFIX;
   const argument0 = Dart.valueToCode(block, 'BOOL', order) || 'true';
   const code = '!' + argument0;
   return [code, order];
 };
 
-Dart['logic_boolean'] = function(block) {
+Dart.forBlock['logic_boolean'] = function(block) {
   // Boolean values true and false.
   const code = (block.getFieldValue('BOOL') === 'TRUE') ? 'true' : 'false';
   return [code, Dart.ORDER_ATOMIC];
 };
 
-Dart['logic_null'] = function(block) {
+Dart.forBlock['logic_null'] = function(block) {
   // Null data type.
   return ['null', Dart.ORDER_ATOMIC];
 };
 
-Dart['logic_ternary'] = function(block) {
+Dart.forBlock['logic_ternary'] = function(block) {
   // Ternary operator.
   const value_if =
       Dart.valueToCode(block, 'IF', Dart.ORDER_CONDITIONAL) || 'false';

generators/dart/loops.js

@@ -16,7 +16,7 @@ import * as stringUtils from '../../core/utils/string.js';
 import {NameType} from '../../core/names.js';
 
 
-Dart['controls_repeat_ext'] = function(block) {
+Dart.forBlock['controls_repeat_ext'] = function(block) {
   let repeats;
   // Repeat n times.
   if (block.getField('TIMES')) {
@@ -40,9 +40,9 @@ Dart['controls_repeat_ext'] = function(block) {
   return code;
 };
 
-Dart['controls_repeat'] = Dart['controls_repeat_ext'];
+Dart.forBlock['controls_repeat'] = Dart.forBlock['controls_repeat_ext'];
 
-Dart['controls_whileUntil'] = function(block) {
+Dart.forBlock['controls_whileUntil'] = function(block) {
   // Do while/until loop.
   const until = block.getFieldValue('MODE') === 'UNTIL';
   let argument0 =
@@ -57,7 +57,7 @@ Dart['controls_whileUntil'] = function(block) {
   return 'while (' + argument0 + ') {\n' + branch + '}\n';
 };
 
-Dart['controls_for'] = function(block) {
+Dart.forBlock['controls_for'] = function(block) {
   // For loop.
   const variable0 =
       Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
@@ -117,7 +117,7 @@ Dart['controls_for'] = function(block) {
   return code;
 };
 
-Dart['controls_forEach'] = function(block) {
+Dart.forBlock['controls_forEach'] = function(block) {
   // For each loop.
   const variable0 =
       Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
@@ -130,7 +130,7 @@ Dart['controls_forEach'] = function(block) {
   return code;
 };
 
-Dart['controls_flow_statements'] = function(block) {
+Dart.forBlock['controls_flow_statements'] = function(block) {
   // Flow statements: continue, break.
   let xfix = '';
   if (Dart.STATEMENT_PREFIX) {

generators/dart/math.js

@@ -17,7 +17,7 @@ import {dartGenerator as Dart} from '../dart.js';
 
 Dart.addReservedWords('Math');
 
-Dart['math_number'] = function(block) {
+Dart.forBlock['math_number'] = function(block) {
   // Numeric value.
   let code = Number(block.getFieldValue('NUM'));
   let order;
@@ -35,7 +35,7 @@ Dart['math_number'] = function(block) {
   return [code, order];
 };
 
-Dart['math_arithmetic'] = function(block) {
+Dart.forBlock['math_arithmetic'] = function(block) {
   // Basic arithmetic operators, and power.
   const OPERATORS = {
     'ADD': [' + ', Dart.ORDER_ADDITIVE],
@@ -60,7 +60,7 @@ Dart['math_arithmetic'] = function(block) {
   return [code, order];
 };
 
-Dart['math_single'] = function(block) {
+Dart.forBlock['math_single'] = function(block) {
   // Math operators with single operand.
   const operator = block.getFieldValue('OP');
   let code;
@@ -144,7 +144,7 @@ Dart['math_single'] = function(block) {
   return [code, Dart.ORDER_MULTIPLICATIVE];
 };
 
-Dart['math_constant'] = function(block) {
+Dart.forBlock['math_constant'] = function(block) {
   // Constants: PI, E, the Golden Ratio, sqrt(2), 1/sqrt(2), INFINITY.
   const CONSTANTS = {
     'PI': ['Math.pi', Dart.ORDER_UNARY_POSTFIX],
@@ -161,7 +161,7 @@ Dart['math_constant'] = function(block) {
   return CONSTANTS[constant];
 };
 
-Dart['math_number_property'] = function(block) {
+Dart.forBlock['math_number_property'] = function(block) {
   // Check if a number is even, odd, prime, whole, positive, or negative
   // or if it is divisible by certain number. Returns true or false.
   const PROPERTIES = {
@@ -216,7 +216,7 @@ bool ${Dart.FUNCTION_NAME_PLACEHOLDER_}(n) {
   return [code, outputOrder];
 };
 
-Dart['math_change'] = function(block) {
+Dart.forBlock['math_change'] = function(block) {
   // Add to a variable in place.
   const argument0 =
       Dart.valueToCode(block, 'DELTA', Dart.ORDER_ADDITIVE) || '0';
@@ -227,11 +227,11 @@ Dart['math_change'] = function(block) {
 };
 
 // Rounding functions have a single operand.
-Dart['math_round'] = Dart['math_single'];
+Dart.forBlock['math_round'] = Dart.forBlock['math_single'];
 // Trigonometry functions have a single operand.
-Dart['math_trig'] = Dart['math_single'];
+Dart.forBlock['math_trig'] = Dart.forBlock['math_single'];
 
-Dart['math_on_list'] = function(block) {
+Dart.forBlock['math_on_list'] = function(block) {
   // Math functions for lists.
   const func = block.getFieldValue('OP');
   const list = Dart.valueToCode(block, 'LIST', Dart.ORDER_NONE) || '[]';
@@ -386,7 +386,7 @@ dynamic ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['math_modulo'] = function(block) {
+Dart.forBlock['math_modulo'] = function(block) {
   // Remainder computation.
   const argument0 =
       Dart.valueToCode(block, 'DIVIDEND', Dart.ORDER_MULTIPLICATIVE) || '0';
@@ -396,7 +396,7 @@ Dart['math_modulo'] = function(block) {
   return [code, Dart.ORDER_MULTIPLICATIVE];
 };
 
-Dart['math_constrain'] = function(block) {
+Dart.forBlock['math_constrain'] = function(block) {
   // Constrain a number between two limits.
   Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
   const argument0 = Dart.valueToCode(block, 'VALUE', Dart.ORDER_NONE) || '0';
@@ -408,7 +408,7 @@ Dart['math_constrain'] = function(block) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['math_random_int'] = function(block) {
+Dart.forBlock['math_random_int'] = function(block) {
   // Random integer between [X] and [Y].
   Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
   const argument0 = Dart.valueToCode(block, 'FROM', Dart.ORDER_NONE) || '0';
@@ -428,13 +428,13 @@ int ${Dart.FUNCTION_NAME_PLACEHOLDER_}(num a, num b) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['math_random_float'] = function(block) {
+Dart.forBlock['math_random_float'] = function(block) {
   // Random fraction between 0 and 1.
   Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
   return ['new Math.Random().nextDouble()', Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['math_atan2'] = function(block) {
+Dart.forBlock['math_atan2'] = function(block) {
   // Arctangent of point (X, Y) in degrees from -180 to 180.
   Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
   const argument0 = Dart.valueToCode(block, 'X', Dart.ORDER_NONE) || '0';

generators/dart/procedures.js

@@ -15,7 +15,7 @@ import {NameType} from '../../core/names.js';
 import {dartGenerator as Dart} from '../dart.js';
 
 
-Dart['procedures_defreturn'] = function(block) {
+Dart.forBlock['procedures_defreturn'] = function(block) {
   // Define a procedure with a return value.
   const funcName =
       Dart.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
@@ -60,9 +60,9 @@ Dart['procedures_defreturn'] = function(block) {
 
 // Defining a procedure without a return value uses the same generator as
 // a procedure with a return value.
-Dart['procedures_defnoreturn'] = Dart['procedures_defreturn'];
+Dart.forBlock['procedures_defnoreturn'] = Dart.forBlock['procedures_defreturn'];
 
-Dart['procedures_callreturn'] = function(block) {
+Dart.forBlock['procedures_callreturn'] = function(block) {
   // Call a procedure with a return value.
   const funcName =
       Dart.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
@@ -75,15 +75,15 @@ Dart['procedures_callreturn'] = function(block) {
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Dart['procedures_callnoreturn'] = function(block) {
+Dart.forBlock['procedures_callnoreturn'] = function(block) {
   // Call a procedure with no return value.
   // Generated code is for a function call as a statement is the same as a
   // function call as a value, with the addition of line ending.
-  const tuple = Dart['procedures_callreturn'](block);
+  const tuple = Dart.forBlock['procedures_callreturn'](block);
   return tuple[0] + ';\n';
 };
 
-Dart['procedures_ifreturn'] = function(block) {
+Dart.forBlock['procedures_ifreturn'] = function(block) {
   // Conditionally return value from a procedure.
   const condition =
       Dart.valueToCode(block, 'CONDITION', Dart.ORDER_NONE) || 'false';