diff --git a/lib/assets/src/caches.ts b/lib/assets/src/caches.ts index 65f6507..eedcb75 100644 --- a/lib/assets/src/caches.ts +++ b/lib/assets/src/caches.ts @@ -1,8 +1,8 @@ // TODO(lib/assets): do not depend on Discord's ClientInfoModule for versioning, use native interop import { ClientInfoModule } from '@revenge-mod/discord/native' import { getStorage } from '@revenge-mod/storage' -import { debounce } from '@revenge-mod/utils/callbacks' -import { mergeDeep } from '@revenge-mod/utils/objects' +import { debounce } from '@revenge-mod/utils/callback' +import { mergeDeep } from '@revenge-mod/utils/object' import type { Metro } from '@revenge-mod/modules/types' import type { Asset } from './types' diff --git a/lib/components/src/init.ts b/lib/components/src/init.ts index a66dfea..2aae937 100644 --- a/lib/components/src/init.ts +++ b/lib/components/src/init.ts @@ -1,5 +1,5 @@ import { pUnscopedApi } from '@revenge-mod/plugins/_' -import { defineLazyProperty } from '@revenge-mod/utils/objects' +import { defineLazyProperty } from '@revenge-mod/utils/object' import type { UnscopedInitPluginApi } from '@revenge-mod/plugins/types' const uapi = pUnscopedApi as UnscopedInitPluginApi diff --git a/lib/discord/src/common/flux.ts b/lib/discord/src/common/flux.ts index 01dad0e..4f7e935 100644 --- a/lib/discord/src/common/flux.ts +++ b/lib/discord/src/common/flux.ts @@ -11,7 +11,7 @@ import { } from '@revenge-mod/modules/finders/lookup' import { waitForModules } from '@revenge-mod/modules/finders/wait' import { getModuleDependencies } from '@revenge-mod/modules/metro/utils' -import { noopFalse } from '@revenge-mod/utils/callbacks' +import { noopFalse } from '@revenge-mod/utils/callback' import { cached, cacheFilterResultForId } from '../../../modules/src/caches' import { FilterResultFlags } from '../../../modules/src/finders/_internal' import type { diff --git a/lib/discord/src/init.ts b/lib/discord/src/init.ts index aef1511..92313a8 100644 --- a/lib/discord/src/init.ts +++ b/lib/discord/src/init.ts @@ -2,7 +2,7 @@ import { pEmitter, pUnscopedApi } from '@revenge-mod/plugins/_' import { defineLazyProperties, defineLazyProperty, -} from '@revenge-mod/utils/objects' +} from '@revenge-mod/utils/object' import { Logger } from './common' import type { UnscopedInitPluginApi } from '@revenge-mod/plugins/types' import type { PluginApiDiscord } from './types/revenge' diff --git a/lib/discord/src/modules/settings/index.ts b/lib/discord/src/modules/settings/index.ts index dc0e573..975b58c 100644 --- a/lib/discord/src/modules/settings/index.ts +++ b/lib/discord/src/modules/settings/index.ts @@ -1,5 +1,5 @@ import { ReactNavigationNative } from '@revenge-mod/externals/react-navigation' -import { findInTree } from '@revenge-mod/utils/trees' +import { findInTree } from '@revenge-mod/utils/tree' import { Constants } from '../../common' import { RootNavigationRef } from '../main_tabs_v2' import { sData, sSubscriptions } from './_internal' diff --git a/lib/externals/src/init.ts b/lib/externals/src/init.ts index 37cecb4..59d4844 100644 --- a/lib/externals/src/init.ts +++ b/lib/externals/src/init.ts @@ -1,5 +1,5 @@ import { pUnscopedApi } from '@revenge-mod/plugins/_' -import { defineLazyProperties } from '@revenge-mod/utils/objects' +import { defineLazyProperties } from '@revenge-mod/utils/object' import type { UnscopedInitPluginApi } from '@revenge-mod/plugins/types' import type { PluginApiExternals } from './types' diff --git a/lib/modules/src/caches.ts b/lib/modules/src/caches.ts index 322be61..84d2625 100644 --- a/lib/modules/src/caches.ts +++ b/lib/modules/src/caches.ts @@ -1,7 +1,7 @@ // TODO(lib/modules/caches): do not depend on Discord's ClientInfoModule for versioning, use native interop import { ClientInfoModule } from '@revenge-mod/discord/native' import { getStorage } from '@revenge-mod/storage' -import { debounce } from '@revenge-mod/utils/callbacks' +import { debounce } from '@revenge-mod/utils/callback' import type { Metro } from '@revenge-mod/modules/types' import type { FilterResultFlag } from './finders/_internal' import type { Filter } from './finders/filters' diff --git a/lib/modules/src/finders/_internal.ts b/lib/modules/src/finders/_internal.ts index d7c4bfb..ff5ca86 100644 --- a/lib/modules/src/finders/_internal.ts +++ b/lib/modules/src/finders/_internal.ts @@ -1,4 +1,4 @@ -import { getCurrentStack } from '@revenge-mod/utils/errors' +import { getCurrentStack } from '@revenge-mod/utils/error' import { cacheFilterResultForId } from '../caches' import { isModuleExportBad } from '../metro/utils' import type { If } from '@revenge-mod/utils/types' diff --git a/lib/modules/src/finders/get.ts b/lib/modules/src/finders/get.ts index 09e8c2f..9158fac 100644 --- a/lib/modules/src/finders/get.ts +++ b/lib/modules/src/finders/get.ts @@ -1,4 +1,4 @@ -import { noopFalse } from '@revenge-mod/utils/callbacks' +import { noopFalse } from '@revenge-mod/utils/callback' import { lookupModule, lookupModuleByImportedPath, diff --git a/lib/modules/src/finders/lookup.ts b/lib/modules/src/finders/lookup.ts index 0d8bdbe..d3c64c6 100644 --- a/lib/modules/src/finders/lookup.ts +++ b/lib/modules/src/finders/lookup.ts @@ -1,4 +1,4 @@ -import { getCurrentStack } from '@revenge-mod/utils/errors' +import { getCurrentStack } from '@revenge-mod/utils/error' import { proxify } from '@revenge-mod/utils/proxy' import { cacheFilterNotFound, getCachedFilterRegistry } from '../caches' import { diff --git a/lib/plugins/src/_internal.ts b/lib/plugins/src/_internal.ts index 7061903..e74c0a8 100644 --- a/lib/plugins/src/_internal.ts +++ b/lib/plugins/src/_internal.ts @@ -1,6 +1,6 @@ import { TypedEventEmitter } from '@revenge-mod/discord/common/utils' -import { getErrorStack } from '@revenge-mod/utils/errors' -import { allSettled, sleepReject } from '@revenge-mod/utils/promises' +import { getErrorStack } from '@revenge-mod/utils/error' +import { allSettled, sleepReject } from '@revenge-mod/utils/promise' import { pUnscopedApi as uapi } from './apis' import { PluginFlags as Flag, PluginStatus as Status } from './constants' import type { diff --git a/lib/storage/src/index.ts b/lib/storage/src/index.ts index a4534b5..021d491 100644 --- a/lib/storage/src/index.ts +++ b/lib/storage/src/index.ts @@ -1,8 +1,8 @@ // TODO(storage): Implement using NativeModules interop instead import { FileModule } from '@revenge-mod/discord/native' -import { getErrorStack } from '@revenge-mod/utils/errors' -import { mergeDeep } from '@revenge-mod/utils/objects' +import { getErrorStack } from '@revenge-mod/utils/error' +import { mergeDeep } from '@revenge-mod/utils/object' import type { AnyObject, DeepPartial } from '@revenge-mod/utils/types' export type StorageSubscription = ( diff --git a/lib/storage/src/init.ts b/lib/storage/src/init.ts index eeb3eab..c6d8956 100644 --- a/lib/storage/src/init.ts +++ b/lib/storage/src/init.ts @@ -1,6 +1,6 @@ import { pEmitter } from '@revenge-mod/plugins/_' import { PluginsStorageDirectory } from '@revenge-mod/plugins/constants' -import { defineLazyProperty } from '@revenge-mod/utils/objects' +import { defineLazyProperty } from '@revenge-mod/utils/object' import { useReRender } from '@revenge-mod/utils/react' import { useEffect } from 'react' import { getStorage, Storage } from '.' diff --git a/lib/utils/package.json b/lib/utils/package.json index e828341..2369078 100644 --- a/lib/utils/package.json +++ b/lib/utils/package.json @@ -4,28 +4,25 @@ "type": "module", "exports": { "./patches/objects": { - "default": "./src/patches/objects.ts" + "default": "./src/patches/object.ts" }, "./patches/proxy": { "default": "./src/patches/proxy.ts" }, - "./callbacks": { - "default": "./src/callbacks.ts" + "./callback": { + "default": "./src/callback.ts" }, "./discord": { "default": "./src/discord.ts" }, - "./errors": { - "default": "./src/errors.ts" + "./error": { + "default": "./src/error.ts" }, - "./generators": { - "default": "./src/generators.ts" + "./object": { + "default": "./src/object.ts" }, - "./objects": { - "default": "./src/objects.ts" - }, - "./promises": { - "default": "./src/promises.ts" + "./promise": { + "default": "./src/promise.ts" }, "./proxy": { "default": "./src/proxy.ts" @@ -33,11 +30,11 @@ "./react": { "default": "./src/react.ts" }, - "./trees": { - "default": "./src/trees.ts" + "./tree": { + "default": "./src/tree.ts" }, "./types": { "types": "./src/types.ts" } } -} +} \ No newline at end of file diff --git a/lib/utils/src/callbacks.ts b/lib/utils/src/callback.ts similarity index 100% rename from lib/utils/src/callbacks.ts rename to lib/utils/src/callback.ts diff --git a/lib/utils/src/errors.ts b/lib/utils/src/error.ts similarity index 100% rename from lib/utils/src/errors.ts rename to lib/utils/src/error.ts diff --git a/lib/utils/src/objects.ts b/lib/utils/src/object.ts similarity index 97% rename from lib/utils/src/objects.ts rename to lib/utils/src/object.ts index b44ee7f..464107a 100644 --- a/lib/utils/src/objects.ts +++ b/lib/utils/src/object.ts @@ -1,6 +1,6 @@ import type { AnyObject } from './types' -export { objectFreeze } from './patches/objects' +export { objectFreeze } from './patches/object' /** * Simple check if to see if value is an object. diff --git a/lib/utils/src/patches/objects.ts b/lib/utils/src/patches/object.ts similarity index 100% rename from lib/utils/src/patches/objects.ts rename to lib/utils/src/patches/object.ts diff --git a/lib/utils/src/promises.ts b/lib/utils/src/promise.ts similarity index 100% rename from lib/utils/src/promises.ts rename to lib/utils/src/promise.ts diff --git a/lib/utils/src/proxy.ts b/lib/utils/src/proxy.ts index 814816b..1f565e7 100644 --- a/lib/utils/src/proxy.ts +++ b/lib/utils/src/proxy.ts @@ -3,7 +3,7 @@ * This is especially useful for blacklisting exports that cannot be patched. */ -import { getCurrentStack } from './errors' +import { getCurrentStack } from './error' import { pTargets } from './patches/proxy' /** diff --git a/lib/utils/src/react.ts b/lib/utils/src/react.ts index a38ec0c..56fe5ea 100644 --- a/lib/utils/src/react.ts +++ b/lib/utils/src/react.ts @@ -1,7 +1,7 @@ import { useEffect, useReducer } from 'react' -import { findInTree } from './trees' +import { findInTree } from './tree' import type { ReactNode } from 'react' -import type { SearchFilter } from './trees' +import type { SearchFilter } from './tree' export function useIsFirstRender() { let firstRender = false diff --git a/lib/utils/src/trees.ts b/lib/utils/src/tree.ts similarity index 100% rename from lib/utils/src/trees.ts rename to lib/utils/src/tree.ts diff --git a/src/patches/log-promise-rejections.ts b/src/patches/log-promise-rejections.ts index 073260b..971c824 100644 --- a/src/patches/log-promise-rejections.ts +++ b/src/patches/log-promise-rejections.ts @@ -5,7 +5,7 @@ * See for reference: https://github.com/facebook/hermes/blob/3332fa020cae0bab751f648db7c94e1d687eeec7/lib/InternalBytecode/01-Promise.js#L446 */ -import { getErrorStack } from '@revenge-mod/utils/errors' +import { getErrorStack } from '@revenge-mod/utils/error' const ErrorTypeWhitelist = [ReferenceError, TypeError, RangeError] diff --git a/src/plugins/init/developer-settings/definitions/EvalJSSetting.tsx b/src/plugins/init/developer-settings/definitions/EvalJSSetting.tsx index 59fce82..b2e34a5 100644 --- a/src/plugins/init/developer-settings/definitions/EvalJSSetting.tsx +++ b/src/plugins/init/developer-settings/definitions/EvalJSSetting.tsx @@ -2,8 +2,8 @@ import TableRowAssetIcon from '@revenge-mod/components/TableRowAssetIcon' import { AlertActionCreators } from '@revenge-mod/discord/actions' import { Design } from '@revenge-mod/discord/design' import { nodeUtil } from '@revenge-mod/externals/browserify' -import { getErrorStack } from '@revenge-mod/utils/errors' -import { sleep } from '@revenge-mod/utils/promises' +import { getErrorStack } from '@revenge-mod/utils/error' +import { sleep } from '@revenge-mod/utils/promise' import { useRef, useState } from 'react' import { api } from '..' import { Setting } from '../constants' diff --git a/src/plugins/init/developer-settings/react-devtools.ts b/src/plugins/init/developer-settings/react-devtools.ts index 0ef299b..ac59c74 100644 --- a/src/plugins/init/developer-settings/react-devtools.ts +++ b/src/plugins/init/developer-settings/react-devtools.ts @@ -1,7 +1,7 @@ import { ToastActionCreators } from '@revenge-mod/discord/actions' import { TypedEventEmitter } from '@revenge-mod/discord/common/utils' import { lookupGeneratedIconComponent } from '@revenge-mod/utils/discord' -import { getErrorStack } from '@revenge-mod/utils/errors' +import { getErrorStack } from '@revenge-mod/utils/error' import { useReRender } from '@revenge-mod/utils/react' import { useEffect } from 'react' import { api } from '.' diff --git a/src/plugins/init/developer-settings/screens/AssetBrowserSettingScreen.tsx b/src/plugins/init/developer-settings/screens/AssetBrowserSettingScreen.tsx index 2056ff9..de965ef 100644 --- a/src/plugins/init/developer-settings/screens/AssetBrowserSettingScreen.tsx +++ b/src/plugins/init/developer-settings/screens/AssetBrowserSettingScreen.tsx @@ -9,7 +9,7 @@ import { import { Design } from '@revenge-mod/discord/design' import { Clipboard } from '@revenge-mod/externals/react-native-clipboard' import { FlashList } from '@revenge-mod/externals/shopify' -import { debounce } from '@revenge-mod/utils/callbacks' +import { debounce } from '@revenge-mod/utils/callback' import { lookupGeneratedIconComponent } from '@revenge-mod/utils/discord' import { useCallback, useMemo, useState } from 'react' import { Image, StyleSheet, useWindowDimensions } from 'react-native' diff --git a/src/plugins/init/settings/screens/RevengePluginsSettingScreen.tsx b/src/plugins/init/settings/screens/RevengePluginsSettingScreen.tsx index e979685..186f024 100644 --- a/src/plugins/init/settings/screens/RevengePluginsSettingScreen.tsx +++ b/src/plugins/init/settings/screens/RevengePluginsSettingScreen.tsx @@ -8,7 +8,7 @@ import { ReactNavigationNative } from '@revenge-mod/externals/react-navigation' import { FlashList } from '@revenge-mod/externals/shopify' import { InternalPluginFlags, pList, pMetadata } from '@revenge-mod/plugins/_' import { PluginFlags } from '@revenge-mod/plugins/constants' -import { debounce } from '@revenge-mod/utils/callbacks' +import { debounce } from '@revenge-mod/utils/callback' import { useCallback, useMemo, useState } from 'react' import { useWindowDimensions, View } from 'react-native' import { ClickOutsideProvider } from 'react-native-click-outside' diff --git a/src/plugins/preinit/no-track/index.ts b/src/plugins/preinit/no-track/index.ts index 56205de..5d4edb9 100644 --- a/src/plugins/preinit/no-track/index.ts +++ b/src/plugins/preinit/no-track/index.ts @@ -5,8 +5,8 @@ import { getModuleDependencies } from '@revenge-mod/modules/metro/utils' import { instead } from '@revenge-mod/patcher' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' import { PluginFlags } from '@revenge-mod/plugins/constants' -import { noop } from '@revenge-mod/utils/callbacks' -import { getCurrentStack } from '@revenge-mod/utils/errors' +import { noop } from '@revenge-mod/utils/callback' +import { getCurrentStack } from '@revenge-mod/utils/error' // TODO(plugins/no-track): Block Sentry native-side registerPlugin( diff --git a/src/preinit.ts b/src/preinit.ts index 4b06b23..3e71924 100644 --- a/src/preinit.ts +++ b/src/preinit.ts @@ -5,7 +5,7 @@ import { onModuleFirstRequired, onModuleInitialized, } from '@revenge-mod/modules/metro/subscriptions' -import { getErrorStack } from '@revenge-mod/utils/errors' +import { getErrorStack } from '@revenge-mod/utils/error' import { BuildEnvironment } from './constants' const IndexModuleId = 0