mirror of
https://github.com/google/blockly.git
synced 2026-01-04 23:50:12 +01:00
* feat(j2ts): Add support for migrating renaming imports
Convert
const {foo: bar} = require(/*...*/);
into
import {foo as bar} from /*...*/;
^^^^^^^^^^
Also fix a bug that caused relative paths to ESM in the same
directory to be missing a leading "./".
* fix(build): Fix trivial error exports for generators
The UMD wrapper was inadvertently exporting the contents of (e.g.)
the Blockly.JavaScript closure module rather than the intended
export of Blockly.JavaScript.all module - which went unnoticed
because the latter just reexported the former - but we are
about to convert the former to ESM.
* chore(generators): Migrate language generators to ESM
Migrate the main language generators in generators/*.js to ESM.
This was done by running js2ts on the files, renaming them back
to .js, and commenting out "import type" statements, which are
legal TS but not needed in JS (at least if you are not actually
letting Closure Compiler do type checking, which we are not.)
* chore(generators): Migrate block generators to ESM
Migrate generators/*/*.js (except all.js) to ESM.
This was done by running js2ts on the files, renaming them back
to .js, and removing now-spurious @suppress {extraRequire}
directives.
* chores(generators): Migrate generator chunk entrypoints to ESM
This was done by running js2ts on the files, renaming them back
to .js, and manually fixing the export statements.
An additional change to the chunk exports configuration in
build_tasks.js was necessary in order for the UMD wrapper to
find the new module object, which is given a different name
than the old exports object.
406 lines
13 KiB
JavaScript
406 lines
13 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating JavaScript for list blocks.
|
|
* @suppress {missingRequire}
|
|
*/
|
|
|
|
import * as goog from '../../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.JavaScript.lists');
|
|
|
|
import {NameType} from '../../core/names.js';
|
|
import {javascriptGenerator as JavaScript} from '../javascript.js';
|
|
|
|
|
|
JavaScript['lists_create_empty'] = function(block) {
|
|
// Create an empty list.
|
|
return ['[]', JavaScript.ORDER_ATOMIC];
|
|
};
|
|
|
|
JavaScript['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] =
|
|
JavaScript.valueToCode(block, 'ADD' + i, JavaScript.ORDER_NONE) ||
|
|
'null';
|
|
}
|
|
const code = '[' + elements.join(', ') + ']';
|
|
return [code, JavaScript.ORDER_ATOMIC];
|
|
};
|
|
|
|
JavaScript['lists_repeat'] = function(block) {
|
|
// Create a list with one element repeated.
|
|
const functionName = JavaScript.provideFunction_('listsRepeat', `
|
|
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(value, n) {
|
|
var array = [];
|
|
for (var i = 0; i < n; i++) {
|
|
array[i] = value;
|
|
}
|
|
return array;
|
|
}
|
|
`);
|
|
const element =
|
|
JavaScript.valueToCode(block, 'ITEM', JavaScript.ORDER_NONE) || 'null';
|
|
const repeatCount =
|
|
JavaScript.valueToCode(block, 'NUM', JavaScript.ORDER_NONE) || '0';
|
|
const code = functionName + '(' + element + ', ' + repeatCount + ')';
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
};
|
|
|
|
JavaScript['lists_length'] = function(block) {
|
|
// String or array length.
|
|
const list =
|
|
JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_MEMBER) || '[]';
|
|
return [list + '.length', JavaScript.ORDER_MEMBER];
|
|
};
|
|
|
|
JavaScript['lists_isEmpty'] = function(block) {
|
|
// Is the string null or array empty?
|
|
const list =
|
|
JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_MEMBER) || '[]';
|
|
return ['!' + list + '.length', JavaScript.ORDER_LOGICAL_NOT];
|
|
};
|
|
|
|
JavaScript['lists_indexOf'] = function(block) {
|
|
// Find an item in the list.
|
|
const operator =
|
|
block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
|
|
const item =
|
|
JavaScript.valueToCode(block, 'FIND', JavaScript.ORDER_NONE) || "''";
|
|
const list =
|
|
JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_MEMBER) || '[]';
|
|
const code = list + '.' + operator + '(' + item + ')';
|
|
if (block.workspace.options.oneBasedIndex) {
|
|
return [code + ' + 1', JavaScript.ORDER_ADDITION];
|
|
}
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
};
|
|
|
|
JavaScript['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') ? JavaScript.ORDER_NONE : JavaScript.ORDER_MEMBER;
|
|
const list = JavaScript.valueToCode(block, 'VALUE', listOrder) || '[]';
|
|
|
|
switch (where) {
|
|
case ('FIRST'):
|
|
if (mode === 'GET') {
|
|
const code = list + '[0]';
|
|
return [code, JavaScript.ORDER_MEMBER];
|
|
} else if (mode === 'GET_REMOVE') {
|
|
const code = list + '.shift()';
|
|
return [code, JavaScript.ORDER_MEMBER];
|
|
} else if (mode === 'REMOVE') {
|
|
return list + '.shift();\n';
|
|
}
|
|
break;
|
|
case ('LAST'):
|
|
if (mode === 'GET') {
|
|
const code = list + '.slice(-1)[0]';
|
|
return [code, JavaScript.ORDER_MEMBER];
|
|
} else if (mode === 'GET_REMOVE') {
|
|
const code = list + '.pop()';
|
|
return [code, JavaScript.ORDER_MEMBER];
|
|
} else if (mode === 'REMOVE') {
|
|
return list + '.pop();\n';
|
|
}
|
|
break;
|
|
case ('FROM_START'): {
|
|
const at = JavaScript.getAdjusted(block, 'AT');
|
|
if (mode === 'GET') {
|
|
const code = list + '[' + at + ']';
|
|
return [code, JavaScript.ORDER_MEMBER];
|
|
} else if (mode === 'GET_REMOVE') {
|
|
const code = list + '.splice(' + at + ', 1)[0]';
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
} else if (mode === 'REMOVE') {
|
|
return list + '.splice(' + at + ', 1);\n';
|
|
}
|
|
break;
|
|
}
|
|
case ('FROM_END'): {
|
|
const at = JavaScript.getAdjusted(block, 'AT', 1, true);
|
|
if (mode === 'GET') {
|
|
const code = list + '.slice(' + at + ')[0]';
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
} else if (mode === 'GET_REMOVE') {
|
|
const code = list + '.splice(' + at + ', 1)[0]';
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
} else if (mode === 'REMOVE') {
|
|
return list + '.splice(' + at + ', 1);';
|
|
}
|
|
break;
|
|
}
|
|
case ('RANDOM'): {
|
|
const functionName = JavaScript.provideFunction_('listsGetRandomItem', `
|
|
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(list, remove) {
|
|
var x = Math.floor(Math.random() * list.length);
|
|
if (remove) {
|
|
return list.splice(x, 1)[0];
|
|
} else {
|
|
return list[x];
|
|
}
|
|
}
|
|
`);
|
|
const code = functionName + '(' + list + ', ' + (mode !== 'GET') + ')';
|
|
if (mode === 'GET' || mode === 'GET_REMOVE') {
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
} else if (mode === 'REMOVE') {
|
|
return code + ';\n';
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
throw Error('Unhandled combination (lists_getIndex).');
|
|
};
|
|
|
|
JavaScript['lists_setIndex'] = function(block) {
|
|
// Set element at index.
|
|
// Note: Until February 2013 this block did not have MODE or WHERE inputs.
|
|
let list =
|
|
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_MEMBER) || '[]';
|
|
const mode = block.getFieldValue('MODE') || 'GET';
|
|
const where = block.getFieldValue('WHERE') || 'FROM_START';
|
|
const value =
|
|
JavaScript.valueToCode(block, 'TO', JavaScript.ORDER_ASSIGNMENT) ||
|
|
'null';
|
|
// 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 =
|
|
JavaScript.nameDB_.getDistinctName('tmpList', NameType.VARIABLE);
|
|
const code = 'var ' + 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 + '.unshift(' + value + ');\n';
|
|
}
|
|
break;
|
|
case ('LAST'):
|
|
if (mode === 'SET') {
|
|
let code = cacheList();
|
|
code += list + '[' + list + '.length - 1] = ' + value + ';\n';
|
|
return code;
|
|
} else if (mode === 'INSERT') {
|
|
return list + '.push(' + value + ');\n';
|
|
}
|
|
break;
|
|
case ('FROM_START'): {
|
|
const at = JavaScript.getAdjusted(block, 'AT');
|
|
if (mode === 'SET') {
|
|
return list + '[' + at + '] = ' + value + ';\n';
|
|
} else if (mode === 'INSERT') {
|
|
return list + '.splice(' + at + ', 0, ' + value + ');\n';
|
|
}
|
|
break;
|
|
}
|
|
case ('FROM_END'): {
|
|
const at = JavaScript.getAdjusted(
|
|
block, 'AT', 1, false, JavaScript.ORDER_SUBTRACTION);
|
|
let code = cacheList();
|
|
if (mode === 'SET') {
|
|
code += list + '[' + list + '.length - ' + at + '] = ' + value + ';\n';
|
|
return code;
|
|
} else if (mode === 'INSERT') {
|
|
code += list + '.splice(' + list + '.length - ' + at + ', 0, ' + value +
|
|
');\n';
|
|
return code;
|
|
}
|
|
break;
|
|
}
|
|
case ('RANDOM'): {
|
|
let code = cacheList();
|
|
const xVar =
|
|
JavaScript.nameDB_.getDistinctName('tmpX', NameType.VARIABLE);
|
|
code += 'var ' + xVar + ' = Math.floor(Math.random() * ' + list +
|
|
'.length);\n';
|
|
if (mode === 'SET') {
|
|
code += list + '[' + xVar + '] = ' + value + ';\n';
|
|
return code;
|
|
} else if (mode === 'INSERT') {
|
|
code += list + '.splice(' + xVar + ', 0, ' + value + ');\n';
|
|
return code;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
throw Error('Unhandled combination (lists_setIndex).');
|
|
};
|
|
|
|
/**
|
|
* Returns an expression calculating the index into a list.
|
|
* @param {string} listName Name of the list, used to calculate length.
|
|
* @param {string} where The method of indexing, selected by dropdown in Blockly
|
|
* @param {string=} opt_at The optional offset when indexing from start/end.
|
|
* @return {string|undefined} Index expression.
|
|
*/
|
|
const getSubstringIndex = function(listName, where, opt_at) {
|
|
if (where === 'FIRST') {
|
|
return '0';
|
|
} else if (where === 'FROM_END') {
|
|
return listName + '.length - 1 - ' + opt_at;
|
|
} else if (where === 'LAST') {
|
|
return listName + '.length - 1';
|
|
} else {
|
|
return opt_at;
|
|
}
|
|
};
|
|
|
|
JavaScript['lists_getSublist'] = function(block) {
|
|
// Get sublist.
|
|
const list =
|
|
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_MEMBER) || '[]';
|
|
const where1 = block.getFieldValue('WHERE1');
|
|
const where2 = block.getFieldValue('WHERE2');
|
|
let code;
|
|
if (where1 === 'FIRST' && where2 === 'LAST') {
|
|
code = list + '.slice(0)';
|
|
} else if (
|
|
list.match(/^\w+$/) ||
|
|
(where1 !== 'FROM_END' && where2 === 'FROM_START')) {
|
|
// If the list is a variable or doesn't require a call for length, don't
|
|
// generate a helper function.
|
|
let at1;
|
|
switch (where1) {
|
|
case 'FROM_START':
|
|
at1 = JavaScript.getAdjusted(block, 'AT1');
|
|
break;
|
|
case 'FROM_END':
|
|
at1 = JavaScript.getAdjusted(
|
|
block, 'AT1', 1, false, JavaScript.ORDER_SUBTRACTION);
|
|
at1 = list + '.length - ' + at1;
|
|
break;
|
|
case 'FIRST':
|
|
at1 = '0';
|
|
break;
|
|
default:
|
|
throw Error('Unhandled option (lists_getSublist).');
|
|
}
|
|
let at2;
|
|
switch (where2) {
|
|
case 'FROM_START':
|
|
at2 = JavaScript.getAdjusted(block, 'AT2', 1);
|
|
break;
|
|
case 'FROM_END':
|
|
at2 = JavaScript.getAdjusted(
|
|
block, 'AT2', 0, false, JavaScript.ORDER_SUBTRACTION);
|
|
at2 = list + '.length - ' + at2;
|
|
break;
|
|
case 'LAST':
|
|
at2 = list + '.length';
|
|
break;
|
|
default:
|
|
throw Error('Unhandled option (lists_getSublist).');
|
|
}
|
|
code = list + '.slice(' + at1 + ', ' + at2 + ')';
|
|
} else {
|
|
const at1 = JavaScript.getAdjusted(block, 'AT1');
|
|
const at2 = JavaScript.getAdjusted(block, 'AT2');
|
|
const wherePascalCase = {
|
|
'FIRST': 'First',
|
|
'LAST': 'Last',
|
|
'FROM_START': 'FromStart',
|
|
'FROM_END': 'FromEnd',
|
|
};
|
|
// The value for 'FROM_END' and'FROM_START' depends on `at` so
|
|
// we add it as a parameter.
|
|
const at1Param =
|
|
(where1 === 'FROM_END' || where1 === 'FROM_START') ? ', at1' : '';
|
|
const at2Param =
|
|
(where2 === 'FROM_END' || where2 === 'FROM_START') ? ', at2' : '';
|
|
const functionName = JavaScript.provideFunction_(
|
|
'subsequence' + wherePascalCase[where1] + wherePascalCase[where2], `
|
|
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(sequence${at1Param}${at2Param}) {
|
|
var start = ${getSubstringIndex('sequence', where1, 'at1')};
|
|
var end = ${getSubstringIndex('sequence', where2, 'at2')} + 1;
|
|
return sequence.slice(start, end);
|
|
}
|
|
`);
|
|
code = functionName + '(' + list +
|
|
// The value for 'FROM_END' and 'FROM_START' depends on `at` so we
|
|
// pass it.
|
|
((where1 === 'FROM_END' || where1 === 'FROM_START') ? ', ' + at1 : '') +
|
|
((where2 === 'FROM_END' || where2 === 'FROM_START') ? ', ' + at2 : '') +
|
|
')';
|
|
}
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
};
|
|
|
|
JavaScript['lists_sort'] = function(block) {
|
|
// Block for sorting a list.
|
|
const list =
|
|
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_FUNCTION_CALL) ||
|
|
'[]';
|
|
const direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
|
|
const type = block.getFieldValue('TYPE');
|
|
const getCompareFunctionName =
|
|
JavaScript.provideFunction_('listsGetSortCompare', `
|
|
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(type, direction) {
|
|
var compareFuncs = {
|
|
'NUMERIC': function(a, b) {
|
|
return Number(a) - Number(b); },
|
|
'TEXT': function(a, b) {
|
|
return String(a) > String(b) ? 1 : -1; },
|
|
'IGNORE_CASE': function(a, b) {
|
|
return String(a).toLowerCase() > String(b).toLowerCase() ? 1 : -1; },
|
|
};
|
|
var compare = compareFuncs[type];
|
|
return function(a, b) { return compare(a, b) * direction; };
|
|
}
|
|
`);
|
|
return [
|
|
list + '.slice().sort(' + getCompareFunctionName + '("' + type + '", ' +
|
|
direction + '))',
|
|
JavaScript.ORDER_FUNCTION_CALL
|
|
];
|
|
};
|
|
|
|
JavaScript['lists_split'] = function(block) {
|
|
// Block for splitting text into a list, or joining a list into text.
|
|
let input = JavaScript.valueToCode(block, 'INPUT', JavaScript.ORDER_MEMBER);
|
|
const delimiter =
|
|
JavaScript.valueToCode(block, 'DELIM', JavaScript.ORDER_NONE) || "''";
|
|
const mode = block.getFieldValue('MODE');
|
|
let functionName;
|
|
if (mode === 'SPLIT') {
|
|
if (!input) {
|
|
input = "''";
|
|
}
|
|
functionName = 'split';
|
|
} else if (mode === 'JOIN') {
|
|
if (!input) {
|
|
input = '[]';
|
|
}
|
|
functionName = 'join';
|
|
} else {
|
|
throw Error('Unknown mode: ' + mode);
|
|
}
|
|
const code = input + '.' + functionName + '(' + delimiter + ')';
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
};
|
|
|
|
JavaScript['lists_reverse'] = function(block) {
|
|
// Block for reversing a list.
|
|
const list =
|
|
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_FUNCTION_CALL) ||
|
|
'[]';
|
|
const code = list + '.slice().reverse()';
|
|
return [code, JavaScript.ORDER_FUNCTION_CALL];
|
|
};
|