Skip to content

More link between object and array when object in $ref #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −5
Open

More link between object and array when object in $ref #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function processItems (schema, rootSchema, base, config) {
const defaultValue = item.default
const optional = !schema.minItems || i >= schema.minItems
if (item.type === 'array' && item.items) {
result.push(...writeProperty('array', prefixedProperty, item.description, optional, defaultValue, schema, config))
result.push(...writeProperty('array', prefixedProperty, item.description, optional, defaultValue, schema, config, item.items))
result.push(...processItems(item, rootSchema, prefixedProperty, config))
} else if (item.type === 'object' && item.properties) {
result.push(...writeProperty('object', prefixedProperty, item.description, optional, defaultValue, schema, config))
Expand Down Expand Up @@ -127,7 +127,7 @@ function processProperties (schema, rootSchema, base, config) {
result.push(...writeProperty('object', prefixedProperty, prop.description, optional, defaultValue, schema, config))
result.push(...processProperties(prop, rootSchema, prefixedProperty, config))
} else if (prop.type === 'array' && prop.items) {
result.push(...writeProperty('array', prefixedProperty, prop.description, optional, defaultValue, schema, config))
result.push(...writeProperty('array', prefixedProperty, prop.description, optional, defaultValue, schema, config, prop.items))
result.push(...processItems(prop, rootSchema, prefixedProperty, config))
} else {
const type = getSchemaType(prop, rootSchema) || getDefaultPropertyType(config, property)
Expand Down Expand Up @@ -186,7 +186,7 @@ function getSchemaType (schema, rootSchema) {
return schema.type
}

function getType (schema, config, type) {
function getType (schema, config, type, items = null) {
const typeCheck = type || schema.type
let typeMatch
if (schema.format) {
Expand All @@ -197,6 +197,21 @@ function getType (schema, config, type) {
typeMatch = config.types && config.types[typeCheck]
}

if(type === 'array') {
//console.log('items', items)
if(items && items['$ref']) {
let ref = items['$ref'].split('/').pop();
ref = ref.charAt(0).toUpperCase() + ref.slice(1);
return ` {${ref}[]}`
}
}

if(schema['$ref']) {
let ref = schema['$ref'].split('/').pop();
ref = ref.charAt(0).toUpperCase() + ref.slice(1);
return ` {${ref}}`
}

let typeStr
if (config.types === null || config.formats === null ||
(config.formats && (
Expand Down Expand Up @@ -238,8 +253,8 @@ function writeDescription (schema, config) {
return result
}

function writeProperty (type, field, description = '', optional, defaultValue, schema, config) {
const typeExpression = getType(schema, config, type)
function writeProperty (type, field, description = '', optional, defaultValue, schema, config, items = null) {
const typeExpression = getType(schema, config, type, items)

let fieldTemplate = ' '
if (optional) {
Expand Down