Adds if, then, else rule

Marcisbee · Oct 5, 2021 · 6a9bf54 · 6a9bf54
1 parent 8a4cee1
commit 6a9bf54
Show file tree

Hide file tree

Showing 16 changed files with 465 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esjson",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "JSON Schema validator (cli)",
   "main": "src/index.js",
   "bin": {

diff --git a/src/index.js b/src/index.js
@@ -30,6 +30,7 @@ const defaultConfig = {
  * @property {Record<string, any>} config
  * @property {string} filePath
  * @property {boolean=} shallow
+ * @property {boolean=} catch
  */
 
 function validator() {

diff --git a/src/report.js b/src/report.js
@@ -84,7 +84,7 @@ function report(params) {
 			"\n" +
 			blue(`ℹ ${passed} validated`) +
 			"\n" +
-			bold(green("\u2714 No knowns problems!")) +
+			bold(green("\u2714 No known problems!")) +
 			"\n\n",
 		);
 		process.exit(0);

diff --git a/src/validate.js b/src/validate.js
@@ -41,7 +41,7 @@ function validate(filePath, fileContents, schema, config, position = []) {
 			) {
 				const warning = new Warning(message, code, pos, undefined, lineNo);
 
-				if (this.shallow) {
+				if (this.shallow || this.catch) {
 					throw warning;
 				}
 
@@ -52,7 +52,7 @@ function validate(filePath, fileContents, schema, config, position = []) {
 
 			const error = new ValidationError(message, code, pos, undefined, lineNo);
 
-			if (this.shallow) {
+			if (this.shallow || this.catch) {
 				throw error;
 			}
 

diff --git a/src/validate/all-of.js b/src/validate/all-of.js
@@ -13,9 +13,9 @@ function validateAllOf(value, currentSchema, position) {
 
 	for (const key in currentSchema) {
 		try {
-			// Run shallow validation
+			// Run full validation
 			this.validateSchema.call(
-				{...this, shallow: true},
+				{...this, catch: true},
 				value,
 				position,
 				currentSchema[key],

diff --git a/src/validate/const.js b/src/validate/const.js
@@ -0,0 +1,19 @@
+/**
+ * @this {import('src').Context}
+ * @param {*} value
+ * @param {*} currentSchema
+ * @param {(string | number)[]} position
+ */
+function validateConst(value, currentSchema, position) {
+	if (value === currentSchema) {
+		return true;
+	}
+
+	this.error(
+		`Value "${value}" not accepted. Expected value: ${currentSchema}`,
+		"const",
+		position,
+	);
+}
+
+module.exports = validateConst;
diff --git a/src/validate/if-then-else.js b/src/validate/if-then-else.js
@@ -0,0 +1,36 @@
+/**
+ * @this {import('src').Context}
+ * @param {*} value
+ * @param {*} currentSchema
+ * @param {(string | number)[]} position
+ */
+function validateIfThenElse(value, currentSchema, position) {
+	let errorDepth = position.length + 1;
+	let possibleError;
+
+	try {
+		// Run full validation
+		this.validateSchema.call(
+			{...this, catch: true},
+			value,
+			position,
+			currentSchema,
+		);
+
+		return;
+	} catch (e) {
+		if (e.position && e.position.length > errorDepth) {
+			possibleError = "if";
+			errorDepth = e.position.length;
+		}
+	}
+
+	// Guessing the error based on error depth
+	if (possibleError) {
+		return possibleError;
+	}
+
+	return true;
+}
+
+module.exports = validateIfThenElse;
diff --git a/src/validate/not.js b/src/validate/not.js
@@ -0,0 +1,25 @@
+/**
+ * @this {import('src').Context}
+ * @param {*} value
+ * @param {*} currentSchema
+ * @param {(string | number)[]} position
+ */
+function validateNot(value, currentSchema, position) {
+	try {
+		// Run full validation
+		this.validateSchema.call(
+			{...this, catch: true},
+			value,
+			position,
+			currentSchema,
+		);
+
+		this.error("Value not accepted", "not", position);
+
+		return;
+	} catch (e) {
+		return true;
+	}
+}
+
+module.exports = validateNot;
diff --git a/src/validate/schema.js b/src/validate/schema.js
@@ -1,8 +1,11 @@
 const GenericError = require("../diagnostics/generic-error");
 
-const validateEnum = require("./enum");
 const validateAllOf = require("./all-of");
 const validateAnyOf = require("./any-of");
+const validateConst = require("./const");
+const validateEnum = require("./enum");
+const validateIfThenElse = require("./if-then-else");
+const validateNot = require("./not");
 const validateString = require("./type/string");
 const validateObject = require("./type/object");
 const validateNumber = require("./type/number");
@@ -28,6 +31,41 @@ function validateSchema(json, position, currentSchema = this.schema) {
 		throw new GenericError("Invalid schema");
 	}
 
+	if (currentSchema.if) {
+		const key = validateIfThenElse.call(
+			this,
+			json,
+			{
+				type: currentSchema.type,
+				...currentSchema.if,
+			},
+			position,
+		);
+
+		if (typeof key === "undefined") {
+			currentSchema = {
+				...currentSchema,
+				if: undefined,
+				then: undefined,
+				else: undefined,
+				...(currentSchema.then || {type: "object"}),
+			};
+		} else {
+			currentSchema = {
+				...currentSchema,
+				if: undefined,
+				then: undefined,
+				else: undefined,
+				...(currentSchema.else || {type: "object"}),
+			};
+		}
+	}
+
+	if (currentSchema.const) {
+		validateConst.call(this, json, currentSchema.const, position);
+		return;
+	}
+
 	if (currentSchema.type === "array") {
 		validateArray.call(this, json, currentSchema, position);
 		return;
@@ -68,6 +106,11 @@ function validateSchema(json, position, currentSchema = this.schema) {
 		return;
 	}
 
+	if (currentSchema.not) {
+		validateNot.call(this, json, currentSchema.not, position);
+		return;
+	}
+
 	if (!this.shallow && currentSchema.allOf) {
 		const key = validateAllOf.call(this, json, currentSchema.allOf, position);
 

diff --git a/src/validate/type/boolean.js b/src/validate/type/boolean.js
@@ -1,4 +1,5 @@
 const validateEnum = require("../enum");
+const validateNot = require("../not");
 
 /**
  * @this {import('src').Context}
@@ -15,6 +16,10 @@ function validateBoolean(value, currentSchema, position) {
 	if (currentSchema.enum) {
 		validateEnum.call(this, value, currentSchema.enum, position);
 	}
+
+	if (currentSchema.not) {
+		validateNot.call(this, value, currentSchema.not, position);
+	}
 }
 
 module.exports = validateBoolean;
diff --git a/src/validate/type/null.js b/src/validate/type/null.js
@@ -1,4 +1,5 @@
 const validateEnum = require("../enum");
+const validateNot = require("../not");
 
 /**
  * @this {import('src').Context}
@@ -15,6 +16,10 @@ function validateNull(value, currentSchema, position) {
 	if (currentSchema.enum) {
 		validateEnum.call(this, value, currentSchema.enum, position);
 	}
+
+	if (currentSchema.not) {
+		validateNot.call(this, value, currentSchema.not, position);
+	}
 }
 
 module.exports = validateNull;
diff --git a/src/validate/type/number.js b/src/validate/type/number.js
@@ -1,4 +1,5 @@
 const validateEnum = require("../enum");
+const validateNot = require("../not");
 
 /**
  * @this {import('src').Context}
@@ -15,6 +16,10 @@ function validateNumber(value, currentSchema, position) {
 	if (currentSchema.enum) {
 		validateEnum.call(this, value, currentSchema.enum, position);
 	}
+
+	if (currentSchema.not) {
+		validateNot.call(this, value, currentSchema.not, position);
+	}
 }
 
 module.exports = validateNumber;
diff --git a/src/validate/type/string.js b/src/validate/type/string.js
@@ -1,4 +1,5 @@
 const validateEnum = require("../enum");
+const validateNot = require("../not");
 
 /**
  * @this {import('src').Context}
@@ -15,6 +16,10 @@ function validateString(value, currentSchema, position) {
 	if (currentSchema.enum) {
 		validateEnum.call(this, value, currentSchema.enum, position);
 	}
+
+	if (currentSchema.not) {
+		validateNot.call(this, value, currentSchema.not, position);
+	}
 }
 
 module.exports = validateString;