Transforms: Shortcode: Support isMatch predicate

docs/designers-developers/developers/block-api/block-registration.md

@@ -439,6 +439,24 @@ transforms: {
 ```
 {% end %}
 
+In the case of shortcode transforms, `isMatch` receives shortcode attributes per the [Shortcode API](https://codex.wordpress.org/Shortcode_API):
+
+{% codetabs %}
+{% ES5 %}
+```js
+isMatch: function( attributes ) {
+	return attributes.named.id === 'my-id';
+},
+```
+{% ESNext %}
+```js
+isMatch( { named: { id } } ) {
+	return id === 'my-id';
+},
+```
+{% end %}
+
+
 To control the priority with which a transform is applied, define a `priority` numeric property on your transform object, where a lower value will take precedence over higher values. This behaves much like a [WordPress hook](https://codex.wordpress.org/Plugin_API#Hook_to_WordPress). Like hooks, the default priority is `10` when not otherwise set.
 
 A file can be dropped into the editor and converted into a block with a matching transform.

packages/blocks/src/api/raw-handling/shortcode-converter.js

@@ -15,11 +15,12 @@ import { createBlock, getBlockTransforms, findTransform } from '../factory';
 import { getBlockType } from '../registration';
 import { getBlockAttributes } from '../parser';
 
-function segmentHTMLToShortcodeBlock( HTML, lastIndex = 0 ) {
+function segmentHTMLToShortcodeBlock( HTML, lastIndex = 0, excludedBlockNames = [] ) {
 	// Get all matches.
 	const transformsFrom = getBlockTransforms( 'from' );
 
 	const transformation = findTransform( transformsFrom, ( transform ) => (
+		excludedBlockNames.indexOf( transform.blockName ) === -1 &&
 		transform.type === 'shortcode' &&
 		some( castArray( transform.tag ), ( tag ) => regexp( tag ).test( HTML ) )
 	) );
@@ -32,6 +33,7 @@ function segmentHTMLToShortcodeBlock( HTML, lastIndex = 0 ) {
 	const transformTag = find( transformTags, ( tag ) => regexp( tag ).test( HTML ) );
 
 	let match;
+	const previousIndex = lastIndex;
 
 	if ( ( match = next( transformTag, HTML, lastIndex ) ) ) {
 		const beforeHTML = HTML.substr( 0, match.index );
@@ -49,6 +51,22 @@ function segmentHTMLToShortcodeBlock( HTML, lastIndex = 0 ) {
 			return segmentHTMLToShortcodeBlock( HTML, lastIndex );
 		}
 
+		// If a transformation's `isMatch` predicate fails for the inbound
+		// shortcode, try again by excluding the current block type.
+		//
+		// This is the only call to `segmentHTMLToShortcodeBlock` that should
+		// ever carry over `excludedBlockNames`. Other calls in the module
+		// should skip that argument as a way to reset the exclusion state, so
+		// that one `isMatch` fail in an HTML fragment doesn't prevent any
+		// valid matches in subsequent fragments.
+		if ( transformation.isMatch && ! transformation.isMatch( match.shortcode.attrs ) ) {
+			return segmentHTMLToShortcodeBlock(
+				HTML,
+				previousIndex,
+				[ ...excludedBlockNames, transformation.blockName ],
+			);
+		}
+
 		const attributes = mapValues(
 			pickBy( transformation.attributes, ( schema ) => schema.shortcode ),
 			// Passing all of `match` as second argument is intentionally broad

test/integration/blocks-raw-handling.test.js

@@ -11,6 +11,7 @@ import {
 	getBlockContent,
 	pasteHandler,
 	rawHandler,
+	registerBlockType,
 	serialize,
 } from '@wordpress/blocks';
 import { registerCoreBlocks } from '@wordpress/block-library';
@@ -24,6 +25,38 @@ describe( 'Blocks raw handling', () => {
 		// Load all hooks that modify blocks
 		require( '../../packages/editor/src/hooks' );
 		registerCoreBlocks();
+		registerBlockType( 'test/gallery', {
+			title: 'Test Gallery',
+			category: 'common',
+			attributes: {
+				ids: {
+					type: 'array',
+					default: [],
+				},
+			},
+			transforms: {
+				from: [
+					{
+						type: 'shortcode',
+						tag: 'gallery',
+						isMatch( { named: { ids } } ) {
+							return ids.indexOf( 42 ) > -1;
+						},
+						attributes: {
+							ids: {
+								type: 'array',
+								shortcode: ( { named: { ids } } ) =>
+									ids.split( ',' ).map( ( id ) => (
+										parseInt( id, 10 )
+									) ),
+							},
+						},
+						priority: 9,
+					},
+				],
+			},
+			save: () => null,
+		} );
 	} );
 
 	it( 'should filter inline content', () => {
@@ -248,12 +281,17 @@ describe( 'Blocks raw handling', () => {
 			'markdown',
 			'wordpress',
 			'gutenberg',
-			'caption-shortcode',
+			'shortcode-matching',
 		].forEach( ( type ) => {
 			it( type, () => {
 				const HTML = readFile( path.join( __dirname, `fixtures/${ type }-in.html` ) );
 				const plainText = readFile( path.join( __dirname, `fixtures/${ type }-in.txt` ) );
 				const output = readFile( path.join( __dirname, `fixtures/${ type }-out.html` ) );
+
+				if ( ! ( HTML || plainText ) || ! output ) {
+					throw new Error( `Expected fixtures for type ${ type }` );
+				}
+
 				const converted = pasteHandler( { HTML, plainText, canUserUseUnfilteredHTML: true } );
 				const serialized = typeof converted === 'string' ? converted : serialize( converted );
 

test/integration/fixtures/shortcode-matching-in.html

@@ -0,0 +1,3 @@
+<p>[gallery ids="40,41,42"]</p>
+<p>[gallery ids="1000"]</p>
+<p>[gallery ids="42"]</p>

test/integration/fixtures/shortcode-matching-out.html

@@ -0,0 +1,7 @@
+<!-- wp:test/gallery {"ids":[40,41,42]} /-->
+
+<!-- wp:gallery {"ids":[1000],"columns":3,"linkTo":"attachment"} -->
+<figure class="wp-block-gallery columns-3 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img data-id="1000" class="wp-image-1000"/></figure></li></ul></figure>
+<!-- /wp:gallery -->
+
+<!-- wp:test/gallery {"ids":[42]} /-->

test/integration/shortcode-converter.test.js

@@ -40,6 +40,60 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 			},
 			save: () => null,
 		} );
+		registerBlockType( 'test/broccoli', {
+			title: 'Test Broccoli',
+			category: 'common',
+			attributes: {
+				id: {
+					type: 'number',
+				},
+			},
+			transforms: {
+				from: [
+					{
+						type: 'shortcode',
+						tag: [ 'my-broccoli' ],
+						attributes: {
+							id: {
+								type: 'number',
+								shortcode: ( { named: { id } } ) => parseInt( id, 10 ),
+							},
+						},
+						isMatch( { named: { id } } ) {
+							return id < 1000;
+						},
+					},
+				],
+			},
+			save: () => null,
+		} );
+		registerBlockType( 'test/fallback-broccoli', {
+			title: 'Test Fallback Broccoli',
+			category: 'common',
+			attributes: {
+				id: {
+					type: 'number',
+				},
+			},
+			transforms: {
+				from: [
+					{
+						type: 'shortcode',
+						tag: [ 'my-broccoli' ],
+						attributes: {
+							id: {
+								type: 'number',
+								shortcode: ( { named: { id } } ) => parseInt( id, 10 ),
+							},
+						},
+						isMatch( { named: { id } } ) {
+							return id > 1000;
+						},
+					},
+				],
+			},
+			save: () => null,
+		} );
 	} );
 
 	it( 'should convert a standalone shortcode between two paragraphs', () => {
@@ -64,6 +118,41 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 <p>Bar</p>` );
 	} );
 
+	it( 'should convert a shortcode to a block type with a passing `isMatch`', () => {
+		const original = `<p>[my-broccoli id="42"]</p>`;
+
+		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
+		const expectedBlock = createBlock( 'test/broccoli', { id: 42 } );
+		expectedBlock.clientId = transformed[ 1 ].clientId;
+		expect( transformed[ 1 ] ).toEqual( expectedBlock );
+	} );
+
+	it( 'should not convert a shortcode to a block type with a failing `isMatch`', () => {
+		const original = `<p>[my-broccoli id="1000"]</p>`;
+
+		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
+		const expectedBlock = createBlock( 'core/shortcode' );
+		expectedBlock.clientId = transformed[ 1 ].clientId;
+		expect( transformed[ 1 ] ).toEqual( expectedBlock );
+	} );
+
+	it( 'should not blindly exclude a transform in subsequent shortcodes after a failed `isMatch`', () => {
+		const original = `<p>[my-broccoli id="1001"]</p>
+		<p>[my-broccoli id="42"]</p>
+		<p>[my-broccoli id="1000"]</p>`;
+
+		const transformed = segmentHTMLToShortcodeBlock( original );
+		const firstExpectedBlock = createBlock( 'test/fallback-broccoli', { id: 1001 } );
+		firstExpectedBlock.clientId = transformed[ 1 ].clientId;
+		const secondExpectedBlock = createBlock( 'test/broccoli', { id: 42 } );
+		secondExpectedBlock.clientId = transformed[ 3 ].clientId;
+		const thirdExpectedBlock = createBlock( 'core/shortcode' );
+		thirdExpectedBlock.clientId = transformed[ 5 ].clientId;
+		expect( transformed[ 1 ] ).toEqual( firstExpectedBlock );
+		expect( transformed[ 3 ] ).toEqual( secondExpectedBlock );
+		expect( transformed[ 5 ] ).toEqual( thirdExpectedBlock );
+	} );
+
 	it( 'should convert two instances of the same shortcode', () => {
 		const original = `<p>[foo one]</p>
 <p>[foo two]</p>`;