@bedrockio/model 0.21.3 → 0.22.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.22.1
+
+- Indicate whether document was created or not in upsert.
+
+## 0.22.0
+
+- Removed regex parsing in search.
+
 ## 0.21.3
 
 - Fixed issue with middleware hook patch.

package/README.md

@@ -603,8 +603,6 @@ Input to `search` will execute the optimal mongo query and supports several
 advanced features:
 
 - Array fields will be executed using `$in`.
-- Javascript regular expressions will map to `$regex` which allows for
-  [more advanced PCRE compatible features](https://docs.mongodb.com/manual/reference/operator/query/regex/#pcre-vs-javascript).
 - Nested objects will be automatically flattened to query subdocuments:
 
 ```

package/dist/cjs/search.js

@@ -351,8 +351,6 @@ function hasTextIndex(schema) {
 // handling specialed query syntax:
 // ranges:
 //  path: { min: n, max n }
-// regex:
-//  path: "/reg/"
 // array:
 //  path; [1,2,3]
 function normalizeQuery(query, schema, root = {}, rootPath = []) {
@@ -364,8 +362,6 @@ function normalizeQuery(query, schema, root = {}, rootPath = []) {
       }
     } else if (isNestedQuery(key, value)) {
       normalizeQuery(value, (0, _utils.getField)(schema, key), root, path);
-    } else if (isRegexQuery(key, value)) {
-      root[path.join('.')] = parseRegexQuery(value);
     } else if (isArrayQuery(key, value)) {
       root[path.join('.')] = {
         $in: value
@@ -420,23 +416,6 @@ function isInclude(str) {
   return str === 'include';
 }
 
-// Regex queries
-
-const REGEX_QUERY = /^\/(.+)\/(\w*)$/;
-function isRegexQuery(key, value) {
-  return REGEX_QUERY.test(value);
-}
-function parseRegexQuery(str) {
-  // Note that using the $options syntax allows for PCRE features
-  // that aren't supported in Javascript as compared to RegExp(...):
-  // https://docs.mongodb.com/manual/reference/operator/query/regex/#pcre-vs-javascript
-  const [, $regex, $options] = str.match(REGEX_QUERY);
-  return {
-    $regex,
-    $options
-  };
-}
-
 // Search field caching
 
 function validateSearchFields(schema, definition) {

package/dist/cjs/upsert.js

@@ -16,8 +16,10 @@ function applyUpsert(schema) {
     if (doc) {
       doc.assign(fields);
       await doc.save();
+      doc.$locals.created = false;
     } else {
       doc = await this.create(fields);
+      doc.$locals.created = true;
     }
     return doc;
   });

package/package.json

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

package/src/search.js

@@ -398,8 +398,6 @@ function hasTextIndex(schema) {
 // handling specialed query syntax:
 // ranges:
 //  path: { min: n, max n }
-// regex:
-//  path: "/reg/"
 // array:
 //  path; [1,2,3]
 function normalizeQuery(query, schema, root = {}, rootPath = []) {
@@ -411,8 +409,6 @@ function normalizeQuery(query, schema, root = {}, rootPath = []) {
       }
     } else if (isNestedQuery(key, value)) {
       normalizeQuery(value, getField(schema, key), root, path);
-    } else if (isRegexQuery(key, value)) {
-      root[path.join('.')] = parseRegexQuery(value);
     } else if (isArrayQuery(key, value)) {
       root[path.join('.')] = { $in: value };
     } else if (isEmptyArrayQuery(schema, key, value)) {
@@ -475,25 +471,6 @@ function isInclude(str) {
   return str === 'include';
 }
 
-// Regex queries
-
-const REGEX_QUERY = /^\/(.+)\/(\w*)$/;
-
-function isRegexQuery(key, value) {
-  return REGEX_QUERY.test(value);
-}
-
-function parseRegexQuery(str) {
-  // Note that using the $options syntax allows for PCRE features
-  // that aren't supported in Javascript as compared to RegExp(...):
-  // https://docs.mongodb.com/manual/reference/operator/query/regex/#pcre-vs-javascript
-  const [, $regex, $options] = str.match(REGEX_QUERY);
-  return {
-    $regex,
-    $options,
-  };
-}
-
 // Search field caching
 
 function validateSearchFields(schema, definition) {

package/src/upsert.js

@@ -12,8 +12,10 @@ export function applyUpsert(schema) {
     if (doc) {
       doc.assign(fields);
       await doc.save();
+      doc.$locals.created = false;
     } else {
       doc = await this.create(fields);
+      doc.$locals.created = true;
     }
 
     return doc;

package/types/generated/upsert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../src/upsert.js"],"names":[],"mappings":"AAAA,+CAgCC"}
+{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../src/upsert.js"],"names":[],"mappings":"AAAA,+CAkCC"}