blockly 9.0.0-beta.0 → 9.0.0-beta.2

package/generators/dart/procedures.js

@@ -1,105 +0,0 @@
-/**
- * @license
- * Copyright 2014 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Dart for procedure blocks.
- */
-'use strict';
-
-goog.module('Blockly.Dart.procedures');
-
-const {NameType} = goog.require('Blockly.Names');
-const {dartGenerator: Dart} = goog.require('Blockly.Dart');
-
-
-Dart['procedures_defreturn'] = function(block) {
-  // Define a procedure with a return value.
-  const funcName =
-      Dart.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
-  let xfix1 = '';
-  if (Dart.STATEMENT_PREFIX) {
-    xfix1 += Dart.injectId(Dart.STATEMENT_PREFIX, block);
-  }
-  if (Dart.STATEMENT_SUFFIX) {
-    xfix1 += Dart.injectId(Dart.STATEMENT_SUFFIX, block);
-  }
-  if (xfix1) {
-    xfix1 = Dart.prefixLines(xfix1, Dart.INDENT);
-  }
-  let loopTrap = '';
-  if (Dart.INFINITE_LOOP_TRAP) {
-    loopTrap = Dart.prefixLines(
-        Dart.injectId(Dart.INFINITE_LOOP_TRAP, block), Dart.INDENT);
-  }
-  const branch = Dart.statementToCode(block, 'STACK');
-  let returnValue = Dart.valueToCode(block, 'RETURN', Dart.ORDER_NONE) || '';
-  let xfix2 = '';
-  if (branch && returnValue) {
-    // After executing the function body, revisit this block for the return.
-    xfix2 = xfix1;
-  }
-  if (returnValue) {
-    returnValue = Dart.INDENT + 'return ' + returnValue + ';\n';
-  }
-  const returnType = returnValue ? 'dynamic' : 'void';
-  const args = [];
-  const variables = block.getVars();
-  for (let i = 0; i < variables.length; i++) {
-    args[i] = Dart.nameDB_.getName(variables[i], NameType.VARIABLE);
-  }
-  let code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' +
-      xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
-  code = Dart.scrub_(block, code);
-  // Add % so as not to collide with helper functions in definitions list.
-  Dart.definitions_['%' + funcName] = code;
-  return null;
-};
-
-// 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['procedures_callreturn'] = function(block) {
-  // Call a procedure with a return value.
-  const funcName =
-      Dart.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
-  const args = [];
-  const variables = block.getVars();
-  for (let i = 0; i < variables.length; i++) {
-    args[i] = Dart.valueToCode(block, 'ARG' + i, Dart.ORDER_NONE) || 'null';
-  }
-  let code = funcName + '(' + args.join(', ') + ')';
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['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);
-  return tuple[0] + ';\n';
-};
-
-Dart['procedures_ifreturn'] = function(block) {
-  // Conditionally return value from a procedure.
-  const condition =
-      Dart.valueToCode(block, 'CONDITION', Dart.ORDER_NONE) || 'false';
-  let code = 'if (' + condition + ') {\n';
-  if (Dart.STATEMENT_SUFFIX) {
-    // Inject any statement suffix here since the regular one at the end
-    // will not get executed if the return is triggered.
-    code += Dart.prefixLines(
-        Dart.injectId(Dart.STATEMENT_SUFFIX, block), Dart.INDENT);
-  }
-  if (block.hasReturnValue_) {
-    const value = Dart.valueToCode(block, 'VALUE', Dart.ORDER_NONE) || 'null';
-    code += Dart.INDENT + 'return ' + value + ';\n';
-  } else {
-    code += Dart.INDENT + 'return;\n';
-  }
-  code += '}\n';
-  return code;
-};

package/generators/dart/text.js

@@ -1,338 +0,0 @@
-/**
- * @license
- * Copyright 2014 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Dart for text blocks.
- */
-'use strict';
-
-goog.module('Blockly.Dart.texts');
-
-const {NameType} = goog.require('Blockly.Names');
-const {dartGenerator: Dart} = goog.require('Blockly.Dart');
-
-
-Dart.addReservedWords('Html,Math');
-
-Dart['text'] = function(block) {
-  // Text value.
-  const code = Dart.quote_(block.getFieldValue('TEXT'));
-  return [code, Dart.ORDER_ATOMIC];
-};
-
-Dart['text_multiline'] = function(block) {
-  // Text value.
-  const code = Dart.multiline_quote_(block.getFieldValue('TEXT'));
-  const order =
-      code.indexOf('+') !== -1 ? Dart.ORDER_ADDITIVE : Dart.ORDER_ATOMIC;
-  return [code, order];
-};
-
-Dart['text_join'] = function(block) {
-  // Create a string made up of any number of elements of any type.
-  switch (block.itemCount_) {
-    case 0:
-      return ["''", Dart.ORDER_ATOMIC];
-    case 1: {
-      const element =
-          Dart.valueToCode(block, 'ADD0', Dart.ORDER_UNARY_POSTFIX) || "''";
-      const code = element + '.toString()';
-      return [code, Dart.ORDER_UNARY_POSTFIX];
-    }
-    default: {
-      const elements = new Array(block.itemCount_);
-      for (let i = 0; i < block.itemCount_; i++) {
-        elements[i] =
-            Dart.valueToCode(block, 'ADD' + i, Dart.ORDER_NONE) || "''";
-      }
-      const code = '[' + elements.join(',') + '].join()';
-      return [code, Dart.ORDER_UNARY_POSTFIX];
-    }
-  }
-};
-
-Dart['text_append'] = function(block) {
-  // Append to a variable in place.
-  const varName =
-      Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  const value = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
-  return varName + ' = [' + varName + ', ' + value + '].join();\n';
-};
-
-Dart['text_length'] = function(block) {
-  // String or array length.
-  const text =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
-  return [text + '.length', Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_isEmpty'] = function(block) {
-  // Is the string null or array empty?
-  const text =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
-  return [text + '.isEmpty', Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_indexOf'] = function(block) {
-  // Search the text for a substring.
-  const operator =
-      block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
-  const substring = Dart.valueToCode(block, 'FIND', Dart.ORDER_NONE) || "''";
-  const text =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
-  const code = text + '.' + operator + '(' + substring + ')';
-  if (block.workspace.options.oneBasedIndex) {
-    return [code + ' + 1', Dart.ORDER_ADDITIVE];
-  }
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_charAt'] = function(block) {
-  // Get letter at index.
-  // Note: Until January 2013 this block did not have the WHERE input.
-  const where = block.getFieldValue('WHERE') || 'FROM_START';
-  const textOrder = (where === 'FIRST' || where === 'FROM_START') ?
-      Dart.ORDER_UNARY_POSTFIX :
-      Dart.ORDER_NONE;
-  const text = Dart.valueToCode(block, 'VALUE', textOrder) || "''";
-  let at;
-  switch (where) {
-    case 'FIRST': {
-      const code = text + '[0]';
-      return [code, Dart.ORDER_UNARY_POSTFIX];
-    }
-    case 'FROM_START': {
-      at = Dart.getAdjusted(block, 'AT');
-      const code = text + '[' + at + ']';
-      return [code, Dart.ORDER_UNARY_POSTFIX];
-    }
-    case 'LAST':
-      at = 1;
-      // Fall through.
-    case 'FROM_END': {
-      at = Dart.getAdjusted(block, 'AT', 1);
-      const functionName = Dart.provideFunction_('text_get_from_end', `
-String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
-  return text[text.length - x];
-}
-`);
-      const code = functionName + '(' + text + ', ' + at + ')';
-      return [code, Dart.ORDER_UNARY_POSTFIX];
-    }
-    case 'RANDOM': {
-      Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
-      const functionName = Dart.provideFunction_('text_random_letter', `
-String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text) {
-  int x = new Math.Random().nextInt(text.length);
-  return text[x];
-}
-`);
-      const code = functionName + '(' + text + ')';
-      return [code, Dart.ORDER_UNARY_POSTFIX];
-    }
-  }
-  throw Error('Unhandled option (text_charAt).');
-};
-
-Dart['text_getSubstring'] = function(block) {
-  // Get substring.
-  const where1 = block.getFieldValue('WHERE1');
-  const where2 = block.getFieldValue('WHERE2');
-  const requiresLengthCall = (where1 !== 'FROM_END' && where2 === 'FROM_START');
-  const textOrder =
-      requiresLengthCall ? Dart.ORDER_UNARY_POSTFIX : Dart.ORDER_NONE;
-  const text = Dart.valueToCode(block, 'STRING', textOrder) || "''";
-  let code;
-  if (where1 === 'FIRST' && where2 === 'LAST') {
-    code = text;
-    return [code, Dart.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':
-        at1 = Dart.getAdjusted(block, 'AT1');
-        break;
-      case 'FROM_END':
-        at1 = Dart.getAdjusted(block, 'AT1', 1, false, Dart.ORDER_ADDITIVE);
-        at1 = text + '.length - ' + at1;
-        break;
-      case 'FIRST':
-        at1 = '0';
-        break;
-      default:
-        throw Error('Unhandled option (text_getSubstring).');
-    }
-    let at2;
-    switch (where2) {
-      case 'FROM_START':
-        at2 = Dart.getAdjusted(block, 'AT2', 1);
-        break;
-      case 'FROM_END':
-        at2 = Dart.getAdjusted(block, 'AT2', 0, false, Dart.ORDER_ADDITIVE);
-        at2 = text + '.length - ' + at2;
-        break;
-      case 'LAST':
-        break;
-      default:
-        throw Error('Unhandled option (text_getSubstring).');
-    }
-
-    if (where2 === 'LAST') {
-      code = text + '.substring(' + at1 + ')';
-    } else {
-      code = text + '.substring(' + at1 + ', ' + at2 + ')';
-    }
-  } else {
-    const at1 = Dart.getAdjusted(block, 'AT1');
-    const at2 = Dart.getAdjusted(block, 'AT2');
-    const functionName = Dart.provideFunction_('text_get_substring', `
-String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, num at1, String where2, num at2) {
-  int getAt(String where, num at) {
-    if (where == 'FROM_END') {
-      at = text.length - 1 - at;
-    } else if (where == 'FIRST') {
-      at = 0;
-    } else if (where == 'LAST') {
-      at = text.length - 1;
-    } else if (where != 'FROM_START') {
-      throw 'Unhandled option (text_getSubstring).';
-    }
-    return at;
-  }
-  at1 = getAt(where1, at1);
-  at2 = getAt(where2, at2) + 1;
-  return text.substring(at1, at2);
-}
-`);
-    code = functionName + '(' + text + ', \'' + where1 + '\', ' + at1 + ', \'' +
-        where2 + '\', ' + at2 + ')';
-  }
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_changeCase'] = function(block) {
-  // Change capitalization.
-  const OPERATORS = {
-    'UPPERCASE': '.toUpperCase()',
-    'LOWERCASE': '.toLowerCase()',
-    'TITLECASE': null
-  };
-  const operator = OPERATORS[block.getFieldValue('CASE')];
-  const textOrder = operator ? Dart.ORDER_UNARY_POSTFIX : Dart.ORDER_NONE;
-  const text = Dart.valueToCode(block, 'TEXT', textOrder) || "''";
-  let code;
-  if (operator) {
-    // Upper and lower case are functions built into Dart.
-    code = text + operator;
-  } else {
-    // Title case is not a native Dart function.  Define one.
-    const functionName = Dart.provideFunction_('text_toTitleCase', `
-String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String str) {
-  RegExp exp = new RegExp(r'\\b');
-  List<String> list = str.split(exp);
-  final title = new StringBuffer();
-  for (String part in list) {
-    if (part.length > 0) {
-      title.write(part[0].toUpperCase());
-      if (part.length > 0) {
-        title.write(part.substring(1).toLowerCase());
-      }
-    }
-  }
-  return title.toString();
-}
-`);
-    code = functionName + '(' + text + ')';
-  }
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_trim'] = function(block) {
-  // Trim spaces.
-  const OPERATORS = {
-    'LEFT': '.replaceFirst(new RegExp(r\'^\\s+\'), \'\')',
-    'RIGHT': '.replaceFirst(new RegExp(r\'\\s+$\'), \'\')',
-    'BOTH': '.trim()'
-  };
-  const operator = OPERATORS[block.getFieldValue('MODE')];
-  const text =
-      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
-  return [text + operator, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_print'] = function(block) {
-  // Print statement.
-  const msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
-  return 'print(' + msg + ');\n';
-};
-
-Dart['text_prompt_ext'] = function(block) {
-  // Prompt function.
-  Dart.definitions_['import_dart_html'] = 'import \'dart:html\' as Html;';
-  let msg;
-  if (block.getField('TEXT')) {
-    // Internal message.
-    msg = Dart.quote_(block.getFieldValue('TEXT'));
-  } else {
-    // External message.
-    msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
-  }
-  let code = 'Html.window.prompt(' + msg + ', \'\')';
-  const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
-  if (toNumber) {
-    Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
-    code = 'Math.parseDouble(' + code + ')';
-  }
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_prompt'] = Dart['text_prompt_ext'];
-
-Dart['text_count'] = function(block) {
-  const text = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
-  const sub = Dart.valueToCode(block, 'SUB', Dart.ORDER_NONE) || "''";
-  // Substring count is not a native Dart function.  Define one.
-  const functionName = Dart.provideFunction_('text_count', `
-int ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
-  if (needle.length == 0) {
-    return haystack.length + 1;
-  }
-  int index = 0;
-  int count = 0;
-  while (index != -1) {
-    index = haystack.indexOf(needle, index);
-    if (index != -1) {
-      count++;
-     index += needle.length;
-    }
-  }
-  return count;
-}
-`);
-  const code = functionName + '(' + text + ', ' + sub + ')';
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_replace'] = function(block) {
-  const text =
-      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
-  const from = Dart.valueToCode(block, 'FROM', Dart.ORDER_NONE) || "''";
-  const to = Dart.valueToCode(block, 'TO', Dart.ORDER_NONE) || "''";
-  const code = text + '.replaceAll(' + from + ', ' + to + ')';
-  return [code, Dart.ORDER_UNARY_POSTFIX];
-};
-
-Dart['text_reverse'] = function(block) {
-  // There isn't a sensible way to do this in Dart. See:
-  // http://stackoverflow.com/a/21613700/3529104
-  // Implementing something is possibly better than not implementing anything?
-  const text =
-      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
-  const code = 'new String.fromCharCodes(' + text + '.runes.toList().reversed)';
-  return [code, Dart.ORDER_UNARY_PREFIX];
-};

package/generators/dart/variables.js

@@ -1,32 +0,0 @@
-/**
- * @license
- * Copyright 2014 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Dart for variable blocks.
- */
-'use strict';
-
-goog.module('Blockly.Dart.variables');
-
-const {NameType} = goog.require('Blockly.Names');
-const {dartGenerator: Dart} = goog.require('Blockly.Dart');
-
-
-Dart['variables_get'] = function(block) {
-  // Variable getter.
-  const code =
-      Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  return [code, Dart.ORDER_ATOMIC];
-};
-
-Dart['variables_set'] = function(block) {
-  // Variable setter.
-  const argument0 =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_ASSIGNMENT) || '0';
-  const varName =
-      Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  return varName + ' = ' + argument0 + ';\n';
-};

package/generators/dart/variables_dynamic.js

@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Dart for dynamic variable blocks.
- */
-'use strict';
-
-goog.module('Blockly.Dart.variablesDynamic');
-
-const {dartGenerator: Dart} = goog.require('Blockly.Dart');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Dart.variables');
-
-
-// Dart is dynamically typed.
-Dart['variables_get_dynamic'] = Dart['variables_get'];
-Dart['variables_set_dynamic'] = Dart['variables_set'];