Skip to content

Commit 56c67fb

Browse files
committed
chore: lint with oxfmt and oxlint
1 parent 24e006b commit 56c67fb

File tree

15 files changed

+145
-324
lines changed

15 files changed

+145
-324
lines changed

.oxfmtrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://unpkg.com/oxfmt/configuration_schema.json",
3+
"ignorePatterns": ["CHANGELOG.md"]
4+
}

.oxlintrc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"$schema": "https://unpkg.com/oxlint/configuration_schema.json",
3+
"plugins": [
4+
"unicorn",
5+
"typescript",
6+
"oxc"
7+
],
8+
"rules": {}
9+
}

.prettierrc

Whitespace-only changes.

CHANGELOG.md

Lines changed: 91 additions & 158 deletions
Large diffs are not rendered by default.

eslint.config.mjs

Lines changed: 0 additions & 15 deletions
This file was deleted.

renovate.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"extends": [
3-
"github>unjs/renovate-config"
4-
]
2+
"extends": ["github>unjs/renovate-config"]
53
}

shims.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
declare global {
22
interface Console {
33
// https://developer.chrome.com/blog/devtools-modern-web-debugging/#linked-stack-traces
4-
createTask(name: string): { run: <T extends () => any>(function_: T) => ReturnType<T> }
4+
createTask(name: string): { run: <T extends () => any>(function_: T) => ReturnType<T> };
55
}
66
}
77

src/debugger.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,10 @@ export function createDebugger(
4141
} satisfies CreateDebuggerOptions;
4242

4343
const _filter = options.filter;
44-
const filter =
45-
typeof _filter === "string"
46-
? (name: string) => name.startsWith(_filter)
47-
: _filter;
44+
const filter = typeof _filter === "string" ? (name: string) => name.startsWith(_filter) : _filter;
4845

4946
const _tag = options.tag ? `[${options.tag}] ` : "";
50-
const logPrefix = (event: any) =>
51-
_tag + event.name + "".padEnd(event._id, "\0");
47+
const logPrefix = (event: any) => _tag + event.name + "".padEnd(event._id, "\0");
5248

5349
const _idCtr: Record<string, number> = {};
5450

src/hookable.ts

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,9 @@ import {
66
callHooks,
77
} from "./utils.ts";
88

9-
import type {
10-
DeprecatedHook,
11-
NestedHooks,
12-
HookCallback,
13-
HookKeys,
14-
} from "./types.ts";
15-
16-
type InferCallback<HT, HN extends keyof HT> = HT[HN] extends HookCallback
17-
? HT[HN]
18-
: never;
9+
import type { DeprecatedHook, NestedHooks, HookCallback, HookKeys } from "./types.ts";
10+
11+
type InferCallback<HT, HN extends keyof HT> = HT[HN] extends HookCallback ? HT[HN] : never;
1912
type InferSpyEvent<HT extends Record<string, any>> = {
2013
[key in keyof HT]: {
2114
name: key;
@@ -66,8 +59,7 @@ export class Hookable<
6659
let message = dep.message;
6760
if (!message) {
6861
message =
69-
`${originalName} hook has been deprecated` +
70-
(dep.to ? `, please use ${dep.to}` : "");
62+
`${originalName} hook has been deprecated` + (dep.to ? `, please use ${dep.to}` : "");
7163
}
7264
if (!this._deprecatedMessages) {
7365
this._deprecatedMessages = new Set();
@@ -107,9 +99,7 @@ export class Hookable<
10799
function_: InferCallback<HooksT, NameT>,
108100
): () => void {
109101
let _unreg: (() => void) | undefined;
110-
let _function: ((...arguments_: any) => any) | undefined = (
111-
...arguments_: any
112-
) => {
102+
let _function: ((...arguments_: any) => any) | undefined = (...arguments_: any) => {
113103
if (typeof _unreg === "function") {
114104
_unreg();
115105
}
@@ -121,10 +111,7 @@ export class Hookable<
121111
return _unreg;
122112
}
123113

124-
removeHook<NameT extends HookNameT>(
125-
name: NameT,
126-
function_: InferCallback<HooksT, NameT>,
127-
): void {
114+
removeHook<NameT extends HookNameT>(name: NameT, function_: InferCallback<HooksT, NameT>): void {
128115
const hooks = this._hooks[name];
129116

130117
if (hooks) {
@@ -148,18 +135,15 @@ export class Hookable<
148135
name: NameT,
149136
deprecated: HookKeys<HooksT> | DeprecatedHook<HooksT>,
150137
): void {
151-
this._deprecatedHooks[name] =
152-
typeof deprecated === "string" ? { to: deprecated } : deprecated;
138+
this._deprecatedHooks[name] = typeof deprecated === "string" ? { to: deprecated } : deprecated;
153139
const _hooks = this._hooks[name] || [];
154140
this._hooks[name] = undefined;
155141
for (const hook of _hooks) {
156142
this.hook(name, hook as any);
157143
}
158144
}
159145

160-
deprecateHooks(
161-
deprecatedHooks: Partial<Record<HookNameT, DeprecatedHook<HooksT>>>,
162-
): void {
146+
deprecateHooks(deprecatedHooks: Partial<Record<HookNameT, DeprecatedHook<HooksT>>>): void {
163147
for (const name in deprecatedHooks) {
164148
this.deprecateHook(name, deprecatedHooks[name] as DeprecatedHook<HooksT>);
165149
}
@@ -168,9 +152,7 @@ export class Hookable<
168152
addHooks(configHooks: NestedHooks<HooksT>): () => void {
169153
const hooks = flatHooks<HooksT>(configHooks);
170154
// @ts-ignore
171-
const removeFns = Object.keys(hooks).map((key) =>
172-
this.hook(key as HookNameT, hooks[key]),
173-
);
155+
const removeFns = Object.keys(hooks).map((key) => this.hook(key as HookNameT, hooks[key]));
174156

175157
return () => {
176158
for (const unreg of removeFns) {
@@ -221,8 +203,7 @@ export class Hookable<
221203
name: NameT,
222204
args: Parameters<InferCallback<HooksT, NameT>>,
223205
): ReturnType<CallFunction> {
224-
const event =
225-
this._before || this._after ? { name, args, context: {} } : undefined;
206+
const event = this._before || this._after ? { name, args, context: {} } : undefined;
226207
if (this._before) {
227208
callEachWith(this._before, event);
228209
}
@@ -285,10 +266,7 @@ export class HookableCore<
285266
this._hooks = {};
286267
}
287268

288-
hook<NameT extends HookNameT>(
289-
name: NameT,
290-
fn: InferCallback<HooksT, NameT>,
291-
): () => void {
269+
hook<NameT extends HookNameT>(name: NameT, fn: InferCallback<HooksT, NameT>): () => void {
292270
if (!name || typeof fn !== "function") {
293271
return () => {};
294272
}
@@ -303,10 +281,7 @@ export class HookableCore<
303281
};
304282
}
305283

306-
removeHook<NameT extends HookNameT>(
307-
name: NameT,
308-
function_: InferCallback<HooksT, NameT>,
309-
): void {
284+
removeHook<NameT extends HookNameT>(name: NameT, function_: InferCallback<HooksT, NameT>): void {
310285
const hooks = this._hooks[name];
311286

312287
if (hooks) {

src/index.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
export { Hookable, HookableCore, createHooks } from "./hookable.ts";
22

3-
export {
4-
flatHooks,
5-
mergeHooks,
6-
parallelCaller,
7-
serial,
8-
serialCaller,
9-
} from "./utils.ts";
3+
export { flatHooks, mergeHooks, parallelCaller, serial, serialCaller } from "./utils.ts";
104

115
export * from "./debugger.ts";
126

0 commit comments

Comments
 (0)