CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 10:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(generators): Introduce JavascriptGenerator class, Order enum (#7153)

Browse Source 
* refactor(generators): Introduce class JavascriptGenerator

  Also fix an import ordering error.

* refactor(generators): Use Order.* instead of .ORDER_*

* refactor(generators): Don't rename javascriptGenerator
This commit is contained in:
Christopher Allen
2023-06-13 21:30:37 +01:00
committed by GitHub
parent 3e9d892934
commit 306eb80216
10 changed files with 770 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
generators/javascript/colour.js
View File

@@ -11,36 +11,36 @@
import * as goog from '../../closure/goog/goog.js';
goog.declareModuleId('Blockly.JavaScript.colour');
import {javascriptGenerator as JavaScript} from '../javascript.js';
import {Order, javascriptGenerator} from '../javascript.js';
JavaScript.forBlock['colour_picker'] = function(block) {
javascriptGenerator.forBlock['colour_picker'] = function(block) {
// Colour picker.
const code = JavaScript.quote_(block.getFieldValue('COLOUR'));
return [code, JavaScript.ORDER_ATOMIC];
const code = javascriptGenerator.quote_(block.getFieldValue('COLOUR'));
return [code, Order.ATOMIC];
};
JavaScript.forBlock['colour_random'] = function(block) {
javascriptGenerator.forBlock['colour_random'] = function(block) {
// Generate a random colour.
const functionName = JavaScript.provideFunction_('colourRandom', `
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}() {
const functionName = javascriptGenerator.provideFunction_('colourRandom', `
function ${javascriptGenerator.FUNCTION_NAME_PLACEHOLDER_}() {
var num = Math.floor(Math.random() * Math.pow(2, 24));
return '#' + ('00000' + num.toString(16)).substr(-6);
}
`);
const code = functionName + '()';
return [code, JavaScript.ORDER_FUNCTION_CALL];
return [code, Order.FUNCTION_CALL];
};
JavaScript.forBlock['colour_rgb'] = function(block) {
javascriptGenerator.forBlock['colour_rgb'] = function(block) {
// Compose a colour from RGB components expressed as percentages.
const red = JavaScript.valueToCode(block, 'RED', JavaScript.ORDER_NONE) || 0;
const red = javascriptGenerator.valueToCode(block, 'RED', Order.NONE) || 0;
const green =
JavaScript.valueToCode(block, 'GREEN', JavaScript.ORDER_NONE) || 0;
javascriptGenerator.valueToCode(block, 'GREEN', Order.NONE) || 0;
const blue =
JavaScript.valueToCode(block, 'BLUE', JavaScript.ORDER_NONE) || 0;
const functionName = JavaScript.provideFunction_('colourRgb', `
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
javascriptGenerator.valueToCode(block, 'BLUE', Order.NONE) || 0;
const functionName = javascriptGenerator.provideFunction_('colourRgb', `
function ${javascriptGenerator.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
r = Math.max(Math.min(Number(r), 100), 0) * 2.55;
g = Math.max(Math.min(Number(g), 100), 0) * 2.55;
b = Math.max(Math.min(Number(b), 100), 0) * 2.55;
@@ -51,19 +51,19 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
}
`);
const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
return [code, JavaScript.ORDER_FUNCTION_CALL];
return [code, Order.FUNCTION_CALL];
};
JavaScript.forBlock['colour_blend'] = function(block) {
javascriptGenerator.forBlock['colour_blend'] = function(block) {
// Blend two colours together.
const c1 = JavaScript.valueToCode(block, 'COLOUR1', JavaScript.ORDER_NONE) ||
const c1 = javascriptGenerator.valueToCode(block, 'COLOUR1', Order.NONE) ||
"'#000000'";
const c2 = JavaScript.valueToCode(block, 'COLOUR2', JavaScript.ORDER_NONE) ||
const c2 = javascriptGenerator.valueToCode(block, 'COLOUR2', Order.NONE) ||
"'#000000'";
const ratio =
JavaScript.valueToCode(block, 'RATIO', JavaScript.ORDER_NONE) || 0.5;
const functionName = JavaScript.provideFunction_('colourBlend', `
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
javascriptGenerator.valueToCode(block, 'RATIO', Order.NONE) || 0.5;
const functionName = javascriptGenerator.provideFunction_('colourBlend', `
function ${javascriptGenerator.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
ratio = Math.max(Math.min(Number(ratio), 1), 0);
var r1 = parseInt(c1.substring(1, 3), 16);
var g1 = parseInt(c1.substring(3, 5), 16);
@@ -81,5 +81,5 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
}
`);
const code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
return [code, JavaScript.ORDER_FUNCTION_CALL];
return [code, Order.FUNCTION_CALL];
};