Skip to content
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
6 changes: 4 additions & 2 deletions src/core/plugins/json-schema-2020-12-samples/fn/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,8 @@ export const sampleFromSchemaGeneric = (
) {
res[displayName].push(additionalPropSample)
} else {
const keyName =
additionalProps?.["x-additionalPropertiesName"] || "additionalProp"
const toGenerateCount =
Number.isInteger(schema.minProperties) &&
schema.minProperties > 0 &&
Expand All @@ -494,10 +496,10 @@ export const sampleFromSchemaGeneric = (
}
if (respectXML) {
const temp = {}
temp["additionalProp" + i] = additionalPropSample["notagname"]
temp[keyName + i] = additionalPropSample["notagname"]
res[displayName].push(temp)
} else {
res["additionalProp" + i] = additionalPropSample
res[keyName + i] = additionalPropSample
}
propertyAddedCounter++
}
Expand Down
5 changes: 3 additions & 2 deletions src/core/plugins/json-schema-5-samples/fn/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ export const sampleFromSchemaGeneric = (schema, config={}, exampleOverride = und
{
res[displayName].push(additionalPropSample)
} else {
const keyName = additionalProps["x-additionalPropertiesName"] || "additionalProp"
const toGenerateCount = schema.minProperties !== null && schema.minProperties !== undefined && propertyAddedCounter < schema.minProperties
? schema.minProperties - propertyAddedCounter
: 3
Expand All @@ -527,10 +528,10 @@ export const sampleFromSchemaGeneric = (schema, config={}, exampleOverride = und
}
if(respectXML) {
const temp = {}
temp["additionalProp" + i] = additionalPropSample["notagname"]
temp[keyName + i] = additionalPropSample["notagname"]
res[displayName].push(temp)
} else {
res["additionalProp" + i] = additionalPropSample
res[keyName + i] = additionalPropSample
}
propertyAddedCounter++
}
Expand Down
46 changes: 46 additions & 0 deletions test/unit/core/plugins/json-schema-2020-12-samples/fn.js
Original file line number Diff line number Diff line change
Expand Up @@ -1263,6 +1263,30 @@ describe("sampleFromSchema", () => {
expect(sampleFromSchema(definition)).toEqual(expected)
})

it("should handle additionalProperties with x-additionalPropertiesName", () => {
const definition = {
type: "object",
additionalProperties: {
type: "string",
"x-additionalPropertiesName": "bar",
},
properties: {
foo: {
type: "string",
},
},
}

const expected = {
foo: "string",
bar1: "string",
bar2: "string",
bar3: "string",
}

expect(sampleFromSchema(definition)).toEqual(expected)
})

it("should handle additionalProperties=true", () => {
const definition = {
type: "object",
Expand Down Expand Up @@ -2765,6 +2789,28 @@ describe("createXMLExample", function () {
expect(sut(definition)).toEqual(expected)
})

it("returns object with additional props with x-additionalPropertiesName", function () {
const expected =
'<?xml version="1.0" encoding="UTF-8"?>\n<animals>\n\t<dog>string</dog>\n\t<animal1>string</animal1>\n\t<animal2>string</animal2>\n\t<animal3>string</animal3>\n</animals>'
const definition = {
type: "object",
properties: {
dog: {
type: "string",
},
},
additionalProperties: {
type: "string",
"x-additionalPropertiesName": "animal",
},
xml: {
name: "animals",
},
}

expect(sut(definition)).toEqual(expected)
})

it("returns object with additional props =true", function () {
const expected =
'<?xml version="1.0" encoding="UTF-8"?>\n<animals>\n\t<dog>string</dog>\n\t<additionalProp>Anything can be here</additionalProp>\n</animals>'
Expand Down
45 changes: 45 additions & 0 deletions test/unit/core/plugins/json-schema-5-samples/fn/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,30 @@ describe("sampleFromSchema", () => {
expect(sampleFromSchema(definition)).toEqual(expected)
})

it("should handle additionalProperties with x-additionalPropertiesName", () => {
const definition = {
type: "object",
additionalProperties: {
type: "string",
"x-additionalPropertiesName": "bar",
},
properties: {
foo: {
type: "string",
},
},
}

const expected = {
foo: "string",
bar1: "string",
bar2: "string",
bar3: "string",
}

expect(sampleFromSchema(definition)).toEqual(expected)
})

it("should handle additionalProperties=true", () => {
const definition = {
type: "object",
Expand Down Expand Up @@ -2223,6 +2247,27 @@ describe("createXMLExample", function () {
expect(sut(definition)).toEqual(expected)
})

it("returns object with additional props with x-additionalPropertiesName", function () {
let expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<animals>\n\t<dog>string</dog>\n\t<animal1>string</animal1>\n\t<animal2>string</animal2>\n\t<animal3>string</animal3>\n</animals>"
let definition = {
type: "object",
properties: {
dog: {
type: "string"
}
},
additionalProperties: {
type: "string",
"x-additionalPropertiesName": "animal"
},
xml: {
name: "animals"
}
}

expect(sut(definition)).toEqual(expected)
})

it("returns object with additional props =true", function () {
let expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<animals>\n\t<dog>string</dog>\n\t<additionalProp>Anything can be here</additionalProp>\n</animals>"
let definition = {
Expand Down