mirror of
https://github.com/google/blockly.git
synced 2026-01-10 02:17:09 +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.
126 lines
4.3 KiB
JavaScript
126 lines
4.3 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2015 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating PHP for procedure blocks.
|
|
*/
|
|
|
|
import * as goog from '../../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.PHP.procedures');
|
|
|
|
import * as Variables from '../../core/variables.js';
|
|
import {NameType} from '../../core/names.js';
|
|
import {phpGenerator as PHP} from '../php.js';
|
|
|
|
|
|
PHP['procedures_defreturn'] = function(block) {
|
|
// Define a procedure with a return value.
|
|
// First, add a 'global' statement for every variable that is not shadowed by
|
|
// a local parameter.
|
|
const globals = [];
|
|
const workspace = block.workspace;
|
|
const usedVariables = Variables.allUsedVarModels(workspace) || [];
|
|
for (let i = 0, variable; variable = usedVariables[i]; i++) {
|
|
const varName = variable.name;
|
|
if (block.getVars().indexOf(varName) === -1) {
|
|
globals.push(PHP.nameDB_.getName(varName, NameType.VARIABLE));
|
|
}
|
|
}
|
|
// Add developer variables.
|
|
const devVarList = Variables.allDeveloperVariables(workspace);
|
|
for (let i = 0; i < devVarList.length; i++) {
|
|
globals.push(
|
|
PHP.nameDB_.getName(devVarList[i], NameType.DEVELOPER_VARIABLE));
|
|
}
|
|
const globalStr =
|
|
globals.length ? PHP.INDENT + 'global ' + globals.join(', ') + ';\n' : '';
|
|
|
|
const funcName =
|
|
PHP.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
|
|
let xfix1 = '';
|
|
if (PHP.STATEMENT_PREFIX) {
|
|
xfix1 += PHP.injectId(PHP.STATEMENT_PREFIX, block);
|
|
}
|
|
if (PHP.STATEMENT_SUFFIX) {
|
|
xfix1 += PHP.injectId(PHP.STATEMENT_SUFFIX, block);
|
|
}
|
|
if (xfix1) {
|
|
xfix1 = PHP.prefixLines(xfix1, PHP.INDENT);
|
|
}
|
|
let loopTrap = '';
|
|
if (PHP.INFINITE_LOOP_TRAP) {
|
|
loopTrap = PHP.prefixLines(
|
|
PHP.injectId(PHP.INFINITE_LOOP_TRAP, block), PHP.INDENT);
|
|
}
|
|
const branch = PHP.statementToCode(block, 'STACK');
|
|
let returnValue = PHP.valueToCode(block, 'RETURN', PHP.ORDER_NONE) || '';
|
|
let xfix2 = '';
|
|
if (branch && returnValue) {
|
|
// After executing the function body, revisit this block for the return.
|
|
xfix2 = xfix1;
|
|
}
|
|
if (returnValue) {
|
|
returnValue = PHP.INDENT + 'return ' + returnValue + ';\n';
|
|
}
|
|
const args = [];
|
|
const variables = block.getVars();
|
|
for (let i = 0; i < variables.length; i++) {
|
|
args[i] = PHP.nameDB_.getName(variables[i], NameType.VARIABLE);
|
|
}
|
|
let code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' +
|
|
globalStr + xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
|
|
code = PHP.scrub_(block, code);
|
|
// Add % so as not to collide with helper functions in definitions list.
|
|
PHP.definitions_['%' + funcName] = code;
|
|
return null;
|
|
};
|
|
|
|
// Defining a procedure without a return value uses the same generator as
|
|
// a procedure with a return value.
|
|
PHP['procedures_defnoreturn'] = PHP['procedures_defreturn'];
|
|
|
|
PHP['procedures_callreturn'] = function(block) {
|
|
// Call a procedure with a return value.
|
|
const funcName =
|
|
PHP.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
|
|
const args = [];
|
|
const variables = block.getVars();
|
|
for (let i = 0; i < variables.length; i++) {
|
|
args[i] = PHP.valueToCode(block, 'ARG' + i, PHP.ORDER_NONE) || 'null';
|
|
}
|
|
const code = funcName + '(' + args.join(', ') + ')';
|
|
return [code, PHP.ORDER_FUNCTION_CALL];
|
|
};
|
|
|
|
PHP['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 = PHP['procedures_callreturn'](block);
|
|
return tuple[0] + ';\n';
|
|
};
|
|
|
|
PHP['procedures_ifreturn'] = function(block) {
|
|
// Conditionally return value from a procedure.
|
|
const condition =
|
|
PHP.valueToCode(block, 'CONDITION', PHP.ORDER_NONE) || 'false';
|
|
let code = 'if (' + condition + ') {\n';
|
|
if (PHP.STATEMENT_SUFFIX) {
|
|
// Inject any statement suffix here since the regular one at the end
|
|
// will not get executed if the return is triggered.
|
|
code +=
|
|
PHP.prefixLines(PHP.injectId(PHP.STATEMENT_SUFFIX, block), PHP.INDENT);
|
|
}
|
|
if (block.hasReturnValue_) {
|
|
const value = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || 'null';
|
|
code += PHP.INDENT + 'return ' + value + ';\n';
|
|
} else {
|
|
code += PHP.INDENT + 'return;\n';
|
|
}
|
|
code += '}\n';
|
|
return code;
|
|
};
|