@bedrockio/model 0.3.1 → 0.3.2

package/dist/cjs/assign.js

@@ -5,14 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.applyAssign = applyAssign;
 var _lodash = require("lodash");
+var _mongoose = _interopRequireDefault(require("mongoose"));
 var _utils = require("./utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function applyAssign(schema) {
   schema.method('assign', function assign(fields) {
     unsetReferenceFields(fields, schema.obj);
     for (let [path, value] of Object.entries(flattenObject(fields))) {
       if (value === null) {
         this.set(path, undefined);
-        this.markModified(path);
       } else {
         this.set(path, value);
       }
@@ -27,6 +28,8 @@ function unsetReferenceFields(fields, schema = {}) {
   for (let [key, value] of Object.entries(fields)) {
     if (!value && (0, _utils.isReferenceField)(schema, key)) {
       fields[key] = undefined;
+    } else if (value instanceof _mongoose.default.Document) {
+      fields[key] = value;
     } else if (value && typeof value === 'object') {
       unsetReferenceFields(value, (0, _utils.getField)(schema, key));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -39,7 +39,7 @@
     "@babel/preset-env": "^7.20.2",
     "@bedrockio/prettier-config": "^1.0.2",
     "@bedrockio/yada": "^1.0.40",
-    "@shelf/jest-mongodb": "^4.2.0",
+    "@shelf/jest-mongodb": "^4.3.2",
     "eslint": "^8.33.0",
     "eslint-plugin-bedrock": "^1.0.26",
     "jest": "^29.4.1",

package/src/assign.js

@@ -1,4 +1,5 @@
 import { isPlainObject } from 'lodash';
+import mongoose from 'mongoose';
 
 import { isReferenceField, getField } from './utils';
 
@@ -8,7 +9,6 @@ export function applyAssign(schema) {
     for (let [path, value] of Object.entries(flattenObject(fields))) {
       if (value === null) {
         this.set(path, undefined);
-        this.markModified(path);
       } else {
         this.set(path, value);
       }
@@ -23,6 +23,8 @@ function unsetReferenceFields(fields, schema = {}) {
   for (let [key, value] of Object.entries(fields)) {
     if (!value && isReferenceField(schema, key)) {
       fields[key] = undefined;
+    } else if (value instanceof mongoose.Document) {
+      fields[key] = value;
     } else if (value && typeof value === 'object') {
       unsetReferenceFields(value, getField(schema, key));
     }

package/types/assign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assign.d.ts","sourceRoot":"","sources":["../src/assign.js"],"names":[],"mappings":"AAIA,+CAYC"}
+{"version":3,"file":"assign.d.ts","sourceRoot":"","sources":["../src/assign.js"],"names":[],"mappings":"AAKA,+CAWC"}

package/types/include.d.ts

@@ -14,7 +14,7 @@ export const INCLUDE_FIELD_SCHEMA: {
     meta: {};
     required(): any;
     default(arg: any): any;
-    custom(...args: import("@bedrockio/yada/types/Schema").CustomSignature): any;
+    custom(fn: Function): any;
     strip(strip: any): any;
     allow(...set: any[]): any;
     reject(...set: any[]): any;

package/types/schema.d.ts

@@ -31,6 +31,9 @@ export function createSchema(definition: object, options?: mongoose.SchemaOption
     optimisticConcurrency?: boolean;
     pluginTags?: string[];
     read?: string;
+    readConcern?: {
+        level: "local" | "available" | "majority" | "snapshot" | "linearizable";
+    };
     writeConcern?: mongoose.mongo.WriteConcern;
     safe?: boolean | {
         w?: string | number;

package/types/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.js"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,yCAJW,MAAM,YACN,SAAS,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAuChC;AAED,iEAsBC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.js"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,yCAJW,MAAM,YACN,SAAS,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAuChC;AAED,iEAsBC"}

package/types/search.d.ts

@@ -11,7 +11,7 @@ export function searchValidation(options?: {}): {
     meta: {};
     required(): any;
     default(arg: any): any;
-    custom(...args: import("@bedrockio/yada/types/Schema").CustomSignature): any;
+    custom(fn: Function): any;
     strip(strip: any): any;
     allow(...set: any[]): any;
     reject(...set: any[]): any;

package/types/validation.d.ts

@@ -73,7 +73,7 @@ export const OBJECT_ID_SCHEMA: {
     assertions: any[];
     meta: {};
     default(arg: any): any;
-    custom(...args: import("@bedrockio/yada/types/Schema").CustomSignature): any;
+    custom(fn: Function): any;
     strip(strip: any): any;
     allow(...set: any[]): any;
     reject(...set: any[]): any;