From 216df1372f2d5a643b3d49b72ea341e04fe1a5dd Mon Sep 17 00:00:00 2001
From: Martin Hansen <martin@martinhansen.no>
Date: Fri, 16 Mar 2018 08:54:46 +0100
Subject: [PATCH] WIP

---
 demo/server/index.js            |  2 +-
 demo/src/components/Browser.vue |  4 ++--
 demo/static/thing.json          |  4 ++--
 demo/static/things.json         | 27 ++++++++++++++++++++++++++-
 src/resolver.js                 |  2 +-
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/demo/server/index.js b/demo/server/index.js
index 20ebead..5ee4c45 100644
--- a/demo/server/index.js
+++ b/demo/server/index.js
@@ -46,7 +46,7 @@ app.get('/api/things/:id', function(req, res) {
   }
   res.set('link', formatter(links))
 
-  if (req.params.id === 12345) {
+  if (req.params.id === '12345') {
     res.send({id: 12345, data: {}})
   } else {
     res.send({id: 67890, data: {}})
diff --git a/demo/src/components/Browser.vue b/demo/src/components/Browser.vue
index f4e94ae..82ec704 100644
--- a/demo/src/components/Browser.vue
+++ b/demo/src/components/Browser.vue
@@ -14,12 +14,12 @@
   <nav>
     <h1>Links</h1>
     <ul class="links">
-      <li v-for="link in resource.links" :key="link.rel">
+      <li v-for="link in resource.links" :key="link.rel + link.uri">
         <router-link :to="{ name: 'Browser', query: {uri: link.uri} }">{{link.title || link.rel}}</router-link>
       </li>
     </ul>
     <ul v-if="fetchSchemas.isResolved" class="links">
-      <li v-for="link in schemaLinks" :key="link.rel">
+      <li v-for="link in schemaLinks" :key="link.rel + link.targetUri">
         <router-link :to="{ name: 'Browser', query: {uri: link.targetUri} }">{{link.title || link.rel}}</router-link>
       </li>
     </ul>
diff --git a/demo/static/thing.json b/demo/static/thing.json
index 48addaf..5727579 100644
--- a/demo/static/thing.json
+++ b/demo/static/thing.json
@@ -1,7 +1,7 @@
 {
   "$id": "https://schema.example.com/thing",
   "$schema": "http://json-schema.org/draft-07/hyper-schema#",
-  "base": "https://api.example.com/",
+  "base": "https://api.example.com/things/",
   "type": "object",
   "required": ["data"],
   "properties": {
@@ -12,7 +12,7 @@
   },
   "links": [{
     "rel": "self",
-    "href": "things/{id}",
+    "href": "{id}",
     "templateRequired": ["id"],
     "targetSchema": {
       "$ref": "#"
diff --git a/demo/static/things.json b/demo/static/things.json
index b5103b1..26a93fe 100644
--- a/demo/static/things.json
+++ b/demo/static/things.json
@@ -9,7 +9,32 @@
       "type": "array",
       "items": {
         "allOf": [{
-          "$ref": "thing.json#"
+          "$id": "https://schema.example.com/thing",
+          "$schema": "http://json-schema.org/draft-07/hyper-schema#",
+          "base": "https://api.example.com/things",
+          "type": "object",
+          "required": ["data"],
+          "properties": {
+            "id": {
+              "$ref": "#/definitions/id"
+            },
+            "data": true
+          },
+          "links": [{
+            "rel": "self",
+            "href": "{id}",
+            "templateRequired": ["id"],
+            "targetSchema": {
+              "$ref": "#"
+            }
+          }],
+          "definitions": {
+            "id": {
+              "type": "integer",
+              "minimum": 1,
+              "readOnly": true
+            }
+          }
         }],
         "links": [{
           "anchorPointer": "",
diff --git a/src/resolver.js b/src/resolver.js
index 150c5d1..47c5296 100644
--- a/src/resolver.js
+++ b/src/resolver.js
@@ -150,7 +150,7 @@ function getAllSchemaLinks(schema) {
   traverse(schema, function(subSchema, pointer, root, parentPointer, parentKeyWord) {
     links = links.concat((subSchema.links || []).map(l => createLink(l, pointer, parentPointer, parentKeyWord)))
   })
-
+  console.log(links)
   return links
 }