blockly 9.0.0-beta.0 → 9.0.0-beta.1

package/generators/python/colour.js

@@ -1,67 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for colour blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.colour');
-
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-
-
-Python['colour_picker'] = function(block) {
-  // Colour picker.
-  const code = Python.quote_(block.getFieldValue('COLOUR'));
-  return [code, Python.ORDER_ATOMIC];
-};
-
-Python['colour_random'] = function(block) {
-  // Generate a random colour.
-  Python.definitions_['import_random'] = 'import random';
-  const code = '\'#%06x\' % random.randint(0, 2**24 - 1)';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['colour_rgb'] = function(block) {
-  // Compose a colour from RGB components expressed as percentages.
-  const functionName = Python.provideFunction_('colour_rgb', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(r, g, b):
-  r = round(min(100, max(0, r)) * 2.55)
-  g = round(min(100, max(0, g)) * 2.55)
-  b = round(min(100, max(0, b)) * 2.55)
-  return '#%02x%02x%02x' % (r, g, b)
-`);
-  const r = Python.valueToCode(block, 'RED', Python.ORDER_NONE) || 0;
-  const g = Python.valueToCode(block, 'GREEN', Python.ORDER_NONE) || 0;
-  const b = Python.valueToCode(block, 'BLUE', Python.ORDER_NONE) || 0;
-  const code = functionName + '(' + r + ', ' + g + ', ' + b + ')';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['colour_blend'] = function(block) {
-  // Blend two colours together.
-  const functionName = Python.provideFunction_('colour_blend', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(colour1, colour2, ratio):
-  r1, r2 = int(colour1[1:3], 16), int(colour2[1:3], 16)
-  g1, g2 = int(colour1[3:5], 16), int(colour2[3:5], 16)
-  b1, b2 = int(colour1[5:7], 16), int(colour2[5:7], 16)
-  ratio = min(1, max(0, ratio))
-  r = round(r1 * (1 - ratio) + r2 * ratio)
-  g = round(g1 * (1 - ratio) + g2 * ratio)
-  b = round(b1 * (1 - ratio) + b2 * ratio)
-  return '#%02x%02x%02x' % (r, g, b)
-`);
-  const colour1 =
-      Python.valueToCode(block, 'COLOUR1', Python.ORDER_NONE) || '\'#000000\'';
-  const colour2 =
-      Python.valueToCode(block, 'COLOUR2', Python.ORDER_NONE) || '\'#000000\'';
-  const ratio = Python.valueToCode(block, 'RATIO', Python.ORDER_NONE) || 0;
-  const code =
-      functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};

package/generators/python/lists.js

@@ -1,346 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for list blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.lists');
-
-const stringUtils = goog.require('Blockly.utils.string');
-const {NameType} = goog.require('Blockly.Names');
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-
-
-Python['lists_create_empty'] = function(block) {
-  // Create an empty list.
-  return ['[]', Python.ORDER_ATOMIC];
-};
-
-Python['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++) {
-    elements[i] =
-        Python.valueToCode(block, 'ADD' + i, Python.ORDER_NONE) || 'None';
-  }
-  const code = '[' + elements.join(', ') + ']';
-  return [code, Python.ORDER_ATOMIC];
-};
-
-Python['lists_repeat'] = function(block) {
-  // Create a list with one element repeated.
-  const item = Python.valueToCode(block, 'ITEM', Python.ORDER_NONE) || 'None';
-  const times =
-      Python.valueToCode(block, 'NUM', Python.ORDER_MULTIPLICATIVE) || '0';
-  const code = '[' + item + '] * ' + times;
-  return [code, Python.ORDER_MULTIPLICATIVE];
-};
-
-Python['lists_length'] = function(block) {
-  // String or array length.
-  const list = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || '[]';
-  return ['len(' + list + ')', Python.ORDER_FUNCTION_CALL];
-};
-
-Python['lists_isEmpty'] = function(block) {
-  // Is the string null or array empty?
-  const list = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || '[]';
-  const code = 'not len(' + list + ')';
-  return [code, Python.ORDER_LOGICAL_NOT];
-};
-
-Python['lists_indexOf'] = function(block) {
-  // Find an item in the list.
-  const item = Python.valueToCode(block, 'FIND', Python.ORDER_NONE) || '[]';
-  const list = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || "''";
-  let errorIndex = ' -1';
-  let firstIndexAdjustment = '';
-  let lastIndexAdjustment = ' - 1';
-
-  if (block.workspace.options.oneBasedIndex) {
-    errorIndex = ' 0';
-    firstIndexAdjustment = ' + 1';
-    lastIndexAdjustment = '';
-  }
-
-  let functionName;
-  if (block.getFieldValue('END') === 'FIRST') {
-    functionName = Python.provideFunction_('first_index', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(my_list, elem):
-  try: index = my_list.index(elem)${firstIndexAdjustment}
-  except: index =${errorIndex}
-  return index
-`);
-  } else {
-    functionName = Python.provideFunction_('last_index', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(my_list, elem):
-  try: index = len(my_list) - my_list[::-1].index(elem)${lastIndexAdjustment}
-  except: index =${errorIndex}
-  return index
-`);
-  }
-  const code = functionName + '(' + list + ', ' + item + ')';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['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';
-  const where = block.getFieldValue('WHERE') || 'FROM_START';
-  const listOrder =
-      (where === 'RANDOM') ? Python.ORDER_NONE : Python.ORDER_MEMBER;
-  const list = Python.valueToCode(block, 'VALUE', listOrder) || '[]';
-
-  switch (where) {
-    case 'FIRST':
-      if (mode === 'GET') {
-        const code = list + '[0]';
-        return [code, Python.ORDER_MEMBER];
-      } else if (mode === 'GET_REMOVE') {
-        const code = list + '.pop(0)';
-        return [code, Python.ORDER_FUNCTION_CALL];
-      } else if (mode === 'REMOVE') {
-        return list + '.pop(0)\n';
-      }
-      break;
-    case 'LAST':
-      if (mode === 'GET') {
-        const code = list + '[-1]';
-        return [code, Python.ORDER_MEMBER];
-      } else if (mode === 'GET_REMOVE') {
-        const code = list + '.pop()';
-        return [code, Python.ORDER_FUNCTION_CALL];
-      } else if (mode === 'REMOVE') {
-        return list + '.pop()\n';
-      }
-      break;
-    case 'FROM_START': {
-      const at = Python.getAdjustedInt(block, 'AT');
-      if (mode === 'GET') {
-        const code = list + '[' + at + ']';
-        return [code, Python.ORDER_MEMBER];
-      } else if (mode === 'GET_REMOVE') {
-        const code = list + '.pop(' + at + ')';
-        return [code, Python.ORDER_FUNCTION_CALL];
-      } else if (mode === 'REMOVE') {
-        return list + '.pop(' + at + ')\n';
-      }
-      break;
-    }
-    case 'FROM_END': {
-      const at = Python.getAdjustedInt(block, 'AT', 1, true);
-      if (mode === 'GET') {
-        const code = list + '[' + at + ']';
-        return [code, Python.ORDER_MEMBER];
-      } else if (mode === 'GET_REMOVE') {
-        const code = list + '.pop(' + at + ')';
-        return [code, Python.ORDER_FUNCTION_CALL];
-      } else if (mode === 'REMOVE') {
-        return list + '.pop(' + at + ')\n';
-      }
-      break;
-    }
-    case 'RANDOM':
-      Python.definitions_['import_random'] = 'import random';
-      if (mode === 'GET') {
-        const code = 'random.choice(' + list + ')';
-        return [code, Python.ORDER_FUNCTION_CALL];
-      } else {
-        const functionName =
-            Python.provideFunction_('lists_remove_random_item', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(myList):
-  x = int(random.random() * len(myList))
-  return myList.pop(x)
-`);
-        const code = functionName + '(' + list + ')';
-        if (mode === 'GET_REMOVE') {
-          return [code, Python.ORDER_FUNCTION_CALL];
-        } else if (mode === 'REMOVE') {
-          return code + '\n';
-        }
-      }
-      break;
-  }
-  throw Error('Unhandled combination (lists_getIndex).');
-};
-
-Python['lists_setIndex'] = function(block) {
-  // Set element at index.
-  // Note: Until February 2013 this block did not have MODE or WHERE inputs.
-  let list = Python.valueToCode(block, 'LIST', Python.ORDER_MEMBER) || '[]';
-  const mode = block.getFieldValue('MODE') || 'GET';
-  const where = block.getFieldValue('WHERE') || 'FROM_START';
-  const value = Python.valueToCode(block, 'TO', Python.ORDER_NONE) || 'None';
-  // Cache non-trivial values to variables to prevent repeated look-ups.
-  // Closure, which accesses and modifies 'list'.
-  function cacheList() {
-    if (list.match(/^\w+$/)) {
-      return '';
-    }
-    const listVar =
-        Python.nameDB_.getDistinctName('tmp_list', NameType.VARIABLE);
-    const code = listVar + ' = ' + list + '\n';
-    list = listVar;
-    return code;
-  }
-
-  switch (where) {
-    case 'FIRST':
-      if (mode === 'SET') {
-        return list + '[0] = ' + value + '\n';
-      } else if (mode === 'INSERT') {
-        return list + '.insert(0, ' + value + ')\n';
-      }
-      break;
-    case 'LAST':
-      if (mode === 'SET') {
-        return list + '[-1] = ' + value + '\n';
-      } else if (mode === 'INSERT') {
-        return list + '.append(' + value + ')\n';
-      }
-      break;
-    case 'FROM_START': {
-      const at = Python.getAdjustedInt(block, 'AT');
-      if (mode === 'SET') {
-        return list + '[' + at + '] = ' + value + '\n';
-      } else if (mode === 'INSERT') {
-        return list + '.insert(' + at + ', ' + value + ')\n';
-      }
-      break;
-    }
-    case 'FROM_END': {
-      const at = Python.getAdjustedInt(block, 'AT', 1, true);
-      if (mode === 'SET') {
-        return list + '[' + at + '] = ' + value + '\n';
-      } else if (mode === 'INSERT') {
-        return list + '.insert(' + at + ', ' + value + ')\n';
-      }
-      break;
-    }
-    case 'RANDOM': {
-      Python.definitions_['import_random'] = 'import random';
-      let code = cacheList();
-      const xVar = Python.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
-      code += xVar + ' = int(random.random() * len(' + list + '))\n';
-      if (mode === 'SET') {
-        code += list + '[' + xVar + '] = ' + value + '\n';
-        return code;
-      } else if (mode === 'INSERT') {
-        code += list + '.insert(' + xVar + ', ' + value + ')\n';
-        return code;
-      }
-      break;
-    }
-  }
-  throw Error('Unhandled combination (lists_setIndex).');
-};
-
-Python['lists_getSublist'] = function(block) {
-  // Get sublist.
-  const list = Python.valueToCode(block, 'LIST', Python.ORDER_MEMBER) || '[]';
-  const where1 = block.getFieldValue('WHERE1');
-  const where2 = block.getFieldValue('WHERE2');
-  let at1;
-  switch (where1) {
-    case 'FROM_START':
-      at1 = Python.getAdjustedInt(block, 'AT1');
-      if (at1 === 0) {
-        at1 = '';
-      }
-      break;
-    case 'FROM_END':
-      at1 = Python.getAdjustedInt(block, 'AT1', 1, true);
-      break;
-    case 'FIRST':
-      at1 = '';
-      break;
-    default:
-      throw Error('Unhandled option (lists_getSublist)');
-  }
-
-  let at2;
-  switch (where2) {
-    case 'FROM_START':
-      at2 = Python.getAdjustedInt(block, 'AT2', 1);
-      break;
-    case 'FROM_END':
-      at2 = Python.getAdjustedInt(block, 'AT2', 0, true);
-      // Ensure that if the result calculated is 0 that sub-sequence will
-      // include all elements as expected.
-      if (!stringUtils.isNumber(String(at2))) {
-        Python.definitions_['import_sys'] = 'import sys';
-        at2 += ' or sys.maxsize';
-      } else if (at2 === 0) {
-        at2 = '';
-      }
-      break;
-    case 'LAST':
-      at2 = '';
-      break;
-    default:
-      throw Error('Unhandled option (lists_getSublist)');
-  }
-  const code = list + '[' + at1 + ' : ' + at2 + ']';
-  return [code, Python.ORDER_MEMBER];
-};
-
-Python['lists_sort'] = function(block) {
-  // Block for sorting a list.
-  const list = (Python.valueToCode(block, 'LIST', Python.ORDER_NONE) || '[]');
-  const type = block.getFieldValue('TYPE');
-  const reverse = block.getFieldValue('DIRECTION') === '1' ? 'False' : 'True';
-  const sortFunctionName = Python.provideFunction_('lists_sort', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(my_list, type, reverse):
-  def try_float(s):
-    try:
-      return float(s)
-    except:
-      return 0
-  key_funcs = {
-    "NUMERIC": try_float,
-    "TEXT": str,
-    "IGNORE_CASE": lambda s: str(s).lower()
-  }
-  key_func = key_funcs[type]
-  list_cpy = list(my_list)
-  return sorted(list_cpy, key=key_func, reverse=reverse)
-`);
-
-  const code =
-      sortFunctionName + '(' + list + ', "' + type + '", ' + reverse + ')';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['lists_split'] = function(block) {
-  // Block for splitting text into a list, or joining a list into text.
-  const mode = block.getFieldValue('MODE');
-  let code;
-  if (mode === 'SPLIT') {
-    const value_input =
-        Python.valueToCode(block, 'INPUT', Python.ORDER_MEMBER) || "''";
-    const value_delim = Python.valueToCode(block, 'DELIM', Python.ORDER_NONE);
-    code = value_input + '.split(' + value_delim + ')';
-  } else if (mode === 'JOIN') {
-    const value_input =
-        Python.valueToCode(block, 'INPUT', Python.ORDER_NONE) || '[]';
-    const value_delim =
-        Python.valueToCode(block, 'DELIM', Python.ORDER_MEMBER) || "''";
-    code = value_delim + '.join(' + value_input + ')';
-  } else {
-    throw Error('Unknown mode: ' + mode);
-  }
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['lists_reverse'] = function(block) {
-  // Block for reversing a list.
-  const list = Python.valueToCode(block, 'LIST', Python.ORDER_NONE) || '[]';
-  const code = 'list(reversed(' + list + '))';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};

package/generators/python/logic.js

@@ -1,120 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for logic blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.logic');
-
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-
-
-Python['controls_if'] = function(block) {
-  // If/elseif/else condition.
-  let n = 0;
-  let code = '', branchCode, conditionCode;
-  if (Python.STATEMENT_PREFIX) {
-    // Automatic prefix insertion is switched off for this block.  Add manually.
-    code += Python.injectId(Python.STATEMENT_PREFIX, block);
-  }
-  do {
-    conditionCode =
-        Python.valueToCode(block, 'IF' + n, Python.ORDER_NONE) || 'False';
-    branchCode = Python.statementToCode(block, 'DO' + n) || Python.PASS;
-    if (Python.STATEMENT_SUFFIX) {
-      branchCode =
-          Python.prefixLines(
-              Python.injectId(Python.STATEMENT_SUFFIX, block), Python.INDENT) +
-          branchCode;
-    }
-    code += (n === 0 ? 'if ' : 'elif ') + conditionCode + ':\n' + branchCode;
-    n++;
-  } while (block.getInput('IF' + n));
-
-  if (block.getInput('ELSE') || Python.STATEMENT_SUFFIX) {
-    branchCode = Python.statementToCode(block, 'ELSE') || Python.PASS;
-    if (Python.STATEMENT_SUFFIX) {
-      branchCode =
-          Python.prefixLines(
-              Python.injectId(Python.STATEMENT_SUFFIX, block), Python.INDENT) +
-          branchCode;
-    }
-    code += 'else:\n' + branchCode;
-  }
-  return code;
-};
-
-Python['controls_ifelse'] = Python['controls_if'];
-
-Python['logic_compare'] = function(block) {
-  // Comparison operator.
-  const OPERATORS =
-      {'EQ': '==', 'NEQ': '!=', 'LT': '<', 'LTE': '<=', 'GT': '>', 'GTE': '>='};
-  const operator = OPERATORS[block.getFieldValue('OP')];
-  const order = Python.ORDER_RELATIONAL;
-  const argument0 = Python.valueToCode(block, 'A', order) || '0';
-  const argument1 = Python.valueToCode(block, 'B', order) || '0';
-  const code = argument0 + ' ' + operator + ' ' + argument1;
-  return [code, order];
-};
-
-Python['logic_operation'] = function(block) {
-  // Operations 'and', 'or'.
-  const operator = (block.getFieldValue('OP') === 'AND') ? 'and' : 'or';
-  const order =
-      (operator === 'and') ? Python.ORDER_LOGICAL_AND : Python.ORDER_LOGICAL_OR;
-  let argument0 = Python.valueToCode(block, 'A', order);
-  let argument1 = Python.valueToCode(block, 'B', order);
-  if (!argument0 && !argument1) {
-    // If there are no arguments, then the return value is false.
-    argument0 = 'False';
-    argument1 = 'False';
-  } else {
-    // Single missing arguments have no effect on the return value.
-    const defaultArgument = (operator === 'and') ? 'True' : 'False';
-    if (!argument0) {
-      argument0 = defaultArgument;
-    }
-    if (!argument1) {
-      argument1 = defaultArgument;
-    }
-  }
-  const code = argument0 + ' ' + operator + ' ' + argument1;
-  return [code, order];
-};
-
-Python['logic_negate'] = function(block) {
-  // Negation.
-  const argument0 =
-      Python.valueToCode(block, 'BOOL', Python.ORDER_LOGICAL_NOT) || 'True';
-  const code = 'not ' + argument0;
-  return [code, Python.ORDER_LOGICAL_NOT];
-};
-
-Python['logic_boolean'] = function(block) {
-  // Boolean values true and false.
-  const code = (block.getFieldValue('BOOL') === 'TRUE') ? 'True' : 'False';
-  return [code, Python.ORDER_ATOMIC];
-};
-
-Python['logic_null'] = function(block) {
-  // Null data type.
-  return ['None', Python.ORDER_ATOMIC];
-};
-
-Python['logic_ternary'] = function(block) {
-  // Ternary operator.
-  const value_if =
-      Python.valueToCode(block, 'IF', Python.ORDER_CONDITIONAL) || 'False';
-  const value_then =
-      Python.valueToCode(block, 'THEN', Python.ORDER_CONDITIONAL) || 'None';
-  const value_else =
-      Python.valueToCode(block, 'ELSE', Python.ORDER_CONDITIONAL) || 'None';
-  const code = value_then + ' if ' + value_if + ' else ' + value_else;
-  return [code, Python.ORDER_CONDITIONAL];
-};