kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-23 21:00:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

change to use this type

Browse Source
This commit is contained in:
Horiuchi_H
2016-01-15 16:51:34 +09:00
parent 2fb6c66915
commit 22726c0751
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sequelize/sequelize-tests.ts
View File

@@ -8,7 +8,7 @@ import Sequelize = require("sequelize");
//
interface AnyAttributes { };
interface AnyInstance extends Sequelize.Instance<AnyInstance, AnyAttributes> { };
interface AnyInstance extends Sequelize.Instance<AnyAttributes> { };
var s = new Sequelize( '' );
var sequelize = s;
@@ -32,7 +32,7 @@ interface GUserAttributes {
username? : string;
}
interface GUserInstance extends Sequelize.Instance<GUserInstance, GUserAttributes> {}
interface GUserInstance extends Sequelize.Instance<GUserAttributes> {}
var GUser = s.define<GUserInstance, GUserAttributes>( 'user', { id: Sequelize.INTEGER, username : Sequelize.STRING });
GUser.create({ id : 1, username : 'one' }).then( ( guser ) => guser.save() );
@@ -47,7 +47,7 @@ interface GTaskAttributes {
revision? : number;
name? : string;
}
interface GTaskInstance extends Sequelize.Instance<GTaskInstance, GTaskAttributes> {
interface GTaskInstance extends Sequelize.Instance<GTaskAttributes> {
upRevision(): void;
}
var GTask = s.define<GTaskInstance, GTaskAttributes>( 'task', { revision : Sequelize.INTEGER, name : Sequelize.STRING });
@@ -347,7 +347,7 @@ interface ProductAttributes {
price?: number;
};
interface ProductInstance extends Sequelize.Instance<ProductInstance, ProductAttributes>, ProductAttributes {
interface ProductInstance extends Sequelize.Instance<ProductAttributes>, ProductAttributes {
// hasOne association mixins:
getBarcode: Sequelize.HasOneGetAssociationMixin<BarcodeInstance>;
setBarcode: Sequelize.HasOneSetAssociationMixin<BarcodeInstance, number>;
@@ -365,7 +365,7 @@ interface BarcodeAttributes {
dateIssued?: Date;
};
interface BarcodeInstance extends Sequelize.Instance<BarcodeInstance, BarcodeAttributes>, BarcodeAttributes {
interface BarcodeInstance extends Sequelize.Instance<BarcodeAttributes>, BarcodeAttributes {
// belongsTo association mixins:
getProduct: Sequelize.BelongsToGetAssociationMixin<ProductInstance>;
setProduct: Sequelize.BelongsToSetAssociationMixin<ProductInstance, number>;
@@ -378,7 +378,7 @@ interface WarehouseAttributes {
capacity?: number;
};
interface WarehouseInstance extends Sequelize.Instance<WarehouseInstance, WarehouseAttributes>, WarehouseAttributes {
interface WarehouseInstance extends Sequelize.Instance<WarehouseAttributes>, WarehouseAttributes {
// hasMany association mixins:
getProducts: Sequelize.HasManyGetAssociationsMixin<ProductInstance>;
setProducts: Sequelize.HasManySetAssociationsMixin<ProductInstance, number>;
@@ -410,7 +410,7 @@ interface BranchAttributes {
rank?: number;
};
interface BranchInstance extends Sequelize.Instance<BranchInstance, BranchAttributes>, BranchAttributes {
interface BranchInstance extends Sequelize.Instance<BranchAttributes>, BranchAttributes {
// belongsToMany association mixins:
getWarehouses: Sequelize.BelongsToManyGetAssociationsMixin<WarehouseInstance>;
setWarehouses: Sequelize.BelongsToManySetAssociationsMixin<WarehouseInstance, number, WarehouseBranchAttributes>;
@@ -440,7 +440,7 @@ interface WarehouseBranchAttributes {
distance?: number;
};
interface WarehouseBranchInstance extends Sequelize.Instance<WarehouseBranchInstance, WarehouseBranchAttributes>, WarehouseBranchAttributes { };
interface WarehouseBranchInstance extends Sequelize.Instance<WarehouseBranchAttributes>, WarehouseBranchAttributes { };
interface CustomerAttributes {
id?: number;
@@ -448,7 +448,7 @@ interface CustomerAttributes {
credit?: number;
};
interface CustomerInstance extends Sequelize.Instance<CustomerInstance, CustomerAttributes>, CustomerAttributes {
interface CustomerInstance extends Sequelize.Instance<CustomerAttributes>, CustomerAttributes {
// belongsToMany association mixins:
getBranches: Sequelize.BelongsToManyGetAssociationsMixin<BranchInstance>;
setBranches: Sequelize.BelongsToManySetAssociationsMixin<BranchInstance, number, void>;
@@ -633,11 +633,11 @@ new s.ConnectionTimedOutError( new Error( 'original connection error message' )
// https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/hooks.test.js
//
User.addHook( 'afterCreate', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function ) { next(); } );
User.addHook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function) { next(); } );
User.addHook( 'afterCreate', function( instance : Sequelize.Instance<any>, options : Object, next : Function ) { next(); } );
User.addHook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any>, options : Object, next : Function) { next(); } );
s.addHook( 'beforeInit', function( config : Object, options : Object ) { } );
User.hook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function) { next(); } );
User.hook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function ) { next(); } );
User.hook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any>, options : Object, next : Function) { next(); } );
User.hook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any>, options : Object, next : Function ) { next(); } );
User.removeHook( 'afterCreate', 'myHook' );

52
sequelize/sequelize.d.ts vendored
View File

@@ -2690,7 +2690,7 @@ declare module "sequelize" {
*
* @see Sequelize.define for more information about getters and setters
*/
interface Instance<TInstance, TAttributes> {
interface Instance<TAttributes> {
/**
* Returns true if this instance has not yet been persisted to the database
@@ -2702,7 +2702,7 @@ declare module "sequelize" {
*
* @see Model
*/
Model : Model<TInstance, TAttributes>;
Model : Model<this, TAttributes>;
/**
* A reference to the sequelize instance
@@ -2759,10 +2759,10 @@ declare module "sequelize" {
* @param options.raw If set to true, field and virtual setters will be ignored
* @param options.reset Clear all previously set data values
*/
set( key : string, value : any, options? : InstanceSetOptions ) : TInstance;
set( keys : Object, options? : InstanceSetOptions ) : TInstance;
setAttributes( key : string, value : any, options? : InstanceSetOptions ) : TInstance;
setAttributes( keys : Object, options? : InstanceSetOptions ) : TInstance;
set( key : string, value : any, options? : InstanceSetOptions ) : this;
set( keys : Object, options? : InstanceSetOptions ) : this;
setAttributes( key : string, value : any, options? : InstanceSetOptions ) : this;
setAttributes( keys : Object, options? : InstanceSetOptions ) : this;
/**
* If changed is called with a string it will return a boolean indicating whether the value of that key in
@@ -2787,7 +2787,7 @@ declare module "sequelize" {
* called with an instance of `Sequelize.ValidationError`. This error will have a property for each of the
* fields for which validation failed, with the error message for that field.
*/
save( options? : InstanceSaveOptions ) : Promise<TInstance>;
save( options? : InstanceSaveOptions ) : Promise<this>;
/**
* Refresh the current instance in-place, i.e. update the object with current data from the DB and return
@@ -2795,7 +2795,7 @@ declare module "sequelize" {
* return a new instance. With this method, all references to the Instance are updated with the new data
* and no new objects are created.
*/
reload( options? : FindOptions ) : Promise<TInstance>;
reload( options? : FindOptions ) : Promise<this>;
/**
* Validate the attribute of this instance according to validation rules set in the model definition.
@@ -2810,10 +2810,10 @@ declare module "sequelize" {
/**
* This is the same as calling `set` and then calling `save`.
*/
update( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<TInstance>;
update( keys : Object, options? : InstanceUpdateOptions ) : Promise<TInstance>;
updateAttributes( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<TInstance>;
updateAttributes( keys : Object, options? : InstanceUpdateOptions ) : Promise<TInstance>;
update( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<this>;
update( keys : Object, options? : InstanceUpdateOptions ) : Promise<this>;
updateAttributes( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<this>;
updateAttributes( keys : Object, options? : InstanceUpdateOptions ) : Promise<this>;
/**
* Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will
@@ -2847,7 +2847,7 @@ declare module "sequelize" {
* If and object is provided, each column is incremented by the value given.
*/
increment( fields : string | string[] | Object,
options? : InstanceIncrementDecrementOptions ) : Promise<TInstance>;
options? : InstanceIncrementDecrementOptions ) : Promise<this>;
/**
* Decrement the value of one or more columns. This is done in the database, which means it does not use
@@ -2870,17 +2870,17 @@ declare module "sequelize" {
* If and object is provided, each column is decremented by the value given
*/
decrement( fields : string | string[] | Object,
options? : InstanceIncrementDecrementOptions ) : Promise<TInstance>;
options? : InstanceIncrementDecrementOptions ) : Promise<this>;
/**
* Check whether all values of this and `other` Instance are the same
*/
equals( other : Instance<any, any> ) : boolean;
equals( other : Instance<any> ) : boolean;
/**
* Check if this is eqaul to one of `others` by calling equals
*/
equalsOneOf( others : Instance<any, any>[] ) : boolean;
equalsOneOf( others : Instance<any>[] ) : boolean;
/**
* Convert the instance to a JSON representation. Proxies to calling `get` with no keys. This means get all
@@ -3577,7 +3577,7 @@ declare module "sequelize" {
* Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the
* model instance (this)
*/
sync( options? : SyncOptions ) : Promise<Model<TInstance, TAttributes>>;
sync( options? : SyncOptions ) : Promise<this>;
/**
* Drop the table represented by this Model
@@ -3595,7 +3595,7 @@ declare module "sequelize" {
* @param schema The name of the schema
* @param options
*/
schema( schema : string, options? : SchemaOptions ) : Model<TInstance, TAttributes>;
schema( schema : string, options? : SchemaOptions ) : this;
/**
* Get the tablename of the model, taking schema into account. The method will return The name as a string
@@ -3656,7 +3656,7 @@ declare module "sequelize" {
* @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
* model will clear the previous scope.
*/
scope( options? : string | string[] | ScopeOptions | WhereOptions ) : Model<TInstance, TAttributes>;
scope( options? : string | string[] | ScopeOptions | WhereOptions ) : this;
/**
* Search for multiple instances.
@@ -3911,7 +3911,7 @@ declare module "sequelize" {
/**
* Unscope the model
*/
unscoped() : Model<TInstance, TAttributes>;
unscoped() : this;
}
@@ -4089,7 +4089,7 @@ declare module "sequelize" {
/**
* Inserts a new record
*/
insert( instance : Instance<any, any>, tableName : string, values : Object,
insert( instance : Instance<any>, tableName : string, values : Object,
options? : QueryOptions ) : Promise<Object>;
/**
@@ -4107,7 +4107,7 @@ declare module "sequelize" {
/**
* Updates a row
*/
update( instance : Instance<any, any>, tableName : string, values : Object, identifier : Object,
update( instance : Instance<any>, tableName : string, values : Object, identifier : Object,
options? : QueryOptions ) : Promise<Object>;
/**
@@ -4119,7 +4119,7 @@ declare module "sequelize" {
/**
* Deletes a row
*/
"delete"( instance : Instance<any, any>, tableName : string, identifier : Object,
"delete"( instance : Instance<any>, tableName : string, identifier : Object,
options? : QueryOptions ) : Promise<Object>;
/**
@@ -4136,7 +4136,7 @@ declare module "sequelize" {
/**
* Increments a row value
*/
increment( instance : Instance<any, any>, tableName : string, values : Object, identifier : Object,
increment( instance : Instance<any>, tableName : string, values : Object, identifier : Object,
options? : QueryOptions ) : Promise<Object>;
/**
@@ -4482,7 +4482,7 @@ declare module "sequelize" {
/**
* A sequelize instance used to build the return instance
*/
instance? : Instance<any, any>;
instance? : Instance<any>;
/**
* A sequelize model used to build the returned model instances (used to be called callee)
@@ -5210,7 +5210,7 @@ declare module "sequelize" {
/**
* A reference to the sequelize instance class.
*/
Instance : Instance<any, any>;
Instance : Instance<any>;
/**
* Creates a object representing a database function. This can be used in search queries, both in where and