@wordpress/abilities 0.2.0 → 0.2.1-next.738bb1424.0

package/src/store/constants.ts

@@ -2,14 +2,13 @@
  * Store constants
  */
 export const STORE_NAME = 'core/abilities';
-export const ENTITY_KIND = 'root';
-export const ENTITY_NAME = 'abilities';
-export const ENTITY_NAME_CATEGORIES = 'ability-categories';
+
+// Validation patterns
+export const ABILITY_NAME_PATTERN = /^[a-z0-9-]+\/[a-z0-9-]+$/;
+export const CATEGORY_SLUG_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 
 // Action types
-export const RECEIVE_ABILITIES = 'RECEIVE_ABILITIES';
 export const REGISTER_ABILITY = 'REGISTER_ABILITY';
 export const UNREGISTER_ABILITY = 'UNREGISTER_ABILITY';
-export const RECEIVE_CATEGORIES = 'RECEIVE_CATEGORIES';
 export const REGISTER_ABILITY_CATEGORY = 'REGISTER_ABILITY_CATEGORY';
 export const UNREGISTER_ABILITY_CATEGORY = 'UNREGISTER_ABILITY_CATEGORY';

package/src/store/index.ts

@@ -1,9 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createReduxStore, register, dispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { __ } from '@wordpress/i18n';
+import { createReduxStore, register } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -11,13 +9,7 @@ import { __ } from '@wordpress/i18n';
 import reducer from './reducer';
 import * as actions from './actions';
 import * as selectors from './selectors';
-import * as resolvers from './resolvers';
-import {
-	STORE_NAME,
-	ENTITY_KIND,
-	ENTITY_NAME,
-	ENTITY_NAME_CATEGORIES,
-} from './constants';
+import { STORE_NAME } from './constants';
 
 /**
  * The abilities store definition.
@@ -26,30 +18,6 @@ export const store = createReduxStore( STORE_NAME, {
 	reducer,
 	actions,
 	selectors,
-	resolvers,
 } );
 
 register( store );
-
-dispatch( coreStore ).addEntities( [
-	{
-		name: ENTITY_NAME,
-		kind: ENTITY_KIND,
-		key: 'name',
-		baseURL: '/wp-abilities/v1/abilities',
-		baseURLParams: { context: 'edit' },
-		plural: 'abilities',
-		label: __( 'Abilities' ),
-		supportsPagination: true,
-	},
-	{
-		name: ENTITY_NAME_CATEGORIES,
-		kind: ENTITY_KIND,
-		key: 'slug',
-		baseURL: '/wp-abilities/v1/categories',
-		baseURLParams: { context: 'edit' },
-		plural: 'ability-categories',
-		label: __( 'Ability Categories' ),
-		supportsPagination: true,
-	},
-] );

package/src/store/reducer.ts

@@ -8,10 +8,8 @@ import { combineReducers } from '@wordpress/data';
  */
 import type { Ability, AbilityCategory } from '../types';
 import {
-	RECEIVE_ABILITIES,
 	REGISTER_ABILITY,
 	UNREGISTER_ABILITY,
-	RECEIVE_CATEGORIES,
 	REGISTER_ABILITY_CATEGORY,
 	UNREGISTER_ABILITY_CATEGORY,
 } from './constants';
@@ -78,16 +76,32 @@ function sanitizeCategory( category: any ): AbilityCategory {
 		);
 }
 
-interface AbilitiesAction {
-	type: string;
-	abilities?: Ability[];
-	ability?: Ability;
-	categories?: AbilityCategory[];
-	category?: AbilityCategory;
-	name?: string;
-	slug?: string;
+interface RegisterAbilityAction {
+	type: typeof REGISTER_ABILITY;
+	ability: Ability;
 }
 
+interface UnregisterAbilityAction {
+	type: typeof UNREGISTER_ABILITY;
+	name: string;
+}
+
+interface RegisterAbilityCategoryAction {
+	type: typeof REGISTER_ABILITY_CATEGORY;
+	category: AbilityCategory;
+}
+
+interface UnregisterAbilityCategoryAction {
+	type: typeof UNREGISTER_ABILITY_CATEGORY;
+	slug: string;
+}
+
+type AbilitiesAction = RegisterAbilityAction | UnregisterAbilityAction;
+
+type AbilitiesCategoryAction =
+	| RegisterAbilityCategoryAction
+	| UnregisterAbilityCategoryAction;
+
 const DEFAULT_STATE: Record< string, Ability > = {};
 
 /**
@@ -102,16 +116,6 @@ function abilitiesByName(
 	action: AbilitiesAction
 ): Record< string, Ability > {
 	switch ( action.type ) {
-		case RECEIVE_ABILITIES: {
-			if ( ! action.abilities ) {
-				return state;
-			}
-			const newState: Record< string, Ability > = {};
-			action.abilities.forEach( ( ability ) => {
-				newState[ ability.name ] = sanitizeAbility( ability );
-			} );
-			return newState;
-		}
 		case REGISTER_ABILITY: {
 			if ( ! action.ability ) {
 				return state;
@@ -122,7 +126,7 @@ function abilitiesByName(
 			};
 		}
 		case UNREGISTER_ABILITY: {
-			if ( ! action.name || ! state[ action.name ] ) {
+			if ( ! state[ action.name ] ) {
 				return state;
 			}
 			const { [ action.name ]: _, ...newState } = state;
@@ -144,19 +148,9 @@ const DEFAULT_CATEGORIES_STATE: Record< string, AbilityCategory > = {};
  */
 function categoriesBySlug(
 	state: Record< string, AbilityCategory > = DEFAULT_CATEGORIES_STATE,
-	action: AbilitiesAction
+	action: AbilitiesCategoryAction
 ): Record< string, AbilityCategory > {
 	switch ( action.type ) {
-		case RECEIVE_CATEGORIES: {
-			if ( ! action.categories ) {
-				return state;
-			}
-			const newState: Record< string, AbilityCategory > = {};
-			action.categories.forEach( ( category ) => {
-				newState[ category.slug ] = sanitizeCategory( category );
-			} );
-			return newState;
-		}
 		case REGISTER_ABILITY_CATEGORY: {
 			if ( ! action.category ) {
 				return state;
@@ -167,7 +161,7 @@ function categoriesBySlug(
 			};
 		}
 		case UNREGISTER_ABILITY_CATEGORY: {
-			if ( ! action.slug || ! state[ action.slug ] ) {
+			if ( ! state[ action.slug ] ) {
 				return state;
 			}
 			const { [ action.slug ]: _, ...newState } = state;

package/src/store/selectors.ts

@@ -6,12 +6,8 @@ import { createSelector } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import type {
-	Ability,
-	AbilityCategory,
-	AbilitiesQueryArgs,
-	AbilitiesState,
-} from '../types';
+import type { Ability, AbilityCategory, AbilitiesQueryArgs } from '../types';
+import type { AbilitiesState } from './types';
 
 /**
  * Returns all registered abilities.
@@ -34,7 +30,7 @@ export const getAbilities = createSelector(
 		}
 		return abilities;
 	},
-	( state: AbilitiesState, category?: string ) => [
+	( state: AbilitiesState, { category }: AbilitiesQueryArgs = {} ) => [
 		state.abilitiesByName,
 		category,
 	]