Skip to content

Add support for regex wildcard group #63

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
Jan 16, 2025
Merged

Add support for regex wildcard group #63

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions lib/generate-doc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ module.exports = function generateDocument (baseDocument, router, basePath) {
if (routeLayer && routeLayer.keys && routeLayer.keys.length) {
const keys = {}

const params = routeLayer.keys.map((k) => {
const params = routeLayer.keys.map((k, i) => {
const prev = i > 0 && routeLayer.keys[i - 1]
// do not count parameters without a name if they are next to a named parameter
if (typeof k.name === 'number' && prev && prev.offset + prev.name.length + 1 >= k.offset) {
return null
}
let param
if (schema.parameters) {
param = schema.parameters.find((p) => p.name === k.name && p.in === 'path')
Expand All @@ -45,6 +50,7 @@ module.exports = function generateDocument (baseDocument, router, basePath) {
schema: k.schema || { type: 'string' }
}, param || {})
})
.filter((e) => e)

if (schema.parameters) {
schema.parameters.forEach((p) => {
Expand All @@ -55,7 +61,7 @@ module.exports = function generateDocument (baseDocument, router, basePath) {
}

operation.parameters = params
path = pathToRegexp.compile(path)(keys, { encode: (value) => value })
path = pathToRegexp.compile(path.replace(/\*|\(\*\)/g, '(.*)'))(keys, { encode: (value) => value })
}

doc.paths[path] = doc.paths[path] || {}
Expand Down
Loading