fix: ignore keyNotInSchema for $type in $currentDate

longshotlabs · Apr 8, 2021 · 3d7b815 · 3d7b815
1 parent 1da95aa
commit 3d7b815
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/package/lib/SimpleSchema.tests.js b/package/lib/SimpleSchema.tests.js
@@ -1159,6 +1159,36 @@ describe('SimpleSchema', function () {
     expect(foo.rawDefinition).toEqual({ foo: String });
   });
 
+  it('$currentDate Date validation', function () {
+    const schema = new SimpleSchema({
+      date: Date,
+    });
+    const context = schema.namedContext();
+
+    let testModifer = {
+      $currentDate: {
+        date: true,
+      },
+    };
+    expect(context.validate(testModifer, { modifier: true })).toBe(true);
+
+    testModifer = {
+      $currentDate: {
+        date: { $type: 'date' },
+      },
+    };
+    context.validate(testModifer, { modifier: true });
+    expect(context.validate(testModifer, { modifier: true })).toBe(true);
+
+    // timestamp fails because it would save a MongoDB.Timestamp value into a Date field
+    testModifer = {
+      $currentDate: {
+        date: { $type: 'timestamp' },
+      },
+    };
+    expect(context.validate(testModifer, { modifier: true })).toBe(false);
+  });
+
   describe('SimpleSchema.Any', function () {
     const schema = new SimpleSchema({
       testAny: SimpleSchema.Any,

diff --git a/package/lib/doValidation.js b/package/lib/doValidation.js
@@ -54,7 +54,7 @@ function doValidation({
     // Get the schema for this key, marking invalid if there isn't one.
     if (!def) {
       // We don't need KEY_NOT_IN_SCHEMA error for $unset and we also don't need to continue
-      if (op === '$unset') return;
+      if (op === '$unset' || (op === '$currentDate' && affectedKey.endsWith('.$type'))) return;
 
       validationErrors.push({
         name: affectedKey,