fix: issue#58 merge missing parent properties in oneOf-object resolution

lib/step.ts

@@ -3,8 +3,13 @@ import createSchemaOf from "./createSchemaOf";
 import { JsonSchema, JsonError, isJsonError } from "./types";
 import { SchemaNode } from "./schemaNode";
 import { reduceSchema } from "./reduceSchema";
+import { mergeSchema } from "./mergeSchema";
 
-type StepFunction = (node: SchemaNode, key: string, data: any) => SchemaNode | JsonError | undefined;
+type StepFunction = (
+ node: SchemaNode,
+ key: string,
+ data: any
+) => SchemaNode | JsonError | undefined;
 
 const stepType: Record<string, StepFunction> = {
  array: (node, key, data) => {
@@ -101,7 +106,12 @@ const stepType: Record<string, StepFunction> = {
  if (nextPropertyNode && Array.isArray(nextPropertyNode.schema.oneOf)) {
  // @special case: this is a mix of a schema and optional definitions
  // we resolve the schema here and add the original schema to `oneOfSchema`
- return draft.resolveOneOf(node.next(nextPropertyNode.schema, key), data[key]);
+ const nextNode = node.next(nextPropertyNode.schema, key);
+ const result = draft.resolveOneOf(nextNode, data[key]);
+ if (isJsonError(result)) {
+ return result;
+ }
+ return nextNode.merge(result.schema, "oneOf");
  }
  if (nextPropertyNode) {
  return nextPropertyNode;
@@ -155,7 +165,11 @@ const stepType: Record<string, StepFunction> = {
  * @param [pointer] - pointer to schema and data (parent of key)
  * @return Schema or Error if failed resolving key
  */
-export default function step(node: SchemaNode, key: string | number, data?: any): SchemaNode | JsonError {
+export default function step(
+ node: SchemaNode,
+ key: string | number,
+ data?: any
+): SchemaNode | JsonError {
  const { draft, schema, pointer } = node;
  const typeOfData = getTypeOf(data);
  let schemaType = schema.type ?? typeOfData;

test/unit/issues/issue58.oneOfType.test.ts

@@ -0,0 +1,150 @@
+import { strict as assert } from "assert";
+import { Draft07 as Draft } from "../../../lib/draft07";
+
+describe("issue#58 - oneOf should invalid type error", () => {
+ let draft: Draft;
+ beforeEach(() => (draft = new Draft()));
+
+ it("should return one-of-error for invalid type", () => {
+ draft.setSchema({
+ oneOf: [{ type: "null" }, { type: "number" }]
+ });
+ const errors = draft.validate("string");
+ assert(errors.length > 0);
+ });
+
+ it("should validate correct type defined in one-of statement", () => {
+ draft.setSchema({
+ oneOf: [{ type: "null" }, { type: "number" }]
+ });
+ const errors = draft.validate(123);
+ assert(errors.length === 0);
+ });
+
+ it("should return type-error for non-integer value", () => {
+ draft.setSchema({
+ properties: {
+ foo: {
+ properties: {
+ number: {
+ type: "integer"
+ }
+ }
+ }
+ }
+ });
+ const errors = draft.validate({ foo: { number: "not an integer" } });
+ assert(errors.length > 0);
+ });
+
+ it("should return type-error for non-integer value in combination with oneOf", () => {
+ draft.setSchema({
+ properties: {
+ foo: {
+ properties: {
+ number: {
+ type: "integer"
+ }
+ },
+ oneOf: [
+ {
+ type: "null"
+ },
+ {
+ type: "object"
+ }
+ ]
+ }
+ }
+ });
+ const errors = draft.validate({ foo: { number: "not an integer" } });
+ assert(errors.length > 0);
+ });
+
+ it("should return type-error", () => {
+ const schema = {
+ $schema: "http:https://json-schema.org/draft-04/schema#",
+ properties: {
+ foo: {
+ additionalProperties: false,
+ properties: {
+ number: {
+ type: "integer"
+ }
+ },
+ oneOf: [
+ {
+ type: "null"
+ },
+ {
+ type: "object"
+ }
+ ]
+ }
+ },
+ additionalProperties: false,
+ oneOf: [
+ {
+ type: "null"
+ },
+ {
+ type: "object"
+ }
+ ]
+ };
+ const inputData: {
+ foo: { number: string };
+ } = {
+ foo: {
+ number: "not an integer"
+ }
+ };
+
+ draft.setSchema(schema);
+ const errors = draft.validate(inputData);
+ assert.equal(errors.length, 1);
+ assert.equal(errors[0].code, "type-error");
+ });
+
+ it("should validate without type-error", () => {
+ const schema = {
+ $schema: "http:https://json-schema.org/draft-04/schema#",
+ properties: {
+ foo: {
+ additionalProperties: false,
+ properties: {
+ number: {
+ type: "integer"
+ }
+ },
+ oneOf: [
+ {
+ type: "null"
+ },
+ {
+ type: "object"
+ }
+ ]
+ }
+ },
+ additionalProperties: false,
+ oneOf: [
+ {
+ type: "null"
+ },
+ {
+ type: "object"
+ }
+ ]
+ };
+ const inputData = {
+ foo: {
+ number: 123
+ }
+ };
+
+ draft.setSchema(schema);
+ const errors = draft.validate(inputData);
+ assert.equal(errors.length, 0);
+ });
+});