diff --git a/src/framework/openapi.schema.validator.ts b/src/framework/openapi.schema.validator.ts index cecd0cbf..7e16bcfd 100644 --- a/src/framework/openapi.schema.validator.ts +++ b/src/framework/openapi.schema.validator.ts @@ -1,8 +1,8 @@ import * as Ajv from 'ajv'; import * as merge from 'lodash.merge' -const draftSchema = require('ajv/lib/refs/json-schema-draft-04.json'); +import * as draftSchema from 'ajv/lib/refs/json-schema-draft-04.json'; // https://github.com/OAI/OpenAPI-Specification/blob/master/schemas/v3.0/schema.json -const openapi3Schema = require('./openapi.v3.schema.json'); +import * as openapi3Schema from './openapi.v3.schema.json'; export default class OpenAPISchemaValidator{ private validator: Ajv.ValidateFunction; diff --git a/src/middlewares/openapi.request.validator.ts b/src/middlewares/openapi.request.validator.ts index 23418ec7..80653feb 100644 --- a/src/middlewares/openapi.request.validator.ts +++ b/src/middlewares/openapi.request.validator.ts @@ -1,9 +1,7 @@ import * as Ajv from 'ajv'; - import { validationError } from '../errors'; import ono from 'ono'; - -const draftSchema = require('ajv/lib/refs/json-schema-draft-04.json'); +import * as draftSchema from 'ajv/lib/refs/json-schema-draft-04.json'; const TYPE_JSON = 'application/json'; @@ -205,7 +203,9 @@ export class RequestValidator { */ parameters.parseArray.forEach(item => { if (req[item.reqField] && req[item.reqField][item.name]) { - req[item.reqField][item.name] = req[item.reqField][item.name].split(item.delimiter); + req[item.reqField][item.name] = req[item.reqField][item.name].split( + item.delimiter, + ); } }); @@ -299,7 +299,11 @@ export class RequestValidator { throw ono(err, message); } - if (parameter.schema && parameter.schema.type === 'array' && !parameter.explode) { + if ( + parameter.schema && + parameter.schema.type === 'array' && + !parameter.explode + ) { const delimiter = arrayDelimiter[parameter.style]; if (!delimiter) { const message = `Parameter 'style' has incorrect value '${parameter.style}' for [${parameter.name}]`; diff --git a/test/headers.spec.ts b/test/headers.spec.ts index 1b34b4aa..720f8672 100644 --- a/test/headers.spec.ts +++ b/test/headers.spec.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import * as request from 'supertest'; import { createApp } from './app'; +import * as packageJson from '../package.json'; const app = createApp({ apiSpecPath: './openapi.yaml' }, 3004); -const packageJson = require('../package.json'); const basePath = (app).basePath; describe(packageJson.name, () => { diff --git a/test/middleware.spec.ts b/test/middleware.spec.ts index e7e6508d..97e8ba73 100644 --- a/test/middleware.spec.ts +++ b/test/middleware.spec.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; import { OpenApiValidator } from '../src'; - -const packageJson = require('../package.json'); +import * as packageJson from '../package.json'; describe(packageJson.name, () => { it('should succeed when spec exists and is valid', async () => { diff --git a/test/multipart.spec.ts b/test/multipart.spec.ts index b3eb6e85..ba39de8a 100644 --- a/test/multipart.spec.ts +++ b/test/multipart.spec.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import * as request from 'supertest'; import { createApp } from './app'; +import * as packageJson from '../package.json'; const app = createApp({ apiSpecPath: './openapi.yaml' }, 3003); -const packageJson = require('../package.json'); const basePath = (app).basePath; describe(packageJson.name, () => { diff --git a/test/routes.spec.ts b/test/routes.spec.ts index 62d35ad5..1e7e39ea 100644 --- a/test/routes.spec.ts +++ b/test/routes.spec.ts @@ -1,7 +1,8 @@ import { expect } from 'chai'; import * as request from 'supertest'; import { createApp } from './app'; -const apiSpec = require('./resources/openapi.json'); +import * as apiSpec from './resources/openapi.json'; + const app = createApp({ apiSpecPath: './openapi.yaml' }, 3001); const app2 = createApp({ apiSpec }, 3002); diff --git a/tsconfig.json b/tsconfig.json index b2519467..d621e305 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,8 +5,10 @@ "lib": ["es6", "dom"], "module": "commonjs", "outDir": "dist", - "sourceMap": true + "sourceMap": true, + "resolveJsonModule": true }, + "exclude": ["node_modules"], "include": ["typings.d.ts", "src/**/*.ts"] }