small fixes

Author: pablorsk

src/library/interfaces/cache.d.ts

@@ -1,4 +1,4 @@
-import { ICollection } from '../interfaces';
+import { ICollection, IResource } from '../interfaces';
 
 export interface ICache {
     // collections: Object;
@@ -8,7 +8,10 @@ export interface ICache {
     isCollectionLive(url: string, ttl: number): boolean;
     getCollection(url: string): ICollection;
     setCollection(url: string, collection: ICollection): void;
-    clearAllCollections(): void;
+    clearAllCollections(): boolean;
+    isResourceLive(id: string, ttl: number): boolean;
+    setResource(resource: IResource): void;
+    getCollection(url: string): ICollection;
 
     removeResource(id: string): void;
 }

src/library/interfaces/service.d.ts

@@ -3,6 +3,8 @@ import { ISchema, IResource, ICollection, IParamsCollection, ICache, IParamsReso
 export interface IService {
     smartfilter?: string;
     schema?: ISchema;
+    getPrePath(): string;
+    getPath(): string;
     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;

src/library/resource.ts

@@ -8,38 +8,21 @@ import { PathBuilder } from './services/path-builder';
 // import { UrlParamsBuilder } from './services/url-params-builder';
 import { Converter } from './services/resource-converter';
 
-import { IAttributes, IResource, ICollection, IExecParams, IParamsResource } from './interfaces';
+import { IService, IAttributes, IResource, ICollection, IExecParams, IParamsResource } from './interfaces';
 import { IRelationships, IRelationship } from './interfaces';
 
 export class Resource extends ParentResourceService implements IResource {
     public is_new = true;
     public is_loading = false;
     public is_saving = false;
-
     public id: string = '';
     public type: string = '';
     public attributes: IAttributes = {};
     public relationships: IRelationships = {};
 
-    public reset(): void {
-        this.id = '';
-        this.attributes = {};
-        angular.forEach(this.getService().schema.attributes, (value, key) => {
-            this.attributes[key] = ('default' in value) ? value.default : undefined;
-        });
-        this.relationships = {};
-        angular.forEach(this.getService().schema.relationships, (value, key) => {
-            this.relationships[key] = <IRelationship>{ data: {} };
-            if (this.getService().schema.relationships[key].hasMany) {
-                this.relationships[key].data = Base.newCollection();
-            }
-        });
-        this.is_new = true;
-    }
-
     public toObject(params?: IParamsResource): IDataObject {
         params = angular.extend({}, Base.Params, params);
-        this.getService().schema = angular.extend({}, Base.Schema, this.getService().schema);
+        // this.getService().schema = angular.extend({}, Base.Schema, this.getService().schema);
 
         let relationships = { };
         let included = [ ];
@@ -103,13 +86,9 @@ export class Resource extends ParentResourceService 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({ 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(exec_params: IExecParams): any {
         super.__exec(exec_params);
 
@@ -247,7 +226,7 @@ export class Resource extends ParentResourceService implements IResource {
     /**
     @return This resource like a service
     **/
-    public getService() {
+    public getService(): IService {
         return Converter.getService(this.type);
     }
 }

src/library/service.ts

@@ -14,9 +14,6 @@ import { MemoryCache } from './services/memorycache';
 import { IService, ISchema, IResource, ICollection, IExecParams, ICache, IParamsCollection, IParamsResource } from './interfaces';
 
 export class Service extends ParentResourceService implements IService {
-    public is_new = true;
-    public is_loading = false;
-    public is_saving = false;
     public schema: ISchema;
     public memorycache: ICache;
     public type: string;
@@ -34,6 +31,7 @@ export class Service extends ParentResourceService implements IService {
         }
         // only when service is registered, not cloned object
         this.memorycache = new MemoryCache();
+        this.schema = angular.extend({}, Base.Schema, this.schema);
         return Core.Me._register(this);
     }
 
@@ -53,27 +51,20 @@ export class Service extends ParentResourceService 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: 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');
         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({ 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(exec_params: IExecParams): any {
         super.__exec(exec_params);
 
-        this.schema = angular.extend({}, Base.Schema, this.schema);
-
         switch (exec_params.exec_type) {
             case 'get':
             return this._get(exec_params.id, exec_params.params, exec_params.fc_success, exec_params.fc_error);
@@ -265,8 +256,6 @@ export class Service extends ParentResourceService implements IService {
         .delete(path.get())
         .then(
             success => {
-                // we don't use more temporary_collection
-                // delete this.tempororay_collection[id];
                 this.getService().memorycache.removeResource(id);
                 this.runFc(fc_success, success);
             },
@@ -279,11 +268,11 @@ export class Service extends ParentResourceService implements IService {
     /**
     @return This resource like a service
     **/
-    public getService() {
+    public getService(): IService {
         return Converter.getService(this.type);
     }
 
-    public clearMemoryCache() {
+    public clearMemoryCache(): boolean {
         return this.getService().memorycache.clearAllCollections();
     }
 }

src/library/services/memorycache.ts

@@ -8,19 +8,19 @@ export class MemoryCache implements ICache {
     private collections_lastupdate = {};
     public resources = {};
 
-    public isCollectionExist(url: string): boolean  {
+    public isCollectionExist(url: string): boolean {
         return (url in this.collections && this.collections[url].$source !== 'new' ? true : false);
     }
 
-    public isCollectionLive(url: string, ttl: number): boolean  {
+    public isCollectionLive(url: string, ttl: number): boolean {
         return (Date.now() <= (this.collections_lastupdate[url] + ttl * 1000));
     }
 
-    public isResourceLive(id: string, ttl: number): boolean  {
+    public isResourceLive(id: string, ttl: number): boolean {
         return this.resources[id] && (Date.now() <= (this.resources[id].lastupdate + ttl * 1000));
     }
 
-    public getCollection(url: string): ICollection  {
+    public getCollection(url: string): ICollection {
         if (!(url in this.collections)) {
             this.collections[url] = Base.newCollection();
             this.collections[url].$source = 'new';

src/library/services/path-builder.ts

@@ -1,13 +1,13 @@
 export class PathBuilder {
-    public paths: Array<String> = [];
-    public includes: Array<String> = [];
-    private get_params: Array<String> = [];
+    public paths: Array<string> = [];
+    public includes: Array<string> = [];
+    private get_params: Array<string> = [];
 
-    public prependPath(value: String) {
+    public prependPath(value: string) {
         this.paths.unshift(value);
     }
 
-    public appendPath(value: String) {
+    public appendPath(value: string) {
         if (value !== '') {
             this.paths.push(value);
         }
@@ -17,15 +17,15 @@ export class PathBuilder {
         this.get_params.push(param);
     }
 
-    public setInclude(strings_array: Array<String>) {
+    public setInclude(strings_array: Array<string>) {
         this.includes = strings_array;
     }
 
-    public getForCache(): String {
+    public getForCache(): string {
         return this.paths.join('/') + this.get_params.join('/');
     }
 
-    public get(): String {
+    public get(): string {
         var params = [];
         angular.copy(this.get_params, params);