@bedrockio/model 0.1.26 → 0.1.28

package/dist/cjs/include.js

@@ -44,6 +44,11 @@ function applyInclude(schema) {
     }
     return next();
   });
+  schema.pre(/^count/, function (next) {
+    const filter = this.getFilter();
+    delete filter.include;
+    return next();
+  });
 
   // Static Methods
 

package/dist/cjs/validation.js

@@ -268,7 +268,14 @@ function getSchemaForTypedef(typedef, options = {}) {
     schema = schema.required();
   }
   if (typedef.default) {
-    schema = schema.default(typedef.default);
+    // Note that adding a default in the validation is
+    // technically unnecessary as this will be handled
+    // at the model level, however fixed values can be
+    // reported to the OpenAPI definition to enrich
+    // documentation.
+    if (typeof typedef.default !== 'function') {
+      schema = schema.default(typedef.default);
+    }
   }
   if (typedef.validate?.schema) {
     schema = schema.append(typedef.validate.schema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -29,7 +29,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@bedrockio/yada": "^1.0.27",
+    "@bedrockio/yada": "^1.0.30",
     "mongoose": ">=6.9.0"
   },
   "devDependencies": {
@@ -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.28",
+    "@bedrockio/yada": "^1.0.30",
     "@shelf/jest-mongodb": "^4.1.6",
     "babel-plugin-import-replacement": "^1.0.1",
     "eslint": "^8.33.0",

package/src/include.js

@@ -39,6 +39,12 @@ export function applyInclude(schema) {
     return next();
   });
 
+  schema.pre(/^count/, function (next) {
+    const filter = this.getFilter();
+    delete filter.include;
+    return next();
+  });
+
   // Static Methods
 
   // Async method runs the create first then calls into

package/src/validation.js

@@ -280,7 +280,14 @@ function getSchemaForTypedef(typedef, options = {}) {
     schema = schema.required();
   }
   if (typedef.default) {
-    schema = schema.default(typedef.default);
+    // Note that adding a default in the validation is
+    // technically unnecessary as this will be handled
+    // at the model level, however fixed values can be
+    // reported to the OpenAPI definition to enrich
+    // documentation.
+    if (typeof typedef.default !== 'function') {
+      schema = schema.default(typedef.default);
+    }
   }
   if (typedef.validate?.schema) {
     schema = schema.append(typedef.validate.schema);

package/types/include.d.ts

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

package/types/include.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../src/include.js"],"names":[],"mappings":"AA2BA,gDAiEC;AAMD,uDA4BC;AAGD,2DAIC;AAjHD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKG"}
+{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../src/include.js"],"names":[],"mappings":"AA2BA,gDAuEC;AAMD,uDA4BC;AAGD,2DAIC;AAvHD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKG"}

package/types/search.d.ts

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

package/types/validation.d.ts

@@ -10,6 +10,7 @@ export function getTupleValidator(types: any): {
     schema: any;
 };
 export const OBJECT_ID_SCHEMA: {
+    required(): any;
     length(length: number): any;
     min(length: number): any;
     max(length: number): any;
@@ -69,8 +70,7 @@ export const OBJECT_ID_SCHEMA: {
     toString(): any;
     assertions: any[];
     meta: {};
-    required(): any;
-    default(value: any): any;
+    default(arg: any): any;
     custom(...args: import("@bedrockio/yada/types/Schema").CustomSignature): any;
     strip(strip: any): any;
     allow(...set: any[]): any;

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiFA,kDAEC;AAED,oEAiFC;AAsBD,wEAkBC;AA6QD;;;EAEC;AAED;;;EAOC;AApdD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiFA,kDAEC;AAED,oEAiFC;AAsBD,wEAkBC;AAoRD;;;EAEC;AAED;;;EAOC;AA3dD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}