Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/blockly/blocks/loops.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ export const blocks = createBlockDefinitionsFromJsonArray([
{
'type': 'field_variable',
'name': 'VAR',
'variable': null,
},
{
'type': 'input_value',
Expand Down Expand Up @@ -167,7 +166,6 @@ export const blocks = createBlockDefinitionsFromJsonArray([
{
'type': 'field_variable',
'name': 'VAR',
'variable': null,
},
{
'type': 'input_value',
Expand Down
2 changes: 1 addition & 1 deletion packages/blockly/blocks/variables_dynamic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'variable': '%{BKY_VARIABLES_DEFAULT_NAME}',
},
],
'output': null,
'style': 'variable_dynamic_blocks',
'helpUrl': '%{BKY_VARIABLES_GET_HELPURL}',
'tooltip': '%{BKY_VARIABLES_GET_TOOLTIP}',
Expand All @@ -59,6 +58,7 @@ export const blocks = createBlockDefinitionsFromJsonArray([
'name': 'VALUE',
},
],
'output': null,
'previousStatement': null,
'nextStatement': null,
'style': 'variable_dynamic_blocks',
Expand Down
19 changes: 9 additions & 10 deletions packages/blockly/core/block.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1721,8 +1721,8 @@ export class Block {

// Validate that each arg has a corresponding message
let n = 0;
while (json['args' + n]) {
if (json['message' + n] === undefined) {
while (json[`args${n}`]) {
if (json[`message${n}`] === undefined) {
throw Error(
warningPrefix +
`args${n} must have a corresponding message (message${n}).`,
Expand All @@ -1732,14 +1732,13 @@ export class Block {
}

// Set basic properties of block.
// Makes styles backward compatible with old way of defining hat style.
if (json['style'] && json['style'].hat) {
this.hat = json['style'].hat;
// Handle legacy style object format for backwards compatibility
if (json['style'] && typeof json['style'] === 'object') {
this.hat = (json['style'] as {hat?: string}).hat;
// Must set to null so it doesn't error when checking for style and
// colour.
json['style'] = null;
}

if (json['style'] && json['colour']) {
throw Error(warningPrefix + 'Must not have both a colour and a style.');
} else if (json['style']) {
Expand All @@ -1750,12 +1749,12 @@ export class Block {

// Interpolate the message blocks.
let i = 0;
while (json['message' + i] !== undefined) {
while (json[`message${i}`] !== undefined) {
this.interpolate(
json['message' + i],
json['args' + i] || [],
json[`message${i}`] || '',
json[`args${i}`] || [],
// Backwards compatibility: lastDummyAlign aliases implicitAlign.
json['implicitAlign' + i] || json['lastDummyAlign' + i],
json[`implicitAlign${i}`] || (json as any)[`lastDummyAlign${i}`],
warningPrefix,
);
i++;
Expand Down
144 changes: 144 additions & 0 deletions packages/blockly/core/interfaces/i_json_block_definition.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
/**
* @license
* Copyright 2025 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/

import {FieldCheckboxFromJsonConfig} from '../field_checkbox.js';
import {FieldDropdownFromJsonConfig} from '../field_dropdown';
import {FieldImageFromJsonConfig} from '../field_image';
import {FieldNumberFromJsonConfig} from '../field_number';
import {FieldTextInputFromJsonConfig} from '../field_textinput';
import {FieldVariableFromJsonConfig} from '../field_variable';

/**
* Defines the JSON structure for a block definition.
*
* @example
* ```typescript
* const blockDef: JsonBlockDefinition = {
* type: 'custom_block',
* message0: 'move %1 steps',
* args0: [
* {
* 'type': 'field_number',
* 'name': 'INPUT',
* },
* ],
* previousStatement: null,
* nextStatement: null,
* };
* ```
*/
export interface JsonBlockDefinition {
type: string;
style?: string | null;
colour?: string | number;
output?: string | string[] | null;
previousStatement?: string | string[] | null;
nextStatement?: string | string[] | null;
outputShape?: number;
inputsInline?: boolean;
tooltip?: string;
helpUrl?: string;
extensions?: string[];
mutator?: string;
enableContextMenu?: boolean;
suppressPrefixSuffix?: boolean;

[key: `message${number}`]: string | undefined;
[key: `args${number}`]: JsonBlockArg[] | undefined;
[key: `implicitAlign${number}`]: string | undefined;
}

/**
* A map for custom args.
*
* @example
* ```typescript
* declare module 'blockly/core/interfaces/i_json_block_definition' {
* interface JsonBlockCustomArgMap {
* field_mitosis: {
* type: 'field_mitosis';
* name?: string;
* cellId: string;
* };
* }
* }
* ```
*/
export interface JsonBlockCustomArgMap {}

export type BuiltinJsonBlockArg =
| InputValueArg
| InputStatementArg
| InputDummyArg
| InputEndRowArg
| FieldInputArg
| FieldNumberArg
| FieldDropdownArg
| FieldCheckboxArg
| FieldImageArg
| FieldVariableArg;

export type CustomJsonBlockArg =
JsonBlockCustomArgMap[keyof JsonBlockCustomArgMap];

export type JsonBlockArg = BuiltinJsonBlockArg | CustomJsonBlockArg;

/** Input args */
interface InputValueArg {
type: 'input_value';
name?: string;
check?: string | string[];
align?: FieldsAlign;
}

interface InputStatementArg {
type: 'input_statement';
name?: string;
check?: string | string[];
}

interface InputDummyArg {
type: 'input_dummy';
name?: string;
}

interface InputEndRowArg {
type: 'input_end_row';
name?: string;
}

/** Field args */
interface FieldInputArg extends FieldTextInputFromJsonConfig {
type: 'field_input';
name?: string;
}

interface FieldNumberArg extends FieldNumberFromJsonConfig {
type: 'field_number';
name?: string;
}

interface FieldDropdownArg extends FieldDropdownFromJsonConfig {
type: 'field_dropdown';
name?: string;
}

interface FieldCheckboxArg extends FieldCheckboxFromJsonConfig {
type: 'field_checkbox';
name?: string;
}

interface FieldImageArg extends FieldImageFromJsonConfig {
type: 'field_image';
name?: string;
}

interface FieldVariableArg extends FieldVariableFromJsonConfig {
type: 'field_variable';
name?: string;
}

export type FieldsAlign = 'LEFT' | 'RIGHT' | 'CENTRE';
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* @license
* Copyright 2025 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/

import {defineBlocksWithJsonArray} from 'blockly-test/core';
import type {JsonBlockDefinition} from 'blockly-test/core/interfaces/i_json_block_definition';

import './different_user_input';

declare module 'blockly-test/core/interfaces/i_json_block_definition' {
interface JsonBlockCustomArgMap {
field_mitosis: {
type: 'field_mitosis';
name?: string;
cellId: string;
};
}
}

const mitosisBlockDefinition: JsonBlockDefinition = {
type: 'mitosis_block',
message0: 'split cell %1',
args0: [
{
type: 'field_mitosis',
name: 'CELL',
cellId: 'cell-A',
},
],
previousStatement: null,
nextStatement: null,
};

defineBlocksWithJsonArray([mitosisBlockDefinition]);