@bedrockio/model 0.1.15 → 0.1.17

package/dist/cjs/include.js

@@ -234,7 +234,7 @@ function setNodePath(node, options) {
             exclude
           });
           halt = true;
-        } else {
+        } else if ((0, _utils.isSchemaTypedef)(field)) {
           node[key] = null;
         }
       } else if (type === 'virtual') {

package/dist/cjs/validation.js

@@ -23,16 +23,18 @@ const DATE_TAGS = {
   'x-schema': 'DateTime',
   'x-description': 'A `string` in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format.'
 };
-const OBJECT_ID_SCHEMA = _yada.default.string().mongo().tag({
+const OBJECT_ID_SCHEMA = _yada.default.string().mongo().message('Must be an ObjectId.').tag({
   'x-schema': 'ObjectId',
   'x-description': 'A 24 character hexadecimal string representing a Mongo [ObjectId](https://bit.ly/3YPtGlU).'
 });
 exports.OBJECT_ID_SCHEMA = OBJECT_ID_SCHEMA;
 const REFERENCE_SCHEMA = _yada.default.allow(OBJECT_ID_SCHEMA, _yada.default.object({
   id: OBJECT_ID_SCHEMA.required()
+}).options({
+  stripUnknown: true
 }).custom(obj => {
   return obj.id;
-})).tag({
+})).message('Must be an ObjectId or object containing "id" field.').tag({
   'x-schema': 'Reference',
   'x-description': `
 A 24 character hexadecimal string representing a Mongo [ObjectId](https://bit.ly/3YPtGlU).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -37,7 +37,7 @@
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
     "@bedrockio/prettier-config": "^1.0.2",
-    "@bedrockio/yada": "^1.0.27",
+    "@bedrockio/yada": "^1.0.28",
     "@shelf/jest-mongodb": "^4.1.6",
     "babel-plugin-import-replacement": "^1.0.1",
     "eslint": "^8.33.0",

package/src/include.js

@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 import { escapeRegExp } from 'lodash';
 import yd from '@bedrockio/yada';
 
-import { resolveInnerField } from './utils';
+import { resolveInnerField, isSchemaTypedef } from './utils';
 import { POPULATE_MAX_DEPTH } from './const';
 
 // @ts-ignore
@@ -218,7 +218,7 @@ function setNodePath(node, options) {
             exclude,
           });
           halt = true;
-        } else {
+        } else if (isSchemaTypedef(field)) {
           node[key] = null;
         }
       } else if (type === 'virtual') {

package/src/validation.js

@@ -16,11 +16,15 @@ const DATE_TAGS = {
     'A `string` in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format.',
 };
 
-export const OBJECT_ID_SCHEMA = yd.string().mongo().tag({
-  'x-schema': 'ObjectId',
-  'x-description':
-    'A 24 character hexadecimal string representing a Mongo [ObjectId](https://bit.ly/3YPtGlU).',
-});
+export const OBJECT_ID_SCHEMA = yd
+  .string()
+  .mongo()
+  .message('Must be an ObjectId.')
+  .tag({
+    'x-schema': 'ObjectId',
+    'x-description':
+      'A 24 character hexadecimal string representing a Mongo [ObjectId](https://bit.ly/3YPtGlU).',
+  });
 
 const REFERENCE_SCHEMA = yd
   .allow(
@@ -29,10 +33,14 @@ const REFERENCE_SCHEMA = yd
       .object({
         id: OBJECT_ID_SCHEMA.required(),
       })
+      .options({
+        stripUnknown: true,
+      })
       .custom((obj) => {
         return obj.id;
       })
   )
+  .message('Must be an ObjectId or object containing "id" field.')
   .tag({
     'x-schema': 'Reference',
     'x-description': `

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAyEA,kDAEC;AAED,oEA8EC;AAsBD,wEAkBC;AA6QD;;;EAEC;AAED;;;EAOC;AAzcD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIG"}
+{"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"}