Compare commits

...
4 Commits
Author SHA1 Message Date
Kyle Shockey 08b2048917 fix(sample-gen): respect null values in examples 2018-06-27 19:32:35 -07:00
Kyle Shockey 889f4d1262 Merge branch 'master' of github.com:swagger-api/swagger-ui 2018-06-27 19:28:37 -07:00
kyle a86fcf312a improvement: re-enable and improve Models jump-to-path (#4674) 2018-06-22 21:28:19 -07:00
kyle 815dbe0b5d housekeeping: remove extraneous getbase aliases (#4671)
* remove extraneous Babel alias

* remove extraneous Webpack alias
2018-06-21 23:01:18 -07:00
5 changed files with 43 additions and 8 deletions
-4
View File
@@ -41,10 +41,6 @@
{ {
"expose": "less", "expose": "less",
"src": "src/less" "src": "src/less"
},
{
"expose": "base",
"src": "npm:getbase/src/less/base"
} }
] ]
] ]
+1 -3
View File
@@ -141,9 +141,7 @@ module.exports = function(rules, options) {
"node_modules" "node_modules"
], ],
extensions: [".web.js", ".js", ".jsx", ".json", ".less"], extensions: [".web.js", ".js", ".jsx", ".json", ".less"],
alias: { alias: {}
base: "getbase/src/less/base",
}
}, },
devtool: specialOptions.sourcemaps ? "nosource-source-map" : false, devtool: specialOptions.sourcemaps ? "nosource-source-map" : false,
+1
View File
@@ -29,6 +29,7 @@ export const sampleFromSchema = (schema, config={}) => {
let { type, example, properties, additionalProperties, items } = objectify(schema) let { type, example, properties, additionalProperties, items } = objectify(schema)
let { includeReadOnly, includeWriteOnly } = config let { includeReadOnly, includeWriteOnly } = config
if(example !== undefined) { if(example !== undefined) {
return deeplyStripKey(example, "$$ref", (val) => { return deeplyStripKey(example, "$$ref", (val) => {
// do a couple of quick sanity tests to ensure the value // do a couple of quick sanity tests to ensure the value
+1 -1
View File
@@ -742,7 +742,7 @@ export const getCommonExtensions = (defObj) => defObj.filter((v, k) => /^pattern
// `predicate` can be used to discriminate the stripping further, // `predicate` can be used to discriminate the stripping further,
// by preserving the key's place in the object based on its value. // by preserving the key's place in the object based on its value.
export function deeplyStripKey(input, keyToStrip, predicate = () => true) { export function deeplyStripKey(input, keyToStrip, predicate = () => true) {
if(typeof input !== "object" || Array.isArray(input) || !keyToStrip) { if(typeof input !== "object" || Array.isArray(input) || input === null || !keyToStrip) {
return input return input
} }
+40
View File
@@ -379,6 +379,46 @@ describe("sampleFromSchema", function() {
expect(sampleFromSchema(definition)).toEqual(expected) expect(sampleFromSchema(definition)).toEqual(expected)
}) })
it("returns null for a null example", function() {
var definition = {
"type": "object",
"properties": {
"foo": {
"type": "string",
"nullable": true,
"example": null
}
}
}
var expected = {
foo: null
}
expect(sampleFromSchema(definition)).toEqual(expected)
})
it("returns null for a null object-level example", function() {
var definition = {
"type": "object",
"properties": {
"foo": {
"type": "string",
"nullable": true
}
},
"example": {
"foo": null
}
}
var expected = {
foo: null
}
expect(sampleFromSchema(definition)).toEqual(expected)
})
}) })
}) })