diff --git a/types/common.d.ts b/types/common.d.ts index 3d31389d..5831b144 100644 --- a/types/common.d.ts +++ b/types/common.d.ts @@ -18,7 +18,7 @@ export type Options = AnyObject; /** * Type alias for Node.js callback functions */ -export type Callback = (err: any, result?: T) => void; +export type Callback = (err?: Error | null, result?: T) => void; /** * Return export type for promisified Node.js async methods. diff --git a/types/model.d.ts b/types/model.d.ts index 18938ea6..90af3816 100644 --- a/types/model.d.ts +++ b/types/model.d.ts @@ -246,4 +246,4 @@ export declare class ModelBuilder extends EventEmitter { * Union export type for model instance or plain object representing the model * instance */ -export type ModelData = T | AnyObject; +export type ModelData = T | Partial; diff --git a/types/persisted-model.d.ts b/types/persisted-model.d.ts index c5442c93..cb99617a 100644 --- a/types/persisted-model.d.ts +++ b/types/persisted-model.d.ts @@ -38,8 +38,14 @@ export declare class PersistedModel extends ModelBase { static create( data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; + + static create( + data: PersistedData[], + options?: Options, + callback?: Callback, + ): PromiseOrVoid; /** * Update or insert a model instance @@ -51,20 +57,20 @@ export declare class PersistedModel extends ModelBase { static upsert( data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; static updateOrCreate( data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; static patchOrCreate( data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Update or insert a model instance based on the search criteria. @@ -86,15 +92,15 @@ export declare class PersistedModel extends ModelBase { where: Where, data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; static patchOrCreateWithWhere( where: Where, data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Replace or insert a model instance; replace existing record if one is found, @@ -110,8 +116,8 @@ export declare class PersistedModel extends ModelBase { static replaceOrCreate( data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Finds one record matching the optional filter object. If not found, creates @@ -147,8 +153,8 @@ export declare class PersistedModel extends ModelBase { filter: Filter, data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Check whether a model instance exists in database. @@ -183,7 +189,7 @@ export declare class PersistedModel extends ModelBase { filter?: Filter, options?: Options, callback?: Callback, - ): PromiseOrVoid; + ): PromiseOrVoid; /** * Find all model instances that match `filter` specification. @@ -215,8 +221,8 @@ export declare class PersistedModel extends ModelBase { static find( filter?: Filter, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Find one model instance that matches `filter` specification. @@ -246,8 +252,8 @@ export declare class PersistedModel extends ModelBase { static findOne( filter?: Filter, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Destroy all model instances that match the optional `where` specification. @@ -362,8 +368,8 @@ export declare class PersistedModel extends ModelBase { id: any, data: PersistedData, options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Return the number of records that match the optional "where" filter. @@ -479,8 +485,8 @@ export declare class PersistedModel extends ModelBase { */ reload( options?: Options, - callback?: Callback, - ): PromiseOrVoid; + callback?: Callback, + ): PromiseOrVoid; /** * Set the correct `id` property for the `PersistedModel`. Uses the `setId` method if the model is attached to