Throw on invalid or unregistered schema

mojolicious · Jul 27, 2022 · 45fdd6a · 45fdd6a
1 parent ce5555e
commit 45fdd6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/context.ts b/src/context.ts
@@ -311,7 +311,7 @@ class Context extends EventEmitter {
   /**
    * Get JSON schema validation function.
    */
-  schema(schema: Record<string, any> | string): ValidatorFunction | null {
+  schema(schema: Record<string, any> | string): ValidatorFunction {
     return this.app.validator.schema(schema);
   }
 

diff --git a/src/validator.ts b/src/validator.ts
@@ -19,7 +19,7 @@ export class Validator {
   /**
    * Get JSON schema validation function.
    */
-  schema(schema: JSONObject | string): ValidatorFunction | null {
+  schema(schema: JSONObject | string): ValidatorFunction {
     const ajv = this._ajv;
 
     let validate: ValidateFunction | undefined;
@@ -30,7 +30,8 @@ export class Validator {
     } else {
       validate = ajv.compile(schema);
     }
-    if (validate === undefined) return null;
+
+    if (validate === undefined) throw new Error(`Invalid schema: '${schema}'`);
 
     return function (data: JSONObject): ValidatorResult {
       const isValid = (validate as ValidateFunction)(data);

diff --git a/test/app.js b/test/app.js
@@ -833,7 +833,11 @@ t.test('App', async t => {
     (await ua.putOk('/schema/user', {json: {user: 'kraih'}})).statusIs(200).jsonIs({valid: false});
     (await ua.putOk('/schema/user', {json: {username: 'sri'}})).statusIs(200).jsonIs({valid: true});
 
-    t.notOk(app.validator.schema('test123'));
+    const schema = 'test123';
+    t.throws(() => {
+      app.validator.schema(schema);
+    }, new Error(`Invalid schema: '${schema}'`));
+
     (await ua.putOk('/schema/dynamic', {json: {test: 123}})).statusIs(200).jsonIs({valid: true, errors: []});
     (await ua.putOk('/schema/dynamic', {json: {test: '123'}})).statusIs(200).jsonIs({valid: true, errors: []});
     (await ua.putOk('/schema/dynamic', {json: {test: ' 123'}})).statusIs(200).jsonIs({valid: true, errors: []});