@rpcbase/server 0.250.0 → 0.252.0

package/boot/setup_env.js

@@ -5,17 +5,11 @@ const dotenv = require("dotenv")
 const wd = process.cwd()
 
 const shared_env_path = path.join(wd, "../../.env")
-const base_env_path = path.join(wd, "./.env.base")
 const env_path = path.join(wd, "./.env")
 
 const res_shared = dotenv.config({path: shared_env_path})
-const res_base = dotenv.config({path: base_env_path})
 const res = dotenv.config({path: env_path})
 
-if (res_base.error) {
-  throw res_base.error
-}
-
 if (res.error) {
   throw res.error
 }

package/boot/shared.js

@@ -1,6 +1,8 @@
 /* @flow */
 require("./setup_env")
 
+require("../src/helpers/expect_ext")
+
 const mongoose = require("../mongoose")
 require("@rpcbase/access-control")(mongoose)
 

package/cli/run_docker.js

@@ -10,7 +10,6 @@ const is_ci = process.env.CI === "true"
 const run_docker = async(infrastructure_dir, proj_prefix, args) => {
   // env
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
-  const base_env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env.base"))
 
   const exists = (f) => {
     const target_path = path.join(infrastructure_dir, f)
@@ -42,7 +41,7 @@ const run_docker = async(infrastructure_dir, proj_prefix, args) => {
 
 
   const cmd = "docker compose"
-  const cmd_args = ["--env-file", base_env_path, "--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
+  const cmd_args = ["--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
 
   console.log("CMD", cmd_args.join(" "))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.250.0",
+  "version": "0.252.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

package/src/helpers/expect_ext.js

@@ -0,0 +1,42 @@
+/* @flow */
+const {expect} = require("expect")
+
+const isMongoId = require("validator/lib/isMongoId")
+const isEmail = require("validator/lib/isEmail")
+
+
+expect.extend({
+  toBeMongoId: (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: (actual) => {
+    const pass = 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