Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Adding support for parameters that may have child $ref pointers. #225

Merged
merged 1 commit into from
Jun 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions example/swagger-files/parameters-with-refs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"openapi": "3.0.0",
"servers": [
{
"url": "http://httpbin.org"
}
],
"info": {
"version": "1.0.0",
"title": "An example of how we render $ref usage on resource parameters"
},
"paths": {
"/anything": {
"get": {
"summary": "Query param with a child $ref",
"description": "",
"parameters": [
{
"in": "query",
"name": "array (with a $ref)",
"schema": {
"type": "array",
"items": {
"$ref": "#/components/schemas/string_enum"
}
}
}
],
"responses": {}
},
"post": {
"summary": "Query param pointing to a $ref",
"description": "",
"parameters": [
{
"$ref": "#/components/parameters/limitParam"
}
],
"responses": {}
}
}
},
"components": {
"parameters": {
"limitParam": {
"in": "query",
"name": "limit",
"required": false,
"schema": {
"type": "integer",
"minimum": 1,
"maximum": 50,
"default": 20
},
"description": "The numbers of items to return."
}
},
"schemas": {
"string_enum": {
"name": "string",
"enum": [
"available",
"pending",
"sold"
],
"type": "string"
}
}
}
}
36 changes: 34 additions & 2 deletions example/swagger-files/types.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,22 @@
"format": "string"
},
"string (format: url)": {
"type": "string",
"format": "url"
"type": "string",
"format": "url"
},
"string (format: unknown-format)": {
"type": "string",
"format": "unknown-format"
},
"string (enum)": {
"type": "string",
"enum": ["available", "pending", "sold"]
},
"string (enum, with default)": {
"type": "string",
"enum": ["available", "pending", "sold"],
"default": "available"
},
"integer": {
"type": "integer",
"format": "int64",
Expand Down Expand Up @@ -104,6 +113,18 @@
"boolean without description": {
"type": "boolean"
},
"array (of strings)": {
"type": "array",
"items": {
"type": "string"
}
},
"array (with a $ref)": {
"type": "array",
"items": {
"$ref": "#/components/schemas/string_enum"
}
},
"object": {
"type": "object",
"description": "This is an object with a description",
Expand Down Expand Up @@ -400,6 +421,17 @@
"x-samples-enabled": true,
"x-samples-languages": ["curl", "node", "ruby", "javascript", "python"],
"components": {
"schemas": {
"string_enum": {
"name": "string",
"enum": [
"available",
"pending",
"sold"
],
"type": "string"
}
},
"requestBodies": {
"Circular": {
"type": "object",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,25 @@ test('it should pass through type for non-body parameters', () => {
).toEqual('boolean');
});

test('it should pass through type for non-body parameters that are arrays', () => {
expect(
parametersToJsonSchema({
parameters: [
{
in: 'query',
name: 'options',
schema: {
type: 'array',
items: {
type: 'string',
},
},
},
],
})[0].schema.properties.options.type,
).toEqual('array');
});

test('it should pass through format', () => {
expect(
parametersToJsonSchema({
Expand Down Expand Up @@ -396,3 +415,37 @@ test('it should fetch $ref parameters', () => {
)[0].schema.properties.param,
).toEqual(oas.components.parameters.Param.schema);
});

test('it should fetch parameters that have a child $ref', () => {
const oas = {
components: {
schemas: {
string_enum: {
name: 'string',
enum: ['available', 'pending', 'sold'],
type: 'string',
},
},
},
};

expect(
parametersToJsonSchema(
{
parameters: [
{
in: 'query',
name: 'param',
schema: {
type: 'array',
items: {
$ref: '#/components/schemas/string_enum',
},
},
},
],
},
oas,
)[0].schema.properties.param.items,
).toEqual(oas.components.schemas.string_enum);
});
10 changes: 9 additions & 1 deletion packages/api-explorer/src/lib/parameters-to-json-schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ function getOtherParams(pathOperation, oas) {
if (current.schema) {
if (current.schema.type === 'array') {
schema.type = 'array';
schema.items = current.schema.items;

if (
Object.keys(current.schema.items).length === 1 &&
typeof current.schema.items.$ref !== 'undefined'
) {
schema.items = findSchemaDefinition(current.schema.items.$ref, oas);
} else {
schema.items = current.schema.items;
}
}

if (typeof current.schema.default !== 'undefined') schema.default = current.schema.default;
Expand Down