Refactor

WordPress · Apr 30, 2024 · 0e0bf30 · 0e0bf30
1 parent 947d0a2
commit 0e0bf30
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 -   Hooks useMemo and useCallback should return a value. ([#60474](https://github.com/WordPress/gutenberg/pull/60474))
 
+-	Prevent wrong written directives from killing the runtime ([#61249](https://github.com/WordPress/gutenberg/pull/61249))
+
 ## 5.4.0 (2024-04-03)
 
 ## 5.3.0 (2024-03-21)

diff --git a/packages/interactivity/src/vdom.ts b/packages/interactivity/src/vdom.ts
@@ -118,30 +118,31 @@ export function toVdom( root ) {
 		if ( directives.length ) {
 			props.__directives = directives.reduce(
 				( obj, [ name, ns, value ] ) => {
-					let [ prefix, suffix ] = [ '', 'default' ];
-
 					const directiveMatch = directiveParser.exec( name );
-					if ( directiveMatch ) {
-						const [ , _prefix, _suffix ] = directiveMatch;
-						prefix = _prefix;
-						suffix = _suffix ?? 'default';
-					} else if (
-						// @ts-expect-error
+					const prefix = directiveMatch ? directiveMatch[ 1 ] : '';
+					const suffix =
+						directiveMatch && directiveMatch[ 2 ]
+							? directiveMatch[ 2 ]
+							: 'default';
+
+					if (
+						! directiveMatch &&
+						// @ts-expect-error This is a debug-only warning.
 						typeof SCRIPT_DEBUG !== 'undefined' &&
 						// @ts-expect-error
 						SCRIPT_DEBUG === true
 					) {
 						// eslint-disable-next-line no-console
 						console.warn( `Invalid directive: ${ name }.` );
 					}
-					if ( ! obj[ prefix ] ) {
-						obj[ prefix ] = [];
-					}
+
+					obj[ prefix ] = obj[ prefix ] || [];
 					obj[ prefix ].push( {
 						namespace: ns ?? currentNamespace(),
 						value,
 						suffix,
 					} );
+
 					return obj;
 				},
 				{}