Skip to content

Commit

Permalink
refactor: fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
crimx committed Oct 22, 2024
1 parent cbd517f commit 893b7ed
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 29 deletions.
1 change: 1 addition & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export default tsEslint.config(
parser: tsEslint.parser,
},
rules: {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-non-null-assertion": "off",
Expand Down
1 change: 1 addition & 0 deletions src/abortable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
// eslint-disable-next-line @typescript-eslint/no-unused-vars -- used in type doc
Disposer,
} from "./interface";

import { dispose } from "./utils";

/**
Expand Down
13 changes: 4 additions & 9 deletions src/disposable-one.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,11 @@ export interface DisposableOne extends DisposableDisposer {
dispose(this: void): void;
}

interface DisposableOneImpl extends DisposableOne {}

function is(this: DisposableOneImpl, disposable: DisposableType): boolean {
function is(this: DisposableOne, disposable: DisposableType): boolean {
return Object.is(this.current, disposable);
}

function set<T extends DisposableType>(
this: DisposableOneImpl,
disposable: T
): T {
function set<T extends DisposableType>(this: DisposableOne, disposable: T): T {
if (!this.is(disposable)) {
this.flush();
this.current = disposable;
Expand All @@ -122,7 +117,7 @@ function set<T extends DisposableType>(
}

function make<T extends DisposableType>(
this: DisposableOneImpl,
this: DisposableOne,
executor: () => T | null | undefined | void
): T | void {
const disposable = executor();
Expand All @@ -131,7 +126,7 @@ function make<T extends DisposableType>(
}
}

function remove(this: DisposableOneImpl): boolean {
function remove(this: DisposableOne): boolean {
const exists = !!this.current;
this.current = undefined;
return exists;
Expand Down
4 changes: 3 additions & 1 deletion src/disposable-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ export function disposableStore(
disposableStore.make = make;
disposableStore.remove = remove;
disposableStore.flush = flush;
disposables && disposableStore.add(disposables);
if (disposables) {
disposableStore.add(disposables);
}
return disposableStore;
}
16 changes: 0 additions & 16 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
import type { Disposer, IDisposable } from "./interface";

export type PickMethods<T> = Pick<
T,
{
// eslint-disable-next-line @typescript-eslint/ban-types
[K in keyof T]: T[K] extends Function ? K : never;
}[keyof T]
>;

export type OmitMethods<T> = Pick<
T,
{
// eslint-disable-next-line @typescript-eslint/ban-types
[K in keyof T]: T[K] extends Function ? never : K;
}[keyof T]
>;

/**
* Dispose a disposable object or a disposer function. Log the error if any.
* @param disposable A disposable object or a disposer function. Do nothing otherwise.
Expand Down
1 change: 1 addition & 0 deletions test/abortable.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { describe, it, expect, vi } from "vitest";

import { abortable } from "../src";
import { isAbortable } from "../src/abortable";

Expand Down
4 changes: 3 additions & 1 deletion test/disposable-map.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { describe, expect, it, vi } from "vitest";
import type { DisposableDisposer, IDisposable } from "../src";

import { describe, expect, it, vi } from "vitest";

import { abortable, disposableMap } from "../src";

describe("DisposableMap", () => {
Expand Down
4 changes: 3 additions & 1 deletion test/disposable-one.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { describe, expect, it, vi } from "vitest";
import type { DisposableDisposer } from "../src";

import { describe, expect, it, vi } from "vitest";

import { abortable, disposableOne } from "../src";

describe("DisposableOne", () => {
Expand Down
4 changes: 3 additions & 1 deletion test/disposable-store.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { describe, it, expect, vi } from "vitest";
import type { DisposableDisposer, IDisposable } from "../src";

import { describe, it, expect, vi } from "vitest";

import { abortable, disposableStore } from "../src";

describe("DisposableStore", () => {
Expand Down

0 comments on commit 893b7ed

Please sign in to comment.