@bedrockio/model 0.1.1 → 0.1.3

package/dist/cjs/schema.js

@@ -233,7 +233,12 @@ function applyTupleExtension(typedef) {
     type
   } = typedef;
   if (Array.isArray(type) && type.length > 1) {
-    typedef.type = ['Mixed'];
+    // Note that mongoose appears to have a bug where passing
+    // "Array" as a string will become a double nested array.
+    // Compare to Array (native function) which will not result
+    // in this nesting. Using an empty array instead to signal
+    // mixed types. https://mongoosejs.com/docs/schematypes.html#arrays
+    typedef.type = [];
     typedef.validate = (0, _validation.getTupleValidator)(type);
   }
 }

package/dist/cjs/validation.js

@@ -117,7 +117,7 @@ function applyValidation(schema, definition) {
 
 // Yada schemas
 
-function getSchemaFromMongoose(schema, options) {
+function getSchemaFromMongoose(schema, options = {}) {
   let {
     obj
   } = schema;
@@ -175,15 +175,22 @@ function getObjectSchema(arg, options) {
     return getSchemaForType(arg);
   }
 }
-function getArraySchema(obj, options) {
-  // Nested array fields may not skip required
-  // validations as they are a new context.
-  let schema = getObjectSchema(obj[0], {
-    ...options,
-    skipRequired: false
-  });
-  if (!options.unwindArrayFields) {
-    schema = _yada.default.array(schema);
+function getArraySchema(arr, options) {
+  let schema;
+  if (arr.length === 0) {
+    schema = _yada.default.array();
+  } else if (arr.length === 1) {
+    // Nested array fields may not skip required
+    // validations as they are a new context.
+    schema = getObjectSchema(arr[0], {
+      ...options,
+      skipRequired: false
+    });
+    if (!options.unwindArrayFields) {
+      schema = _yada.default.array(schema);
+    }
+  } else {
+    throw new Error('Array schema may not have more than 1 element.');
   }
   return schema;
 }
@@ -339,7 +346,7 @@ function getTupleValidator(types) {
   types = types.map(type => {
     return getSchemaForTypedef(type);
   });
-  return wrapSchemaAsValidator(_yada.default.array(types).length(types.length));
+  return wrapSchemaAsValidator(_yada.default.tuple(types));
 }
 
 // Returns an async function that will error on failure.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@bedrockio/logger": "^1.0.5",
-    "@bedrockio/yada": "^1.0.16",
+    "@bedrockio/yada": "^1.0.17",
     "lodash": "^4.17.21"
   },
   "peerDependencies": {

package/src/schema.js

@@ -243,7 +243,12 @@ function applyScopeExtension(scope, definition) {
 function applyTupleExtension(typedef) {
   const { type } = typedef;
   if (Array.isArray(type) && type.length > 1) {
-    typedef.type = ['Mixed'];
+    // Note that mongoose appears to have a bug where passing
+    // "Array" as a string will become a double nested array.
+    // Compare to Array (native function) which will not result
+    // in this nesting. Using an empty array instead to signal
+    // mixed types. https://mongoosejs.com/docs/schematypes.html#arrays
+    typedef.type = [];
     typedef.validate = getTupleValidator(type);
   }
 }

package/src/validation.js

@@ -129,7 +129,7 @@ export function applyValidation(schema, definition) {
 
 // Yada schemas
 
-function getSchemaFromMongoose(schema, options) {
+function getSchemaFromMongoose(schema, options = {}) {
   let { obj } = schema;
   if (options.stripReserved) {
     obj = omit(obj, RESERVED_FIELDS);
@@ -185,15 +185,22 @@ function getObjectSchema(arg, options) {
   }
 }
 
-function getArraySchema(obj, options) {
-  // Nested array fields may not skip required
-  // validations as they are a new context.
-  let schema = getObjectSchema(obj[0], {
-    ...options,
-    skipRequired: false,
-  });
-  if (!options.unwindArrayFields) {
-    schema = yd.array(schema);
+function getArraySchema(arr, options) {
+  let schema;
+  if (arr.length === 0) {
+    schema = yd.array();
+  } else if (arr.length === 1) {
+    // Nested array fields may not skip required
+    // validations as they are a new context.
+    schema = getObjectSchema(arr[0], {
+      ...options,
+      skipRequired: false,
+    });
+    if (!options.unwindArrayFields) {
+      schema = yd.array(schema);
+    }
+  } else {
+    throw new Error('Array schema may not have more than 1 element.');
   }
   return schema;
 }
@@ -378,7 +385,7 @@ export function getTupleValidator(types) {
   types = types.map((type) => {
     return getSchemaForTypedef(type);
   });
-  return wrapSchemaAsValidator(yd.array(types).length(types.length));
+  return wrapSchemaAsValidator(yd.tuple(types));
 }
 
 // Returns an async function that will error on failure.

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiEA,kDAEC;AAED,oEA0DC;AAaD,wEAeC;AAyND;;;EAEC;AAED;;;EAKC;AAtWD,8EAUK"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiEA,kDAEC;AAED,oEA0DC;AAaD,wEAeC;AAgOD;;;EAEC;AAED;;;EAKC;AA7WD,8EAUK"}