CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-05-14 08:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: project cereal cleanup (#5398)

Browse Source 
* fix: make exception constructors package

* fix: rename blocks.load to blocks.append

* fix: inline docs

* fix: consistency in block serialization

* fix: remove unexported functions

* fix: interface requires

* fix: tag TODO with issue number
This commit is contained in:
Beka Westberg
2021-09-10 21:05:17 +00:00
committed by alschmiedt
parent b7d490a1f2
commit a3c1b2fdfc
16 changed files with 102 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/deps.js
+2 -2
View File
@@ -197,11 +197,11 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
tests/mocha/block_create_event_test.js
+1 -1
View File
@@ -21,7 +21,7 @@ suite('Block Create Event', function() {
test('Create shadow on disconnect', function() {
Blockly.Events.disable();
const block = Blockly.serialization.blocks.load(
const block = Blockly.serialization.blocks.append(
{
"type": "text_print",
"inputs": {
tests/mocha/connection_test.js
+27 -28
View File
@@ -1352,18 +1352,18 @@ suite('Connection', function() {
suite('Add - No Block Connected', function() {
// These are defined separately in each suite.
function createRowBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'row_block', 'id': 'id0'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'row_block', 'id': 'id0'}, workspace);
}
function createStatementBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'statement_block', 'id': 'id0'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'statement_block', 'id': 'id0'}, workspace);
}
function createStackBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'stack_block', 'id': 'id0'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'stack_block', 'id': 'id0'}, workspace);
}
test('Value', function() {
@@ -1551,7 +1551,6 @@ suite('Connection', function() {
'</block>'
);
});
test('Multiple Next', function() {
var parent = createStackBlock(this.workspace);
parent.nextConnection.setShadowState({
@@ -1601,7 +1600,7 @@ suite('Connection', function() {
suite('Add - With Block Connected', function() {
// These are defined separately in each suite.
function createRowBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'row_block',
'id': 'id0',
@@ -1618,7 +1617,7 @@ suite('Connection', function() {
}
function createStatementBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'statement_block',
'id': 'id0',
@@ -1635,7 +1634,7 @@ suite('Connection', function() {
}
function createStackBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'stack_block',
'id': 'id0',
@@ -1906,18 +1905,18 @@ suite('Connection', function() {
suite('Add - With Shadow Connected', function() {
// These are defined separately in each suite.
function createRowBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'row_block', 'id': 'id0'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'row_block', 'id': 'id0'}, workspace);
}
function createStatementBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'statement_block', 'id': 'id0'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'statement_block', 'id': 'id0'}, workspace);
}
function createStackBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'stack_block', 'id': 'id0'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'stack_block', 'id': 'id0'}, workspace);
}
test('Value', function() {
@@ -2218,7 +2217,7 @@ suite('Connection', function() {
suite('Remove - No Block Connected', function() {
// These are defined separately in each suite.
function createRowBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'row_block',
'id': 'id0',
@@ -2235,7 +2234,7 @@ suite('Connection', function() {
}
function createStatementBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'statement_block',
'id': 'id0',
@@ -2252,7 +2251,7 @@ suite('Connection', function() {
}
function createStackBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'stack_block',
'id': 'id0',
@@ -2318,7 +2317,7 @@ suite('Connection', function() {
suite('Remove - Block Connected', function() {
// These are defined separately in each suite.
function createRowBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'row_block',
'id': 'id0',
@@ -2339,7 +2338,7 @@ suite('Connection', function() {
}
function createStatementBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'statement_block',
'id': 'id0',
@@ -2360,7 +2359,7 @@ suite('Connection', function() {
}
function createStackBlocks(workspace) {
return Blockly.serialization.blocks.load(
return Blockly.serialization.blocks.append(
{
'type': 'stack_block',
'id': 'id0',
@@ -2436,18 +2435,18 @@ suite('Connection', function() {
suite('Add - Connect & Disconnect - Remove', function() {
// These are defined separately in each suite.
function createRowBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'row_block'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'row_block'}, workspace);
}
function createStatementBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'statement_block'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'statement_block'}, workspace);
}
function createStackBlock(workspace) {
return Blockly.serialization.blocks
.load({'type': 'stack_block'}, workspace);
return Blockly.serialization.blocks.append(
{'type': 'stack_block'}, workspace);
}
test('Value', function() {
tests/mocha/field_variable_test.js
+3 -3
View File
@@ -454,7 +454,7 @@ suite('Variable Fields', function() {
test('ID', function() {
this.workspace.createVariable('test', '', 'id1');
var block = Blockly.serialization.blocks.load({
var block = Blockly.serialization.blocks.append({
'type': 'variables_get',
'fields': {
'VAR': {
@@ -470,7 +470,7 @@ suite('Variable Fields', function() {
});
test('Name, untyped', function() {
var block = Blockly.serialization.blocks.load({
var block = Blockly.serialization.blocks.append({
'type': 'variables_get',
'fields': {
'VAR': {
@@ -486,7 +486,7 @@ suite('Variable Fields', function() {
});
test('Name, typed', function() {
var block = Blockly.serialization.blocks.load({
var block = Blockly.serialization.blocks.append({
'type': 'variables_get',
'fields': {
'VAR': {
tests/mocha/jso_deserialization_test.js
+5 -5
View File
@@ -362,7 +362,7 @@ suite('JSO Deserialization', function() {
'x': 42,
'y': 42
};
Blockly.serialization.blocks.load(state, this.workspace);
Blockly.serialization.blocks.append(state, this.workspace);
assertEventFired(
this.eventsFireStub,
Blockly.Events.BlockCreate,
@@ -378,8 +378,8 @@ suite('JSO Deserialization', function() {
'x': 42,
'y': 42
};
Blockly.serialization.blocks
.load(state, this.workspace, {'recordUndo': true});
Blockly.serialization.blocks.append(
state, this.workspace, {'recordUndo': true});
assertEventFired(
this.eventsFireStub,
Blockly.Events.BlockCreate,
@@ -396,7 +396,7 @@ suite('JSO Deserialization', function() {
'y': 42
};
Blockly.Events.setGroup('my group');
Blockly.serialization.blocks.load(state, this.workspace);
Blockly.serialization.blocks.append(state, this.workspace);
assertEventFired(
this.eventsFireStub,
Blockly.Events.BlockCreate,
@@ -700,7 +700,7 @@ suite('JSO Deserialization', function() {
}
};
const block = Blockly.serialization.blocks.load(
const block = Blockly.serialization.blocks.append(
{
'type': 'test_block',
'extraState': '<mutation value="some value"></mutation>',