Update type definitions.

owljsorg · Sep 14, 2017 · 29a41a1 · 29a41a1
1 parent 2774be7
commit 29a41a1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "owljs",
-  "version": "0.8.26",
+  "version": "0.8.27",
   "description": "Backbone-like frontend library",
   "main": "index.js",
   "typings": "typescript/owl.d.ts",

diff --git a/typescript/owl.Collection.d.ts b/typescript/owl.Collection.d.ts
@@ -4,22 +4,22 @@ import {EventEmitter} from './owl.EventEmitter';
 /**
  * Collection options
  */
-export interface ICollectionOptions {
+export interface ICollectionOptions<M> {
     url: string;
-    model: typeof Model;
+    model: M;
 }
 
 /**
  * owl.Collection
  */
-export class Collection<T> extends EventEmitter {
+export class Collection<I, M> extends EventEmitter {
     protected url: string;
 
-    constructor(data: T[], options: ICollectionOptions);
+    constructor(data: I[], options: ICollectionOptions<M>);
     /**
      * Gets data from the server
      */
-    fetch(query?: Object): Promise<T[]>;
+    fetch(query?: Object): Promise<I[]>;
 
     /**
      * Removes models from collection
@@ -29,17 +29,17 @@ export class Collection<T> extends EventEmitter {
     /**
      * Sets collection data
      */
-    setData(data?: T[]): void;
+    setData(data?: I[]): void;
 
     /**
      * Gets collection data
      */
-    getData(): T[];
+    getData(): I[];
 
     /**
      * Gets collection models
      */
-    getModels(): Model[];
+    getModels(): M[];
 
     /**
      * Gets collection length
@@ -49,7 +49,7 @@ export class Collection<T> extends EventEmitter {
     /**
      * Gets model by index
      */
-    get(index: number): Model;
+    get(index: number): M;
 
     /**
      * Updates collection internal data value based on index

diff --git a/typescript/owl.Model.d.ts b/typescript/owl.Model.d.ts
@@ -13,11 +13,11 @@ export interface IModelOptions {
 /**
  * owl.Model
  */
-export class Model<T> extends EventEmitter {
+export class Model<I> extends EventEmitter {
     protected url: string;
     protected idAttribute: string;
 
-    constructor(data: T, options: IModelOptions);
+    constructor(data: I, options: IModelOptions);
     /**
      * Gets attribute by name
      */
@@ -31,7 +31,7 @@ export class Model<T> extends EventEmitter {
     /**
      * Gets data from the server
      */
-    fetch(query?: Object): Promise<T>;
+    fetch(query?: Object): Promise<I>;
 
     /**
      * Removes all attributes from the model
@@ -46,12 +46,12 @@ export class Model<T> extends EventEmitter {
     /**
      * Updates local data and saves model
      */
-    update(data: T, query?: Object): Promise<Object>;
+    update(data: I, query?: Object): Promise<Object>;
 
     /**
      * Partially updates model
      */
-    patch(data: T, query?: Object, path?: String): Promise<Object>;
+    patch(data: I, query?: Object, path?: String): Promise<Object>;
 
     /**
      * Removes a model
@@ -61,12 +61,12 @@ export class Model<T> extends EventEmitter {
     /**
      * Gets model data
      */
-    getData(): T;
+    getData(): I;
 
     /**
      * Sets model data
      */
-    setData(T): void;
+    setData(data: I): void;
 
     /**
      * Gets model collection