Merge pull request #866 from orbitjs/fix-validate-object

validateObject should not accept null as a valid object
orbitjs · Jul 16, 2021 · 22674a0 · 22674a0
2 parents 14519a7 + ca01cee
commit 22674a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/@orbit/validators/src/object-validator.ts b/packages/@orbit/validators/src/object-validator.ts
@@ -22,7 +22,7 @@ export const validateObject: ObjectValidator = (
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   options?: ObjectValidationOptions
 ): undefined | ObjectValidationIssue[] => {
-  if (typeof input !== 'object') {
+  if (typeof input !== 'object' || input === null) {
     return [
       {
         validator: 'object',

diff --git a/packages/@orbit/validators/test/object-validator-test.ts b/packages/@orbit/validators/test/object-validator-test.ts
@@ -7,6 +7,14 @@ const { module, test } = QUnit;
 module('validateObject', function (hooks) {
   test('validates type', function (assert) {
     assert.strictEqual(validateObject({}), undefined);
+    assert.deepEqual(validateObject(null as any), [
+      {
+        validator: 'object',
+        validation: 'type',
+        ref: null as any,
+        description: 'is not an object'
+      }
+    ]);
     assert.deepEqual(validateObject('not-an-object' as any), [
       {
         validator: 'object',