@bedrockio/model 0.19.0 → 0.19.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.19.2
+
+- Fixed issue with delete hooks in subdocument arrays.
+
+## 0.19.1
+
+- Fix for deep cache field not saving.
+- Test for multiple decomposers.
+
 ## 0.19.0
 
 - Ensure that document clone is synchronous.

package/dist/cjs/cache.js

@@ -227,10 +227,13 @@ function getUpdates(doc, fields) {
 function getIncludes(fields) {
   const includes = new Set();
   for (let field of fields) {
-    includes.add(field.local);
+    includes.add(getPathBase(field.path));
   }
   return includes;
 }
+function getPathBase(path) {
+  return path.split('.').slice(0, -1).join('.');
+}
 
 // Assertions
 

package/dist/cjs/delete-hooks.js

@@ -11,7 +11,8 @@ var _errors = require("./errors");
 var _utils = require("./utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
-  ObjectId: SchemaObjectId
+  ObjectId: SchemaObjectId,
+  DocumentArray: SchemaDocumentArray
 } = _mongoose.default.Schema.Types;
 function addDeletedFields(definition) {
   let {
@@ -223,7 +224,7 @@ function assertModelNames(arr = []) {
 function getAllReferences(doc) {
   const targetName = doc.constructor.modelName;
   return Object.values(_mongoose.default.models).map(model => {
-    const paths = getModelReferences(model, targetName);
+    const paths = getModelReferences(model.schema, targetName);
     return {
       model,
       paths
@@ -234,10 +235,13 @@ function getAllReferences(doc) {
     return paths.length > 0;
   });
 }
-function getModelReferences(model, targetName) {
-  const paths = [];
-  model.schema.eachPath((schemaPath, schemaType) => {
-    if (schemaType instanceof SchemaObjectId && schemaPath[0] !== '_') {
+function getModelReferences(schema, targetName, path = []) {
+  let references = [];
+  schema.eachPath((name, schemaType) => {
+    if (name.startsWith('_') || name === 'deletedRefs') {
+      return;
+    }
+    if (schemaType instanceof SchemaObjectId) {
       const {
         ref,
         refPath
@@ -246,16 +250,18 @@ function getModelReferences(model, targetName) {
       if (ref) {
         refs = [ref];
       } else if (refPath) {
-        refs = model.schema.path(refPath).options.enum;
+        refs = schema.path(refPath).options.enum;
       } else {
-        throw new Error(`Cannot derive refs for ${model.modelName}#${schemaPath}.`);
+        throw new Error(`Cannot derive refs for ${targetName}#${name}.`);
       }
       if (refs.includes(targetName)) {
-        paths.push(schemaPath);
+        references.push([...path, name].join('.'));
       }
+    } else if (schemaType instanceof SchemaDocumentArray) {
+      references = [...references, ...getModelReferences(schemaType.schema, targetName, [name])];
     }
   });
-  return paths;
+  return references;
 }
 
 // Delete

package/package.json

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

package/src/cache.js

@@ -232,11 +232,15 @@ function getUpdates(doc, fields) {
 function getIncludes(fields) {
   const includes = new Set();
   for (let field of fields) {
-    includes.add(field.local);
+    includes.add(getPathBase(field.path));
   }
   return includes;
 }
 
+function getPathBase(path) {
+  return path.split('.').slice(0, -1).join('.');
+}
+
 // Assertions
 
 function assertIncludeModule(Model) {

package/src/delete-hooks.js

@@ -4,7 +4,8 @@ import mongoose from 'mongoose';
 import { ReferenceError } from './errors';
 import { getInnerField } from './utils';
 
-const { ObjectId: SchemaObjectId } = mongoose.Schema.Types;
+const { ObjectId: SchemaObjectId, DocumentArray: SchemaDocumentArray } =
+  mongoose.Schema.Types;
 
 export function addDeletedFields(definition) {
   let { onDelete: deleteHooks } = definition;
@@ -215,7 +216,7 @@ function getAllReferences(doc) {
   const targetName = doc.constructor.modelName;
   return Object.values(mongoose.models)
     .map((model) => {
-      const paths = getModelReferences(model, targetName);
+      const paths = getModelReferences(model.schema, targetName);
       return { model, paths };
     })
     .filter(({ paths }) => {
@@ -223,27 +224,34 @@ function getAllReferences(doc) {
     });
 }
 
-function getModelReferences(model, targetName) {
-  const paths = [];
-  model.schema.eachPath((schemaPath, schemaType) => {
-    if (schemaType instanceof SchemaObjectId && schemaPath[0] !== '_') {
+function getModelReferences(schema, targetName, path = []) {
+  let references = [];
+  schema.eachPath((name, schemaType) => {
+    if (name.startsWith('_') || name === 'deletedRefs') {
+      return;
+    }
+
+    if (schemaType instanceof SchemaObjectId) {
       const { ref, refPath } = schemaType.options;
       let refs;
       if (ref) {
         refs = [ref];
       } else if (refPath) {
-        refs = model.schema.path(refPath).options.enum;
+        refs = schema.path(refPath).options.enum;
       } else {
-        throw new Error(
-          `Cannot derive refs for ${model.modelName}#${schemaPath}.`,
-        );
+        throw new Error(`Cannot derive refs for ${targetName}#${name}.`);
       }
       if (refs.includes(targetName)) {
-        paths.push(schemaPath);
+        references.push([...path, name].join('.'));
       }
+    } else if (schemaType instanceof SchemaDocumentArray) {
+      references = [
+        ...references,
+        ...getModelReferences(schemaType.schema, targetName, [name]),
+      ];
     }
   });
-  return paths;
+  return references;
 }
 
 // Delete

package/types/delete-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-hooks.d.ts","sourceRoot":"","sources":["../src/delete-hooks.js"],"names":[],"mappings":"AAQA,wDAgBC;AAED,qEAqCC"}
+{"version":3,"file":"delete-hooks.d.ts","sourceRoot":"","sources":["../src/delete-hooks.js"],"names":[],"mappings":"AASA,wDAgBC;AAED,qEAqCC"}

package/types/schema.d.ts

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

package/types/search.d.ts

@@ -1,6 +1,5 @@
 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;
@@ -11,10 +10,6 @@ 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;;;;;;;;;;;;;;;;;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"}
+{"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"}

package/types/validation-schemas.d.ts

@@ -162,7 +162,6 @@ 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;
@@ -173,10 +172,6 @@ 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;
@@ -226,7 +221,6 @@ 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;
@@ -237,10 +231,6 @@ 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;
@@ -290,7 +280,6 @@ 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;
@@ -301,10 +290,6 @@ 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;
@@ -355,7 +340,6 @@ 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;
@@ -366,10 +350,6 @@ 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;;;;;;;;;;;;;;;;;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"}
+{"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"}