@bedrockio/model 0.18.5 → 0.19.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.19.0
+
+- Ensure that document clone is synchronous.
+
+## 0.18.6
+
+- Yada bump.
+
 ## 0.18.5
 
 - Moved warnings to `process.emitWarning`.

package/README.md

@@ -1785,9 +1785,7 @@ shop.name; // Now "My New Shop"
 
 ### Clone
 
-Adds a single `clone` method on documents. This is an async method mostly for
-testing that will immediately create a copy of the document. It makes up for
-some of the shortcomings of the Mongoose `$clone` method:
+Adds a single `clone` method on documents that makes up for some of the shortcomings of the Mongoose `$clone` method:
 
 - A new `id` will be generated.
 - Populated and self-referencing documents are handled.

package/dist/cjs/clone.js

@@ -13,11 +13,11 @@ exports.applyClone = applyClone;
 // - Cannot deal with unique fields.
 //
 function applyClone(schema) {
-  schema.method('clone', async function clone() {
-    return await cloneDocument(this);
+  schema.method('clone', function clone() {
+    return cloneDocument(this);
   });
 }
-async function cloneDocument(doc) {
+function cloneDocument(doc) {
   const Model = doc.constructor;
   const clone = new Model();
   for (let [key, typedef] of Object.entries(Model.schema.obj)) {
@@ -31,7 +31,6 @@ async function cloneDocument(doc) {
     }
     clone.set(key, value);
   }
-  await clone.save();
   return clone;
 }
 let counter = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.18.5",
+  "version": "0.19.0",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -39,7 +39,7 @@
     "@babel/preset-env": "^7.26.0",
     "@bedrockio/eslint-plugin": "^1.2.2",
     "@bedrockio/prettier-config": "^1.1.1",
-    "@bedrockio/yada": "^1.10.0",
+    "@bedrockio/yada": "^1.10.3",
     "@shelf/jest-mongodb": "^5.2.2",
     "eslint": "^9.36.0",
     "jest": "^30.2.0",

package/src/clone.js

@@ -7,12 +7,12 @@
 // - Cannot deal with unique fields.
 //
 export function applyClone(schema) {
-  schema.method('clone', async function clone() {
-    return await cloneDocument(this);
+  schema.method('clone', function clone() {
+    return cloneDocument(this);
   });
 }
 
-async function cloneDocument(doc) {
+function cloneDocument(doc) {
   const Model = doc.constructor;
   const clone = new Model();
 
@@ -26,8 +26,6 @@ async function cloneDocument(doc) {
     clone.set(key, value);
   }
 
-  await clone.save();
-
   return clone;
 }
 

package/types/schema.d.ts

@@ -28,7 +28,9 @@ export function createSchema(definition: object, options?: mongoose.SchemaOption
     id?: boolean;
     _id?: boolean;
     minimize?: boolean;
-    optimisticConcurrency?: boolean;
+    optimisticConcurrency?: boolean | string[] | {
+        exclude: string[];
+    };
     pluginTags?: string[];
     read?: string;
     readConcern?: {
@@ -47,16 +49,16 @@ export function createSchema(definition: object, options?: mongoose.SchemaOption
         getters: boolean;
         versionKey: boolean;
         transform: (doc: any, ret: any, options: any) => void;
-    } | mongoose.ToObjectOptions<any>;
+    } | mongoose.ToObjectOptions<any, any>;
     toObject: {
         getters: boolean;
         versionKey: boolean;
         transform: (doc: any, ret: any, options: any) => void;
-    } | mongoose.ToObjectOptions<any>;
+    } | mongoose.ToObjectOptions<any, any>;
     typeKey?: string;
     validateBeforeSave?: boolean;
     validateModifiedOnly?: boolean;
-    versionKey?: string | boolean;
+    versionKey?: string | false;
     selectPopulatedPaths?: boolean;
     skipVersioning?: {
         [key: string]: boolean;
@@ -64,12 +66,13 @@ 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>>;
+    statics?: mongoose.AddThisParameter<any, mongoose.Model<any, any, any, 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":"AAyBA;;;;;;;GAOG;AACH,yCAJW,MAAM,YACN,QAAQ,CAAC,aAAa;;;;;;;YAuC/B,CAAC;WAAa,CAAC;mBACF,CAAC;;;;;;;;;;;;;;;;;;;;;SAsHkC,CAAC;gBACzC,CAAA;SAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA9GrB;AAED,iEAcC;qBA9FoB,UAAU"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.js"],"names":[],"mappings":"AAyBA;;;;;;;GAOG;AACH,yCAJW,MAAM,YACN,QAAQ,CAAC,aAAa;;;;;;;YA2C7B,CAAC;WAAa,CAAC;mBACH,CAAC;;;;;;;;;;;;;;;;;;;;;;;SAgIb,CAAC;gBAA4B,CAAA;SAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA3H5C;AAED,iEAcC;qBA9FoB,UAAU"}

package/types/search.d.ts

@@ -1,5 +1,6 @@
 export function applySearch(schema: any, definition: any): void;
 export function searchValidation(options?: {}): {
+    validateInput(): void;
     setup(): void;
     get(path?: string | Array<string>): any;
     unwind(path?: string | Array<string>): any;
@@ -10,6 +11,10 @@ export function searchValidation(options?: {}): {
     transform(fn: Function, root?: boolean): /*elided*/ any;
     export(): any;
     append(arg: import("@bedrockio/yada/types/object").SchemaMap | import("@bedrockio/yada/types/Schema").default): /*elided*/ any;
+    stripEmpty(): /*elided*/ any;
+    stripUnknown(): /*elided*/ any;
+    allowFlatKeys(): /*elided*/ any;
+    expandFlatKeys(): /*elided*/ any;
     options(options?: {
         stripEmpty?: boolean;
         stripUnknown?: boolean;

package/types/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.js"],"names":[],"mappings":"AAuBA,gEAaC;AAED;;;;;;;;;;;;kBAmHU,CAAC;oBAGD,CAAP;qBACoB,CAAC;sBAGlB,CAAD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA7B6B,CAAC;;;;;;;;;;;;;;EApElC;AAED;;;;;;;;;;;;;;;;mBA1BmD,CAAC;;;;;;;;;;;;qBAuBlD,CAAC;sBAGmB,CAAC;sBACrB,CAAC;wBAA8B,CAAC;wBACrB,CAAC;;;4BAwBc,CAAC;kCAK3B,CAAD;wBACc,CAAC;wBAA+B,CAAC;wCACtB,CAAC;2BAGhB,CAAC;kCAES,CAAC;2BACd,CAAC;qBACL,CAAJ;;;uBAuBgC,CAAC;6BAEjB,CAAC;8BACF,CAAC;6BAGZ,CAAH;0BACgB,CAAC;6BACZ,CAAF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAL8B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA5FgB,CAAC;;;;;;;;;;;;qBAuBlD,CAAC;sBAGmB,CAAC;sBACrB,CAAC;wBAA8B,CAAC;wBACrB,CAAC;;;4BAwBc,CAAC;kCAK3B,CAAD;wBACc,CAAC;wBAA+B,CAAC;wCACtB,CAAC;2BAGhB,CAAC;kCAES,CAAC;2BACd,CAAC;qBACL,CAAJ;;;uBAuBgC,CAAC;6BAEjB,CAAC;8BACF,CAAC;6BAGZ,CAAH;0BACgB,CAAC;6BACZ,CAAF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAL8B,CAAC;;;;;;;;;;;;;;;;;EArDlC"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.js"],"names":[],"mappings":"AAuBA,gEAaC;AAED;;;;;;;;;;;;;;;;;kBAyII,CAAF;oBAIe,CAAC;qBAEd,CAAJ;sBACmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAnDc,CAAC;;;;;;;;;;;;;;EApElC;AAED;;;;;;;;;;;;;;;;mBA1BmD,CAAC;;;;;;;;;;;;qBAuBlD,CAAC;sBAGmB,CAAC;sBACrB,CAAC;wBAA8B,CAAC;wBACrB,CAAC;;;4BAwBc,CAAC;kCAK3B,CAAD;wBACc,CAAC;wBAA+B,CAAC;wCACtB,CAAC;2BAGhB,CAAC;kCAES,CAAC;2BACd,CAAC;qBACL,CAAJ;;;uBAuBgC,CAAC;6BAEjB,CAAC;8BACF,CAAC;6BAGZ,CAAH;0BACgB,CAAC;6BACZ,CAAF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAL8B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA5FgB,CAAC;;;;;;;;;;;;qBAuBlD,CAAC;sBAGmB,CAAC;sBACrB,CAAC;wBAA8B,CAAC;wBACrB,CAAC;;;4BAwBc,CAAC;kCAK3B,CAAD;wBACc,CAAC;wBAA+B,CAAC;wCACtB,CAAC;2BAGhB,CAAC;kCAES,CAAC;2BACd,CAAC;qBACL,CAAJ;;;uBAuBgC,CAAC;6BAEjB,CAAC;8BACF,CAAC;6BAGZ,CAAH;0BACgB,CAAC;6BACZ,CAAF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAL8B,CAAC;;;;;;;;;;;;;;;;;EArDlC"}

package/types/validation-schemas.d.ts

@@ -162,6 +162,7 @@ export const OBJECT_ID_SCHEMA: {
     runAssertion(value: any, assertion: any, options?: {}): Promise<any>;
 };
 export const NUMBER_RANGE_SCHEMA: {
+    validateInput(): void;
     setup(): void;
     get(path?: string | Array<string>): any;
     unwind(path?: string | Array<string>): any;
@@ -172,6 +173,10 @@ export const NUMBER_RANGE_SCHEMA: {
     transform(fn: Function, root?: boolean): /*elided*/ any;
     export(): any;
     append(arg: import("@bedrockio/yada/types/object").SchemaMap | import("@bedrockio/yada/types/Schema").default): /*elided*/ any;
+    stripEmpty(): /*elided*/ any;
+    stripUnknown(): /*elided*/ any;
+    allowFlatKeys(): /*elided*/ any;
+    expandFlatKeys(): /*elided*/ any;
     options(options?: {
         stripEmpty?: boolean;
         stripUnknown?: boolean;
@@ -221,6 +226,7 @@ export const NUMBER_RANGE_SCHEMA: {
     runAssertion(value: any, assertion: any, options?: {}): Promise<any>;
 };
 export const STRING_RANGE_SCHEMA: {
+    validateInput(): void;
     setup(): void;
     get(path?: string | Array<string>): any;
     unwind(path?: string | Array<string>): any;
@@ -231,6 +237,10 @@ export const STRING_RANGE_SCHEMA: {
     transform(fn: Function, root?: boolean): /*elided*/ any;
     export(): any;
     append(arg: import("@bedrockio/yada/types/object").SchemaMap | import("@bedrockio/yada/types/Schema").default): /*elided*/ any;
+    stripEmpty(): /*elided*/ any;
+    stripUnknown(): /*elided*/ any;
+    allowFlatKeys(): /*elided*/ any;
+    expandFlatKeys(): /*elided*/ any;
     options(options?: {
         stripEmpty?: boolean;
         stripUnknown?: boolean;
@@ -280,6 +290,7 @@ export const STRING_RANGE_SCHEMA: {
     runAssertion(value: any, assertion: any, options?: {}): Promise<any>;
 };
 export const DATE_RANGE_SCHEMA: {
+    validateInput(): void;
     setup(): void;
     get(path?: string | Array<string>): any;
     unwind(path?: string | Array<string>): any;
@@ -290,6 +301,10 @@ export const DATE_RANGE_SCHEMA: {
     transform(fn: Function, root?: boolean): /*elided*/ any;
     export(): any;
     append(arg: import("@bedrockio/yada/types/object").SchemaMap | import("@bedrockio/yada/types/Schema").default): /*elided*/ any;
+    stripEmpty(): /*elided*/ any;
+    stripUnknown(): /*elided*/ any;
+    allowFlatKeys(): /*elided*/ any;
+    expandFlatKeys(): /*elided*/ any;
     options(options?: {
         stripEmpty?: boolean;
         stripUnknown?: boolean;
@@ -340,6 +355,7 @@ export const DATE_RANGE_SCHEMA: {
 };
 export const REFERENCE_SCHEMA: import("@bedrockio/yada/types/Schema").default;
 export const INCLUDE_FIELD_SCHEMA: {
+    validateInput(): void;
     setup(): void;
     get(path?: string | Array<string>): any;
     unwind(path?: string | Array<string>): any;
@@ -350,6 +366,10 @@ export const INCLUDE_FIELD_SCHEMA: {
     transform(fn: Function, root?: boolean): /*elided*/ any;
     export(): any;
     append(arg: import("@bedrockio/yada/types/object").SchemaMap | import("@bedrockio/yada/types/Schema").default): /*elided*/ any;
+    stripEmpty(): /*elided*/ any;
+    stripUnknown(): /*elided*/ any;
+    allowFlatKeys(): /*elided*/ any;
+    expandFlatKeys(): /*elided*/ any;
     options(options?: {
         stripEmpty?: boolean;
         stripUnknown?: boolean;

package/types/validation-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation-schemas.d.ts","sourceRoot":"","sources":["../src/validation-schemas.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA2FwE,CAAC;aACjE,CAAC;uBAGc,CAAC;;;;;;;;;;;eAO2H,CAAC;;;;;;;;;;;;;;;;EAtG1F;AAE1D;;;;;;;;;;;;;;;eAwBwB,CAAC;;;;;;;;;;;;iBAoBjB,CAAC;kBAEC,CAAC;kBAEH,CAAH;oBAA8B,CAAC;oBAEhC,CAAD;;;wBA4BW,CAAC;8BAEK,CAAA;oBAEd,CAAF;oBAEiB,CAAC;oCACjB,CAAC;uBAEF,CAAD;8BACkB,CAAC;uBAAkC,CAAC;iBAA4B,CAAC;;;mBAYjC,CAAC;yBAAoC,CAAC;0BAAqC,CAAC;yBAAoC,CAAC;sBAAiC,CAAC;yBAAoC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA1F,CAAC;;;;;;;;;;;;;;;;EA5F/I;AAEL;;;;;;;;;;;;kBA0FghB,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAje,CAAC;;;;;;;;;;;;;;EAhF/I;AAEL;;;;;;;;;;;;kBA8EghB,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAje,CAAC;;;;;;;;;;;;;;EApE/I;AAEL;;;;;;;;;;;;kBAkEghB,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAje,CAAC;;;;;;;;;;;;;;EAhC/I;AAEL,8EAqBK;AAEL;;;;;;;;;;;;kBAOghB,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAje,CAAC;;;;;;;;;;;;;;EADjJ"}
+{"version":3,"file":"validation-schemas.d.ts","sourceRoot":"","sources":["../src/validation-schemas.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA2FwE,CAAC;aACjE,CAAC;uBAGc,CAAC;;;;;;;;;;;eAO2H,CAAC;;;;;;;;;;;;;;;;EAtG1F;AAE1D;;;;;;;;;;;;;;;eAwBwB,CAAC;;;;;;;;;;;;iBAoBjB,CAAC;kBAEC,CAAC;kBAEH,CAAH;oBAA8B,CAAC;oBAEhC,CAAD;;;wBA4BW,CAAC;8BAEK,CAAA;oBAEd,CAAF;oBAEiB,CAAC;oCACjB,CAAC;uBAEF,CAAD;8BACkB,CAAC;uBAAkC,CAAC;iBAA4B,CAAC;;;mBAYjC,CAAC;yBAAoC,CAAC;0BAAqC,CAAC;yBAAoC,CAAC;sBAAiC,CAAC;yBAAoC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA1F,CAAC;;;;;;;;;;;;;;;;EA5F/I;AAEL;;;;;;;;;;;;;;;;;kBA0F04B,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA31B,CAAC;;;;;;;;;;;;;;EAhF/I;AAEL;;;;;;;;;;;;;;;;;kBA8E04B,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA31B,CAAC;;;;;;;;;;;;;;EApE/I;AAEL;;;;;;;;;;;;;;;;;kBAkE04B,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA31B,CAAC;;;;;;;;;;;;;;EAhC/I;AAEL,8EAqBK;AAEL;;;;;;;;;;;;;;;;;kBAO04B,CAAC;oBAA+B,CAAC;qBAAgC,CAAC;sBAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA31B,CAAC;;;;;;;;;;;;;;EADjJ"}