@rpcbase/server 0.357.0 → 0.359.0

package/boot/shared.js

@@ -5,7 +5,7 @@ if (typeof __RB_IS_WEBPACK__ === "undefined") {
 
 require("./setup_env")
 
-require("../extend-expect")
+require("@rpcbase/std/extend-expect")
 
 const mongoose = require("../mongoose")
 

package/mongoose/index.ts

@@ -1,12 +1,10 @@
-export * from "mongoose"
-
 import mongoose from "mongoose"
 import {object_id_plugin} from "./object_id_plugin"
 
-
 mongoose.set("strictQuery", false)
 
 mongoose.plugin(object_id_plugin)
 
-
 export default mongoose
+
+export * from "mongoose"

package/mongoose/object_id_plugin.ts

@@ -3,12 +3,24 @@ import mongoose, { Schema } from "./"
 import {get_object_id} from "../get_object_id"
 
 export const object_id_plugin = (schema: Schema) => {
-  if (!schema.path("_id")) {
-    schema.add({
-      _id: {
-        type: mongoose.Types.ObjectId,
-        default: () => get_object_id(),
-      },
-    })
-  }
+  // Disable Mongoose's automatic _id field creation
+   if (!schema.options._id) {
+     schema.options._id = false
+   }
+
+   // Add your custom _id field
+   schema.add({
+     _id: {
+       type: mongoose.Schema.Types.ObjectId,
+       default: () => get_object_id(),
+     },
+   })
+
+   // Optional: Ensure the _id field is always set
+   schema.pre("save", function(next) {
+     if (!this._id) {
+       this._id = get_object_id()
+     }
+     next()
+   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.357.0",
+  "version": "0.359.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {
@@ -69,12 +69,10 @@
     "cors": "2.8.5",
     "debug": "4.3.6",
     "dotenv": "16.4.5",
-    "expect": "29.7.0",
     "express": "4.19.2",
     "express-session": "1.18.0",
     "firebase-admin": "12.3.0",
     "glob": "11.0.0",
-    "jest-extended": "4.0.2",
     "lodash": "4.17.21",
     "mkdirp": "3.0.1",
     "mongoose": "8.5.2",

package/queue/register_queue_listener.js

@@ -81,6 +81,8 @@ const dispatch_change_handler = (change) => {
     return
   }
 
+  const op = change.operationType
+
   dispatch_queue(queue, model_name, op, change.fullDocument, change.updateDescription)
 }
 

package/extend-expect/index.js

@@ -1,7 +0,0 @@
-/* @flow */
-// WARNING: must be first import here
-require("./mactchers")
-
-// add all jest-extended matchers
-const matchers = require("jest-extended")
-expect.extend(matchers)

package/extend-expect/mactchers.js

@@ -1,42 +0,0 @@
-/* @flow */
-const {expect} = require("expect")
-
-const isMongoId = require("validator/lib/isMongoId")
-const isEmail = require("validator/lib/isEmail")
-
-
-expect.extend({
-  toBeMongoId: function(actual) {
-    const pass = isMongoId(actual)
-
-    if (pass) {
-      return {
-        message: () => `expected ${this.utils.printReceived(actual)} not to be a valid mongoId`,
-        pass: true,
-      }
-    } else {
-      return {
-        message: () => `expected ${this.utils.printReceived(actual)} to be a valid mongoId`,
-        pass: false,
-      }
-    }
-  },
-  toBeEmail: function(actual) {
-    const pass = actual && isEmail(actual)
-
-    if (pass) {
-      return {
-        message: () =>
-          `expected ${this.utils.printReceived(actual)} not to be a valid email address`,
-        pass: true,
-      }
-    } else {
-      return {
-        message: () => `expected ${this.utils.printReceived(actual)} to be a valid email address`,
-        pass: false,
-      }
-    }
-  },
-})
-
-global.expect = expect