better types on functions

Author: pablorsk

src/demo/books/books.component.ts

@@ -32,13 +32,29 @@ class BooksController {
             },
             success => {
                 console.log('success books controller', success, this.books);
+
+                // 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).attributes);
+                // this.books = this.BooksService.all();
+
+                // TEST 2
+                // let book1 = this.BooksService.get(1,
+                //     success => {
+                //         book1.attributes.title += ' :)'; // update view
+                //         console.log('book1', (<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>Books</h3>
+    <h3 ng-click="$ctrl.do()">Books</h3>
     <table class="table table-striped">
         <thead>
             <tr>

src/library/resource.ts

@@ -215,7 +215,7 @@ export class Resource implements IResource, IService {
         params.include ? path.setInclude(params.include) : null;
 
         // cache
-        let resource = (id in this.getService().memorycache.resources ? this.getService().memorycache.resources[id] : this.new());
+        let resource = Converter.newResource(this.type, id);
         resource.is_loading = true;
         // exit if ttl is not expired
         let temporal_ttl = params.ttl ? params.ttl : 0;

src/library/services/resource-converter.ts

@@ -38,10 +38,10 @@ export class Converter {
     static json_array2resources_array_by_type (
         json_array: Array<IDataResource>,
         instance_relationships: boolean
-    ): Object { // Array<Jsonapi.IResource> {
+    ): Array<Jsonapi.IResource> {
         let all_resources:any = { } ;
         Converter.json_array2resources_array(json_array, all_resources, false);
-        let resources = { };
+        let resources = [];
         angular.forEach(all_resources, (resource) => {
             if (!(resource.type in resources)) {
                 resources[resource.type] = { };
@@ -69,17 +69,37 @@ export class Converter {
         let resource_service = Core.Me.getResource(type);
         if (angular.isUndefined(resource_service)) {
             console.warn('`' + type + '`', 'service not found on getService()');
+            // resource_service = new Resource();
+            // resource_service.memorycache = new MemoryCache();
+            // resource_service.reset();
         }
         return resource_service;
     }
 
+    static newResource(type: string, id: string): Jsonapi.IResource {
+        if (Converter.getService(type).memorycache && id in Converter.getService(type).memorycache.resources) {
+            return Converter.getService(type).memorycache.resources[id];
+        } else {
+            return Converter.getService(type).new();
+        }
+    }
+
     /* return a resource type(resoruce_service) with data(data) */
     static procreate(resource_service: Jsonapi.IResource, data: IDataResource): Jsonapi.IResource {
         if (!('type' in data && 'id' in data)) {
             console.error('Jsonapi Resource is not correct', data);
         }
-        let resource = new (<any>resource_service.constructor)();
-        resource.new();
+
+        let resource: Jsonapi.IResource;
+        if (data.id in Converter.getService(data.type).memorycache.resources) {
+            console.log('HAY CACHE!', data.type);
+            resource = Converter.getService(data.type).memorycache.resources[data.id];
+        } else {
+            // resource = new (<any>resource_service.constructor)();
+            // resource.new();
+            resource = Converter.getService(data.type).clone();
+        }
+
         resource.id = data.id;
         resource.attributes = data.attributes ? data.attributes : {};
         resource.is_new = false;
@@ -92,68 +112,66 @@ export class Converter {
         schema: Jsonapi.ISchema
     ) {
         // instancio los include y los guardo en included arrary
-        let included_resources = {};
+        let included_resources = [];
         if ('included' in document_from) {
             included_resources = Converter.json_array2resources_array_by_type(document_from.included, false);
         }
 
         if (angular.isArray(document_from.data)) {
-            Converter._buildResources(document_from, <Jsonapi.ICollection>resource_dest, schema, included_resources);
+            Converter._buildCollection(document_from, <Jsonapi.ICollection>resource_dest, schema, included_resources);
         } else {
             Converter._buildResource(document_from.data, <Jsonapi.IResource>resource_dest, schema, included_resources);
         }
     }
 
-    static _buildResources(
-        document_from: Jsonapi.ICollection,
-        resource_dest: Jsonapi.ICollection,
+    static _buildCollection(
+        collection_data_from: IDataCollection,
+        collection_dest: Jsonapi.ICollection,
         schema: Jsonapi.ISchema,
-        included_resources: Object
+        included_resources: Jsonapi.IResource[]
     ) {
         // sometime get Cannot set property 'number' of undefined (page)
-        if (resource_dest.page && document_from['meta']) {
-            resource_dest.page.number = document_from['meta']['page'] ? document_from['meta']['page'] : 1;
-            resource_dest.page.
-                resources_per_page = document_from['meta']['resources_per_page'] ? document_from['meta']['resources_per_page'] : null;
-            resource_dest.page.total_resources = document_from['meta']['total_resources'] ? document_from['meta']['total_resources'] : null;
+        if (collection_dest.page && collection_data_from['meta']) {
+            collection_dest.page.number = collection_data_from['meta']['page'] || 1;
+            collection_dest.page.resources_per_page = collection_data_from['meta']['resources_per_page'] || null;
+            collection_dest.page.total_resources = collection_data_from['meta']['total_resources'] || null;
         }
 
         // convert and add new dataresoures to final collection
-        let dataresource: IDataResource;
         let new_ids = {};
-        for (dataresource of document_from.data) {
+        for (let dataresource of collection_data_from.data) {
             let service = Converter.getService(dataresource.type);
-            if (!(dataresource.id in resource_dest)) {
-                resource_dest[dataresource.id] = new (<any>service.constructor)();
-                resource_dest[dataresource.id].reset();
+            if (!(dataresource.id in collection_dest)) {
+                collection_dest[dataresource.id] = new (<any>service.constructor)();
+                collection_dest[dataresource.id].reset();
             }
-            Converter._buildResource(dataresource, resource_dest[dataresource.id], schema, included_resources);
+            Converter._buildResource(dataresource, collection_dest[dataresource.id], schema, included_resources);
             new_ids[dataresource.id] = dataresource.id;
         }
 
         /*
         remove old members of collection (bug, for example, when request something like orders/10/details and has new ids)
         */
-        angular.forEach(resource_dest, resource => {
+        angular.forEach(collection_dest, resource => {
             if (!(resource.id in new_ids)) {
-                delete resource_dest[resource.id];
+                delete collection_dest[resource.id];
             }
         });
     }
 
     static _buildResource(
-        document_from: IDataResource,
+        resource_data_from: IDataResource,
         resource_dest: Jsonapi.IResource,
         schema: Jsonapi.ISchema,
-        included_resources: Object
+        included_resources: Jsonapi.IResource[]
     ) {
-        resource_dest.attributes = document_from.attributes;
-        resource_dest.id = document_from.id;
+        resource_dest.attributes = resource_data_from.attributes;
+        resource_dest.id = resource_data_from.id;
         resource_dest.is_new = false;
 
         let relationships_converter = new ResourceRelationshipsConverter(
             Converter.getService,
-            document_from.relationships,
+            resource_data_from.relationships,
             resource_dest.relationships,
             included_resources,
             schema

src/library/services/resource-relationships-converter.ts

@@ -6,15 +6,15 @@ export class ResourceRelationshipsConverter {
     private getService: Function;
     private relationships_from: Array<any>;
     private relationships_dest: IRelationships;
-    private included_resources: Object;
+    private included_resources: IResource[];
     private schema: ISchema;
 
     /** @ngInject */
     public constructor(
         getService: Function,
         relationships_from: Array<any>,
         relationships_dest: IRelationships,
-        included_resources: Object,
+        included_resources: IResource[],
         schema: ISchema
     ) {
         this.getService = getService;
@@ -96,36 +96,41 @@ export class ResourceRelationshipsConverter {
     }
 
     private __buildRelationshipHasOne(
-        relation_from_value: IDataObject,
-        relation_key: number
-    ) {
+        relation_data_from: IDataObject,
+        relation_data_key: number
+    ): void {
         // new related resource <> cached related resource <> ? delete!
         if (
-            this.relationships_dest[relation_key].data == null ||
-            relation_from_value.data.id !== (<IResource>this.relationships_dest[relation_key].data).id
+            this.relationships_dest[relation_data_key].data == null ||
+            relation_data_from.data.id !== (<IResource>this.relationships_dest[relation_data_key].data).id
         ) {
-            this.relationships_dest[relation_key].data = {};
+            this.relationships_dest[relation_data_key].data = {};
         }
 
         // trae datos o cambió resource? actualizamos!
         if (
-            'attributes' in relation_from_value.data ||
-            (<IResource>this.relationships_dest[relation_key].data).id !== relation_from_value.data.id
+            'attributes' in relation_data_from.data ||
+            (<IResource>this.relationships_dest[relation_data_key].data).id !== relation_data_from.data.id
         ) {
-            let tmp = this.__buildRelationship(relation_from_value.data, this.included_resources);
-            this.relationships_dest[relation_key].data = tmp;
+            let resource_data = this.__buildRelationship(relation_data_from.data, this.included_resources);
+            this.relationships_dest[relation_data_key].data = resource_data;
         }
     }
 
-    private __buildRelationship(relation: IDataResource, included_array): IResource | IDataResource {
-        if (relation.type in included_array &&
-            relation.id in included_array[relation.type]
+    private __buildRelationship(resource_data_from: IDataResource, included_array: IResource[]): IResource | IDataResource {
+        if (resource_data_from.type in included_array &&
+            resource_data_from.id in included_array[resource_data_from.type]
         ) {
             // it's in included
-            return included_array[relation.type][relation.id];
+            return included_array[resource_data_from.type][resource_data_from.id];
         } else {
-            // resource not included, return directly the object
-            return relation;
+            // OPTIONAL: return cached IResource
+            let service = this.getService(resource_data_from.type);
+            if (service && resource_data_from.id in service.memorycache.resources) {
+                return service.memorycache.resources[resource_data_from.id];
+            } else {
+                return resource_data_from;
+            }
         }
     }
 }