@aeriajs/builtins 0.0.66 → 0.0.67

package/dist/collections/user/activate.js

@@ -1,31 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = exports.ActivationErrors = void 0;
 const core_1 = require("@aeriajs/core");
 const common_1 = require("@aeriajs/common");
+const bcrypt_1 = __importDefault(require("bcrypt"));
 var ActivationErrors;
 (function (ActivationErrors) {
     ActivationErrors["UserNotFound"] = "USER_NOT_FOUND";
@@ -50,8 +31,7 @@ const activate = async (payload, context) => {
     if (user.active) {
         return (0, common_1.left)(ActivationErrors.AlreadyActiveUser);
     }
-    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
-    const equal = await bcrypt.compare(user._id.toString(), token);
+    const equal = await bcrypt_1.default.compare(user._id.toString(), token);
     if (!equal) {
         return (0, common_1.left)(ActivationErrors.InvalidLink);
     }
@@ -66,7 +46,7 @@ const activate = async (payload, context) => {
         }, {
             $set: {
                 active: true,
-                password: await bcrypt.hash(payload.password, 10),
+                password: await bcrypt_1.default.hash(payload.password, 10),
             },
         });
         return (0, common_1.right)(true);

package/dist/collections/user/activate.mjs

@@ -1,6 +1,7 @@
 "use strict";
 import { ObjectId } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
+import bcrypt from "bcrypt";
 export var ActivationErrors = /* @__PURE__ */ ((ActivationErrors2) => {
   ActivationErrors2["UserNotFound"] = "USER_NOT_FOUND";
   ActivationErrors2["AlreadyActiveUser"] = "ALREADY_ACTIVE_USER";
@@ -28,7 +29,6 @@ export const activate = async (payload, context) => {
   if (user.active) {
     return left("ALREADY_ACTIVE_USER" /* AlreadyActiveUser */);
   }
-  const bcrypt = await import("bcrypt");
   const equal = await bcrypt.compare(user._id.toString(), token);
   if (!equal) {
     return left("INVALID_LINK" /* InvalidLink */);

package/dist/collections/user/authenticate.js

@@ -1,29 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authenticate = exports.getDefaultUser = exports.AuthenticationErrors = void 0;
+const bcrypt_1 = require("bcrypt");
 const core_1 = require("@aeriajs/core");
 const common_1 = require("@aeriajs/common");
 var AuthenticationErrors;
@@ -131,8 +109,7 @@ const authenticate = async (props, context) => {
             active: 1,
         },
     });
-    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
-    if (!user || !user.password || !await bcrypt.compare(props.password, user.password)) {
+    if (!user || !user.password || !await (0, bcrypt_1.compare)(props.password, user.password)) {
         return (0, common_1.left)(AuthenticationErrors.InvalidCredentials);
     }
     if (!user.active) {

package/dist/collections/user/authenticate.mjs

@@ -1,4 +1,5 @@
 "use strict";
+import { compare as bcryptCompare } from "bcrypt";
 import { signToken, decodeToken } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
 export var AuthenticationErrors = /* @__PURE__ */ ((AuthenticationErrors2) => {
@@ -103,8 +104,7 @@ export const authenticate = async (props, context) => {
       }
     }
   );
-  const bcrypt = await import("bcrypt");
-  if (!user || !user.password || !await bcrypt.compare(props.password, user.password)) {
+  if (!user || !user.password || !await bcryptCompare(props.password, user.password)) {
     return left("INVALID_CREDENTIALS" /* InvalidCredentials */);
   }
   if (!user.active) {

package/dist/collections/user/createAccount.js

@@ -1,31 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccount = void 0;
 const common_1 = require("@aeriajs/common");
 const validation_1 = require("@aeriajs/validation");
+const bcrypt_1 = __importDefault(require("bcrypt"));
 const createAccount = async (payload, context) => {
     const user = Object.assign({}, payload);
     if (!context.config.allowSignup) {
@@ -66,8 +47,7 @@ const createAccount = async (payload, context) => {
         Object.assign(user, context.config.signupDefaults);
     }
     if (user.password) {
-        const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
-        user.password = await bcrypt.hash(user.password, 10);
+        user.password = await bcrypt_1.default.hash(user.password, 10);
     }
     if (!context.token.authenticated) {
         Object.assign(user, {

package/dist/collections/user/createAccount.mjs

@@ -1,6 +1,7 @@
 "use strict";
 import { isLeft, unwrapEither, left, right } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
+import bcrypt from "bcrypt";
 export const createAccount = async (payload, context) => {
   const user = Object.assign({}, payload);
   if (!context.config.allowSignup) {
@@ -41,7 +42,6 @@ export const createAccount = async (payload, context) => {
     Object.assign(user, context.config.signupDefaults);
   }
   if (user.password) {
-    const bcrypt = await import("bcrypt");
     user.password = await bcrypt.hash(user.password, 10);
   }
   if (!context.token.authenticated) {

package/dist/collections/user/getActivationLink.js

@@ -1,34 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActivationLink = void 0;
 const entrypoint_1 = require("@aeriajs/entrypoint");
+const bcrypt_1 = __importDefault(require("bcrypt"));
 const getActivationLink = async (userId) => {
     const config = await (0, entrypoint_1.getConfig)();
-    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
-    const activationToken = await bcrypt.hash(userId.toString(), 10);
+    const activationToken = await bcrypt_1.default.hash(userId.toString(), 10);
     const link = `${config.publicUrl}/user/activate?u=${userId.toString()}&t=${activationToken}`;
     return link;
 };

package/dist/collections/user/getActivationLink.mjs

@@ -1,8 +1,8 @@
 "use strict";
 import { getConfig } from "@aeriajs/entrypoint";
+import bcrypt from "bcrypt";
 export const getActivationLink = async (userId) => {
   const config = await getConfig();
-  const bcrypt = await import("bcrypt");
   const activationToken = await bcrypt.hash(userId.toString(), 10);
   const link = `${config.publicUrl}/user/activate?u=${userId.toString()}&t=${activationToken}`;
   return link;

package/dist/collections/user/getInfo.js

@@ -1,31 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInfo = exports.ActivationErrors = void 0;
 const core_1 = require("@aeriajs/core");
 const common_1 = require("@aeriajs/common");
+const bcrypt_1 = __importDefault(require("bcrypt"));
 var ActivationErrors;
 (function (ActivationErrors) {
     ActivationErrors["UserNotFound"] = "USER_NOT_FOUND";
@@ -46,8 +27,7 @@ const getInfo = async (payload, context) => {
     if (user.active) {
         return (0, common_1.left)(ActivationErrors.AlreadyActiveUser);
     }
-    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
-    const equal = await bcrypt.compare(user._id.toString(), token);
+    const equal = await bcrypt_1.default.compare(user._id.toString(), token);
     if (!equal) {
         return (0, common_1.left)(ActivationErrors.InvalidLink);
     }

package/dist/collections/user/getInfo.mjs

@@ -1,6 +1,7 @@
 "use strict";
 import { ObjectId } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
+import bcrypt from "bcrypt";
 export var ActivationErrors = /* @__PURE__ */ ((ActivationErrors2) => {
   ActivationErrors2["UserNotFound"] = "USER_NOT_FOUND";
   ActivationErrors2["AlreadyActiveUser"] = "ALREADY_ACTIVE_USER";
@@ -24,7 +25,6 @@ export const getInfo = async (payload, context) => {
   if (user.active) {
     return left("ALREADY_ACTIVE_USER" /* AlreadyActiveUser */);
   }
-  const bcrypt = await import("bcrypt");
   const equal = await bcrypt.compare(user._id.toString(), token);
   if (!equal) {
     return left("INVALID_LINK" /* InvalidLink */);

package/dist/collections/user/insert.js

@@ -1,34 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insert = void 0;
+const bcrypt_1 = __importDefault(require("bcrypt"));
 const core_1 = require("@aeriajs/core");
 const insert = async (payload, context) => {
     if (payload.what.password) {
-        const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
-        payload.what.password = await bcrypt.hash(payload.what.password, 10);
+        payload.what.password = await bcrypt_1.default.hash(payload.what.password, 10);
     }
     return core_1.functions.insert(payload, context);
 };

package/dist/collections/user/insert.mjs

@@ -1,8 +1,8 @@
 "use strict";
+import bcrypt from "bcrypt";
 import { functions } from "@aeriajs/core";
 export const insert = async (payload, context) => {
   if (payload.what.password) {
-    const bcrypt = await import("bcrypt");
     payload.what.password = await bcrypt.hash(payload.what.password, 10);
   }
   return functions.insert(payload, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.66",
+  "version": "0.0.67",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@aeriajs/access-control": "^0.0.36",
-    "@aeriajs/core": "^0.0.66",
+    "@aeriajs/core": "^0.0.67",
     "@aeriajs/common": "^0.0.36",
     "@aeriajs/entrypoint": "^0.0.36",
     "@aeriajs/types": "^0.0.33",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@aeriajs/access-control": "^0.0.36",
-    "@aeriajs/core": "^0.0.66",
+    "@aeriajs/core": "^0.0.67",
     "@aeriajs/common": "^0.0.36",
     "@aeriajs/entrypoint": "^0.0.36",
     "@aeriajs/types": "^0.0.33",