@bedrockio/model 0.7.2 → 0.7.4

package/CHANGELOG.md

@@ -0,0 +1,18 @@
+## 0.7.0
+
+- Handling null fields in search queries.
+
+## 0.6.0
+
+- Added upsert module with `findOrCreate`.
+- Added mechanism to sync cached fields when referenced document is saved.
+- Renamed `syncSearchFields` to `syncCacheFields`.
+- Simplified cache fields and search definition.
+
+## 0.5.0
+
+- Refactored include module to use ^ operator for exclusion.
+
+## 0.4.0
+
+- Added `hydrate` patch method.

package/dist/cjs/search.js

@@ -192,7 +192,7 @@ function buildRegexQuery(keyword, fields) {
     const regexKeyword = (0, _lodash.escapeRegExp)(keyword);
     return {
       [field]: {
-        $regex: `${regexKeyword}`,
+        $regex: regexKeyword,
         $options: 'i'
       }
     };

package/dist/cjs/validation.js

@@ -40,7 +40,7 @@ A 24 character hexadecimal string representing a Mongo [ObjectId](https://bit.ly
 An object with an \`id\` field may also be passed, which will be converted into a string.
     `.trim()
 });
-const namedSchemas = {
+const NAMED_SCHEMAS = {
   // Email is special as we are assuming that in
   // all cases lowercase should be allowed but coerced.
   email: _yada.default.string().lowercase().email(),
@@ -61,6 +61,8 @@ const namedSchemas = {
   locale: _yada.default.string().locale(),
   md5: _yada.default.string().md5(),
   phone: _yada.default.string().phone(),
+  'phone:US': _yada.default.string().phone('US'),
+  'phone:NANP': _yada.default.string().phone('NANP'),
   postalCode: _yada.default.string().postalCode(),
   zipcode: _yada.default.string().zipcode(),
   sha1: _yada.default.string().sha1(),
@@ -70,7 +72,7 @@ const namedSchemas = {
   uuid: _yada.default.string().uuid()
 };
 function addValidators(schemas) {
-  Object.assign(namedSchemas, schemas);
+  Object.assign(NAMED_SCHEMAS, schemas);
 }
 function applyValidation(schema, definition) {
   const hasUnique = (0, _softDelete.hasUniqueConstraints)(schema);
@@ -555,7 +557,7 @@ function wrapMongooseValidator(validator) {
   };
 }
 function getNamedSchema(name) {
-  const schema = namedSchemas[name];
+  const schema = NAMED_SCHEMAS[name];
   if (!schema) {
     throw new Error(`Cannot find schema for "${name}".`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -9,7 +9,8 @@
     "lint": "eslint",
     "build": "scripts/build",
     "eject": "scripts/eject.js",
-    "prepublishOnly": "yarn build && yarn types"
+    "prepublish": "yarn build && yarn types",
+    "postpublish": "scripts/tag"
   },
   "main": "dist/cjs/index.js",
   "module": "src/index.js",
@@ -30,7 +31,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@bedrockio/yada": "^1.2.2",
+    "@bedrockio/yada": "^1.2.3",
     "mongoose": "^8.6.2"
   },
   "devDependencies": {
@@ -38,7 +39,7 @@
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
     "@bedrockio/prettier-config": "^1.0.2",
-    "@bedrockio/yada": "^1.2.2",
+    "@bedrockio/yada": "^1.2.3",
     "@shelf/jest-mongodb": "^4.3.2",
     "eslint": "^8.33.0",
     "eslint-plugin-bedrock": "^1.0.26",

package/src/search.js

@@ -196,7 +196,7 @@ function buildRegexQuery(keyword, fields) {
     const regexKeyword = escapeRegExp(keyword);
     return {
       [field]: {
-        $regex: `${regexKeyword}`,
+        $regex: regexKeyword,
         $options: 'i',
       },
     };

package/src/validation.js

@@ -49,7 +49,7 @@ An object with an \`id\` field may also be passed, which will be converted into
     `.trim(),
   });
 
-const namedSchemas = {
+const NAMED_SCHEMAS = {
   // Email is special as we are assuming that in
   // all cases lowercase should be allowed but coerced.
   email: yd.string().lowercase().email(),
@@ -71,6 +71,8 @@ const namedSchemas = {
   locale: yd.string().locale(),
   md5: yd.string().md5(),
   phone: yd.string().phone(),
+  'phone:US': yd.string().phone('US'),
+  'phone:NANP': yd.string().phone('NANP'),
   postalCode: yd.string().postalCode(),
   zipcode: yd.string().zipcode(),
   sha1: yd.string().sha1(),
@@ -81,7 +83,7 @@ const namedSchemas = {
 };
 
 export function addValidators(schemas) {
-  Object.assign(namedSchemas, schemas);
+  Object.assign(NAMED_SCHEMAS, schemas);
 }
 
 export function applyValidation(schema, definition) {
@@ -611,7 +613,7 @@ function wrapMongooseValidator(validator) {
 }
 
 function getNamedSchema(name) {
-  const schema = namedSchemas[name];
+  const schema = NAMED_SCHEMAS[name];
   if (!schema) {
     throw new Error(`Cannot find schema for "${name}".`);
   }

package/types/validation.d.ts

@@ -19,7 +19,7 @@ export const OBJECT_ID_SCHEMA: {
     uppercase(assert?: boolean): any;
     match(reg: RegExp): any;
     email(): any;
-    phone(): any;
+    phone(code: any): any;
     hex(): any;
     md5(): any;
     sha1(): any;

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAkFA,kDAEC;AAED,oEAgGC;AAsBD,wEA2BC;AAkVD;;;EAEC;AAED;;;EAOC;AAljBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AAoFA,kDAEC;AAED,oEAgGC;AAsBD,wEA2BC;AAkVD;;;EAEC;AAED;;;EAOC;AApjBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQK"}