mirror of
https://github.com/google/blockly.git
synced 2026-01-07 17:10:11 +01:00
* 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.
272 lines
6.5 KiB
JavaScript
272 lines
6.5 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* Get JSON for a toolbox that contains categories.
|
|
* @return {Blockly.utils.toolbox.ToolboxJson} The array holding information
|
|
* for a toolbox.
|
|
*/
|
|
export function getCategoryJSON() {
|
|
return {
|
|
'contents': [
|
|
{
|
|
'kind': 'CATEGORY',
|
|
'cssconfig': {
|
|
'container': 'something',
|
|
},
|
|
'contents': [
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml':
|
|
'<block type="basic_block"><field name="TEXT">FirstCategory-FirstBlock</field></block>',
|
|
},
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml':
|
|
'<block type="basic_block"><field name="TEXT">FirstCategory-SecondBlock</field></block>',
|
|
},
|
|
],
|
|
'name': 'First',
|
|
},
|
|
{
|
|
'kind': 'CATEGORY',
|
|
'contents': [
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml':
|
|
'<block type="basic_block"><field name="TEXT">SecondCategory-FirstBlock</field></block>',
|
|
},
|
|
],
|
|
'name': 'Second',
|
|
},
|
|
],
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Get JSON for a simple toolbox.
|
|
* @return {Blockly.utils.toolbox.ToolboxJson} The array holding information
|
|
* for a simple toolbox.
|
|
*/
|
|
export function getSimpleJson() {
|
|
return {
|
|
'contents': [
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml': `<block type="logic_compare">
|
|
<field name="OP">NEQ</field>
|
|
<value name="A">
|
|
<shadow type="math_number">
|
|
<field name="NUM">1</field>
|
|
</shadow>
|
|
</value>
|
|
<value name="B">
|
|
<block type="math_number">
|
|
<field name="NUM">2</field>
|
|
</block>
|
|
</value>
|
|
</block>`,
|
|
},
|
|
{
|
|
'kind': 'SEP',
|
|
'gap': '20',
|
|
},
|
|
{
|
|
'kind': 'BUTTON',
|
|
'text': 'insert',
|
|
'callbackkey': 'insertConnectionRows',
|
|
},
|
|
{
|
|
'kind': 'LABEL',
|
|
'text': 'tooltips',
|
|
},
|
|
],
|
|
};
|
|
}
|
|
|
|
export function getProperSimpleJson() {
|
|
return {
|
|
'contents': [
|
|
{
|
|
'kind': 'BLOCK',
|
|
'type': 'logic_compare',
|
|
'fields': {
|
|
'OP': 'NEQ',
|
|
},
|
|
'inputs': {
|
|
'A': {
|
|
'shadow': {
|
|
'type': 'math_number',
|
|
'fields': {
|
|
'NUM': 1,
|
|
},
|
|
},
|
|
},
|
|
'B': {
|
|
'block': {
|
|
'type': 'math_number',
|
|
'fields': {
|
|
'NUM': 2,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
'kind': 'SEP',
|
|
'gap': '20',
|
|
},
|
|
{
|
|
'kind': 'BUTTON',
|
|
'text': 'insert',
|
|
'callbackkey': 'insertConnectionRows',
|
|
},
|
|
{
|
|
'kind': 'LABEL',
|
|
'text': 'tooltips',
|
|
},
|
|
],
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Get JSON for a toolbox that contains categories that contain categories.
|
|
* @return {Blockly.utils.toolbox.ToolboxJson} The array holding information
|
|
* for a toolbox.
|
|
*/
|
|
export function getDeeplyNestedJSON() {
|
|
return {
|
|
'contents': [
|
|
{
|
|
'kind': 'CATEGORY',
|
|
'cssconfig': {
|
|
'container': 'something',
|
|
},
|
|
'contents': [
|
|
{
|
|
'kind': 'CATEGORY',
|
|
'contents': [
|
|
{
|
|
'kind': 'CATEGORY',
|
|
'contents': [
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml':
|
|
'<block type="basic_block"><field name="TEXT">NestedCategory-FirstBlock</field></block>',
|
|
},
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml':
|
|
'<block type="basic_block"><field name="TEXT">NestedCategory-SecondBlock</field></block>',
|
|
},
|
|
],
|
|
'name': 'NestedCategoryInner',
|
|
},
|
|
],
|
|
'name': 'NestedCategoryMiddle',
|
|
},
|
|
],
|
|
'name': 'NestedCategoryOuter',
|
|
},
|
|
{
|
|
'kind': 'CATEGORY',
|
|
'contents': [
|
|
{
|
|
'kind': 'BLOCK',
|
|
'blockxml':
|
|
'<block type="basic_block"><field name="TEXT">SecondCategory-FirstBlock</field></block>',
|
|
},
|
|
],
|
|
'name': 'Second',
|
|
},
|
|
],
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Get an array filled with xml elements.
|
|
* @return {Array<Node>} Array holding xml elements for a toolbox.
|
|
*/
|
|
export function getXmlArray() {
|
|
const block = Blockly.utils.xml.textToDom(
|
|
`<block type="logic_compare">
|
|
<field name="OP">NEQ</field>
|
|
<value name="A">
|
|
<shadow type="math_number">
|
|
<field name="NUM">1</field>
|
|
</shadow>
|
|
</value>
|
|
<value name="B">
|
|
<block type="math_number">
|
|
<field name="NUM">2</field>
|
|
</block>
|
|
</value>
|
|
</block>`,
|
|
);
|
|
const separator = Blockly.utils.xml.textToDom('<sep gap="20"></sep>');
|
|
const button = Blockly.utils.xml.textToDom(
|
|
'<button text="insert" callbackkey="insertConnectionRows"></button>',
|
|
);
|
|
const label = Blockly.utils.xml.textToDom('<label text="tooltips"></label>');
|
|
return [block, separator, button, label];
|
|
}
|
|
|
|
export function getInjectedToolbox() {
|
|
/**
|
|
* Category: First
|
|
* sep
|
|
* basic_block
|
|
* basic_block
|
|
* Category: second
|
|
* basic_block
|
|
* Category: Variables
|
|
* custom: VARIABLE
|
|
* Category: NestedCategory
|
|
* Category: NestedItemOne
|
|
*/
|
|
const toolboxXml = document.getElementById('toolbox-test');
|
|
const workspace = Blockly.inject('blocklyDiv', {
|
|
toolbox: toolboxXml,
|
|
});
|
|
return workspace.getToolbox();
|
|
}
|
|
|
|
export function getBasicToolbox() {
|
|
const workspace = new Blockly.WorkspaceSvg(new Blockly.Options({}));
|
|
const toolbox = new Blockly.Toolbox(workspace);
|
|
toolbox.HtmlDiv = document.createElement('div');
|
|
toolbox.flyout_ = sinon.createStubInstance(Blockly.VerticalFlyout);
|
|
return toolbox;
|
|
}
|
|
|
|
export function getCollapsibleItem(toolbox) {
|
|
const contents = toolbox.contents_;
|
|
for (let i = 0; i < contents.length; i++) {
|
|
const item = contents[i];
|
|
if (item.isCollapsible()) {
|
|
return item;
|
|
}
|
|
}
|
|
}
|
|
|
|
export function getNonCollapsibleItem(toolbox) {
|
|
const contents = toolbox.contents_;
|
|
for (let i = 0; i < contents.length; i++) {
|
|
const item = contents[i];
|
|
if (!item.isCollapsible()) {
|
|
return item;
|
|
}
|
|
}
|
|
}
|
|
|
|
export function getChildItem(toolbox) {
|
|
return toolbox.getToolboxItemById('nestedCategory');
|
|
}
|
|
|
|
export function getSeparator(toolbox) {
|
|
return toolbox.getToolboxItemById('separator');
|
|
}
|