Merge pull request #476 from apiaryio/kylef/cache-allOf

Cache body generation for allOf's with ref

Author: kylef

packages/fury-cli/package.json

@@ -25,7 +25,7 @@
     "@apielements/apiaryb-parser": "^0.1.0",
     "@apielements/apib-parser": "^0.19.0",
     "@apielements/apib-serializer": "^0.15.0",
-    "@apielements/openapi2-parser": "^0.31.0",
+    "@apielements/openapi2-parser": "^0.31.1",
     "@apielements/openapi3-parser": "^0.12.2",
     "cardinal": "^2.1.1",
     "commander": "^5.1.0",

packages/openapi2-parser/CHANGELOG.md

@@ -1,5 +1,13 @@
 # API Elements: OpenAPI 2 Parser Changelog
 
+## Master
+
+### Bug Fixes
+
+- This release includes performance improvements to parsing documents which
+  contain the same schema re-used via a reference (`$ref`) many times in
+  request parameters and response bodies under an `allOf` key.
+
 ## 0.31.0 (2020-05-12)
 
 ### Bug Fixes

packages/openapi2-parser/lib/parser.js

@@ -1611,7 +1611,16 @@ class Parser {
     const referencedPathValue = this.referencedPathValue();
     let cacheKey;
     if (referencedPathValue && referencedPathValue.$ref) {
+      // schema object with $ref
       cacheKey = `${referencedPathValue.$ref};${contentType}`;
+    } else if (
+      referencedPathValue
+      && referencedPathValue.allOf
+      && Object.keys(referencedPathValue).length === 1
+      && referencedPathValue.allOf.length === 1
+      && referencedPathValue.allOf[0].$ref) {
+      // schema object with single ref in allOf (`allOf: [{$ref: path}]`)
+      cacheKey = `${referencedPathValue.allOf[0].$ref};${contentType}`;
     }
 
     if (this.generateMessageBody || this.generateMessageBodySchema) {

packages/openapi2-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apielements/openapi2-parser",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "description": "Swagger 2.0 parser for Fury.js",
   "author": "Apiary.io <support@apiary.io>",
   "license": "MIT",