Fix oneOf and nullable+enum combined

Author: SamyPesse

src/compileValueSchema.ts

@@ -134,9 +134,6 @@ function compileOneOfSchema(compiler: Compiler, schema: OpenAPIOneOfSchema) {
                         ),
                     ),
                     builders.blockStatement([
-                        builders.expressionStatement(
-                            builders.assignmentExpression('=', resultIdentifier, altIdentifier),
-                        ),
                         ...(index > 0
                             ? [
                                   builders.ifStatement(
@@ -153,11 +150,25 @@ function compileOneOfSchema(compiler: Compiler, schema: OpenAPIOneOfSchema) {
                                   ),
                               ]
                             : []),
+                        builders.expressionStatement(
+                            builders.assignmentExpression('=', resultIdentifier, altIdentifier),
+                        ),
                     ]),
                 ),
             );
         });
 
+        nodes.push(
+            builders.ifStatement(
+                builders.binaryExpression(
+                    '===',
+                    resultIdentifier,
+                    builders.identifier('undefined'),
+                ),
+                builders.blockStatement([builders.returnStatement(error('expected to match one'))]),
+            ),
+        );
+
         nodes.push(builders.returnStatement(resultIdentifier));
 
         return nodes;
@@ -597,13 +608,14 @@ function compileNumberSchema(
     schema: OpenAPINumberSchema | OpenAPIIntegerSchema,
 ) {
     return compiler.declareValidationFunction(schema, ({ value, error }) => {
+        const nodes: namedTypes.BlockStatement['body'] = [];
+        nodes.push(...compileNullableCheck(compiler, schema, value));
+
         const enumCheck = compileEnumableCheck(compiler, schema, value, error);
         if (enumCheck) {
-            return enumCheck;
+            return [...nodes, ...enumCheck];
         }
 
-        const nodes: namedTypes.BlockStatement['body'] = [];
-        nodes.push(...compileNullableCheck(compiler, schema, value));
         nodes.push(
             builders.ifStatement(
                 builders.binaryExpression(
@@ -623,13 +635,14 @@ function compileNumberSchema(
 
 function compileStringSchema(compiler: Compiler, schema: OpenAPIStringSchema) {
     return compiler.declareValidationFunction(schema, ({ value, context, path, error }) => {
+        const nodes: namedTypes.BlockStatement['body'] = [];
+        nodes.push(...compileNullableCheck(compiler, schema, value));
+
         const enumCheck = compileEnumableCheck(compiler, schema, value, error);
         if (enumCheck) {
-            return enumCheck;
+            return [...nodes, ...enumCheck];
         }
 
-        const nodes: namedTypes.BlockStatement['body'] = [];
-        nodes.push(...compileNullableCheck(compiler, schema, value));
         nodes.push(
             builders.ifStatement(
                 builders.binaryExpression(
@@ -752,13 +765,14 @@ function compileStringSchema(compiler: Compiler, schema: OpenAPIStringSchema) {
 
 function compileBooleanSchema(compiler: Compiler, schema: OpenAPIBooleanSchema) {
     return compiler.declareValidationFunction(schema, ({ value, error }) => {
+        const nodes: namedTypes.BlockStatement['body'] = [];
+        nodes.push(...compileNullableCheck(compiler, schema, value));
+
         const enumCheck = compileEnumableCheck(compiler, schema, value, error);
         if (enumCheck) {
-            return enumCheck;
+            return [...nodes, ...enumCheck];
         }
 
-        const nodes: namedTypes.BlockStatement['body'] = [];
-        nodes.push(...compileNullableCheck(compiler, schema, value));
         nodes.push(
             builders.ifStatement(
                 builders.binaryExpression(

src/tests/__snapshots__/compileValueSchema.test.ts.snap

@@ -785,10 +785,13 @@ function obj0(path, value, context) {
     }
     const alt1 = obj2(path, value, context);
     if (!(alt1 instanceof ValidationError)) {
-        result = alt1;
         if (result !== undefined) {
             return new ValidationError(path, 'expected to only match one of the schemas');
         }
+        result = alt1;
+    }
+    if (result === undefined) {
+        return new ValidationError(path, 'expected to match one');
     }
     return result;
 }"

tests/gitbook.test.ts

@@ -103,3 +103,39 @@ test('PUT orgs/apple/schemas/newType', () => {
         },
     });
 });
+
+test('POST orgs/apple/members/jony (invalid)', () => {
+    const result = validateRequest({
+        path: '/orgs/apple/members/jony',
+        method: 'patch',
+        headers: {
+            'content-type': 'application/json',
+        },
+        query: {},
+        body: {
+            role: 'invalid',
+        },
+    });
+    expect(result instanceof ValidationError ? result.path : null).toEqual(['body', 'role']);
+});
+
+test('POST orgs/apple/members/jony (null)', () => {
+    const result = validateRequest({
+        path: '/orgs/apple/members/jony',
+        method: 'patch',
+        headers: {
+            'content-type': 'application/json',
+        },
+        query: {},
+        body: {
+            role: null,
+        },
+    });
+    expect(result).toMatchObject({
+        operationId: 'updateMemberInOrganizationById',
+        params: {
+            organizationId: 'apple',
+            userId: 'jony',
+        },
+    });
+});