Fix incorrect parsing of routes from placeholder route strings. (#1124)

* fix incorrect test fixtures

* fix incorrect regex for parsing model (or resource names) from the route.

Author: nerrad

assets/js/data/schema/test/utils.js

@@ -9,13 +9,13 @@ import {
 
 describe( 'extractModelNameFromRoute', () => {
 	it.each`
-		namespace      | route                                                                        | expected
-		${'wc/blocks'} | ${'wc/blocks/products'}                                                      | ${'products'}
-		${'wc/other'}  | ${'wc/blocks/product'}                                                       | ${'wc/blocks/product'}
-		${'wc/blocks'} | ${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)'}                    | ${'products/attributes'}
-		${'wc/blocks'} | ${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)/terms'}              | ${'products/attributes/terms'}
-		${'wc/blocks'} | ${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)/terms/(?P<id>[d]+)'} | ${'products/attributes/terms'}
-		${'wc/blocks'} | ${'wc/blocks/cart/(?P<id>[s]+)'}                                             | ${'cart'}
+		namespace      | route                                                                          | expected
+		${'wc/blocks'} | ${'wc/blocks/products'}                                                        | ${'products'}
+		${'wc/other'}  | ${'wc/blocks/product'}                                                         | ${'wc/blocks/product'}
+		${'wc/blocks'} | ${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)'}                    | ${'products/attributes'}
+		${'wc/blocks'} | ${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)/terms'}              | ${'products/attributes/terms'}
+		${'wc/blocks'} | ${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)/terms/(?P<id>[d]+)'} | ${'products/attributes/terms'}
+		${'wc/blocks'} | ${'wc/blocks/cart/(?P<id>[\\s]+)'}                                             | ${'cart'}
 	`(
 		'returns "$expected" when namespace is "$namespace" and route is "$route"',
 		( { namespace, route, expected } ) => {
@@ -28,10 +28,10 @@ describe( 'extractModelNameFromRoute', () => {
 
 describe( 'getRouteIds', () => {
 	it.each`
-		route                                                                        | expected
-		${'wc/blocks/products'}                                                      | ${[]}
-		${'wc/blocks/products/(?P<id>[d]+)'}                                         | ${[ 'id' ]}
-		${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)/terms/(?P<id>[d]+)'} | ${[ 'attribute_id', 'id' ]}
+		route                                                                            | expected
+		${'wc/blocks/products'}                                                          | ${[]}
+		${'wc/blocks/products/(?P<id>[\\d]+)'}                                           | ${[ 'id' ]}
+		${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)/terms/(?P<id>[\\d]+)'} | ${[ 'attribute_id', 'id' ]}
 	`(
 		'returns "$expected" when route is "$route"',
 		( { route, expected } ) => {
@@ -42,14 +42,14 @@ describe( 'getRouteIds', () => {
 
 describe( 'simplifyRouteWithId', () => {
 	it.each`
-		route                                                                        | matchIds                    | expected
-		${'wc/blocks/products'}                                                      | ${[]}                       | ${'wc/blocks/products'}
-		${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)'}                    | ${[ 'attribute_id' ]}       | ${'wc/blocks/products/attributes/{attribute_id}'}
-		${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)/terms'}              | ${[ 'attribute_id' ]}       | ${'wc/blocks/products/attributes/{attribute_id}/terms'}
-		${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)/terms/(?P<id>[d]+)'} | ${[ 'attribute_id', 'id' ]} | ${'wc/blocks/products/attributes/{attribute_id}/terms/{id}'}
-		${'wc/blocks/products/attributes/(?P<attribute_id>[d]+)/terms/(?P<id>[d]+)'} | ${[ 'id', 'attribute_id' ]} | ${'wc/blocks/products/attributes/{attribute_id}/terms/{id}'}
-		${'wc/blocks/cart/(?P<id>[s]+)'}                                             | ${[ 'id' ]}                 | ${'wc/blocks/cart/{id}'}
-		${'wc/blocks/cart/(?P<id>[s]+)'}                                             | ${[ 'attribute_id' ]}       | ${'wc/blocks/cart/(?P<id>[s]+)'}
+		route                                                                            | matchIds                    | expected
+		${'wc/blocks/products'}                                                          | ${[]}                       | ${'wc/blocks/products'}
+		${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)'}                      | ${[ 'attribute_id' ]}       | ${'wc/blocks/products/attributes/{attribute_id}'}
+		${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)/terms'}                | ${[ 'attribute_id' ]}       | ${'wc/blocks/products/attributes/{attribute_id}/terms'}
+		${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)/terms/(?P<id>[\\d]+)'} | ${[ 'attribute_id', 'id' ]} | ${'wc/blocks/products/attributes/{attribute_id}/terms/{id}'}
+		${'wc/blocks/products/attributes/(?P<attribute_id>[\\d]+)/terms/(?P<id>[\\d]+)'} | ${[ 'id', 'attribute_id' ]} | ${'wc/blocks/products/attributes/{attribute_id}/terms/{id}'}
+		${'wc/blocks/cart/(?P<id>[\\s]+)'}                                               | ${[ 'id' ]}                 | ${'wc/blocks/cart/{id}'}
+		${'wc/blocks/cart/(?P<id>[\\s]+)'}                                               | ${[ 'attribute_id' ]}       | ${'wc/blocks/cart/(?P<id>[\\s]+)'}
 	`(
 		'returns "$expected" when route is "$route" and matchIds is "$matchIds"',
 		( { route, matchIds, expected } ) => {

assets/js/data/schema/utils.js

@@ -13,7 +13,7 @@
  */
 export const extractModelNameFromRoute = ( namespace, route ) => {
 	route = route.replace( `${ namespace }/`, '' );
-	return route.replace( /\/\(\?P\<[a-z_]*\>\[[a-z]]\+\)/g, '' );
+	return route.replace( /\/\(\?P\<[a-z_]*\>\[\\*[a-z]\]\+\)/g, '' );
 };
 
 /**