Blocks: Apply the most recent filters to previously registered blocks

packages/block-editor/src/store/selectors.js

@@ -24,6 +24,7 @@ import createSelector from 'rememo';
 import {
 	getBlockType,
 	getBlockTypes,
+	getBlockVariations,
 	hasBlockSupport,
 	getPossibleBlockTransformations,
 	parse,
@@ -1514,9 +1515,7 @@ const buildBlockTypeItem = ( state, { buildScope = 'inserter' } ) => (
 	};
 	if ( buildScope === 'transform' ) return blockItemBase;
 
-	const inserterVariations = blockType.variations.filter(
-		( { scope } ) => ! scope || scope.includes( 'inserter' )
-	);
+	const inserterVariations = getBlockVariations( blockType.name, 'inserter' );
 	return {
 		...blockItemBase,
 		initialAttributes: {},

packages/blocks/src/api/raw-handling/test/utils.js

@@ -39,6 +39,9 @@ jest.mock( '@wordpress/data', () => {
 			const mock = jest.fn();
 			return mock;
 		},
+		createRegistryControl() {
+			return jest.fn();
+		},
 	};
 } );
 

packages/blocks/src/api/registration.js

@@ -7,31 +7,25 @@ import {
 	camelCase,
 	isArray,
 	isEmpty,
-	isFunction,
 	isNil,
 	isObject,
-	isPlainObject,
 	isString,
 	mapKeys,
-	omit,
 	pick,
 	pickBy,
-	some,
 } from 'lodash';
 
 /**
  * WordPress dependencies
  */
-import { applyFilters } from '@wordpress/hooks';
 import { select, dispatch } from '@wordpress/data';
 import { _x } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import i18nBlockSchema from './i18n-block.json';
-import { isValidIcon, normalizeIconObject } from './utils';
-import { BLOCK_ICON_DEFAULT, DEPRECATED_ENTRY_KEYS } from './constants';
+import { BLOCK_ICON_DEFAULT } from './constants';
 import { store as blocksStore } from '../store';
 
 /**
@@ -145,18 +139,6 @@ import { store as blocksStore } from '../store';
  *                                              then no preview is shown.
  */
 
-/**
- * Mapping of legacy category slugs to their latest normal values, used to
- * accommodate updates of the default set of block categories.
- *
- * @type {Record<string,string>}
- */
-const LEGACY_CATEGORY_MAPPING = {
-	common: 'text',
-	formatting: 'text',
-	layout: 'design',
-};
-
 export const serverSideBlockDefinitions = {};
 
 /**
@@ -256,13 +238,24 @@ export function registerBlockType( blockNameOrMetadata, settings ) {
 		return;
 	}
 
+	if ( ! /^[a-z][a-z0-9-]*\/[a-z][a-z0-9-]*$/.test( name ) ) {
+		console.error(
+			'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
+		);
+		return;
+	}
+	if ( select( blocksStore ).getBlockType( name ) ) {
+		console.error( 'Block "' + name + '" is already registered.' );
+		return;
+	}
+
 	if ( isObject( blockNameOrMetadata ) ) {
 		unstable__bootstrapServerSideBlockDefinitions( {
 			[ name ]: getBlockSettingsFromMetadata( blockNameOrMetadata ),
 		} );
 	}
 
-	settings = {
+	const blockType = {
 		name,
 		icon: BLOCK_ICON_DEFAULT,
 		keywords: [],
@@ -271,103 +264,15 @@ export function registerBlockType( blockNameOrMetadata, settings ) {
 		usesContext: [],
 		supports: {},
 		styles: [],
+		variations: [],
 		save: () => null,
 		...serverSideBlockDefinitions?.[ name ],
 		...settings,
 	};
 
-	if ( ! /^[a-z][a-z0-9-]*\/[a-z][a-z0-9-]*$/.test( name ) ) {
-		console.error(
-			'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
-		);
-		return;
-	}
-	if ( select( blocksStore ).getBlockType( name ) ) {
-		console.error( 'Block "' + name + '" is already registered.' );
-		return;
-	}
+	dispatch( blocksStore ).__experimentalRegisterBlockType( blockType );
 
-	const preFilterSettings = { ...settings };
-	settings = applyFilters( 'blocks.registerBlockType', settings, name );
-
-	if ( settings.deprecated ) {
-		settings.deprecated = settings.deprecated.map( ( deprecation ) =>
-			pick(
-				// Only keep valid deprecation keys.
-				applyFilters(
-					'blocks.registerBlockType',
-					// Merge deprecation keys with pre-filter settings
-					// so that filters that depend on specific keys being
-					// present don't fail.
-					{
-						// Omit deprecation keys here so that deprecations
-						// can opt out of specific keys like "supports".
-						...omit( preFilterSettings, DEPRECATED_ENTRY_KEYS ),
-						...deprecation,
-					},
-					name
-				),
-				DEPRECATED_ENTRY_KEYS
-			)
-		);
-	}
-
-	if ( ! isPlainObject( settings ) ) {
-		console.error( 'Block settings must be a valid object.' );
-		return;
-	}
-
-	if ( ! isFunction( settings.save ) ) {
-		console.error( 'The "save" property must be a valid function.' );
-		return;
-	}
-	if ( 'edit' in settings && ! isFunction( settings.edit ) ) {
-		console.error( 'The "edit" property must be a valid function.' );
-		return;
-	}
-
-	// Canonicalize legacy categories to equivalent fallback.
-	if ( LEGACY_CATEGORY_MAPPING.hasOwnProperty( settings.category ) ) {
-		settings.category = LEGACY_CATEGORY_MAPPING[ settings.category ];
-	}
-
-	if (
-		'category' in settings &&
-		! some( select( blocksStore ).getCategories(), {
-			slug: settings.category,
-		} )
-	) {
-		console.warn(
-			'The block "' +
-				name +
-				'" is registered with an invalid category "' +
-				settings.category +
-				'".'
-		);
-		delete settings.category;
-	}
-
-	if ( ! ( 'title' in settings ) || settings.title === '' ) {
-		console.error( 'The block "' + name + '" must have a title.' );
-		return;
-	}
-	if ( typeof settings.title !== 'string' ) {
-		console.error( 'Block titles must be strings.' );
-		return;
-	}
-
-	settings.icon = normalizeIconObject( settings.icon );
-	if ( ! isValidIcon( settings.icon.src ) ) {
-		console.error(
-			'The icon passed is invalid. ' +
-				'The icon should be a string, an element, a function, or an object following the specifications documented in https://developer.wordpress.org/block-editor/developers/block-api/block-registration/#icon-optional'
-		);
-		return;
-	}
-
-	dispatch( blocksStore ).addBlockTypes( settings );
-
-	return settings;
+	return select( blocksStore ).getBlockType( name );
 }
 
 /**

packages/blocks/src/api/test/registration.js

@@ -127,6 +127,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 				save: noop,
 				category: 'text',
 				title: 'block title',
@@ -272,6 +273,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 				save: expect.any( Function ),
 			} );
 		} );
@@ -307,6 +309,7 @@ describe( 'blocks', () => {
 					keywords: [],
 					supports: {},
 					styles: [],
+					variations: [],
 				}
 			);
 		} );
@@ -338,6 +341,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -371,6 +375,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -406,6 +411,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -473,6 +479,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -503,6 +510,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -547,6 +555,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -605,6 +614,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -630,6 +640,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -715,6 +726,7 @@ describe( 'blocks', () => {
 										keywords: [],
 										supports: {},
 										styles: [],
+										variations: [],
 										save: () => null,
 										...get(
 											serverSideBlockDefinitions,
@@ -969,6 +981,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 			expect( getBlockTypes() ).toEqual( [] );
 		} );
@@ -1047,6 +1060,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 
@@ -1071,6 +1085,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				supports: {},
 				styles: [],
+				variations: [],
 			} );
 		} );
 	} );