Skip to content

Commit

Permalink
refactor: rename options
Browse files Browse the repository at this point in the history
BREAKING CHANGE: handler~> handlers, placeholder~>placeholders,mime~> mimes
  • Loading branch information
pi0 committed Nov 12, 2018
1 parent 787b378 commit 9e3de71
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ map | `map` | `application/json

## Options

### `handler`
### `handlers`

A mapping from file extensions to the handler. Extensions should start with *dot* like `.js`.

Expand All @@ -94,13 +94,13 @@ Skip middleware when no handler is defined for the current request.

Please note that if this option is set to `true`, then `default` handler will be disabled!

### `placeholder`
### `placeholders`

- Type: `Object`

A mapping from handler to placeholder. Values can be `String` or `Buffer`. You can disable any of the placeholders by setting the value to `false`.

### `mime`
### `mimes`

- Type: `Object`

Expand Down
6 changes: 3 additions & 3 deletions src/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {

skipUnknown: false,

handler: {
handlers: {
// css
'.css': 'css',
// html
Expand All @@ -27,7 +27,7 @@ module.exports = {
'.map': 'map'
},

placeholder: {
placeholders: {
css: '/* style not found */',
default: undefined,
html: '<!-- page not found -->',
Expand All @@ -37,7 +37,7 @@ module.exports = {
map: '{"version": "3", "sources": [], "mappings": "" }'
},

mime: {
mimes: {
css: 'text/css',
default: undefined,
html: 'text/html',
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function createServePlaceholder (_options) {
const ext = path.extname(url)

// Try to find a handler based on ext
let handler = options.handler[ext]
let handler = options.handlers[ext]

// Skip middleware is handler is explictly set to false
if (handler === false) {
Expand All @@ -39,13 +39,13 @@ module.exports = function createServePlaceholder (_options) {
}

// Try to set appreciate mime type based on handler
const mime = options.mime[handler]
const mime = options.mimes[handler]
if (mime) {
res.setHeader('Content-Type', mime)
}

// Try to find placeholder based on handler
const placeholder = options.placeholder[handler]
const placeholder = options.placeholders[handler]

// Send placeholder and end response
res.end(placeholder)
Expand Down
8 changes: 4 additions & 4 deletions test/basic.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('basic', () => {
expect(response.data).toBe('Works!')
})

const handlersToTest = Object.entries(defaults.handler).map(([ext, handler]) => ({ ext, handler }))
const handlersToTest = Object.entries(defaults.handlers).map(([ext, handler]) => ({ ext, handler }))
handlersToTest.push({ ext: '.unknown', handler: 'default ' })

// Test all handlers
Expand All @@ -33,12 +33,12 @@ describe('basic', () => {
transformResponse: req => req
}).catch(e => e.response)

const placeholder = defaults.placeholder[handler]
const placeholder = defaults.placeholders[handler]

if (placeholder instanceof Buffer) {
expect(response.data.data).toBe(defaults.placeholder[handler].data)
expect(response.data.data).toBe(defaults.placeholders[handler].data)
} else {
expect(response.data).toBe(defaults.placeholder[handler] || '')
expect(response.data).toBe(defaults.placeholders[handler] || '')
}
})
})
Expand Down
2 changes: 1 addition & 1 deletion test/with-options.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('skipUnknown', () => {

app.use(placeholder({
skipUnknown: true,
handler: {
handlers: {
'.skipme': false
}
}))
Expand Down

0 comments on commit 9e3de71

Please sign in to comment.