Merge ec82cf5 into c5b637e

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8

.gitignore

@@ -2,3 +2,6 @@ node_modules
 dist
 coverage
 html-report
+
+*.iml
+.idea/

package.json

@@ -18,6 +18,7 @@
     "url": "http://github.com/deblockt/hal-rest-client/issues"
   },
   "dependencies": {
+    "@types/lodash": "^4.14.92",
     "axios": "^0.15.3",
     "reflect-metadata": "^0.1.9",
     "uri-templates": "^0.1.9"

src/hal-json-parser.ts

@@ -38,8 +38,8 @@ export class JSONParser {
         for (const linkKey in json._links) {
           if ("self" !== linkKey) {
             const href = this.extractURI(links[linkKey]);
-            const type =  Reflect.getMetadata("halClient:specificType", c.prototype, linkKey) || HalResource;
             const propKey = halToTs[linkKey] || linkKey;
+            const type =  Reflect.getMetadata("halClient:specificType", c.prototype, propKey) || HalResource;
             const linkResource = createResource(this.halRestClient, type, href);
             for (const propInLinkKey of Object.keys(links[linkKey])) {
               linkResource.prop(propInLinkKey, links[linkKey][propInLinkKey]);

src/hal-resource-interface.ts

@@ -18,6 +18,18 @@ export interface IHalResource {
    */
   fetch(forceOrParams: boolean|object): Promise<this>;
 
+  /**
+   * fetch an array of the current resource
+   *
+   * Unlike #fetch(boolean|object) this method needs #uri to be set. So it's not possible to fetch a resource in
+   * advance.
+   *
+   * @param {object} params: If the uri is a template link, you can set the parameters.
+   * @param {IHalResourceConstructor<this>} resource: An optional resource to create the array items of.
+   * @returns {Promise<this[]>} Will return an array of resources.
+   */
+  fetchArray(params?: object, resource?: IHalResourceConstructor<this>): Promise<this[]>;
+
   /**
    * get or set a prop or a link.
    * if name is a link. link function is used

src/hal-resource.ts

@@ -2,6 +2,7 @@ import { DefaultSerializer, IJSONSerializer } from "./hal-json-serializer";
 import { IHalResource, IHalResourceConstructor } from "./hal-resource-interface";
 import { HalRestClient } from "./hal-rest-client";
 import { URI } from "./uri";
+import * as _ from 'lodash';
 
 export class HalResource implements IHalResource {
     public readonly links = {};
@@ -39,6 +40,13 @@ export class HalResource implements IHalResource {
       }
     }
 
+    public fetchArray(params?: object, resource?: IHalResourceConstructor<this>): Promise<this[]> {
+      return this.restClient.fetchArray(
+        this.uri.fill(params as object),
+        resource ? resource.prototype.constructor : this.constructor as IHalResourceConstructor<this>,
+      ) as Promise<this[]>;
+    }
+
     /**
      * to clear value use null not undefined
      */
@@ -133,11 +141,8 @@ export class HalResource implements IHalResource {
 
       for (const prop of props) {
         const jsonKey = this.tsProptoHalProd(prop) ;
-        if (this.props[prop] !== undefined && this.props[prop] !== null && this.props[prop].onInitEnded !== undefined) {
-          json[jsonKey] = serializer.parseResource(this.props[prop]);
-        } else {
-          json[jsonKey] = serializer.parseProp(this.props[prop]);
-        }
+
+        json[jsonKey] = this.serializeProperty(prop, serializer);
       }
 
       for (const link of links) {
@@ -147,4 +152,23 @@ export class HalResource implements IHalResource {
 
       return json;
     }
+
+    private serializeProperty(prop, serializer: IJSONSerializer, arrayItem?: any) {
+      let result = null;
+
+      const property = arrayItem || this.props[prop];
+
+      if (!_.isEmpty(property) && _.isFunction(property.onInitEnded)) {
+        result = serializer.parseResource(property)
+      } else if (_.isArray(property)) {
+        result = _(property)
+          .map(item => this.serializeProperty(prop, serializer, item))
+          .toArray()
+          .value()
+      } else {
+        result = serializer.parseProp(property)
+      }
+
+      return result
+    }
 }

src/test/model/array-resource.ts

@@ -0,0 +1,17 @@
+import {HalResource} from '../../hal-resource';
+import {HalProperty} from '../../hal-decorator';
+
+export class ArrayResourceItem extends HalResource {
+
+  @HalProperty()
+  public id: Number;
+
+}
+
+export class ArrayResource extends HalResource {
+
+  @HalProperty('items', ArrayResourceItem)
+  public items: ArrayResourceItem[];
+
+}
+

src/test/test-resource-class.ts

@@ -6,6 +6,7 @@ import { test } from "tape-async";
 import { ContactInfos } from "./model/contact-infos";
 import { Cyclical, CyclicalList } from "./model/cyclical";
 import { Person } from "./model/person";
+import {ArrayResource, ArrayResourceItem} from './model/array-resource';
 
 // mock list response
 function initTests() {
@@ -122,6 +123,20 @@ function initTests() {
   testNock
     .get("/cyclicals/refresh")
     .reply(200, cyclicals);
+
+  const arrayResource = {
+    _links: {
+      self: 'http://test.fr/array',
+    },
+    items: [
+      {id: 1, _links: {self: {href: 'http://test.fr/array/1'}}},
+      {id: 2, _links: {self: {href: 'http://test.fr/array/2'}}},
+    ],
+  };
+
+  testNock
+    .get("/arrayResource")
+    .reply(200, arrayResource);
 }
 
 test("can get single string prop", async (t) => {
@@ -267,3 +282,16 @@ test("cyclical property have good class type", async (t) => {
   t.ok(Array.isArray(cyclicals.cyclicals), "cyclicals is an array");
   t.equals(cyclicals.cyclicals[0].property, "name");
 });
+
+test('fetching resource with array contains valid typed resources', async (t) => {
+  initTests();
+
+  const client = createClient('http://test.fr');
+  const resource: ArrayResource = await client.fetch('/arrayResource', ArrayResource);
+
+  t.ok(resource instanceof ArrayResource, 'Result has the correct type');
+  t.ok(Array.isArray(resource.items), 'Result content is array');
+  t.ok(resource.items.length === 2, 'Correct count of array items');
+  t.ok(resource.items[0] instanceof ArrayResourceItem, 'Array item has correct type');
+  t.ok(resource.items[0].id === 1, 'Correct item returned.');
+});