_exec work with a object now (IExecParams). ResourceMerger fixed. Better variables names

Author: pablorsk

src/demo/books/books.component.ts

@@ -35,27 +35,34 @@ class BooksController {
 
                 // TEST 1
                 // this test merge data with cache (this not include author or photos)
-                console.log('book#1', (<IDataResource>this.books[1].relationships.author.data));
-                console.log('book#1', (<IDataResource>this.books[1].relationships.author.data).attributes);
-                // this.books = this.BooksService.all();
+                console.log('BooksRequest#1 received (author data from server)',
+                    (<IDataResource>this.books[1].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)
+                        );
+                    }
+                );
 
                 // TEST 2
-                // let book1 = this.BooksService.get(1,
-                //     success => {
-                //         book1.attributes.title += ' :)'; // update view
-                //         console.log('book1', (<IDataResource>book1.relationships.author.data).attributes);
-                //     });
+                console.log('BookRequest#3 requested');
+                let book1 = this.BooksService.get(1,
+                    success => {
+                        console.log('BookRequest#3 received (author data from cache)',
+                            (<IDataResource>book1.relationships.author.data).attributes
+                        );
+                    });
             },
             error => {
                 console.log('error books controller', error);
             }
         );
     }
 
-    public do() {
-        this.BooksService.all();
-    }
-
     public delete(book: Jsonapi.IResource) {
         this.BooksService.delete(book.id);
     }

src/demo/books/books.html

@@ -1,7 +1,7 @@
 <div>
     <filter-textbox filter="$ctrl.filter"></filter-textbox>
     <br/>
-    <h3 ng-click="$ctrl.do()">Books</h3>
+    <h3>Books</h3>
     <table class="table table-striped">
         <thead>
             <tr>

src/library/interfaces/exec-params.d.ts

@@ -0,0 +1,9 @@
+import { IParamsCollection } from '../interfaces';
+
+export interface IExecParams {
+    id: string | null;
+    params?: IParamsCollection | Function;
+    fc_success?: Function;
+    fc_error?: Function;
+    exec_type: string;
+}

src/library/interfaces/index.d.ts

@@ -11,3 +11,4 @@ export * from './params-collection.d'
 export * from './params-resource.d'
 export * from './resources-by-id.d'
 export * from './resources-by-type.d'
+export * from './exec-params.d'

src/library/interfaces/resource.d.ts

@@ -7,17 +7,14 @@ export interface IResource extends IDataResource {
     lastupdate?: number;
 
     type: string;   // dont work extend?
-
     relationships: IRelationships;    // redefined from IDataResource
 
-    // new? (): IResource;
     reset? (): void;
     addRelationship? (resource: IResource, type_alias?: string): void;
     addRelationships? (resources: ICollection, type_alias: string): void;
     removeRelationship? (type_alias: string, id: string): boolean;
     addRelationshipsArray <T extends IResource>(resources: Array<T>, type_alias?: string): void;
     save? (params?: IParamsResource, fc_success?: Function, fc_error?: Function): any;
     toObject? (params?: IParamsResource): IDataObject;
-
     getService(): IService;
 }

src/library/interfaces/service.d.ts

@@ -9,7 +9,6 @@ export interface IService {
     delete (id: String, params?: IParamsResource | Function, success?: Function, error?: Function): void;
     getService? (): any;    // any, becouse depends of extended class
     clearMemoryCache? (): boolean;
-
     new? (): IResource;
     memorycache: ICache;
 }

src/library/resource.ts

@@ -10,7 +10,7 @@ import { Converter } from './services/resource-converter';
 // import { LocalFilter } from './services/localfilter';
 // import { MemoryCache } from './services/memorycache';
 
-import { IAttributes, IResource, ICollection, IParamsResource } from './interfaces';
+import { IAttributes, IResource, ICollection, IExecParams, IParamsResource } from './interfaces';
 import { IRelationships, IRelationship } from './interfaces';
 
 export class Resource extends ServiceWithRequests implements IResource {
@@ -105,18 +105,19 @@ export class Resource extends ServiceWithRequests implements IResource {
     }
 
     public save<T extends IResource>(params?: Object | Function, fc_success?: Function, fc_error?: Function): Array<T> {
-        return this.__exec(null, params, fc_success, fc_error, 'save');
+        // return this.__exec(null, params, fc_success, fc_error, 'save');
+        return this.__exec({ id: null, params: params, fc_success: fc_success, fc_error: fc_error, exec_type: 'save' });
     }
 
     /**
     This method sort params for all(), get(), delete() and save()
     */
-    protected __exec(id: string, params: IParamsResource, fc_success, fc_error, exec_type: string): any {
-        super.__exec(id, params, fc_success, fc_error, exec_type);
+    protected __exec(exec_params: IExecParams): any {
+        super.__exec(exec_params);
 
-        switch (exec_type) {
+        switch (exec_params.exec_type) {
             case 'save':
-            return this._save(params, fc_success, fc_error);
+            return this._save(exec_params.params, exec_params.fc_success, exec_params.fc_error);
         }
     }
 

src/library/service.ts

@@ -11,7 +11,7 @@ import { Converter } from './services/resource-converter';
 import { LocalFilter } from './services/localfilter';
 import { MemoryCache } from './services/memorycache';
 
-import { IService, ISchema, IResource, ICollection, ICache, IParamsCollection, IParamsResource } from './interfaces';
+import { IService, ISchema, IResource, ICollection, IExecParams, ICache, IParamsCollection, IParamsResource } from './interfaces';
 // import { IRelationships, IRelationship } from './interfaces';
 
 export class Service extends ServiceWithRequests implements IService {
@@ -54,32 +54,34 @@ export class Service extends ServiceWithRequests implements IService {
     }
 
     public get<T extends IResource>(id, params?: IParamsResource | Function, fc_success?: Function, fc_error?: Function): T {
-        return this.__exec(id, params, fc_success, fc_error, 'get');
+        // return this.__exec({ id, params, fc_success, fc_error, 'get' });
+        return this.__exec({ id: id, params: params, fc_success: fc_success, fc_error: fc_error, exec_type: 'get' });
     }
 
     public delete(id: string, params?: Object | Function, fc_success?: Function, fc_error?: Function): void {
-        this.__exec(id, params, fc_success, fc_error, 'delete');
+        // this.__exec(id, params, fc_success, fc_error, 'delete');
+        return this.__exec({ id: id, params: params, fc_success: fc_success, fc_error: fc_error, exec_type: 'delete' });
     }
 
     public all(params?: IParamsCollection | Function, fc_success?: Function, fc_error?: Function): ICollection {
-        return this.__exec(null, params, fc_success, fc_error, 'all');
+        return this.__exec({ id: null, params: params, fc_success: fc_success, fc_error: fc_error, exec_type: 'all' });
     }
 
     /**
     This method sort params for all(), get(), delete() and save()
     */
-    protected __exec(id: string, params: IParamsResource, fc_success, fc_error, exec_type: string): any {
-        super.__exec(id, params, fc_success, fc_error, exec_type);
+    protected __exec(exec_params: IExecParams): any {
+        super.__exec(exec_params);
 
         this.schema = angular.extend({}, Base.Schema, this.schema);
 
-        switch (exec_type) {
+        switch (exec_params.exec_type) {
             case 'get':
-            return this._get(id, params, fc_success, fc_error);
+            return this._get(exec_params.id, exec_params.params, exec_params.fc_success, exec_params.fc_error);
             case 'delete':
-            return this._delete(id, params, fc_success, fc_error);
+            return this._delete(exec_params.id, exec_params.params, exec_params.fc_success, exec_params.fc_error);
             case 'all':
-            return this._all(params, fc_success, fc_error);
+            return this._all(exec_params.params, exec_params.fc_success, exec_params.fc_error);
         }
     }
 

src/library/services/memorycache.ts

@@ -31,18 +31,16 @@ export class MemoryCache implements ICache {
     public setCollection(url: string, collection: ICollection): void  {
         // clone collection, because after maybe delete items for localfilter o pagination
         this.collections[url] = Base.newCollection();
-        angular.forEach(collection, (value: IResource, key: string) => {
-            this.collections[url][key] = value;
-            this.setResource(value);
+        angular.forEach(collection, (resource: IResource, resource_id: string) => {
+            this.collections[url][resource_id] = resource;
+            this.setResource(resource);
         });
         this.collections[url]['page'] = collection.page;
         this.collections_lastupdate[url] = Date.now();
     }
 
     public setResource(resource: IResource): void  {
-        /*
-            we cannot redefine object, because view don't update.
-        */
+        // we cannot redefine object, because view don't update.
         if (resource.id in this.resources) {
             ResourceFunctions.resourceToResource(resource, this.resources[resource.id]);
         } else {

src/library/services/resource-functions.ts

@@ -25,7 +25,7 @@ export class ResourceFunctions {
             if ('id' in source.relationships[type_alias].data) {
                 destination.addRelationship(
                         (<IResource>source.relationships[type_alias].data),
-                        (<IResource>source.relationships[type_alias].data).type
+                        type_alias
                     );
             } else {
                 destination.addRelationships(<ICollection>source.relationships[type_alias].data, type_alias);