included resources are saved on store now

Author: pablorsk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-angular-jsonapi",
-  "version": "0.6.22",
+  "version": "0.6.25",
   "description": "JSONAPI library developed for AngularJS in Typescript",
   "repository": {
     "type": "git",
@@ -10,12 +10,12 @@
     "url": "https://github.com/reyesoft/ts-angular-jsonapi/issues"
   },
   "dependencies": {
-    "angular": "<1.6.0",
+    "angular": ">=1.4.0",
     "angular-localforage": "^1.3.0",
     "localforage-getitems": "^1.3.0"
   },
   "devDependencies": {
-    "@types/angular": "^1.6.6",
+    "@types/angular": "^1.6.4",
     "@types/angular-mocks": "^1.5.9",
     "@types/angular-ui-router": "^1.1.36",
     "@types/es6-shim": "^0.31.32",

src/library/core.ts

@@ -12,7 +12,12 @@ export class Core implements ICore {
     public loadingsOffline = () => {};
 
     public static me: ICore;
-    public static injectedServices: any;
+    public static injectedServices: {
+        $q: ng.IQService,
+        JsonapiStoreService: any,
+        JsonapiHttp: any,
+        rsJsonapiConfig: any
+    };
 
     /** @ngInject */
     public constructor(

src/library/interfaces/cache.d.ts

@@ -1,7 +1,6 @@
 import { ICollection, IResource } from '../interfaces';
 
 export interface ICache {
-    setCollection(url: string, collection: ICollection): void;
     setResource(resource: IResource): void;
     deprecateCollections(path_start_with: string): boolean;
 }

src/library/interfaces/cachememory.d.ts

@@ -10,6 +10,7 @@ export interface ICacheMemory extends ICache {
 
     isResourceLive(id: string, ttl: number): boolean;
     getOrCreateResource(type: string, id: string): IResource;
+    setCollection(url: string, collection: ICollection): void;
 
     removeResource(id: string): void;
 }

src/library/interfaces/cachestore.d.ts

@@ -3,5 +3,6 @@ import { ICache } from '../interfaces/cache.d';
 
 export interface ICacheStore extends ICache {
     getResource(resource: IResource): ng.IPromise<object>;
-    getCollectionFromStorePromise(url:string, collection: ICollection): ng.IPromise<ICollection>;
+    getCollectionFromStorePromise(url:string, includes: Array<string>, collection: ICollection): ng.IPromise<ICollection>;
+    setCollection(url: string, collection: ICollection, include: Array<string>): void;
 }

src/library/interfaces/core.d.ts

@@ -17,5 +17,12 @@ export interface ICore {
 
     // static
     me?: IService;
-    injectedServices?: any;
+
+    // defined on core code too
+    injectedServices?: {
+        $q: ng.IQService,
+        JsonapiStoreService: any,
+        JsonapiHttp: any,
+        rsJsonapiConfig: any
+    };
 }

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

@@ -1,6 +1,9 @@
 import { IDataResource } from './data-resource';
 import { IDocument } from '../interfaces/document';
+import { IPage } from './page';
 
 interface IDataCollection extends IDocument {
     data: IDataResource[];
+    page?: IPage;
+    _lastupdate_time?: number;   // used when come from Store
 }

src/library/service.ts

@@ -102,22 +102,20 @@ export class Service extends ParentResourceService implements IService {
             });
             resource.is_loading = false;
             return resource;
-        }
-
-        // CACHESTORE
-        this.getService().cachestore.getResource(resource)
-        .then(
-            success => {
+        } else {
+            // CACHESTORE
+            this.getService().cachestore.getResource(resource)
+            .then(success => {
                 if (Base.isObjectLive(temporal_ttl, resource.lastupdate)) {
                     this.runFc(fc_success, { data: success});
                 } else {
                     this.getGetFromServer(path, fc_success, fc_error, resource);
                 }
-            },
-            error => {
+            })
+            .catch(error => {
                 this.getGetFromServer(path, fc_success, fc_error, resource);
-            }
-        );
+            });
+        }
 
         return resource;
     }
@@ -205,7 +203,8 @@ export class Service extends ParentResourceService implements IService {
         } else {
             // STORE
             tempororay_collection.$is_loading = true;
-            this.getService().cachestore.getCollectionFromStorePromise(path.getForCache(), tempororay_collection)
+
+            this.getService().cachestore.getCollectionFromStorePromise(path.getForCache(), path.includes, tempororay_collection)
             .then(
                 success => {
                     tempororay_collection.$source = 'store';
@@ -253,7 +252,7 @@ export class Service extends ParentResourceService implements IService {
                 Converter.build(success.data, tempororay_collection);
 
                 this.getService().cachememory.setCollection(path.getForCache(), tempororay_collection);
-                this.getService().cachestore.setCollection(path.getForCache(), tempororay_collection);
+                this.getService().cachestore.setCollection(path.getForCache(), tempororay_collection, params.include);
 
                 // localfilter getted data
                 let localfilter = new LocalFilter(params.localfilter);
@@ -307,8 +306,10 @@ export class Service extends ParentResourceService implements IService {
     }
 
     public clearCacheMemory(): boolean {
-        return this.getService().cachememory.deprecateCollections(this.type) &&
-            this.getService().cachestore.deprecateCollections(this.type);
+        let path = new PathBuilder();
+        path.applyParams(this);
+        return this.getService().cachememory.deprecateCollections(path.getForCache()) &&
+            this.getService().cachestore.deprecateCollections(path.getForCache());
     }
 
     public parseFromServer(attributes: IAttributes): void {