mirror of
https://github.com/google/blockly.git
synced 2026-01-07 00:50:27 +01:00
6f20ac290d
* fix(build): Have buildShims clean up up after itself
We need to create a build/package.json file to allow node.js to
load build/src/core/blockly.js and the other chunk entry points
as ES modules (it forcibly assumes .js means CJS even if one is
trying to import, unless package.json says {"type": "module"}),
but this interferes with scripts/migration/js2ts doing a
require('build/deps.js'), which is _not_ an ES module.
Specific error message was:
/Users/cpcallen/src/blockly/scripts/migration/js2ts:56
require(path.resolve(__dirname, '../../build/deps.js'));
^
Error [ERR_REQUIRE_ESM]: require() of ES Module
/Users/cpcallen/src/blockly/build/deps.js from /Users/cpcallen/src/blockly/scripts/migration/js2ts
not supported.
deps.js is treated as an ES module file as it is a .js file whose
nearest parent package.json contains "type": "module" which
declares all .js files in that package scope as ES modules.
Instead rename deps.js to end in .cjs, change the requiring code
to use dynamic import() which is available in all CommonJS
modules, or change "type": "module" to "type": "commonjs" in
/Users/cpcallen/src/blockly/build/package.json to treat all .js
files as CommonJS (using .mjs for all ES modules instead).
at Object.<anonymous> (/Users/cpcallen/src/blockly/scripts/migration/js2ts:56:1) {
code: 'ERR_REQUIRE_ESM'
}
* chore(tests): Reorder to put interesting script nearer top of file
* chore(tests): Add missing imports of closure/goog/goog.js
These modules were depending on being loaded via the
debug module loader, which cannot be used without first loading
base.js as a script, and thereby defining goog.declareModuleId
as a side effect—but if they are to be loaded via direct import
statements then they need to actually import their own
dependencies.
This is a temporary measure as soon the goog.declareMouleId
calls can themselves be deleted.
* refactor(tests): Use import instead of bootstrap to load Blockly
* chores(build): Stop generating deps.mocha.js
This file was only needed by tests/mocha/index.html's use of
the debug module loader (via bootstrap.js), which has now been
removed.
* chore(tests): Remove unneeded goog.declareModuleId calls
These were only needed because these modules were previously
being loaded by goog.require and/or goog.bootstrap.
* chores(tests): Remove dead code
We are fully committed to proper modules now.
432 lines
15 KiB
JavaScript
432 lines
15 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import {
|
|
sharedTestSetup,
|
|
sharedTestTeardown,
|
|
} from './test_helpers/setup_teardown.js';
|
|
|
|
suite('InsertionMarkers', function () {
|
|
setup(function () {
|
|
sharedTestSetup.call(this);
|
|
this.workspace = Blockly.inject('blocklyDiv', {});
|
|
Blockly.defineBlocksWithJsonArray([
|
|
{
|
|
'type': 'stack_block',
|
|
'message0': '',
|
|
'previousStatement': null,
|
|
'nextStatement': null,
|
|
},
|
|
{
|
|
'type': 'row_block',
|
|
'message0': '%1',
|
|
'args0': [
|
|
{
|
|
'type': 'input_value',
|
|
'name': 'INPUT',
|
|
},
|
|
],
|
|
'output': null,
|
|
},
|
|
{
|
|
'type': 'statement_block',
|
|
'message0': '%1',
|
|
'args0': [
|
|
{
|
|
'type': 'input_statement',
|
|
'name': 'STATEMENT',
|
|
},
|
|
],
|
|
'previousStatement': null,
|
|
'nextStatement': null,
|
|
},
|
|
]);
|
|
});
|
|
teardown(function () {
|
|
sharedTestTeardown.call(this);
|
|
});
|
|
suite('Code Generation', function () {
|
|
setup(function () {
|
|
javascriptGenerator.forBlock['stack_block'] = function (block) {
|
|
return 'stack[' + block.id + '];\n';
|
|
};
|
|
javascriptGenerator.forBlock['row_block'] = function (block) {
|
|
const value = javascriptGenerator.valueToCode(
|
|
block,
|
|
'INPUT',
|
|
javascriptGenerator.ORDER_NONE,
|
|
);
|
|
const code = 'row[' + block.id + '](' + value + ')';
|
|
return [code, javascriptGenerator.ORDER_NONE];
|
|
};
|
|
javascriptGenerator.forBlock['statement_block'] = function (block) {
|
|
return (
|
|
'statement[' +
|
|
block.id +
|
|
']{\n' +
|
|
javascriptGenerator.statementToCode(block, 'STATEMENT') +
|
|
'};\n'
|
|
);
|
|
};
|
|
|
|
this.assertGen = function (xml, expectedCode) {
|
|
Blockly.Xml.domToWorkspace(xml, this.workspace);
|
|
const block = this.workspace.getBlockById('insertion');
|
|
block.isInsertionMarker_ = true;
|
|
const code = javascriptGenerator.workspaceToCode(this.workspace);
|
|
chai.assert.equal(code, expectedCode);
|
|
};
|
|
});
|
|
teardown(function () {
|
|
delete javascriptGenerator.forBlock['stack_block'];
|
|
delete javascriptGenerator.forBlock['row_block'];
|
|
delete javascriptGenerator.forBlock['statement_block'];
|
|
});
|
|
test('Marker Surrounds', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="statement_block" id="insertion">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="a"/>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'statement[a]{\n};\n');
|
|
});
|
|
test('Marker Enclosed', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="statement_block" id="a">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="insertion"/>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'statement[a]{\n};\n');
|
|
});
|
|
test('Marker Enclosed and Surrounds', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="statement_block" id="a">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="insertion">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="b"/>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(
|
|
xml,
|
|
'statement[a]{\n' + ' statement[b]{\n' + ' };\n' + '};\n',
|
|
);
|
|
});
|
|
test('Marker Prev', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="insertion">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="a"/>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'stack[a];\n');
|
|
});
|
|
test('Marker Next', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="a">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="insertion"/>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'stack[a];\n');
|
|
});
|
|
test('Marker Middle of Stack', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="a">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="insertion">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="b"/>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'stack[a];\n' + 'stack[b];\n');
|
|
});
|
|
test('Marker On Output', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="row_block" id="insertion">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="a"/>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'row[a]();\n');
|
|
});
|
|
test('Marker On Input', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="row_block" id="a">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="insertion"/>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'row[a]();\n');
|
|
});
|
|
test('Marker Middle of Row', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="row_block" id="a">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="insertion">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="b"/>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'row[a](row[b]());\n');
|
|
});
|
|
test('Marker Detatched', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="insertion"/>' +
|
|
' <block type="stack_block" id="a"/>' +
|
|
'</xml>',
|
|
);
|
|
this.assertGen(xml, 'stack[a];\n');
|
|
});
|
|
});
|
|
suite('Serialization', function () {
|
|
setup(function () {
|
|
this.assertXml = function (xmlIn, expectXml) {
|
|
Blockly.Xml.domToWorkspace(xmlIn, this.workspace);
|
|
const block = this.workspace.getBlockById('insertion');
|
|
block.setInsertionMarker(true);
|
|
let xml = Blockly.Xml.workspaceToDom(this.workspace);
|
|
Blockly.Xml.domToWorkspace(xml, this.workspace);
|
|
xml = Blockly.Xml.domToText(xml);
|
|
chai.assert.equal(xml, expectXml);
|
|
};
|
|
});
|
|
test('Marker Surrounds', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="statement_block" id="insertion" x="20" y="20">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="a"/>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
// Note how the x and y are not 20, they are slightly lower and end-er
|
|
// because these are the coords of the wrapped block.
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="statement_block" id="a" x="41" y="31"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Enclosed', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="statement_block" id="a" x="20" y="20">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="insertion"/>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="statement_block" id="a" x="20" y="20"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Enclosed and Surrounds', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="statement_block" id="a" x="20" y="20">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="insertion">' +
|
|
' <statement name="STATEMENT">' +
|
|
' <block type="statement_block" id="b"/>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
' </statement>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="statement_block" id="a" x="20" y="20">' +
|
|
'<statement name="STATEMENT">' +
|
|
'<block type="statement_block" id="b"></block>' +
|
|
'</statement>' +
|
|
'</block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Prev', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="insertion" x="20" y="20">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="a"/>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
// Note how the y coord is not at 20, it is lower. This is because these
|
|
// are the coords of the next block.
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="stack_block" id="a" x="20" y="46"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Next', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="a" x="20" y="20">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="insertion"/>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="stack_block" id="a" x="20" y="20"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Middle of Stack', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="a" x="20" y="20">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="insertion">' +
|
|
' <next>' +
|
|
' <block type="stack_block" id="b"/>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
' </next>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="stack_block" id="a" x="20" y="20">' +
|
|
'<next>' +
|
|
'<block type="stack_block" id="b"></block>' +
|
|
'</next>' +
|
|
'</block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker On Output', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="row_block" id="insertion" x="20" y="20">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="a"/>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
// Note how the x value is not at 20. This is because these are the coords
|
|
// of the wrapped block.
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="row_block" id="a" x="41" y="20"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker On Input', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="row_block" id="a" x="20" y="20">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="insertion"/>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="row_block" id="a" x="20" y="20"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Middle of Row', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="row_block" id="a" x="20" y="20">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="insertion">' +
|
|
' <value name="INPUT">' +
|
|
' <block type="row_block" id="b"/>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
' </value>' +
|
|
' </block>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="row_block" id="a" x="20" y="20">' +
|
|
'<value name="INPUT">' +
|
|
'<block type="row_block" id="b"></block>' +
|
|
'</value>' +
|
|
'</block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
test('Marker Detatched', function () {
|
|
const xml = Blockly.utils.xml.textToDom(
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
' <block type="stack_block" id="insertion"/>' +
|
|
' <block type="stack_block" id="a" x="20" y="20"/>' +
|
|
'</xml>',
|
|
);
|
|
this.assertXml(
|
|
xml,
|
|
'<xml xmlns="https://developers.google.com/blockly/xml">' +
|
|
'<block type="stack_block" id="a" x="20" y="20"></block>' +
|
|
'</xml>',
|
|
);
|
|
});
|
|
});
|
|
});
|