Revert "Inserter: use lighter grammar parse to check allowed status (#…

…64902)"

This reverts commit 9b9bbe8.

packages/block-editor/package.json

@@ -39,7 +39,6 @@
 		"@wordpress/a11y": "file:../a11y",
 		"@wordpress/api-fetch": "file:../api-fetch",
 		"@wordpress/blob": "file:../blob",
-		"@wordpress/block-serialization-default-parser": "file:../block-serialization-default-parser",
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/commands": "file:../commands",
 		"@wordpress/components": "file:../components",

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

@@ -20,7 +20,7 @@ import {
 	checkAllowListRecursive,
 	getAllPatternsDependants,
 	getInsertBlockTypeDependants,
-	getGrammar,
+	getParsedPattern,
 } from './utils';
 import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
 import { STORE_NAME } from './constants';
@@ -300,10 +300,10 @@ export const hasAllowedPatterns = createRegistrySelector( ( select ) =>
 				if ( ! inserter ) {
 					return false;
 				}
-				const grammar = getGrammar( pattern );
+				const { blocks } = getParsedPattern( pattern );
 				return (
-					checkAllowListRecursive( grammar, allowedBlockTypes ) &&
-					grammar.every( ( { name: blockName } ) =>
+					checkAllowListRecursive( blocks, allowedBlockTypes ) &&
+					blocks.every( ( { name: blockName } ) =>
 						canInsertBlockType( state, blockName, rootClientId )
 					)
 				);

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

@@ -27,7 +27,6 @@ import {
 	getAllPatternsDependants,
 	getInsertBlockTypeDependants,
 	getParsedPattern,
-	getGrammar,
 } from './utils';
 import { orderBy } from '../utils/sorting';
 import { STORE_NAME } from './constants';
@@ -2377,27 +2376,17 @@ export const __experimentalGetAllowedPatterns = createRegistrySelector(
 			const { getAllPatterns } = unlock( select( STORE_NAME ) );
 			const patterns = getAllPatterns();
 			const { allowedBlockTypes } = getSettings( state );
+
 			const parsedPatterns = patterns
 				.filter( ( { inserter = true } ) => !! inserter )
-				.map( ( pattern ) => {
-					return {
-						...pattern,
-						get blocks() {
-							return getParsedPattern( pattern ).blocks;
-						},
-					};
-				} );
-
+				.map( getParsedPattern );
 			const availableParsedPatterns = parsedPatterns.filter(
-				( pattern ) =>
-					checkAllowListRecursive(
-						getGrammar( pattern ),
-						allowedBlockTypes
-					)
+				( { blocks } ) =>
+					checkAllowListRecursive( blocks, allowedBlockTypes )
 			);
 			const patternsAllowed = availableParsedPatterns.filter(
-				( pattern ) =>
-					getGrammar( pattern ).every( ( { blockName: name } ) =>
+				( { blocks } ) =>
+					blocks.every( ( { name } ) =>
 						canInsertBlockType( state, name, rootClientId )
 					)
 			);

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

@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { parse } from '@wordpress/blocks';
-import { parse as grammarParse } from '@wordpress/block-serialization-default-parser';
 
 /**
  * Internal dependencies
@@ -14,7 +13,6 @@ import { STORE_NAME } from './constants';
 export const withRootClientIdOptionKey = Symbol( 'withRootClientId' );
 
 const parsedPatternCache = new WeakMap();
-const grammarMapCache = new WeakMap();
 
 function parsePattern( pattern ) {
 	const blocks = parse( pattern.content, {
@@ -39,24 +37,14 @@ function parsePattern( pattern ) {
 
 export function getParsedPattern( pattern ) {
 	let parsedPattern = parsedPatternCache.get( pattern );
-	if ( ! parsedPattern ) {
-		parsedPattern = parsePattern( pattern );
-		parsedPatternCache.set( pattern, parsedPattern );
+	if ( parsedPattern ) {
+		return parsedPattern;
 	}
+	parsedPattern = parsePattern( pattern );
+	parsedPatternCache.set( pattern, parsedPattern );
 	return parsedPattern;
 }
 
-export function getGrammar( pattern ) {
-	let grammarMap = grammarMapCache.get( pattern );
-	if ( ! grammarMap ) {
-		grammarMap = grammarParse( pattern.content );
-		// Block names are null only at the top level for whitespace.
-		grammarMap = grammarMap.filter( ( block ) => block.blockName !== null );
-		grammarMapCache.set( pattern, grammarMap );
-	}
-	return grammarMap;
-}
-
 export const checkAllowList = ( list, item, defaultResult = null ) => {
 	if ( typeof list === 'boolean' ) {
 		return list;

packages/block-editor/tsconfig.json

@@ -8,7 +8,6 @@
 	"references": [
 		{ "path": "../a11y" },
 		{ "path": "../api-fetch" },
-		{ "path": "../block-serialization-default-parser" },
 		{ "path": "../blob" },
 		{ "path": "../components" },
 		{ "path": "../compose" },