diff --git a/package.json b/package.json index 5f60810..d82b594 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "coffee-script": "~1.7.1", "yargs": "~1.3.3", - "protagonist-experimental": "0.18.3", + "protagonist-experimental": "0.18.4", "boutique": "git+ssh://git@github.com:apiaryio/boutique.git" }, "devDependencies": { diff --git a/test/fixtures/blueprint.parseresult+sourcemap.json b/test/fixtures/blueprint.parseresult+sourcemap.json index ecd28c6..c2aff13 100644 --- a/test/fixtures/blueprint.parseresult+sourcemap.json +++ b/test/fixtures/blueprint.parseresult+sourcemap.json @@ -1,28 +1,29 @@ { "ast": { - "_version": "3.0", + "_version": "2.1", "metadata": [], "name": "", "description": "", + "element": "category", "resourceGroups": [ { "name": "", "description": "", "resources": [ { + "element": "resource", "name": "", "description": "", "uriTemplate": "/message", "model": {}, "parameters": [], - "attributes": {}, "actions": [ { "name": "", "description": "", "method": "GET", "parameters": [], - "attributes": {}, + "content": [], "examples": [ { "name": "", @@ -33,23 +34,74 @@ "name": "200", "description": "", "headers": [], - "attributes": {}, "body": "Hello World!\n", "schema": "", - "assets": { - "body": { - "source": "Hello World!\n" - }, - "schema": { - "source": "" + "content": [ + { + "element": "asset", + "attributes": { + "role": "bodyExample" + }, + "content": "Hello World!\n" } - } + ] } ] } ] } - ] + ], + "content": [] + } + ] + } + ], + "content": [ + { + "element": "category", + "content": [ + { + "element": "resource", + "name": "", + "description": "", + "uriTemplate": "/message", + "model": {}, + "parameters": [], + "actions": [ + { + "name": "", + "description": "", + "method": "GET", + "parameters": [], + "content": [], + "examples": [ + { + "name": "", + "description": "", + "requests": [], + "responses": [ + { + "name": "200", + "description": "", + "headers": [], + "body": "Hello World!\n", + "schema": "", + "content": [ + { + "element": "asset", + "attributes": { + "role": "bodyExample" + }, + "content": "Hello World!\n" + } + ] + } + ] + } + ] + } + ], + "content": [] } ] } @@ -108,13 +160,94 @@ 17 ] ], - "schema": [] + "schema": [], + "content": [ + { + "content": [ + [ + 35, + 17 + ] + ] + } + ] } ] } - ] + ], + "content": [] + } + ], + "content": [] + } + ] + } + ], + "content": [ + { + "content": [ + { + "name": [], + "description": [], + "uriTemplate": [ + [ + 0, + 15 + ] + ], + "model": {}, + "parameters": [], + "actions": [ + { + "name": [], + "description": [], + "method": [ + [ + 0, + 15 + ] + ], + "parameters": [], + "examples": [ + { + "name": [], + "description": [], + "requests": [], + "responses": [ + { + "name": [ + [ + 17, + 14 + ] + ], + "description": [], + "headers": [], + "body": [ + [ + 35, + 17 + ] + ], + "schema": [], + "content": [ + { + "content": [ + [ + 35, + 17 + ] + ] + } + ] + } + ] + } + ], + "content": [] } - ] + ], + "content": [] } ] } diff --git a/test/fixtures/blueprint.parseresult.json b/test/fixtures/blueprint.parseresult.json index 71a2fac..70ec0a9 100644 --- a/test/fixtures/blueprint.parseresult.json +++ b/test/fixtures/blueprint.parseresult.json @@ -1,28 +1,29 @@ { "ast": { - "_version": "3.0", + "_version": "2.1", "metadata": [], "name": "", "description": "", + "element": "category", "resourceGroups": [ { "name": "", "description": "", "resources": [ { + "element": "resource", "name": "", "description": "", "uriTemplate": "/message", "model": {}, "parameters": [], - "attributes": {}, "actions": [ { "name": "", "description": "", "method": "GET", "parameters": [], - "attributes": {}, + "content": [], "examples": [ { "name": "", @@ -33,23 +34,74 @@ "name": "200", "description": "", "headers": [], - "attributes": {}, "body": "Hello World!\n", "schema": "", - "assets": { - "body": { - "source": "Hello World!\n" - }, - "schema": { - "source": "" + "content": [ + { + "element": "asset", + "attributes": { + "role": "bodyExample" + }, + "content": "Hello World!\n" } - } + ] } ] } ] } - ] + ], + "content": [] + } + ] + } + ], + "content": [ + { + "element": "category", + "content": [ + { + "element": "resource", + "name": "", + "description": "", + "uriTemplate": "/message", + "model": {}, + "parameters": [], + "actions": [ + { + "name": "", + "description": "", + "method": "GET", + "parameters": [], + "content": [], + "examples": [ + { + "name": "", + "description": "", + "requests": [], + "responses": [ + { + "name": "200", + "description": "", + "headers": [], + "body": "Hello World!\n", + "schema": "", + "content": [ + { + "element": "asset", + "attributes": { + "role": "bodyExample" + }, + "content": "Hello World!\n" + } + ] + } + ] + } + ] + } + ], + "content": [] } ] }