fix

src/database.ts

@@ -7,6 +7,7 @@ import Schema from './schema';
 import SchemaType from './schematype';
 import WarehouseError from './error';
 import { logger } from 'hexo-log';
+import type { NodeJSLikeCallback } from './types';
 
 const log = logger();
 const pkg = require('../package.json');

src/document.ts

@@ -1,6 +1,7 @@
 import rfdc from 'rfdc';
 import type Model from './model';
 import type Schema from './schema';
+import type { NodeJSLikeCallback } from './types';
 const cloneDeep = rfdc();
 
 abstract class Document {

src/model.ts

@@ -11,6 +11,7 @@ import WarehouseError from './error';
 import PopulationError from './error/population';
 import Mutex from './mutex';
 import type Database from './database';
+import type { NodeJSLikeCallback, Options } from './types';
 
 class Model extends EventEmitter {
   _mutex = new Mutex();

src/query.ts

@@ -3,6 +3,7 @@ import { parseArgs, shuffle } from './util';
 import type Model from './model';
 import type Schema from './schema';
 import type Document from './document';
+import type { NodeJSLikeCallback, Options } from './types';
 
 abstract class Query {
   data: any[];

src/schema.ts

@@ -5,6 +5,7 @@ import { getProp, setProp, delProp } from './util';
 import PopulationError from './error/population';
 import SchemaTypeVirtual from './types/virtual';
 import { isPlainObject } from 'is-plain-object';
+import type { NodeJSLikeCallback } from './types';
 
 /**
  * @callback queryFilterCallback
@@ -57,8 +58,7 @@ const checkHookType = (type: string) => {
   }
 };
 
-const hookWrapper = (fn: (callback: NodeJSLikeCallback<any>, options?: Promise.PromisifyOptions) => void)
-  : (callback?: NodeJSLikeCallback<any, any>) => Promise<any> => {
+const hookWrapper = (fn: (...args: any[]) => void): (...args: any[]) => Promise<any> => {
   if (fn.length > 1) {
     return Promise.promisify(fn);
   }
@@ -73,7 +73,7 @@ const execSortStack = (stack: ((a: unknown, b: unknown) => number)[]) => {
   const len = stack.length;
 
   return (a: any, b: any) => {
-    let result;
+    let result: number;
 
     for (let i = 0; i < len; i++) {
       result = stack[i](a, b);
@@ -567,7 +567,7 @@ class Schema {
    * @param {String} type Hook type. One of `save` or `remove`.
    * @param {Function} fn
    */
-  pre(type: string, fn: (callback: NodeJSLikeCallback<any, any>, options?: Promise.PromisifyOptions) => void): void {
+  pre(type: string, fn: (...args: any[]) => void): void {
     checkHookType(type);
     if (typeof fn !== 'function') throw new TypeError('Hook must be a function!');
 
@@ -580,7 +580,7 @@ class Schema {
    * @param {String} type Hook type. One of `save` or `remove`.
    * @param {Function} fn
    */
-  post(type: string, fn: (callback: NodeJSLikeCallback<any, any>, options?: Promise.PromisifyOptions) => void): void {
+  post(type: string, fn: (...args: any[]) => void): void {
     checkHookType(type);
     if (typeof fn !== 'function') throw new TypeError('Hook must be a function!');
 

src/types.ts

@@ -1,6 +1,6 @@
-type NodeJSLikeCallback<R, E = any> = (err: E, result?: R) => void
+export type NodeJSLikeCallback<R, E = any> = (err: E, result?: R) => void
 
-interface Options {
+export interface Options {
   lean?: boolean;
   skip?: number;
   limit?: number;

test/scripts/model.ts

@@ -432,7 +432,7 @@ describe('Model', () => {
     });
   });
 
-  it('removeById() - id not exist', () => (User.removeById('foo', {}) as any).should.eventually.be.rejected);
+  it('removeById() - id not exist', () => (User.removeById('foo', () => {}) as any).should.eventually.be.rejected);
 
   it('removeById() - hook', () => {
     const db = new Database();