Extract "MetadataReader" functions

src/modules/metadata/services/MetadataMigrations.ts

@@ -8,7 +8,7 @@
 
 import { APP_METADATA_KEY_PREFIX, METADATA_MIGRATIONS } from '@/modules/metadata/Metadata.constants.ts';
 import { IMetadataMigration, Metadata } from '@/modules/metadata/Metadata.types.ts';
-import { doesMetadataKeyExistIn, getMetadataKey } from '@/modules/metadata/services/MetadataReader.ts';
+import { doesMetadataKeyExistIn, getMetadataKey } from '@/modules/metadata/Metadata.utils.ts';
 
 export const getAppKeyPrefixForMigration = (migrationId: number): string => {
     const appKeyPrefix = METADATA_MIGRATIONS.slice(0, migrationId)

src/modules/metadata/services/MetadataReader.ts

@@ -7,13 +7,7 @@
  */
 
 import { useEffect } from 'react';
-import {
-    APP_METADATA_KEY_PREFIX,
-    GLOBAL_METADATA_KEYS,
-    METADATA_MIGRATIONS,
-    VALID_APP_METADATA_KEYS,
-} from '@/modules/metadata/Metadata.constants.ts';
-import { getActiveDevice } from '@/modules/device/services/Device.ts';
+import { METADATA_MIGRATIONS, VALID_APP_METADATA_KEYS } from '@/modules/metadata/Metadata.constants.ts';
 import { applyMetadataMigrations } from '@/modules/metadata/services/MetadataMigrations.ts';
 import { convertToGqlMeta, convertValueFromMetadata } from '@/modules/metadata/services/MetadataConverter.ts';
 import {
@@ -41,40 +35,7 @@ import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'
 import { ChapterIdInfo } from '@/modules/chapter/services/Chapters.ts';
 import { CategoryIdInfo } from '@/modules/category/Category.types.ts';
 import { SourceType } from '@/lib/graphql/generated/graphql.ts';
-
-export const extractOriginalKey = (key: string) => key.split('_').slice(-1)[0];
-
-/**
- * Returns the key with the provided prefixes.
- *
- * In case the key is not a global key ({@link GLOBAL_METADATA_KEYS}), the active device name ({@link getActiveDevice})
- * will be added as the second prefix.
- *
- * **Important**
- *
- * "default" (case-insensitive) is a reserved value and will be handled as if there is no prefix to add
- *
- * The format is <prefixes>\_<key>
- *
- *     e.g.: <base_prefix>\_[device_name]\_[optional_prefix1]\_[optional_prefix2]\_<key>
- */
-export const getMetadataKey = (key: string, prefixes: string[] = [], appPrefix: string = APP_METADATA_KEY_PREFIX) => {
-    const isGlobalMetadataKey = GLOBAL_METADATA_KEYS.includes(key as AppMetadataKeys);
-    const addActiveDevicePrefix = !isGlobalMetadataKey;
-
-    const finalPrefix = [appPrefix, ...(addActiveDevicePrefix ? [getActiveDevice()] : []), ...prefixes].filter(
-        (prefix) => prefix.toLowerCase() !== 'default',
-    );
-
-    return `${finalPrefix.join('_')}_${key}`;
-};
-
-export const doesMetadataKeyExistIn = (
-    meta: Metadata | undefined,
-    key: string,
-    prefixes?: string[],
-    appPrefix?: string,
-): boolean => Object.prototype.hasOwnProperty.call(meta ?? {}, getMetadataKey(key, prefixes, appPrefix));
+import { doesMetadataKeyExistIn, extractOriginalKey, getMetadataKey } from '@/modules/metadata/Metadata.utils.ts';
 
 export const getMetadataValueFrom = <Key extends AppMetadataKeys, Value extends AllowedMetadataValueTypes>(
     { meta }: MetadataHolder,

src/modules/metadata/services/MetadataUpdater.ts

@@ -10,7 +10,6 @@ import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { SourceType } from '@/lib/graphql/generated/graphql.ts';
 import { ChapterIdInfo } from '@/modules/chapter/services/Chapters.ts';
 import { CategoryIdInfo } from '@/modules/category/Category.types.ts';
-import { getMetadataKey } from '@/modules/metadata/services/MetadataReader.ts';
 import {
     AllowedMetadataValueTypes,
     AppMetadataKeys,
@@ -19,6 +18,7 @@ import {
     MetadataKeyValuePair,
 } from '@/modules/metadata/Metadata.types.ts';
 import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
+import { getMetadataKey } from '@/modules/metadata/Metadata.utils.ts';
 
 export const requestUpdateMetadataValue = async (
     metadataHolder: GqlMetaHolder,