mirror of
https://github.com/google/blockly.git
synced 2026-01-10 02:17:09 +01:00
* feat(build): Make build tasks invoke their prerequisites
- Divide gulp targets into three kinds: main sequence,
manually invokable, and script-only. The first two categories
automatically invoke their prerequisites.
- Give (most of) the affected gulp targets shorter and more memorable
names that could become their npm script names in future.
* feat(build): Make package tasks invoke their prerequisites
Have the package task invoke the cleanBuildDir (as well as
cleanPackageDir) and build tasks. Remove the checkBuildDir
task as it is now redundant since a fresh build is done every
time.
* feat(build): Make git tasks invoke their prerequisites
* feat(build): Make cleanup, license [sic] tasks invoke their prerequisites
Turns out they don't have any, so this commit just classifies
their gulp targets according to the established scheme.
* feat(build): Make appengine tasks invoke their prerequisites
In this case prepareDeployDir will eventually depend on package
but does not for now.
* feat(build): Have npm scripts run npm ci first where applicable
Have any npm script that have external effects (e.g. publishing an
npm package, pushing a new version to appengine, or updating GitHub
Pages) start by running npm ci to ensure that all dependencies are
up-to-date with respect to package-lock.json.
(This is done by npm and not a gulp script because gulp itself
might need updating. So might npm, but that is less likely to
make any difference to what gets published/pushed.)
* chore(build): have tests use package target
Have the tests just run the package target (with debug flags)
since that runs the the build target automatically.
* feat(tests): Write Closure Compiler output directly to dist/
Since they are already UMD-wrapped, have Closure Compiler write
output chunks directly to RELEASE_DIR, i.e. dist/.
* chore(tests): Use freshly-build files in compressed mode.
Use the freshly-built build/*_compresssed.js files when bootstrapping
in compressed mode, rather than using the checked-in files in the
repository root.
This helps ensure that compressed and uncompressed mode will be
testing (as closely as possible) the same code.
Obsoletes #6218 (though the issues discussed there have not actually
yet been addressed in this branch).
* chore(build): Write intermediate langfiles to build/msg
Write the results of create_messages.py to build/msg instead of
build/msg/js.
* fix(build): Use build/msg/en.js instead of msg/messages.js in tests
This has no direct effect but fixes a long-standing misdesign
where we are testing against the input to, rather than the output
of, the language file processing pipeline.
* feat(demos): Use freshly-built files
Use the freshly-built dist/*_compresssed.js and build/msg/* files
rather than using the checked-in files in the repository root.
This helps ensure that these demos are using the most recent
version of Blockly (even in the develop branch).
* fix(build): Update appengine deployment to include built files
Modify the prepareDemos task as follows:
- Use the git index instead of HEAD, so that most local changes
will be applied (without copying whatever .gitignored cruft
might be in the local directory).
- Run clean and build and then copy build/msg and
dist/*_compressed.js* to the deploy directory.
This fixes the problem created by the previous commit, wherein the
demos relied on built files that were not being deployed to
appengine.
* fix(build): Update GitHub Pages deployment to include built files
Modify the updateGithubPages task to run clean and build and
then git add build/msg dist/*_compressed.js*, so that they will
be included in the deployed pages.
This fixes the problem created by the previous^2 commit,
wherein the demos relied on built files that were not being
deployed to GitHub Pages.
* chore(build): Remove build products from repository
Remove *_compressed.js* and msg/js/* from the blockly repository.
Also remove the now-obsolete checkinBuilt gulp task.
* chore(build): Apply relevant changes to test_tasks.js
Apply changes made to run_all_tests.sh and check_metadata.sh to
the corresponding parts of their JS replacements in
test_tasks.js.
* chore(build): Make updates suggested in PR #6475
- Remove `clean:builddir` and `clean:releasedir` - `clean`
is sufficient.
- Remove duplicate `require` from `appengine_tasks.js`.
* feat(build): Use shorter npm script names
Since scripts that run build tasks now automatically run their
prerequisite tasks, the previous naming scheme of task `build`
running all the `build:subtask`s no longe really makes very
much sense.
Additionally, following a chat discussion, there seems to be a
rough consensus to use "messages" to refer to the .json input
files, and "langfiles" to the generated .js output files.
Consequently, simplify npm script names by renaming as follows:
- "generate:langfiles" -> "messages"
- "build:langfiles" -> "langfiles"
- "build:js" -> "tsc"
- "build:deps" -> "deps"
- "build:compiled" -> "minify"
- "build:compressed": delete this synonym for "build:compiled",
("minify" was chosen as agnostic to Closure Compiler vs. WebPack.)
* chores(build): Add deprecation notice for old scripts
To reduce potential confusion/frustration, restore the previous
npm scripts but have them display a deprecation notice instead
(note that npm prints the script contents before running it, so
echo is not needed).
* docs(build): Add comments distinguishing 'messages' from 'langfiles'
406 lines
13 KiB
HTML
406 lines
13 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<meta charset="utf-8">
|
|
<title>Blockly Generator Tests</title>
|
|
<script>
|
|
var BLOCKLY_BOOTSTRAP_OPTIONS = {
|
|
additionalScripts: [
|
|
'build/msg/en.js',
|
|
'tests/generators/unittest_javascript.js',
|
|
'tests/generators/unittest_python.js',
|
|
'tests/generators/unittest_php.js',
|
|
'tests/generators/unittest_lua.js',
|
|
'tests/generators/unittest_dart.js',
|
|
'tests/generators/unittest.js',
|
|
],
|
|
}
|
|
</script>
|
|
<script src="../bootstrap.js"></script>
|
|
<script>
|
|
var demoWorkspace = null;
|
|
var outputCode = '';
|
|
|
|
function start() {
|
|
demoWorkspace = Blockly.inject('blocklyDiv', {
|
|
grid: {
|
|
spacing: 25,
|
|
length: 3,
|
|
colour: '#ccc',
|
|
snap: true
|
|
},
|
|
media: '../../media/',
|
|
toolbox: document.getElementById('toolbox'),
|
|
zoom: {controls: true, wheel: true}
|
|
});
|
|
changeIndex();
|
|
}
|
|
|
|
/**
|
|
* Run this test to load all of the tests in the selected suites. The contents
|
|
* will be loaded into the workspace in order. To test the generators:
|
|
* - select your language from the buttons above the text area
|
|
* - copy all of the generated code
|
|
* - run it in an interpreter of your choice
|
|
* - scan all of the results for "FAIL". All test suites are running in order,
|
|
* and each will report OK or FAIL based only on the tests in that suite.
|
|
* If some tests are failing, load test suites individually to continue
|
|
* debugging.
|
|
*/
|
|
function loadSelected() {
|
|
var output = document.getElementById('importExport');
|
|
output.style.background = 'gray';
|
|
|
|
var loadingElem = document.getElementById('loading');
|
|
loadingElem.textContent = 'loading...';
|
|
|
|
// Clear before adding all of the blocks.
|
|
demoWorkspace.clear();
|
|
|
|
var boxList = document.getElementsByClassName('suite_checkbox');
|
|
for (var i = 0; i < boxList.length; i++) {
|
|
if (boxList[i].checked) {
|
|
var testUrl = boxList[i].value;
|
|
if (testUrl) {
|
|
var xmlText = fetchFile(testUrl);
|
|
if (xmlText !== null) {
|
|
fromXml(testUrl, xmlText, /* opt_append */ true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
output.style.background = '';
|
|
loadingElem.textContent = 'done';
|
|
}
|
|
|
|
/**
|
|
* Ask the user for a file name, then load that file's contents.
|
|
*/
|
|
function loadOther() {
|
|
var url = window.prompt('Enter URL of test file.');
|
|
if (!url) {
|
|
return;
|
|
}
|
|
var xmlText = fetchFile(url);
|
|
if (xmlText !== null) {
|
|
fromXml(url, xmlText);
|
|
}
|
|
}
|
|
|
|
function fetchFile(xmlUrl) {
|
|
try {
|
|
var xmlHttp = new XMLHttpRequest();
|
|
xmlHttp.open('GET', xmlUrl, false);
|
|
xmlHttp.setRequestHeader('Content-Type', 'text/xml');
|
|
xmlHttp.send('');
|
|
} catch (e) {
|
|
// Attempt to diagnose the problem.
|
|
var msg = 'Error: Unable to load XML data.\n';
|
|
if (window.location.protocol == 'file:') {
|
|
msg += 'This may be due to a security restriction preventing\n' +
|
|
'access when using the file:// protocol.\n' +
|
|
'Use an http webserver, or a less paranoid browser.\n';
|
|
}
|
|
alert(msg + '\n' + e);
|
|
return null;
|
|
}
|
|
return xmlHttp.responseText;
|
|
}
|
|
|
|
/**
|
|
* @param {string} filename The URL (or other name) of the XML, for reporting.
|
|
* @param {string} xmlText The actual XML text.
|
|
* @param {boolean=} opt_append True if the XML should be appended to the
|
|
* workspace. Otherwise the workspace is cleared and the new XML is loaded.
|
|
*/
|
|
function fromXml(filename, xmlText, opt_append) {
|
|
var output = document.getElementById('importExport');
|
|
output.value = xmlText;
|
|
output.scrollTop = 0;
|
|
output.scrollLeft = 0;
|
|
if (!opt_append) {
|
|
demoWorkspace.clear();
|
|
}
|
|
try {
|
|
var xmlDoc = Blockly.Xml.textToDom(xmlText);
|
|
if (opt_append) {
|
|
Blockly.Xml.appendDomToWorkspace(xmlDoc, demoWorkspace);
|
|
} else {
|
|
Blockly.Xml.domToWorkspace(xmlDoc, demoWorkspace);
|
|
}
|
|
} catch (e) {
|
|
var msg = 'Error parsing XML: ' + filename + '\n\n\t' + e;
|
|
if (e.stack) {
|
|
msg += '\n\nSee console for stack trace details.'
|
|
}
|
|
console.error(e.stack ? e : msg);
|
|
alert(msg);
|
|
return;
|
|
}
|
|
}
|
|
|
|
function checkAll() {
|
|
var boxList = document.getElementsByClassName('suite_checkbox');
|
|
for (var i = 0; i < boxList.length; i++) {
|
|
boxList[i].checked = true;
|
|
}
|
|
}
|
|
|
|
function uncheckAll() {
|
|
var boxList = document.getElementsByClassName('suite_checkbox');
|
|
for (var i = 0; i < boxList.length; i++) {
|
|
boxList[i].checked = false;
|
|
}
|
|
}
|
|
|
|
function setOutput(text) {
|
|
var output = document.getElementById('importExport');
|
|
output.value = text;
|
|
output.focus();
|
|
output.select();
|
|
}
|
|
|
|
function toXml() {
|
|
var xmlDom = Blockly.Xml.workspaceToDom(demoWorkspace,
|
|
/* opt_noId */ true);
|
|
var xmlText = Blockly.Xml.domToPrettyText(xmlDom);
|
|
xmlText = xmlText.replace(/ id="\d+"/g, '');
|
|
setOutput(xmlText);
|
|
}
|
|
|
|
function toJavaScript() {
|
|
var code = '\'use strict\';\n\n'
|
|
code += javascriptGenerator.workspaceToCode(demoWorkspace);
|
|
setOutput(code);
|
|
outputCode = code;
|
|
}
|
|
|
|
function toPython() {
|
|
var code = pythonGenerator.workspaceToCode(demoWorkspace);
|
|
setOutput(code);
|
|
outputCode = code;
|
|
}
|
|
|
|
function toPhp() {
|
|
var code = phpGenerator.workspaceToCode(demoWorkspace);
|
|
setOutput(code);
|
|
outputCode = code;
|
|
}
|
|
|
|
function toLua() {
|
|
var code = luaGenerator.workspaceToCode(demoWorkspace);
|
|
setOutput(code);
|
|
outputCode = code;
|
|
}
|
|
|
|
function toDart() {
|
|
var code = dartGenerator.workspaceToCode(demoWorkspace);
|
|
setOutput(code);
|
|
outputCode = code;
|
|
}
|
|
|
|
function changeIndex() {
|
|
var oneBasedIndex = document.getElementById('indexing').checked;
|
|
demoWorkspace.options.oneBasedIndex = oneBasedIndex;
|
|
demoWorkspace.getToolbox().flyout_.workspace_.options.oneBasedIndex = oneBasedIndex;
|
|
}
|
|
</script>
|
|
<script type=module>
|
|
// Wait for Blockly to finish loading before running tests.
|
|
import '../bootstrap_done.mjs';
|
|
|
|
start();
|
|
</script>
|
|
|
|
<style>
|
|
html, body {
|
|
height: 100%;
|
|
overflow: hidden;
|
|
}
|
|
body {
|
|
background-color: #fff;
|
|
font-family: sans-serif;
|
|
margin: 0 5px;
|
|
}
|
|
h1 {
|
|
font-weight: normal;
|
|
font-size: 140%;
|
|
}
|
|
#blocklyDiv {
|
|
float: right;
|
|
height: 95%;
|
|
width: 69%;
|
|
margin-top: 5px;
|
|
}
|
|
#importExport {
|
|
height: 100%;
|
|
width: 100%;
|
|
}
|
|
#loading {
|
|
color: red;
|
|
}
|
|
</style>
|
|
</head>
|
|
<body>
|
|
|
|
<div id="blocklyDiv"></div>
|
|
|
|
<xml xmlns="https://developers.google.com/blockly/xml" id="toolbox" style="display: none">
|
|
<category name="Unit test" colour="65">
|
|
<block type="unittest_main"></block>
|
|
<block type="unittest_assertequals">
|
|
<value name="MESSAGE">
|
|
<block type="text">
|
|
<field name="TEXT"></field>
|
|
</block>
|
|
</value>
|
|
</block>
|
|
<block type="unittest_assertvalue">
|
|
<value name="MESSAGE">
|
|
<block type="text">
|
|
<field name="TEXT"></field>
|
|
</block>
|
|
</value>
|
|
</block>
|
|
<block type="unittest_fail"></block>
|
|
<block type="unittest_adjustindex"></block>
|
|
</category>
|
|
<category name="Logic" colour="210">
|
|
<block type="controls_if"></block>
|
|
<block type="controls_ifelse"></block>
|
|
<block type="logic_compare"></block>
|
|
<block type="logic_operation"></block>
|
|
<block type="logic_negate"></block>
|
|
<block type="logic_boolean"></block>
|
|
<block type="logic_null"></block>
|
|
<block type="logic_ternary"></block>
|
|
</category>
|
|
<category name="Loops" colour="120">
|
|
<block type="controls_repeat_ext"></block>
|
|
<block type="controls_whileUntil"></block>
|
|
<block type="controls_for"></block>
|
|
<block type="controls_forEach"></block>
|
|
<block type="controls_flow_statements"></block>
|
|
</category>
|
|
<category name="Math" colour="230">
|
|
<block type="math_number"></block>
|
|
<block type="math_arithmetic"></block>
|
|
<block type="math_single"></block>
|
|
<block type="math_trig"></block>
|
|
<block type="math_constant"></block>
|
|
<block type="math_number_property"></block>
|
|
<block type="math_round"></block>
|
|
<block type="math_on_list"></block>
|
|
<block type="math_modulo"></block>
|
|
<block type="math_constrain"></block>
|
|
<block type="math_random_int"></block>
|
|
<block type="math_random_float"></block>
|
|
<block type="math_atan2"></block>
|
|
</category>
|
|
<category name="Text" colour="160">
|
|
<block type="text"></block>
|
|
<block type="text_join"></block>
|
|
<block type="text_append"></block>
|
|
<block type="text_length"></block>
|
|
<block type="text_isEmpty"></block>
|
|
<block type="text_indexOf"></block>
|
|
<block type="text_charAt"></block>
|
|
<block type="text_getSubstring"></block>
|
|
<block type="text_changeCase"></block>
|
|
<block type="text_trim"></block>
|
|
<block type="text_print"></block>
|
|
<block type="text_prompt_ext"></block>
|
|
<block type="text_count"></block>
|
|
<block type="text_replace"></block>
|
|
<block type="text_reverse"></block>
|
|
<block type="text_multiline"></block>
|
|
</category>
|
|
<category name="Lists" colour="260">
|
|
<block type="lists_create_empty"></block>
|
|
<block type="lists_create_with"></block>
|
|
<block type="lists_repeat"></block>
|
|
<block type="lists_length"></block>
|
|
<block type="lists_isEmpty"></block>
|
|
<block type="lists_indexOf"></block>
|
|
<block type="lists_getIndex"></block>
|
|
<block type="lists_setIndex"></block>
|
|
<block type="lists_getSublist"></block>
|
|
<block type="lists_sort"></block>
|
|
<block type="lists_split"></block>
|
|
<block type="lists_reverse"></block>
|
|
</category>
|
|
<category name="Colour" colour="20">
|
|
<block type="colour_picker"></block>
|
|
<block type="colour_random"></block>
|
|
<block type="colour_rgb"></block>
|
|
<block type="colour_blend"></block>
|
|
</category>
|
|
<sep></sep>
|
|
<category name="Variables" colour="330" custom="VARIABLE"></category>
|
|
<category name="Functions" colour="290" custom="PROCEDURE"></category>
|
|
</xml>
|
|
|
|
<table height="95%" width="30%"><tr><td valign="top">
|
|
<h1>Blockly Generator Tests</h1>
|
|
|
|
<p><a href="https://developers.google.com/blockly/guides/modify/web/unit-testing">See the docs</a> for details on running the tests.
|
|
|
|
|
|
<div id="checkboxes">
|
|
<input type="button" value="Check all" onclick="checkAll()">
|
|
<input type="button" value="Uncheck all" onclick="uncheckAll()"><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="logic.xml">Logic</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="loops1.xml">Loops 1 (repeat, while, foreach)</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="loops2.xml">Loops 2 (count)</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="loops3.xml">Loops 3 (continue, break)</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="math.xml">Math</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="text.xml">Text</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="lists.xml">Lists</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="colour.xml">Colour</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="variables.xml">Variables</input><br/>
|
|
<input type="checkbox" class="suite_checkbox" value="functions.xml">Functions</input><br/>
|
|
</div>
|
|
|
|
<p>
|
|
<input type="button" value="Load selected" id="loadSelectedBtn" onclick="loadSelected()">
|
|
<label for="loadSelectedBtn" id="loading"></label>
|
|
</p>
|
|
<p>
|
|
<input type="button" value="Load by file name" onclick="loadOther()">
|
|
</p>
|
|
|
|
<p>
|
|
<input id="indexing" type="checkbox" onchange="changeIndex()" checked>
|
|
<label for="indexing">Generate with one-based indexing</label>
|
|
</p>
|
|
|
|
<p>
|
|
Generate:
|
|
<input type="button" value="XML" onclick="toXml()">
|
|
<div style="display: inline-block;">
|
|
<input type="button" value="JavaScript" onclick="toJavaScript()">
|
|
<br><a target="_blank" href="https://repl.it/languages/javascript">interpreter</a>
|
|
</div>
|
|
<div style="display: inline-block;">
|
|
<input type="button" value="Python" onclick="toPython()">
|
|
<br><a target="_blank" href="https://repl.it/languages/python3">interpreter</a>
|
|
</div>
|
|
<div style="display: inline-block;">
|
|
<input type="button" value="PHP" onclick="toPhp()">
|
|
<br><a target="_blank" href="https://repl.it/languages/php">interpreter</a>
|
|
</div>
|
|
<div style="display: inline-block;">
|
|
<input type="button" value="Lua" onclick="toLua()">
|
|
<br><a target="_blank" href="https://rextester.com/l/lua_online_compiler">interpreter</a>
|
|
</div>
|
|
<div style="display: inline-block;">
|
|
<input type="button" value="Dart" onclick="toDart()">
|
|
<br><a target="_blank" href="https://dartpad.dartlang.org/">interpreter</a>
|
|
</div>
|
|
</p>
|
|
</td></tr><tr><td height="99%">
|
|
<textarea id="importExport" readonly="readonly" wrap="off"></textarea>
|
|
</td></tr></table>
|
|
</body>
|
|
</html>
|