From 598728d195f6d8476a449444e962ae7ea3dd8d3b Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Mon, 16 Jun 2025 09:56:46 +0700 Subject: [PATCH] fix(lib/plugins)!: name types more consistently skip-checks:true --- lib/plugins/src/_internal.ts | 6 +++--- lib/plugins/src/types.ts | 22 +++++++++++----------- lib/storage/src/types.ts | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/plugins/src/_internal.ts b/lib/plugins/src/_internal.ts index c31b445..90431fd 100644 --- a/lib/plugins/src/_internal.ts +++ b/lib/plugins/src/_internal.ts @@ -6,7 +6,7 @@ import type { InitPluginApi, Plugin, PluginApi, - PluginApiExtensionOptions, + PluginApiExtensionsOptions, PluginCleanup, PluginManifest, PluginOptions, @@ -43,9 +43,9 @@ export const _metas = new Map< ] >() -export function registerPlugin( +export function registerPlugin( manifest: PluginManifest, - options: PluginOptions, + options: PluginOptions, flags: number, iflags: number, ) { diff --git a/lib/plugins/src/types.ts b/lib/plugins/src/types.ts index be5ee2e..9c008fb 100644 --- a/lib/plugins/src/types.ts +++ b/lib/plugins/src/types.ts @@ -5,14 +5,14 @@ import type { PluginApiReact } from './apis/react' import type { PluginFlags, PluginStatus } from './constants' // biome-ignore lint/suspicious/noEmptyInterface: To be extended by actual extensions -export interface PluginApiExtensionOptions {} +export interface PluginApiExtensionsOptions {} /** * The unscoped plugin API (very limited). This API is available as a global for plugins. * Available in the `preInit` phase. */ export interface UnscopedPreInitPluginApi< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > { modules: PluginApiModules patcher: typeof import('@revenge-mod/patcher') @@ -25,7 +25,7 @@ export interface UnscopedPreInitPluginApi< * Available in the `init` phase. */ export interface UnscopedInitPluginApi< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > extends UnscopedPreInitPluginApi { assets: typeof import('@revenge-mod/assets') react: PluginApiReact @@ -36,7 +36,7 @@ export interface UnscopedInitPluginApi< * Available in the `start` and `stop` phase. */ export interface UnscopedPluginApi< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > extends UnscopedInitPluginApi { // ui: typeof import('@revenge-mod/ui') } @@ -49,7 +49,7 @@ export type PluginCleanupApi = (...fns: PluginCleanup[]) => void * Available in the `preInit` phase. */ export interface PreInitPluginApi< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > { unscoped: UnscopedPreInitPluginApi cleanup: PluginCleanupApi @@ -61,7 +61,7 @@ export interface PreInitPluginApi< * Available in the `init` phase. */ export interface InitPluginApi< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > extends PreInitPluginApi { unscoped: UnscopedInitPluginApi } @@ -71,7 +71,7 @@ export interface InitPluginApi< * Available in the `start` and `stop` phase. */ export interface PluginApi< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > extends InitPluginApi { unscoped: UnscopedPluginApi } @@ -116,13 +116,13 @@ export interface PluginManifest { } export interface PluginOptions< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > extends PluginLifecycles { SettingsComponent?: PluginSettingsComponent } export interface PluginLifecycles< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > { /** * Runs as soon as possible with very limited APIs. @@ -153,7 +153,7 @@ export interface PluginLifecycles< } export interface Plugin< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > { // TODO(plugins): support plugin bundles // /** @@ -200,5 +200,5 @@ export interface Plugin< } export interface PluginSettingsComponent< - O extends PluginApiExtensionOptions = PluginApiExtensionOptions, + O extends PluginApiExtensionsOptions = PluginApiExtensionsOptions, > extends FunctionComponent<{ api: PluginApi }> {} diff --git a/lib/storage/src/types.ts b/lib/storage/src/types.ts index ddde34a..928c316 100644 --- a/lib/storage/src/types.ts +++ b/lib/storage/src/types.ts @@ -1,5 +1,5 @@ import type { - PluginApiExtensionOptions, + PluginApiExtensionsOptions, PluginManifest, PluginOptions, } from '@revenge-mod/plugins/types' @@ -7,15 +7,15 @@ import type { AnyObject } from '@revenge-mod/utils/types' import type { Storage, StorageOptions } from '.' declare module '@revenge-mod/plugins/types' { - export interface PluginApiExtensionOptions { + export interface PluginApiExtensionsOptions { storage: AnyObject } - export interface PluginOptions { + export interface PluginOptions { storage?: Omit, 'directory'> } - export interface InitPluginApi { + export interface InitPluginApi { /** * The plugin storage. * @@ -29,7 +29,7 @@ declare module '@revenge-mod/plugins/types' { } declare module '@revenge-mod/plugins/_' { - export function registerPlugin( + export function registerPlugin( manifest: PluginManifest, options: PluginOptions, flags: number,