all with types

Author: pablorsk

src/demo/books/books.component.ts

@@ -36,14 +36,14 @@ class BooksController {
                 // TEST 1
                 // this test merge data with cache (this not include author or photos)
                 console.log('BooksRequest#1 received (author data from server)',
-                    (<IDataResource>this.books[2].relationships.author.data).attributes
+                    (<Jsonapi.IResource>this.books[2].relationships.author.data).attributes
                 );
 
                 console.log('BooksRequest#2 requested');
                 let books2 = this.BooksService.all(
                     success => {
                         console.log('BooksRequest#2 received (author data from cache)',
-                            (<IDataResource>books2[1].relationships.author.data)
+                            (<Jsonapi.IResource>books2[1].relationships.author.data)
                         );
                     }
                 );
@@ -53,7 +53,7 @@ class BooksController {
                 let book1 = this.BooksService.get(1,
                     success => {
                         console.log('BookRequest#3 received (author data from cache)',
-                            (<IDataResource>book1.relationships.author.data).attributes
+                            (<Jsonapi.IResource>book1.relationships.author.data).attributes
                         );
                     });
             },

src/library/interfaces/collection.d.ts

@@ -1,5 +1,6 @@
 import { IResource } from './resource';
 import { IPage } from './page';
+import { IDataResource } from './data-resource';
 
 export interface ICollection extends Array<IResource> {
     $length: number;

src/library/interfaces/data-collection.d.ts

@@ -1,3 +1,6 @@
+import { IDataResource } from './data-resource';
+import { IDocument } from '../interfaces/document';
+
 interface IDataCollection extends IDocument {
     data: IDataResource[];
 }

src/library/interfaces/data-object.d.ts

@@ -1,3 +1,6 @@
+import { IDocument } from './document';
+import { IDataResource } from './data-resource';
+
 interface IDataObject extends IDocument {
     data: IDataResource;
 }

src/library/interfaces/data-resource.d.ts

@@ -1,8 +1,10 @@
-    interface IDataResource {
-        type: string;
-        id: string;
-        attributes?: any;
-        relationships?: any;
-        links?: ILinks;
-        meta?: any;
-    }
+import { IAttributes } from '../interfaces';
+
+interface IDataResource {
+    type: string;
+    id: string;
+    attributes?: IAttributes;
+    relationships?: any;
+    links?: ILinks;
+    meta?: any;
+}

src/library/interfaces/document.d.ts

@@ -1,11 +1,13 @@
+import { IDataResource } from '../interfaces/data-resource';
+
 // http://org/format/#document-top-level
-    interface IDocument {
-        // data in child interface IJsonapiCollection
-        // error in child interface IJsonapiErrors
-        jsonapi?: string;
-        links?: ILinks;
-        included?: Array<IDataResource>;
-        meta?: Object;
+interface IDocument {
+    // data in child interface IJsonapiCollection
+    // error in child interface IJsonapiErrors
+    jsonapi?: string;
+    links?: ILinks;
+    included?: Array<IDataResource>;
+    meta?: Object;
 
-        promise?: any;
-    }
+    promise?: any;
+}

src/library/interfaces/errors.d.ts

@@ -1,13 +1,15 @@
-    interface IErrors extends IDocument {
-        errors: [
-            {
-                code?: string,
-                source?: {
-                    attributes?: string,
-                    pointer: string
-                },
-                title?: string,
-                detail?: string
-            }
-        ];
-    }
+import { IDocument } from './document';
+
+interface IErrors extends IDocument {
+    errors: [
+        {
+            code?: string,
+            source?: {
+                attributes?: string,
+                pointer: string
+            },
+            title?: string,
+            detail?: string
+        }
+    ];
+}

src/library/interfaces/relationship.d.ts

@@ -1,4 +1,5 @@
 import { ICollection, IResource } from '../interfaces';
+import { IDataResource } from './data-resource';
 
 interface IRelationship {
     // IDataResource added for this reason:

src/library/interfaces/resource.d.ts

@@ -1,4 +1,6 @@
 import { IRelationships, ICollection, IParamsResource, IService } from './index';
+import { IDataResource } from './data-resource';
+import { IDataObject } from './data-object';
 
 export interface IResource extends IDataResource {
     is_new: boolean;

src/library/interfaces/service.d.ts

@@ -1,16 +1,16 @@
 import { ISchema, IResource, ICollection, IParamsCollection, ICache, IParamsResource } from './index';
 
 export interface IService {
-    smartfilter?: string;
-    schema?: ISchema;
+    type: string;
+    schema: ISchema;
     getPrePath(): string;
     getPath(): string;
-    register? (): boolean;
+    register(): boolean;
     get<T extends IResource>(id: string | number, params?: IParamsResource | Function, fc_success?: Function, fc_error?: Function): T;
     all(params?: IParamsCollection | Function, success?: Function, error?: Function): ICollection;
     delete (id: String, params?: IParamsResource | Function, success?: Function, error?: Function): void;
-    getService? (): any;    // any, becouse depends of extended class
+    getService<T extends IService> ():T;
     clearMemoryCache? (): boolean;
-    new? (): IResource;
+    new?<T extends IResource>(): T;
     memorycache: ICache;
 }