@bedrockio/model 0.1.22 → 0.1.24

package/.prettierrc.cjs

@@ -0,0 +1 @@
+module.exports = require('@bedrockio/prettier-config');

package/dist/cjs/schema.js

@@ -221,10 +221,18 @@ function applyScopeExtension(scope, definition) {
     ...options
   } = scope;
   for (let [key, val] of Object.entries(normalizeAttributes(attributes))) {
-    definition[key] = {
-      ...val,
-      ...options
-    };
+    if ((0, _utils.isSchemaTypedef)(val)) {
+      definition[key] = {
+        ...val,
+        ...options
+      };
+    } else {
+      definition[key] = {
+        type: 'Object',
+        attributes: val,
+        ...options
+      };
+    }
   }
 }
 

package/dist/cjs/validation.js

@@ -74,11 +74,15 @@ function addValidators(schemas) {
 }
 function applyValidation(schema, definition) {
   const hasUnique = (0, _softDelete.hasUniqueConstraints)(schema);
-  schema.static('getCreateValidation', function getCreateValidation(appendSchema) {
+  schema.static('getCreateValidation', function getCreateValidation(options = {}) {
+    const {
+      allowInclude,
+      ...appendSchema
+    } = options;
     return getSchemaFromMongoose(schema, {
       model: this,
       appendSchema,
-      allowIncludes: true,
+      allowInclude,
       stripDeleted: true,
       stripTimestamps: true,
       allowExpandedRefs: true,
@@ -91,10 +95,15 @@ function applyValidation(schema, definition) {
       })
     });
   });
-  schema.static('getUpdateValidation', function getUpdateValidation(appendSchema) {
+  schema.static('getUpdateValidation', function getUpdateValidation(options = {}) {
+    const {
+      allowInclude,
+      ...appendSchema
+    } = options;
     return getSchemaFromMongoose(schema, {
       model: this,
       appendSchema,
+      allowInclude,
       skipRequired: true,
       stripUnknown: true,
       stripDeleted: true,
@@ -119,7 +128,7 @@ function applyValidation(schema, definition) {
       model: this,
       allowSearch: true,
       skipRequired: true,
-      allowIncludes: true,
+      allowInclude: true,
       expandDotSyntax: true,
       unwindArrayFields: true,
       requireReadAccess: true,
@@ -167,7 +176,7 @@ function getValidationSchema(attributes, options = {}) {
   const {
     appendSchema,
     assertUniqueOptions,
-    allowIncludes
+    allowInclude
   } = options;
   let schema = getObjectSchema(attributes, options);
   if (assertUniqueOptions) {
@@ -183,7 +192,7 @@ function getValidationSchema(attributes, options = {}) {
   if (appendSchema) {
     schema = schema.append(appendSchema);
   }
-  if (allowIncludes) {
+  if (allowInclude) {
     schema = schema.append(_include.INCLUDE_FIELD_SCHEMA);
   }
   return schema;

package/package.json

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

package/src/schema.js

@@ -230,10 +230,18 @@ function isScopeExtension(obj) {
 function applyScopeExtension(scope, definition) {
   const { type, attributes, ...options } = scope;
   for (let [key, val] of Object.entries(normalizeAttributes(attributes))) {
-    definition[key] = {
-      ...val,
-      ...options,
-    };
+    if (isSchemaTypedef(val)) {
+      definition[key] = {
+        ...val,
+        ...options,
+      };
+    } else {
+      definition[key] = {
+        type: 'Object',
+        attributes: val,
+        ...options,
+      };
+    }
   }
 }
 

package/src/validation.js

@@ -88,11 +88,12 @@ export function applyValidation(schema, definition) {
 
   schema.static(
     'getCreateValidation',
-    function getCreateValidation(appendSchema) {
+    function getCreateValidation(options = {}) {
+      const { allowInclude, ...appendSchema } = options;
       return getSchemaFromMongoose(schema, {
         model: this,
         appendSchema,
-        allowIncludes: true,
+        allowInclude,
         stripDeleted: true,
         stripTimestamps: true,
         allowExpandedRefs: true,
@@ -109,10 +110,12 @@ export function applyValidation(schema, definition) {
 
   schema.static(
     'getUpdateValidation',
-    function getUpdateValidation(appendSchema) {
+    function getUpdateValidation(options = {}) {
+      const { allowInclude, ...appendSchema } = options;
       return getSchemaFromMongoose(schema, {
         model: this,
         appendSchema,
+        allowInclude,
         skipRequired: true,
         stripUnknown: true,
         stripDeleted: true,
@@ -138,7 +141,7 @@ export function applyValidation(schema, definition) {
         model: this,
         allowSearch: true,
         skipRequired: true,
-        allowIncludes: true,
+        allowInclude: true,
         expandDotSyntax: true,
         unwindArrayFields: true,
         requireReadAccess: true,
@@ -184,7 +187,7 @@ function getMongooseFields(schema, options) {
 
 // Exported for testing
 export function getValidationSchema(attributes, options = {}) {
-  const { appendSchema, assertUniqueOptions, allowIncludes } = options;
+  const { appendSchema, assertUniqueOptions, allowInclude } = options;
   let schema = getObjectSchema(attributes, options);
   if (assertUniqueOptions) {
     schema = schema.custom(async (obj, { root }) => {
@@ -197,7 +200,7 @@ export function getValidationSchema(attributes, options = {}) {
   if (appendSchema) {
     schema = schema.append(appendSchema);
   }
-  if (allowIncludes) {
+  if (allowInclude) {
     schema = schema.append(INCLUDE_FIELD_SCHEMA);
   }
   return schema;

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiFA,kDAEC;AAED,oEA8EC;AAsBD,wEAkBC;AA6QD;;;EAEC;AAED;;;EAOC;AAjdD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiFA,kDAEC;AAED,oEAiFC;AAsBD,wEAkBC;AA6QD;;;EAEC;AAED;;;EAOC;AApdD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}