diff --git a/types/backbone-relational/backbone-relational-tests.ts b/types/backbone-relational/backbone-relational-tests.ts index 6e0135fcd9..c8b94c4029 100644 --- a/types/backbone-relational/backbone-relational-tests.ts +++ b/types/backbone-relational/backbone-relational-tests.ts @@ -1,13 +1,13 @@ -import * as Backbone from 'backbone'; +import * as BackboneRel from 'backbone-relational'; -class House extends Backbone.RelationalModel { +class House extends BackboneRel.Model { // The 'relations' property, on the House's prototype. Initialized separately for each // instance of House. Each relation must define (as a minimum) the 'type', 'key' and // 'relatedModel'. Options include 'includeInJSON', 'createModels' and 'reverseRelation'. relations = [ { - type: Backbone.HasMany, // Use the type, or the string 'HasOne' or 'HasMany'. + type: BackboneRel.HasMany, // Use the type, or the string 'HasOne' or 'HasMany'. key: 'occupants', relatedModel: 'Person', includeInJSON: true, @@ -20,14 +20,14 @@ class House extends Backbone.RelationalModel { } -class Person extends Backbone.RelationalModel { +class Person extends BackboneRel.Model { relations = [ { // Create a (recursive) one-to-one relationship - type: Backbone.HasOne, + type: BackboneRel.HasOne, key: 'user', relatedModel: 'User', reverseRelation: { - type: Backbone.HasOne, + type: BackboneRel.HasOne, key: 'person' } } @@ -39,7 +39,7 @@ class Person extends Backbone.RelationalModel { } } -class User extends Backbone.RelationalModel { +class User extends BackboneRel.Model { } diff --git a/types/backbone-relational/index.d.ts b/types/backbone-relational/index.d.ts index 84406fb60a..f19cfa8daa 100644 --- a/types/backbone-relational/index.d.ts +++ b/types/backbone-relational/index.d.ts @@ -1,15 +1,16 @@ -// Type definitions for Backbone-relational 0.8.5 +// Type definitions for Backbone-relational 0.10.0 // Project: http://backbonerelational.org/ // Definitions by: Eirik Hoem +// Julian Gonggrijp // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 /// -import * as Backbone from 'backbone'; +import { Events, EventsHash, Model as BModel, Collection } from 'backbone'; -declare module 'backbone' { - class RelationalModel extends Model { +declare module 'backbone-relational' { + class Model extends BModel { /** * Do not use, prefer TypeScript's extend functionality. **/ @@ -47,7 +48,7 @@ declare module 'backbone' { static findOrCreate(attributes:any, options?:any); } - export class Relation extends Model { + export class Relation extends BModel { options:any; instance:any; @@ -60,11 +61,11 @@ declare module 'backbone' { checkPreconditions():boolean; - setRelated(related:Model):void; + setRelated(related:BModel):void; - setRelated(related:Collection):void; + setRelated(related:Collection):void; - getReverseRelations(model:RelationalModel):Relation; + getReverseRelations(model:Model):Relation; destroy():void; } @@ -72,7 +73,7 @@ declare module 'backbone' { export class HasOne extends Relation { collectionType:any; - findRelated(options:any):Model; + findRelated(options:any):BModel; setKeyContents(keyContents:string):void; @@ -82,21 +83,21 @@ declare module 'backbone' { setKeyContents(keyContents:number[]):void; - setKeyContents(keyContents:Collection):void; + setKeyContents(keyContents:Collection):void; - onChange(model:Model, attr:any, options:any):void; + onChange(model:BModel, attr:any, options:any):void; - handleAddition(model:Model, coll:Collection, options:any):void; + handleAddition(model:BModel, coll:Collection, options:any):void; - handleRemoval(model:Model, coll:Collection, options:any):void; + handleRemoval(model:BModel, coll:Collection, options:any):void; - handleReset(coll:Collection, options:any):void; + handleReset(coll:Collection, options:any):void; - tryAddRelated(model:Model, coll:any, options:any):void; + tryAddRelated(model:BModel, coll:any, options:any):void; - addRelated(model:Model, options:any):void; + addRelated(model:BModel, options:any):void; - removeRelated(model:Model, coll:any, options:any):void; + removeRelated(model:BModel, coll:any, options:any):void; } @@ -104,21 +105,21 @@ declare module 'backbone' { export class HasMany extends Relation { collectionType:any; - findRelated(options:any):Model; + findRelated(options:any):BModel; setKeyContents(keyContents:string):void; setKeyContents(keyContents:number):void; - setKeyContents(keyContents:Model):void; + setKeyContents(keyContents:BModel):void; - onChange(model:Model, attr:any, options:any):void; + onChange(model:BModel, attr:any, options:any):void; - tryAddRelated(model:Model, coll:any, options:any):void; + tryAddRelated(model:BModel, coll:any, options:any):void; - addRelated(model:Model, options:any):void; + addRelated(model:BModel, options:any):void; - removeRelated(model:Model, coll:any, options:any):void; + removeRelated(model:BModel, coll:any, options:any):void; } @@ -141,9 +142,9 @@ declare module 'backbone' { removeModelScope(scope):void; - addSubModels(subModelTypes:RelationalModel, superModelType:RelationalModel):void; + addSubModels(subModelTypes:Model, superModelType:Model):void; - setupSuperModel(modelType:RelationalModel):void; + setupSuperModel(modelType:Model):void; addReverseRelation(relation:any):void; @@ -151,30 +152,30 @@ declare module 'backbone' { processOrphanRelations():void; - retroFitRelation(relation:RelationalModel, create:boolean):Collection; + retroFitRelation(relation:Model, create:boolean):Collection; - getCollection(type:RelationalModel, create:boolean):Collection; + getCollection(type:Model, create:boolean):Collection; getObjectByName(name:string):any; resolveIdForItem(type:any, item:any):any; - static find(type:any, item:string):RelationalModel; + static find(type:any, item:string):Model; - static find(type:any, item:number):RelationalModel; + static find(type:any, item:number):Model; - static find(type:any, item:RelationalModel):RelationalModel; + static find(type:any, item:Model):Model; - static find(type:any, item:any):RelationalModel; + static find(type:any, item:any):Model; - register(model:RelationalModel):void; + register(model:Model):void; - checkId(model:RelationalModel, id:any):void; + checkId(model:Model, id:any):void; - update(model:RelationalModel):void; + update(model:Model):void; - unregister(model:RelationalModel, collection:Collection, options:any):void; + unregister(model:Model, collection:Collection, options:any):void; reset():void;