@bedrockio/model 0.1.28 → 0.1.30

package/dist/cjs/references.js

@@ -29,7 +29,7 @@ function applyReferences(schema) {
         return e === model || e === model.modelName;
       });
       if (isAllowed) {
-        return;
+        continue;
       }
       const query = {
         $or: paths.map(path => {

package/dist/cjs/validation.js

@@ -270,12 +270,9 @@ function getSchemaForTypedef(typedef, options = {}) {
   if (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);
-    }
+    // at the model level, however passing this on will
+    // enrich OpenAPI documentation.
+    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.28",
+  "version": "0.1.30",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -29,7 +29,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@bedrockio/yada": "^1.0.30",
+    "@bedrockio/yada": "^1.0.32",
     "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.30",
+    "@bedrockio/yada": "^1.0.32",
     "@shelf/jest-mongodb": "^4.1.6",
     "babel-plugin-import-replacement": "^1.0.1",
     "eslint": "^8.33.0",

package/src/references.js

@@ -21,7 +21,7 @@ export function applyReferences(schema) {
           return e === model || e === model.modelName;
         });
         if (isAllowed) {
-          return;
+          continue;
         }
 
         const query = {

package/src/validation.js

@@ -282,12 +282,9 @@ function getSchemaForTypedef(typedef, options = {}) {
   if (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);
-    }
+    // at the model level, however passing this on will
+    // enrich OpenAPI documentation.
+    schema = schema.default(typedef.default);
   }
   if (typedef.validate?.schema) {
     schema = schema.append(typedef.validate.schema);

package/types/include.d.ts

@@ -24,6 +24,11 @@ export const INCLUDE_FIELD_SCHEMA: {
     validate(value: any, options?: {}): Promise<any>;
     clone(meta: any): any;
     toOpenApi(extra: any): any;
+    getDefault(): {
+        default?: undefined;
+    } | {
+        default: any;
+    };
     inspect(): string;
     expandExtra(extra?: {}): {};
     assertEnum(set: any, allow: any): any;

package/types/include.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../src/include.js"],"names":[],"mappings":"AA2BA,gDAuEC;AAMD,uDA4BC;AAGD,2DAIC;AAvHD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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

@@ -22,6 +22,11 @@ export function searchValidation(options?: {}): {
     validate(value: any, options?: {}): Promise<any>;
     clone(meta: any): any;
     toOpenApi(extra: any): any;
+    getDefault(): {
+        default?: undefined;
+    } | {
+        default: any;
+    };
     inspect(): string;
     expandExtra(extra?: {}): {};
     assertEnum(set: any, allow: any): any;

package/types/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.js"],"names":[],"mappings":"AAcA,gEAgEC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBC"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.js"],"names":[],"mappings":"AAcA,gEAgEC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBC"}

package/types/validation.d.ts

@@ -83,6 +83,11 @@ export const OBJECT_ID_SCHEMA: {
     clone(meta: any): any;
     append(schema: any): any;
     toOpenApi(extra: any): any;
+    getDefault(): {
+        default?: undefined;
+    } | {
+        default: any;
+    };
     inspect(): string;
     expandExtra(extra?: {}): {};
     assertEnum(set: any, allow: 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;AAoRD;;;EAEC;AAED;;;EAOC;AA3dD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAiFA,kDAEC;AAED,oEAiFC;AAsBD,wEAkBC;AAiRD;;;EAEC;AAED;;;EAOC;AAxdD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}