fix(lib)!: move modules/native/discord and its types to discord/native

lib/discord/package.json

@@ -5,6 +5,15 @@
   "exports": {
     ".": {
       "default": "./src/index.ts"
+    },
+    "./flux": {
+      "default": "./src/flux.ts"
+    },
+    "./native": {
+      "default": "./src/native.ts"
+    },
+    "./types": {
+      "types": "./types/index.ts"
     }
   }
 }

lib/discord/src/flux.ts

@@ -1,7 +1,7 @@
 import { waitForModules } from '@revenge-mod/modules/finders'
 import { byProps } from '@revenge-mod/modules/finders/filters'
 
-import type { DiscordModules } from '@revenge-mod/modules/types/discord'
+import type { DiscordModules } from '../types'
 
 waitForModules(byProps<DiscordModules.Flux.Store>('_dispatchToken'), (_, store) => {
     const name = store.getName()

lib/discord/src/index.ts

@@ -1,9 +1,10 @@
 import { lookupModule } from '@revenge-mod/modules/finders'
 import { byName, byProps } from '@revenge-mod/modules/finders/filters'
 
-import type { DiscordModules } from '@revenge-mod/modules/types/discord'
+import type { DiscordModules } from '../types'
 
 export * as flux from './flux'
+export * as native from './native'
 
 // ../discord_common/js/shared/Logger.tsx
 export const Logger = lookupModule(byName<DiscordModules.Logger>('Logger'))!

lib/discord/src/native.ts

@@ -1,4 +1,4 @@
-import type { DiscordNativeModules } from '../../types/discord.native'
+import type { DiscordNativeModules } from '../types/native'
 
 /**
  * Naming conventions:

lib/discord/types/index.ts

@@ -1,3 +1,5 @@
+export * from './native'
+
 export namespace DiscordModules {
     export namespace Flux {
         export type DispatcherPayload = any

lib/init/src/index.ts

@@ -39,9 +39,9 @@ function runCatching<F extends (...args: any[]) => any>(fn: F) {
         try {
             fn(...args)
         } catch (e) {
-            const { ClientInfoModule, DeviceModule } = require('@revenge-mod/modules/native/discord') as
+            const { ClientInfoModule, DeviceModule } = require('@revenge-mod/discord/native') as
                 // biome-ignore format: Don't format this please
-                typeof import('@revenge-mod/modules/native/discord')
+                typeof import('@revenge-mod/discord/native')
 
             // TODO(init): Move to use native module
             alert(

lib/modules/package.json

@@ -19,20 +19,13 @@
       "default": "./src/metro/subscriptions/index.ts"
     },
     "./native": {
-      "default": "./src/native/index.ts"
-    },
-    "./native/discord": {
-      "default": "./src/native/discord.ts"
+      "default": "./src/native.ts"
     },
     "./preinit": {
       "default": "./src/preinit.ts"
     },
     "./types": {
-      "default": "./types/index.ts"
-    },
-    "./types/*": {
-      "default": "./types/*.ts",
-      "types": "./types/*.ts"
+      "default": "./types.ts"
     },
     "./_/metro": {
       "default": "./src/metro/_internal.ts"

lib/modules/src/finders/_internal.ts

@@ -1,7 +1,7 @@
 import { isModuleExportBad } from '../metro'
 
 import type { If } from '@revenge-mod/utils/types'
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 import type { Filter } from './filters'
 
 export type RunFilterOptions = {

lib/modules/src/finders/filters.ts

@@ -3,7 +3,7 @@ import { _mInited } from '../metro/_internal'
 import { getModuleDependencies, initializedModuleHasBadExports, isModuleInitialized } from '../metro'
 
 import type { If, LogicalOr } from '@revenge-mod/utils/types'
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 
 export type FilterResult<F> = F extends Filter<infer R, boolean> ? R : never
 

lib/modules/src/finders/find.ts

@@ -3,7 +3,7 @@ import { type LookupModulesOptions, lookupModule, lookupModuleByImportedPath, lo
 import { type WaitForModulesOptions, waitForModuleByImportedPath, waitForModules } from './wait'
 
 import type { LookupModuleIdsOptions, MaybeDefaultExportMatched } from '.'
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 import type { Filter, FilterResult } from './filters'
 import type { RunFilterReturnExportsOptions } from './_internal'
 import type { If } from '@revenge-mod/utils/types'

lib/modules/src/finders/lookup.ts

@@ -9,7 +9,7 @@ import {
 import { getInitializedModuleExports } from '../metro'
 
 import type { MaybeDefaultExportMatched } from '.'
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 import type { Filter, FilterResult } from './filters'
 import type { If } from '@revenge-mod/utils/types'
 

lib/modules/src/finders/wait.ts

@@ -7,7 +7,7 @@ import {
 } from '../metro'
 
 import type { MaybeDefaultExportMatched } from '.'
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 import type { Filter, FilterResult } from './filters'
 
 export type BaseWaitForModulesOptions<IncludeAll extends boolean = boolean> = {

lib/modules/src/metro/_internal.ts

@@ -1,7 +1,7 @@
 import { _executeInitializedSubscription, _executeRequiredSubscription } from './subscriptions/_internal'
 import { isModuleExportsBad } from './utils'
 
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 
 /** Initializing ID */
 export let _mInitingId = -1

lib/modules/src/metro/subscriptions/_internal.ts

@@ -1,7 +1,7 @@
 import { _mInitingId } from '../_internal'
 
 import type { ModuleInitializedCallback, ModuleRequiredCallback, ModuleWithImportedPathInitializedCallback } from '.'
-import type { Metro } from '../../../types/metro'
+import type { Metro } from '../../../types'
 
 export const _reqAll = new Set<ModuleRequiredCallback>()
 export const _reqSpecific = new Map<Metro.ModuleID, Set<ModuleRequiredCallback>>()

lib/modules/src/metro/subscriptions/index.ts

@@ -1,7 +1,7 @@
 import { _initAll, _importedPath, _initSpecific, _reqSpecific, _reqAll } from './_internal'
 
 import type { initializedModuleHasBadExports } from '../utils'
-import type { Metro } from '../../../types/metro'
+import type { Metro } from '../../../types'
 
 export type ModuleRequiredCallback = (id: Metro.ModuleID) => void
 export type ModuleInitializedCallback = (id: Metro.ModuleID, exports: Metro.ModuleExports) => void

lib/modules/src/metro/utils.ts

@@ -1,7 +1,7 @@
 import { isProxy } from '@revenge-mod/utils/proxy'
 import { _mInited, _mMd, _mUninited } from './_internal'
 
-import type { Metro } from '../../types/metro'
+import type { Metro } from '../../types'
 
 /**
  * Returns whether an uninitialized module has bad exports.

lib/modules/src/native.ts

@@ -0,0 +1,2 @@
+// TODO(modules/native): add support for native modules interop
+export {}

lib/modules/src/native/index.ts

@@ -1 +0,0 @@
-export * as discord from './discord'

lib/modules/types/index.ts

@@ -1,3 +0,0 @@
-export * from './discord'
-export * from './discord.native'
-export * from './metro'