refactor: refactor types

package.json

@@ -13,9 +13,7 @@
     "prepublishOnly": "npm install && npm run clean && npm run build",
     "build": "tsc -b",
     "clean": "tsc -b --clean",
-    "preeslint": "npm run clean && npm run build",
     "eslint": "eslint src test",
-    "pretest": "npm run clean && npm run build",
     "test": "mocha -r ts-node/register 'test/scripts/**/*.ts'",
     "test-cov": "c8 --reporter=lcovonly --reporter=text-summary npm test",
     "typedoc": "typedoc --entryPointStrategy expand ./src"
@@ -41,6 +39,7 @@
   "devDependencies": {
     "@types/bluebird": "^3.5.37",
     "@types/chai": "^4.3.3",
+    "@types/chai-as-promised": "^8.0.1",
     "@types/graceful-fs": "^4.1.5",
     "@types/jsonstream": "^0.8.30",
     "@types/mocha": "^10.0.0",

src/database.ts

@@ -74,8 +74,8 @@ async function exportAsync(database: Database, path: string): Promise<void> {
 interface DatabaseOptions {
   version: number,
   path: string,
-  onUpgrade: (...args: any[]) => any,
-  onDowngrade: (...args: any[]) => any
+  onUpgrade: (oldVersion: number, newVersion: number) => any,
+  onDowngrade: (oldVersion: number, newVersion: number) => any
 }
 
 class Database {

src/document.ts

@@ -2,12 +2,12 @@ import rfdc from 'rfdc';
 import type Model from './model';
 import type Schema from './schema';
 import type BluebirdPromise from 'bluebird';
-import type { NodeJSLikeCallback } from './types';
+import type { NodeJSLikeCallback, Options } from './types';
 const cloneDeep = rfdc();
 
 abstract class Document<T> {
   abstract _model: Model<T>;
-  _id!: string | number | undefined;
+  _id!: string;
   abstract _schema: Schema<T>;
   [key : string]: any;
 
@@ -69,7 +69,7 @@ abstract class Document<T> {
    *
    * @return {object}
    */
-  toObject(): T {
+  toObject(): T extends object ? T : never {
     const keys = Object.keys(this);
     const obj: Partial<T> = {};
 
@@ -80,7 +80,7 @@ abstract class Document<T> {
       obj[key] = isGetter(this, key) ? this[key] : cloneDeep(this[key]);
     }
 
-    return obj as T;
+    return obj as T extends object ? T : never;
   }
 
   /**
@@ -98,7 +98,7 @@ abstract class Document<T> {
    * @param {String|Object} expr
    * @return {Document}
    */
-  populate(expr: string | any[] | { path?: string; model?: any; [key: PropertyKey]: any }): Document<T> {
+  populate(expr: string | string[] | Partial<Options>[] | Partial<Options>): Document<T> {
     const stack = this._schema._parsePopulate(expr);
     return this._model._populate(this, stack);
   }