@bedrockio/model 0.14.2 → 0.14.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.3
+
+- Allow keyword search on number fields.
+
 ## 0.14.2
 
 - Loosened peer deps.

package/dist/cjs/search.js

@@ -85,7 +85,7 @@ function searchQuery(Model, options, config) {
     ...rest
   } = options;
   sort = resolveSort(sort, schema);
-  let query = normalizeQuery(rest, schema.obj);
+  let query = normalizeQuery(rest, schema);
   if (ids?.length) {
     query = (0, _query.mergeQuery)(query, {
       _id: {
@@ -231,7 +231,7 @@ function buildKeywordQuery(schema, keyword, config) {
     return getTextIndexQuery(keyword);
   }
   keyword = (0, _lodash.escapeRegExp)(keyword);
-  const queries = [...getDecomposedQueries(keyword, config), ...getFieldQueries(keyword, config)];
+  const queries = [...getDecomposedQueries(keyword, config), ...getFieldQueries(schema, keyword, config)];
 
   // Note: Mongo will error on empty $or/$and array.
   if (queries.length > 1) {
@@ -295,7 +295,7 @@ const compileDecomposer = (0, _lodash.memoize)(template => {
     }
   };
 });
-function getFieldQueries(keyword, config) {
+function getFieldQueries(schema, keyword, config) {
   const {
     fields
   } = config;
@@ -303,12 +303,26 @@ function getFieldQueries(keyword, config) {
     return [];
   }
   const queries = fields.map(field => {
-    return {
-      [field]: {
-        $regex: keyword,
-        $options: 'i'
-      }
-    };
+    if ((0, _utils.isNumberField)(schema, field)) {
+      return {
+        $expr: {
+          $regexMatch: {
+            input: {
+              $toString: `$${field}`
+            },
+            regex: keyword,
+            options: 'i'
+          }
+        }
+      };
+    } else {
+      return {
+        [field]: {
+          $regex: keyword,
+          $options: 'i'
+        }
+      };
+    }
   });
   if (ObjectId.isValid(keyword)) {
     queries.push({

package/dist/cjs/utils.js

@@ -91,6 +91,10 @@ function isSchemaTypedef(arg) {
 // "inventory" field. It must traverse into arrays and other mongoose
 // schemas along the way except for the final field.
 function getField(obj, path) {
+  if (obj instanceof _mongoose.default.Schema) {
+    // Unwrap mongoose schema if passed.
+    obj = obj.obj;
+  }
   let field = obj;
   if (typeof path === 'string') {
     path = path.split('.');

package/package.json

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

package/src/search.js

@@ -86,7 +86,7 @@ function searchQuery(Model, options, config) {
 
   sort = resolveSort(sort, schema);
 
-  let query = normalizeQuery(rest, schema.obj);
+  let query = normalizeQuery(rest, schema);
 
   if (ids?.length) {
     query = mergeQuery(query, {
@@ -266,7 +266,7 @@ function buildKeywordQuery(schema, keyword, config) {
 
   const queries = [
     ...getDecomposedQueries(keyword, config),
-    ...getFieldQueries(keyword, config),
+    ...getFieldQueries(schema, keyword, config),
   ];
 
   // Note: Mongo will error on empty $or/$and array.
@@ -342,7 +342,7 @@ const compileDecomposer = memoize((template) => {
   };
 });
 
-function getFieldQueries(keyword, config) {
+function getFieldQueries(schema, keyword, config) {
   const { fields } = config;
 
   if (!fields) {
@@ -350,12 +350,26 @@ function getFieldQueries(keyword, config) {
   }
 
   const queries = fields.map((field) => {
-    return {
-      [field]: {
-        $regex: keyword,
-        $options: 'i',
-      },
-    };
+    if (isNumberField(schema, field)) {
+      return {
+        $expr: {
+          $regexMatch: {
+            input: {
+              $toString: `$${field}`,
+            },
+            regex: keyword,
+            options: 'i',
+          },
+        },
+      };
+    } else {
+      return {
+        [field]: {
+          $regex: keyword,
+          $options: 'i',
+        },
+      };
+    }
   });
 
   if (ObjectId.isValid(keyword)) {

package/src/utils.js

@@ -79,6 +79,10 @@ export function isSchemaTypedef(arg) {
 // "inventory" field. It must traverse into arrays and other mongoose
 // schemas along the way except for the final field.
 export function getField(obj, path) {
+  if (obj instanceof mongoose.Schema) {
+    // Unwrap mongoose schema if passed.
+    obj = obj.obj;
+  }
   let field = obj;
   if (typeof path === 'string') {
     path = path.split('.');

package/types/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.js"],"names":[],"mappings":"AAuBA,gEAaC;AAED;;;;;;;;;;;;kBA8GU,CAAP;oBACmB,CAAC;qBAGX,CAAN;sBAEE,CAAR;;;;;;;;;;;;;;;;;;;;;;;;;;;;eArDE,CADF;;;;;;;;;;;;;;;;;EArCC;AAED;;;;;;;;;;;;;;;;;mBAtBI,CAAA;;;;;;;;;;;;qBAuBC,CAAC;sBAA4B,CAAC;sBACvB,CAAC;wBAA8B,CAAC;wBAEnC,CAAC;;;4BA2BK,CAAC;kCACwB,CAAC;wBACrC,CAAA;wBAA+B,CAAC;wCAK9B,CAAJ;2BAAkC,CAAC;kCACP,CAAC;2BAIhB,CAAC;qBAA4B,CAAC;;;uBAsBT,CAAC;6BACH,CAAC;8BAI7B,CAAF;6BAAoC,CAAC;0BAClB,CAAC;6BAIhB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAvCN,CADF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAzDI,CAAA;;;;;;;;;;;;qBAuBC,CAAC;sBAA4B,CAAC;sBACvB,CAAC;wBAA8B,CAAC;wBAEnC,CAAC;;;4BA2BK,CAAC;kCACwB,CAAC;wBACrC,CAAA;wBAA+B,CAAC;wCAK9B,CAAJ;2BAAkC,CAAC;kCACP,CAAC;2BAIhB,CAAC;qBAA4B,CAAC;;;uBAsBT,CAAC;6BACH,CAAC;8BAI7B,CAAF;6BAAoC,CAAC;0BAClB,CAAC;6BAIhB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAvCN,CADF;;;;;;;;;;;;;;;;;;;;EAtBC"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.js"],"names":[],"mappings":"AAuBA,gEAaC;AAED;;;;;;;;;;;;kBA8GU,CAAH;oBAEG,CAAR;qBAEU,CAAF;sBAEF,CAAJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;eArDF,CAAC;;;;;;;;;;;;;;;;;EAtCF;AAED;;;;;;;;;;;;;;;;;mBAtBI,CAAA;;;;;;;;;;;;qBAuBC,CAAC;sBAA4B,CAAC;sBACvB,CAAC;wBAA8B,CAAC;wBAEnC,CAAC;;;4BA4BN,CAAD;kCAAyC,CAAC;wBACtC,CAAC;wBAA+B,CAAC;wCAKlC,CAAA;2BAAkC,CAAC;kCACP,CAAC;2BAIhB,CAAC;qBAA4B,CAAC;;;uBAuB/C,CAAA;6BAEA,CAAA;8BAEK,CAAC;6BAAoC,CAAC;0BAClB,CAAC;6BAIjB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAvCV,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA1DC,CAAA;;;;;;;;;;;;qBAuBC,CAAC;sBAA4B,CAAC;sBACvB,CAAC;wBAA8B,CAAC;wBAEnC,CAAC;;;4BA4BN,CAAD;kCAAyC,CAAC;wBACtC,CAAC;wBAA+B,CAAC;wCAKlC,CAAA;2BAAkC,CAAC;kCACP,CAAC;2BAIhB,CAAC;qBAA4B,CAAC;;;uBAuB/C,CAAA;6BAEA,CAAA;8BAEK,CAAC;6BAAoC,CAAC;0BAClB,CAAC;6BAIjB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAvCV,CAAC;;;;;;;;;;;;;;;;;;;;EAvBF"}

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAQA,iDAcC;AAED,gHAEC;AAED,+DAEC;AAED,0DAEC;AAED,4DAEC;AAED,4DAEC;AAED,2DAGC;AAOD,mDAGC;AAuBD,mDAYC;AAKD;;;;EAoBC;AAKD,wDAEC;qBA5HoB,UAAU"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAQA,iDAcC;AAED,gHAEC;AAED,+DAEC;AAED,0DAEC;AAED,4DAEC;AAED,4DAEC;AAED,2DAGC;AAOD,mDAGC;AAuBD,mDAgBC;AAKD;;;;EAoBC;AAKD,wDAEC;qBAhIoB,UAAU"}