Skip to content

refactor: spread loop of object required properties #434

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

Merged
merged 1 commit into from
May 28, 2022
Merged

refactor: spread loop of object required properties #434

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
30 changes: 5 additions & 25 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ function buildCode (location, code, laterCode, name) {
}

const schema = location.schema
let required = schema.required
const required = schema.required || []

Object.keys(schema.properties || {}).forEach((key, i, a) => {
let propertyLocation = mergeLocation(location, { schema: schema.properties[key] })
Expand Down Expand Up @@ -777,14 +777,12 @@ function buildCode (location, code, laterCode, name) {

const defaultValue = schema.properties[key].default
if (defaultValue !== undefined) {
required = filterRequired(required, key)
code += `
} else {
${addComma}
json += ${asString} + ':' + ${JSON.stringify(JSON.stringify(defaultValue))}
`
} else if (required && required.indexOf(key) !== -1) {
required = filterRequired(required, key)
} else if (required.includes(key)) {
code += `
} else {
throw new Error('${sanitized} is required!')
Expand All @@ -802,20 +800,9 @@ function buildCode (location, code, laterCode, name) {
}
})

if (required && required.length > 0) {
code += 'var required = ['
// eslint-disable-next-line
for (var i = 0; i < required.length; i++) {
if (i > 0) {
code += ','
}
code += `${JSON.stringify(required[i])}`
}
code += `]
for (var i = 0; i < required.length; i++) {
if (obj[required[i]] === undefined) throw new Error('"' + required[i] + '" is required!')
}
`
for (const requiredProperty of required) {
if (schema.properties && schema.properties[requiredProperty] !== undefined) continue
code += `if (obj['${requiredProperty}'] === undefined) throw new Error('"${requiredProperty}" is required!')\n`
}

if (schema.allOf) {
Expand All @@ -827,13 +814,6 @@ function buildCode (location, code, laterCode, name) {
return { code, laterCode }
}

function filterRequired (required, key) {
if (!required) {
return required
}
return required.filter(k => k !== key)
}

function buildCodeWithAllOfs (location, code, laterCode, name) {
if (location.schema.allOf) {
location.schema.allOf.forEach((ss) => {
Expand Down