refactor: abstract prefix-building to a reusable function for consistency

Author: jason10lee

src/reader-activation/store.js

@@ -42,6 +42,21 @@ function initializeSyncInterval( queue ) {
 	}, 1000 );
 }
 
+/**
+ * Get store item key
+ *
+ * @param {boolean} internal Whether it's an internal (bookkeeping) prefix.
+ *
+ * @return {string} Store prefix string.
+ */
+function getStorePrefix( internal = false ) {
+	const parts = [ config.storePrefix ];
+	if ( internal ) {
+		parts.push( '_' );
+	}
+	return parts.join( '' );
+}
+
 /**
  * Get store item key
  *
@@ -54,12 +69,7 @@ export function getStoreItemKey( key, internal = false ) {
 	if ( ! key ) {
 		throw new Error( 'Key is required.' );
 	}
-	const parts = [ config.storePrefix ];
-	if ( internal ) {
-		parts.push( '_' );
-	}
-	parts.push( key );
-	return parts.join( '' );
+	return getStorePrefix( internal ) + key;
 }
 
 /**
@@ -282,16 +292,16 @@ export default function Store() {
 		 */
 		getAll: () => {
 			const data = {};
-			const { storePrefix, storage } = config;
-			const internalPrefix = storePrefix + '_';
-			for ( let i = 0; i < storage.length; i++ ) {
-				const storageKey = storage.key( i );
+			const prefix = getStorePrefix( false );
+			const internalPrefix = getStorePrefix( true );
+			for ( let i = 0; i < config.storage.length; i++ ) {
+				const storageKey = config.storage.key( i );
 				if ( ! storageKey ) {
 					continue;
 				}
-				if ( storageKey.startsWith( storePrefix ) && ! storageKey.startsWith( internalPrefix ) ) {
-					const key = storageKey.slice( storePrefix.length );
-					data[ key ] = decode( storage.getItem( storageKey ) );
+				if ( storageKey.startsWith( prefix ) && ! storageKey.startsWith( internalPrefix ) ) {
+					const key = storageKey.slice( prefix.length );
+					data[ key ] = decode( config.storage.getItem( storageKey ) );
 				}
 			}
 			return data;