Skip to content

Commit

Permalink
feat: Upgrade minim, fury.js, and fury adapters
Browse files Browse the repository at this point in the history
Support `allOf` in object JSON Schemas in Swagger when producing object
data structure elements. Bug fixes in both Swagger and API Blueprint parsers.
  • Loading branch information
honzajavorek committed Aug 15, 2017
1 parent 50e47bd commit ea91dc6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"dependencies": {
"caseless": "^0.12.0",
"clone": "^2.1.1",
"fury": "3.0.0-beta.3",
"fury-adapter-apib-parser": "0.8.0",
"fury-adapter-swagger": "0.12.0",
"minim": "0.18.1",
"fury": "^3.0.0-beta.4",
"fury-adapter-apib-parser": "^0.9.0",
"fury-adapter-swagger": "^0.13.1",
"minim": "^0.19.1",
"sift": "^3.3.10",
"traverse": "^0.6.6",
"uri-template": "^1.0.0"
Expand Down
11 changes: 4 additions & 7 deletions src/compile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ findRelevantTransactions = (mediaType, refract, apiElements) ->
# This gets deleted once we're fully on minim
refractTransitions = children(refract, {element: 'transition'})

apiElements.findRecursive('transition').forEach((transitionElement, transitionNoElement) ->
transitionNo = transitionNoElement.toValue()

apiElements.findRecursive('transition').forEach((transitionElement, transitionNo) ->
# This gets deleted once we're fully on minim
refractTransition = refractTransitions[transitionNo]
refractHttpTransactions = children(refractTransition, {element: 'httpTransaction'})
Expand All @@ -85,8 +83,7 @@ findRelevantTransactions = (mediaType, refract, apiElements) ->
# each transaction example. We iterate over available transactions and
# skip those, which are not first within a particular example.
exampleNo = 0
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNoElement) ->
httpTransactionNo = httpTransactionNoElement.toValue()
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNo) ->
httpTransactionExampleNo = exampleNumbersPerTransaction[httpTransactionNo]

relevantTransaction =
Expand All @@ -101,9 +98,9 @@ findRelevantTransactions = (mediaType, refract, apiElements) ->
)
else
# All other formats then API Blueprint
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNoElement) ->
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNo) ->
relevantTransactions.push(
refract: refractHttpTransactions[httpTransactionNoElement.toValue()]
refract: refractHttpTransactions[httpTransactionNo]
apiElements: httpTransactionElement
)
)
Expand Down

0 comments on commit ea91dc6

Please sign in to comment.