chore(lib/utils): do not pluralize submodules

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'
 

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

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 {

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'

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'

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'
 

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'

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'

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,

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 {

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 {

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<T extends AnyObject = AnyObject> = (

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 '.'

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"
     }
   }
-}
+}

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.

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'
 
 /**

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

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]
 

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'

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 '.'

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'

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'

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(

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