revert: only support v3, which requires schema

Author: restfulhead

src/ajv-openapi-validator.ts

@@ -379,12 +379,10 @@ export class AjvOpenApiValidator {
               }
 
               // TODO could also add support for other parameters such as headers here
-              if (resolvedParam?.in === 'query') {
+              if (resolvedParam?.in === 'query' && resolvedParam.schema) {
                 const schemaName = `#/paths${path.replace(/[{}]/g, '')}/${method}/parameters/${resolvedParam.name}`
                 this.validatorOpts.log(`Adding parameter validator '${path}', '${method}', '${resolvedParam.name}'`)
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const schema = resolvedParam.schema ?? { type: (resolvedParam as any).type } // stricly speaking this isn't valid, but we support it
-                this.ajv.addSchema(schema ?? resolvedParam, schemaName)
+                this.ajv.addSchema(resolvedParam.schema, schemaName)
                 const validator = this.ajv.compile({ $ref: schemaName })
 
                 this.paramsValidators.push({

test/fixtures/accept-a-required-query-param.js.txt

@@ -7,13 +7,17 @@ module.exports = {
                     {
                         in: 'path',
                         name: 'path1',
-                        type: 'string',
+                        schema: {
+                          type: 'string',
+                        },
                         required: true,
                     },
                     {
                         in: 'query',
                         name: 'foo',
-                        type: 'string',
+                        schema: {
+                          type: 'string',
+                        },
                         required: true,
                     },
                 ],

test/fixtures/accept-an-additional-query-param.js.txt

@@ -7,7 +7,9 @@ module.exports = {
                     {
                         in: 'query',
                         name: 'foo',
-                        type: 'string',
+                        schema: {
+                          type: 'string',
+                        },
                         required: true,
                     },
                 ],

test/fixtures/accept-an-optional-query-param.js.txt

@@ -7,7 +7,9 @@ module.exports = {
                     {
                         in: 'query',
                         name: 'foo',
-                        type: 'string',
+                        schema: {
+                            type: 'string',
+                        },
                         required: false,
                     },
                 ],

test/fixtures/accept-custom-formats-openapi3.js.txt renamed to test/fixtures/accept-custom-formats.js.txt

@@ -7,7 +7,9 @@ module.exports = {
                     {
                         in: 'query',
                         name: 'foo',
-                        type: 'string',
+                        schema: {
+                            type: 'string',
+                        },
                         required: true,
                     },
                 ],

test/fixtures/fail-a-missing-query-param.js.txt

@@ -7,7 +7,9 @@ module.exports = {
                     {
                         in: 'query',
                         name: 'foo',
-                        type: 'string',
+                        schema: {
+                            type: 'string',
+                        },
                         required: true,
                     },
                 ],