val's comments

Author: baileympearson

lib/encryption_utils.js renamed to lib/encryptionUtils.js

@@ -25,7 +25,7 @@ const setPopulatedVirtualValue = require('./helpers/populate/setPopulatedVirtual
 const setupTimestamps = require('./helpers/timestamps/setupTimestamps');
 const utils = require('./utils');
 const validateRef = require('./helpers/populate/validateRef');
-const { inferBSONType } = require('./encryption_utils');
+const { inferBSONType } = require('./encryptionUtils');
 
 const hasNumericSubpathRegex = /\.\d+(\.|$)/;
 
@@ -131,7 +131,6 @@ function Schema(obj, options) {
   this.$id = ++id;
   this.mapPaths = [];
   this.encryptedFields = {};
-  this._encryptionType = options?.encryptionType;
 
   this.s = {
     hooks: new Kareem()
@@ -523,7 +522,7 @@ Schema.prototype.pick = function(paths, options) {
   }
 
   if (!this._hasEncryptedFields()) {
-    newSchema._encryptionType = null;
+    newSchema.options.encryptionType = null;
   }
 
   return newSchema;
@@ -695,9 +694,9 @@ Schema.prototype._defaultToObjectOptions = function(json) {
  */
 Schema.prototype.encryptionType = function encryptionType(encryptionType) {
   if (typeof encryptionType === 'string' || encryptionType === null) {
-    this._encryptionType = encryptionType;
+    this.options.encryptionType = encryptionType;
   } else {
-    return this._encryptionType;
+    return this.options.encryptionType;
   }
 };
 

lib/schema.js

@@ -359,7 +359,7 @@ describe('encrypted schema declaration', function() {
             const schema1 = new Schema({ name: { type: String, encrypt: { keyId: KEY_ID, algorithm } } }, { encryptionType: 'csfle' });
             const schema2 = schema1.clone();
 
-            assert.equal(schema2._encryptionType, 'csfle');
+            assert.equal(schema2.encryptionType(), 'csfle');
           });
           describe('When the cloned schema is modified', function() {
             it('The original is not modified', function() {