@bedrockio/model 0.14.3 → 0.14.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.4
+
+- Fixed bug with nested includes in update validation.
+
 ## 0.14.3
 
 - Allow keyword search on number fields.

package/dist/cjs/validation.js

@@ -10,7 +10,6 @@ exports.getTupleValidator = getTupleValidator;
 exports.getValidationSchema = getValidationSchema;
 var _yada = _interopRequireDefault(require("@bedrockio/yada"));
 var _lodash = require("lodash");
-var _mongoose = _interopRequireDefault(require("mongoose"));
 var _access = require("./access");
 var _errors = require("./errors");
 var _include = require("./include");
@@ -59,7 +58,7 @@ function addValidators(schemas) {
 }
 function applyValidation(schema, definition) {
   schema.static('getCreateValidation', function getCreateValidation(options) {
-    return getSchemaFromMongoose(schema, {
+    return getSchemaForMongoose(schema, {
       model: this,
       stripEmpty: true,
       applyUnique: true,
@@ -73,7 +72,7 @@ function applyValidation(schema, definition) {
     });
   });
   schema.static('getUpdateValidation', function getUpdateValidation(options) {
-    return getSchemaFromMongoose(schema, {
+    return getSchemaForMongoose(schema, {
       model: this,
       allowNull: true,
       applyUnique: true,
@@ -96,7 +95,7 @@ function applyValidation(schema, definition) {
       formats,
       ...rest
     } = options;
-    let validation = getSchemaFromMongoose(schema, {
+    let validation = getSchemaForMongoose(schema, {
       model: this,
       allowNull: true,
       stripEmpty: true,
@@ -132,7 +131,7 @@ function applyValidation(schema, definition) {
     return _include.INCLUDE_FIELD_SCHEMA;
   });
   schema.static('getBaseSchema', function getBaseSchema() {
-    return getSchemaFromMongoose(schema, {
+    return getSchemaForMongoose(schema, {
       model: this,
       stripDeleted: true,
       requireReadAccess: true
@@ -142,7 +141,7 @@ function applyValidation(schema, definition) {
 
 // Yada schemas
 
-function getSchemaFromMongoose(schema, options = {}) {
+function getSchemaForMongoose(schema, options = {}) {
   const fields = getMongooseFields(schema, options);
   return getValidationSchema(fields, options);
 }
@@ -182,7 +181,7 @@ function getValidationSchema(attributes, options = {}) {
 function getObjectSchema(arg, options) {
   if ((0, _utils.isSchemaTypedef)(arg)) {
     return getSchemaForTypedef(arg, options);
-  } else if (arg instanceof _mongoose.default.Schema) {
+  } else if ((0, _utils.isMongooseSchema)(arg)) {
     return getObjectSchema(arg.obj, options);
   } else if (Array.isArray(arg)) {
     return getArraySchema(arg, options);
@@ -244,7 +243,7 @@ function getSchemaForTypedef(typedef, options = {}) {
   } = typedef;
   let schema;
   if ((0, _utils.isMongooseSchema)(type)) {
-    schema = getSchemaFromMongoose(type, options);
+    schema = getObjectSchema(type, options);
   } else if (Array.isArray(type)) {
     schema = getArraySchema(type, options);
   } else if (typeof type === 'object') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {

package/src/validation.js

@@ -1,6 +1,5 @@
 import yd from '@bedrockio/yada';
 import { get, lowerFirst, omit } from 'lodash';
-import mongoose from 'mongoose';
 
 import { hasAccess } from './access';
 import { ImplementationError, PermissionsError } from './errors';
@@ -62,7 +61,7 @@ export function addValidators(schemas) {
 
 export function applyValidation(schema, definition) {
   schema.static('getCreateValidation', function getCreateValidation(options) {
-    return getSchemaFromMongoose(schema, {
+    return getSchemaForMongoose(schema, {
       model: this,
       stripEmpty: true,
       applyUnique: true,
@@ -77,7 +76,7 @@ export function applyValidation(schema, definition) {
   });
 
   schema.static('getUpdateValidation', function getUpdateValidation(options) {
-    return getSchemaFromMongoose(schema, {
+    return getSchemaForMongoose(schema, {
       model: this,
       allowNull: true,
       applyUnique: true,
@@ -99,7 +98,7 @@ export function applyValidation(schema, definition) {
     function getSearchValidation(options = {}) {
       const { allowExport, defaults, formats, ...rest } = options;
 
-      let validation = getSchemaFromMongoose(schema, {
+      let validation = getSchemaForMongoose(schema, {
         model: this,
         allowNull: true,
         stripEmpty: true,
@@ -146,7 +145,7 @@ export function applyValidation(schema, definition) {
   });
 
   schema.static('getBaseSchema', function getBaseSchema() {
-    return getSchemaFromMongoose(schema, {
+    return getSchemaForMongoose(schema, {
       model: this,
       stripDeleted: true,
       requireReadAccess: true,
@@ -156,7 +155,7 @@ export function applyValidation(schema, definition) {
 
 // Yada schemas
 
-function getSchemaFromMongoose(schema, options = {}) {
+function getSchemaForMongoose(schema, options = {}) {
   const fields = getMongooseFields(schema, options);
   return getValidationSchema(fields, options);
 }
@@ -196,7 +195,7 @@ export function getValidationSchema(attributes, options = {}) {
 function getObjectSchema(arg, options) {
   if (isSchemaTypedef(arg)) {
     return getSchemaForTypedef(arg, options);
-  } else if (arg instanceof mongoose.Schema) {
+  } else if (isMongooseSchema(arg)) {
     return getObjectSchema(arg.obj, options);
   } else if (Array.isArray(arg)) {
     return getArraySchema(arg, options);
@@ -261,7 +260,7 @@ function getSchemaForTypedef(typedef, options = {}) {
   let schema;
 
   if (isMongooseSchema(type)) {
-    schema = getSchemaFromMongoose(type, options);
+    schema = getObjectSchema(type, options);
   } else if (Array.isArray(type)) {
     schema = getArraySchema(type, options);
   } else if (typeof type === 'object') {

package/types/schema.d.ts

@@ -28,9 +28,7 @@ export function createSchema(definition: object, options?: mongoose.SchemaOption
     id?: boolean;
     _id?: boolean;
     minimize?: boolean;
-    optimisticConcurrency?: boolean | string[] | {
-        exclude: string[];
-    };
+    optimisticConcurrency?: boolean;
     pluginTags?: string[];
     read?: string;
     readConcern?: {
@@ -49,16 +47,16 @@ export function createSchema(definition: object, options?: mongoose.SchemaOption
         getters: boolean;
         versionKey: boolean;
         transform: (doc: any, ret: any, options: any) => void;
-    } | mongoose.ToObjectOptions<any, any>;
+    } | mongoose.ToObjectOptions<any>;
     toObject: {
         getters: boolean;
         versionKey: boolean;
         transform: (doc: any, ret: any, options: any) => void;
-    } | mongoose.ToObjectOptions<any, any>;
+    } | mongoose.ToObjectOptions<any>;
     typeKey?: string;
     validateBeforeSave?: boolean;
     validateModifiedOnly?: boolean;
-    versionKey?: string | false;
+    versionKey?: string | boolean;
     selectPopulatedPaths?: boolean;
     skipVersioning?: {
         [key: string]: boolean;
@@ -66,13 +64,12 @@ export function createSchema(definition: object, options?: mongoose.SchemaOption
     storeSubdocValidationError?: boolean;
     timestamps: boolean | mongoose.SchemaTimestampsConfig;
     suppressReservedKeysWarning?: boolean;
-    statics?: mongoose.AddThisParameter<any, mongoose.Model<any, any, any, any, any, any>>;
+    statics?: mongoose.AddThisParameter<any, mongoose.Model<any, {}, {}, {}, any, any>>;
     methods?: mongoose.AddThisParameter<any, any> & mongoose.AnyObject;
     query?: any;
     castNonArrays?: boolean;
     virtuals?: mongoose.SchemaOptionsVirtualsPropertyType<any, any, any>;
     overwriteModels?: boolean;
-    encryptionType?: "csfle" | "queryableEncryption";
 }, any, any>;
 export function normalizeAttributes(arg: any, path?: any[]): any;
 import mongoose from 'mongoose';

package/types/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.js"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AACH,yCAJW,MAAM,YACN,QAAQ,CAAC,aAAa;;;;;;;YAgDJ,CAAC;WAC1B,CAAF;mBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;SA2HlB,CAAC;gBACL,CAAC;SAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAlId;AAED,iEAsBC;qBA9FoB,UAAU"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.js"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AACH,yCAJW,MAAM,YACN,QAAQ,CAAC,aAAa;;;;;;;YA6CQ,CAAA;WACvC,CAAD;mBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;SAiHX,CAAC;gBAA4B,CAAA;SAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aApHpD;AAED,iEAsBC;qBA9FoB,UAAU"}

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AA0DA,kDAEC;AAED,oEA4FC;AAsBD,wEAiBC;AA8SD;;;EAEC;AAED;;;EAOC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAyDA,kDAEC;AAED,oEA4FC;AAsBD,wEAiBC;AA8SD;;;EAEC;AAED;;;EAOC"}