diff --git a/types/meteor/globals/mongo.d.ts b/types/meteor/globals/mongo.d.ts index 0e22569e67..d35669cea1 100644 --- a/types/meteor/globals/mongo.d.ts +++ b/types/meteor/globals/mongo.d.ts @@ -186,20 +186,20 @@ declare module Mongo { interface CursorStatic { new (): Cursor; } - interface ObserveCallbacks { - added?(document: Object): void; - addedAt?(document: Object, atIndex: number, before: Object): void; - changed?(newDocument: Object, oldDocument: Object): void; - changedAt?(newDocument: Object, oldDocument: Object, indexAt: number): void; - removed?(oldDocument: Object): void; - removedAt?(oldDocument: Object, atIndex: number): void; - movedTo?(document: Object, fromIndex: number, toIndex: number, before: Object): void; + interface ObserveCallbacks { + added?(document: T): void; + addedAt?(document: T, atIndex: number, before: T | null): void; + changed?(newDocument: T, oldDocument: T): void; + changedAt?(newDocument: T, oldDocument: T, indexAt: number): void; + removed?(oldDocument: T): void; + removedAt?(oldDocument: T, atIndex: number): void; + movedTo?(document: T, fromIndex: number, toIndex: number, before: T | null): void; } - interface ObserveChangesCallbacks { - added?(id: string, fields: Object): void; - addedBefore?(id: string, fields: Object, before: Object): void; - changed?(id: string, fields: Object): void; - movedBefore?(id: string, before: Object): void; + interface ObserveChangesCallbacks { + added?(id: string, fields: Partial): void; + addedBefore?(id: string, fields: Partial, before: T | null): void; + changed?(id: string, fields: Partial): void; + movedBefore?(id: string, before: T | null): void; removed?(id: string): void; } interface Cursor { @@ -207,8 +207,8 @@ declare module Mongo { fetch(): Array; forEach(callback: (doc: T, index: number, cursor: Cursor) => void, thisArg?: any): void; map(callback: (doc: T, index: number, cursor: Cursor) => U, thisArg?: any): Array; - observe(callbacks: ObserveCallbacks): Meteor.LiveQueryHandle; - observeChanges(callbacks: ObserveChangesCallbacks): Meteor.LiveQueryHandle; + observe(callbacks: ObserveCallbacks): Meteor.LiveQueryHandle; + observeChanges(callbacks: ObserveChangesCallbacks): Meteor.LiveQueryHandle; } var ObjectID: ObjectIDStatic; diff --git a/types/meteor/mongo.d.ts b/types/meteor/mongo.d.ts index f98ec30e49..adb9644e3a 100644 --- a/types/meteor/mongo.d.ts +++ b/types/meteor/mongo.d.ts @@ -188,20 +188,20 @@ declare module "meteor/mongo" { interface CursorStatic { new (): Cursor; } - interface ObserveCallbacks { - added?(document: Object): void; - addedAt?(document: Object, atIndex: number, before: Object): void; - changed?(newDocument: Object, oldDocument: Object): void; - changedAt?(newDocument: Object, oldDocument: Object, indexAt: number): void; - removed?(oldDocument: Object): void; - removedAt?(oldDocument: Object, atIndex: number): void; - movedTo?(document: Object, fromIndex: number, toIndex: number, before: Object): void; + interface ObserveCallbacks { + added?(document: T): void; + addedAt?(document: T, atIndex: number, before: T | null): void; + changed?(newDocument: T, oldDocument: T): void; + changedAt?(newDocument: T, oldDocument: T, indexAt: number): void; + removed?(oldDocument: T): void; + removedAt?(oldDocument: T, atIndex: number): void; + movedTo?(document: T, fromIndex: number, toIndex: number, before: T | null): void; } - interface ObserveChangesCallbacks { - added?(id: string, fields: Object): void; - addedBefore?(id: string, fields: Object, before: Object): void; - changed?(id: string, fields: Object): void; - movedBefore?(id: string, before: Object): void; + interface ObserveChangesCallbacks { + added?(id: string, fields: Partial): void; + addedBefore?(id: string, fields: Partial, before: T | null): void; + changed?(id: string, fields: Partial): void; + movedBefore?(id: string, before: T | null): void; removed?(id: string): void; } interface Cursor { @@ -209,8 +209,8 @@ declare module "meteor/mongo" { fetch(): Array; forEach(callback: (doc: T, index: number, cursor: Cursor) => void, thisArg?: any): void; map(callback: (doc: T, index: number, cursor: Cursor) => U, thisArg?: any): Array; - observe(callbacks: ObserveCallbacks): Meteor.LiveQueryHandle; - observeChanges(callbacks: ObserveChangesCallbacks): Meteor.LiveQueryHandle; + observe(callbacks: ObserveCallbacks): Meteor.LiveQueryHandle; + observeChanges(callbacks: ObserveChangesCallbacks): Meteor.LiveQueryHandle; } var ObjectID: ObjectIDStatic;