@aeriajs/builtins 0.0.162 → 0.0.164

package/dist/authentication.d.ts

@@ -1,6 +1,7 @@
 import type { RouteContext, SchemaWithId, TokenRecipient } from '@aeriajs/types';
 import type { description } from './collections/user/description.js';
-export type TokenableUser = Pick<SchemaWithId<typeof description>, '_id' | 'name' | 'email' | 'roles' | 'active'>;
+type User = SchemaWithId<typeof description>;
+export type TokenableUser = Pick<User, '_id' | 'name' | 'email' | 'roles' | 'active'>;
 export type SuccessfulAuthentication = {
     user: TokenableUser & {
         _id: null;
@@ -25,3 +26,4 @@ export declare const defaultSuccessfulAuthentication: () => Promise<{
         content: string;
     };
 }>;
+export {};

package/dist/authentication.js

@@ -24,16 +24,11 @@ const successfulAuthentication = async (user, context) => {
         });
     }
     if (context.config.tokenUserProperties) {
-        const pick = (obj, properties) => properties.reduce((a, prop) => {
-            if ('prop' in obj) {
-                return a;
-            }
-            return {
-                ...a,
-                [prop]: obj[prop],
-            };
-        }, {});
-        tokenContent.userinfo = pick(user, context.config.tokenUserProperties);
+        const userinfo = {};
+        for (const prop of context.config.tokenUserProperties) {
+            userinfo[prop] = user[prop];
+        }
+        tokenContent.userinfo = userinfo;
     }
     const token = await (0, core_1.signToken)(tokenContent);
     return {

package/dist/authentication.mjs

@@ -21,16 +21,11 @@ export const successfulAuthentication = async (user, context) => {
     });
   }
   if (context.config.tokenUserProperties) {
-    const pick = (obj, properties) => properties.reduce((a, prop) => {
-      if ("prop" in obj) {
-        return a;
-      }
-      return {
-        ...a,
-        [prop]: obj[prop]
-      };
-    }, {});
-    tokenContent.userinfo = pick(user, context.config.tokenUserProperties);
+    const userinfo = {};
+    for (const prop of context.config.tokenUserProperties) {
+      userinfo[prop] = user[prop];
+    }
+    tokenContent.userinfo = userinfo;
   }
   const token = await signToken(tokenContent);
   return {

package/dist/collections/file/description.d.ts

@@ -28,10 +28,10 @@ export declare const description: {
             readonly type: "boolean";
         };
         readonly link: {
-            readonly getter: (value: any) => Promise<string>;
+            readonly getter: (doc: object) => Promise<string | undefined>;
         };
         readonly download_link: {
-            readonly getter: (value: any) => Promise<string>;
+            readonly getter: (doc: object) => Promise<string | undefined>;
         };
     };
     readonly actions: {

package/dist/collections/file/description.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.description = void 0;
+const mongodb_1 = require("mongodb");
 const core_1 = require("@aeriajs/core");
 const entrypoint_1 = require("@aeriajs/entrypoint");
-const link = async (_id) => {
+const link = async (fileId) => {
     const config = await (0, entrypoint_1.getConfig)();
-    return `${config.publicUrl || ''}/file/${_id}`;
+    return `${config.publicUrl || ''}/file/${fileId}`;
 };
-const timestamp = (lastModified) => lastModified
+const timestamp = (lastModified) => lastModified instanceof Date
     ? new Date(lastModified).getTime()
     : 'fresh';
 exports.description = (0, core_1.defineDescription)({
@@ -44,13 +45,17 @@ exports.description = (0, core_1.defineDescription)({
             type: 'boolean',
         },
         link: {
-            getter: async (value) => {
-                return `${await link(value._id)}/${timestamp(value.last_modified)}`;
+            getter: async (doc) => {
+                if ('_id' in doc && 'last_modified' in doc && doc._id instanceof mongodb_1.ObjectId) {
+                    return `${await link(doc._id)}/${timestamp(doc.last_modified)}`;
+                }
             },
         },
         download_link: {
-            getter: async (value) => {
-                return `${await link(value._id)}/download/${timestamp(value.last_modified)}`;
+            getter: async (doc) => {
+                if ('_id' in doc && 'last_modified' in doc && doc._id instanceof mongodb_1.ObjectId) {
+                    return `${await link(doc._id)}/download/${timestamp(doc.last_modified)}`;
+                }
             },
         },
     },

package/dist/collections/file/description.mjs

@@ -1,11 +1,12 @@
 "use strict";
+import { ObjectId } from "mongodb";
 import { defineDescription } from "@aeriajs/core";
 import { getConfig } from "@aeriajs/entrypoint";
-const link = async (_id) => {
+const link = async (fileId) => {
   const config = await getConfig();
-  return `${config.publicUrl || ""}/file/${_id}`;
+  return `${config.publicUrl || ""}/file/${fileId}`;
 };
-const timestamp = (lastModified) => lastModified ? new Date(lastModified).getTime() : "fresh";
+const timestamp = (lastModified) => lastModified instanceof Date ? new Date(lastModified).getTime() : "fresh";
 export const description = defineDescription({
   $id: "file",
   icon: "paperclip",
@@ -40,13 +41,17 @@ export const description = defineDescription({
       type: "boolean"
     },
     link: {
-      getter: async (value) => {
-        return `${await link(value._id)}/${timestamp(value.last_modified)}`;
+      getter: async (doc) => {
+        if ("_id" in doc && "last_modified" in doc && doc._id instanceof ObjectId) {
+          return `${await link(doc._id)}/${timestamp(doc.last_modified)}`;
+        }
       }
     },
     download_link: {
-      getter: async (value) => {
-        return `${await link(value._id)}/download/${timestamp(value.last_modified)}`;
+      getter: async (doc) => {
+        if ("_id" in doc && "last_modified" in doc && doc._id instanceof ObjectId) {
+          return `${await link(doc._id)}/download/${timestamp(doc.last_modified)}`;
+        }
       }
     }
   },

package/dist/collections/file/index.d.ts

@@ -127,10 +127,10 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                 readonly type: "boolean";
             };
             readonly link: {
-                readonly getter: (value: any) => Promise<string>;
+                readonly getter: (doc: object) => Promise<string | undefined>;
             };
             readonly download_link: {
-                readonly getter: (value: any) => Promise<string>;
+                readonly getter: (doc: object) => Promise<string | undefined>;
             };
         };
         readonly actions: {
@@ -184,10 +184,10 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                     readonly type: "boolean";
                 };
                 readonly link: {
-                    readonly getter: (value: any) => Promise<string>;
+                    readonly getter: (doc: object) => Promise<string | undefined>;
                 };
                 readonly download_link: {
-                    readonly getter: (value: any) => Promise<string>;
+                    readonly getter: (doc: object) => Promise<string | undefined>;
                 };
             };
             readonly actions: {
@@ -279,10 +279,10 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                 readonly type: "boolean";
             };
             readonly link: {
-                readonly getter: (value: any) => Promise<string>;
+                readonly getter: (doc: object) => Promise<string | undefined>;
             };
             readonly download_link: {
-                readonly getter: (value: any) => Promise<string>;
+                readonly getter: (doc: object) => Promise<string | undefined>;
             };
         };
         readonly actions: {
@@ -330,10 +330,10 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                 readonly type: "boolean";
             };
             readonly link: {
-                readonly getter: (value: any) => Promise<string>;
+                readonly getter: (doc: object) => Promise<string | undefined>;
             };
             readonly download_link: {
-                readonly getter: (value: any) => Promise<string>;
+                readonly getter: (doc: object) => Promise<string | undefined>;
             };
         };
         readonly actions: {
@@ -387,10 +387,10 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                     readonly type: "boolean";
                 };
                 readonly link: {
-                    readonly getter: (value: any) => Promise<string>;
+                    readonly getter: (doc: object) => Promise<string | undefined>;
                 };
                 readonly download_link: {
-                    readonly getter: (value: any) => Promise<string>;
+                    readonly getter: (doc: object) => Promise<string | undefined>;
                 };
             };
             readonly actions: {

package/dist/collections/file/insert.d.ts

@@ -34,10 +34,10 @@ export declare const insert: (payload: {
             readonly type: "boolean";
         };
         readonly link: {
-            readonly getter: (value: any) => Promise<string>;
+            readonly getter: (doc: object) => Promise<string | undefined>;
         };
         readonly download_link: {
-            readonly getter: (value: any) => Promise<string>;
+            readonly getter: (doc: object) => Promise<string | undefined>;
         };
     };
     readonly actions: {

package/dist/collections/log/index.d.ts

@@ -28,15 +28,7 @@ export declare const log: Omit<import("@aeriajs/types").Collection<{
     };
     functions: {
         readonly get: (payload: import("@aeriajs/types").GetPayload<import("@aeriajs/types").SchemaWithId<any>>, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").GetOptions) => Promise<import("@aeriajs/types").GetReturnType<import("@aeriajs/types").SchemaWithId<any>>>;
-        readonly getAll: (payload: import("@aeriajs/types").GetAllPayload<import("@aeriajs/types").SchemaWithId<any>> | undefined, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").GetAllOptions) => Promise<{
-            readonly _tag: "Error";
-            readonly error: import("@aeriajs/types").ACError.InvalidLimit | import("@aeriajs/types").ACError.OwnershipError;
-            readonly result: undefined;
-        } | {
-            readonly _tag: "Result";
-            readonly error: undefined;
-            readonly result: import("@aeriajs/types").SchemaWithId<any>[];
-        }>;
+        readonly getAll: (payload: import("@aeriajs/types").GetAllPayload<import("@aeriajs/types").SchemaWithId<any>> | undefined, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").GetAllOptions) => Promise<import("@aeriajs/types").Result.Either<any, any>>;
         readonly insert: (payload: import("@aeriajs/types").InsertPayload<import("@aeriajs/types").SchemaWithId<any>>, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").InsertOptions) => Promise<import("@aeriajs/types").InsertReturnType<import("@aeriajs/types").SchemaWithId<any>>>;
     };
     exposedFunctions: {
@@ -101,15 +93,7 @@ export declare const log: Omit<import("@aeriajs/types").Collection<{
     };
     functions: {
         readonly get: (payload: import("@aeriajs/types").GetPayload<import("@aeriajs/types").SchemaWithId<any>>, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").GetOptions) => Promise<import("@aeriajs/types").GetReturnType<import("@aeriajs/types").SchemaWithId<any>>>;
-        readonly getAll: (payload: import("@aeriajs/types").GetAllPayload<import("@aeriajs/types").SchemaWithId<any>> | undefined, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").GetAllOptions) => Promise<{
-            readonly _tag: "Error";
-            readonly error: import("@aeriajs/types").ACError.InvalidLimit | import("@aeriajs/types").ACError.OwnershipError;
-            readonly result: undefined;
-        } | {
-            readonly _tag: "Result";
-            readonly error: undefined;
-            readonly result: import("@aeriajs/types").SchemaWithId<any>[];
-        }>;
+        readonly getAll: (payload: import("@aeriajs/types").GetAllPayload<import("@aeriajs/types").SchemaWithId<any>> | undefined, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").GetAllOptions) => Promise<import("@aeriajs/types").Result.Either<any, any>>;
         readonly insert: (payload: import("@aeriajs/types").InsertPayload<import("@aeriajs/types").SchemaWithId<any>>, context: import("@aeriajs/types").StrictContext<any>, options?: import("@aeriajs/core").InsertOptions) => Promise<import("@aeriajs/types").InsertReturnType<import("@aeriajs/types").SchemaWithId<any>>>;
     };
     contracts: {

package/dist/collections/user/createAccount.d.ts

@@ -1,13 +1,115 @@
 import type { Context, SchemaWithId } from '@aeriajs/types';
 import type { description } from './description.js';
-import { Result, HTTPStatus, ACError } from '@aeriajs/types';
-export declare const createAccount: (payload: Partial<SchemaWithId<typeof description>>, context: Context<typeof description>) => Promise<Result.Error<{
+import { HTTPStatus, ACError } from '@aeriajs/types';
+export declare enum CreateAccountError {
+    SignupDisallowed = "SIGNUP_DISALLOWED"
+}
+export declare const createAccount: (payload: Partial<SchemaWithId<typeof description>>, context: Context<typeof description>) => Promise<import("@aeriajs/types").Result.Error<{
+    readonly code: CreateAccountError;
+} & {
+    httpStatus: HTTPStatus.Forbidden;
+}> | import("@aeriajs/types").Result.Error<{
     readonly code: ACError.MalformedInput;
-    readonly details: import("@aeriajs/types").ValidationError | import("@aeriajs/types").PropertyValidationError;
+    readonly details: import("@aeriajs/types").PropertyValidationError | import("@aeriajs/types").ValidationError;
 } & {
     httpStatus: HTTPStatus.BadRequest;
-}> | {
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: any;
-}>;
+}> | import("@aeriajs/types").InsertReturnType<SchemaWithId<{
+    readonly $id: "user";
+    readonly icon: "users";
+    readonly required: readonly ["name", "roles", "email"];
+    readonly form: readonly ["name", "active", "roles", "email", "phone_number", "picture_file"];
+    readonly indexes: readonly ["name"];
+    readonly properties: {
+        readonly name: {
+            readonly type: "string";
+        };
+        readonly given_name: {
+            readonly getter: (doc: object) => string | undefined;
+        };
+        readonly family_name: {
+            readonly getter: (doc: object) => string | undefined;
+        };
+        readonly active: {
+            readonly type: "boolean";
+        };
+        readonly roles: {
+            readonly type: "array";
+            readonly items: {
+                readonly type: "string";
+            };
+            readonly uniqueItems: true;
+        };
+        readonly email: {
+            readonly type: "string";
+            readonly inputType: "email";
+            readonly unique: true;
+        };
+        readonly password: {
+            readonly type: "string";
+            readonly inputType: "password";
+            readonly hidden: true;
+        };
+        readonly phone_number: {
+            readonly type: "string";
+            readonly mask: "(##) #####-####";
+        };
+        readonly picture_file: {
+            readonly $ref: "file";
+            readonly accept: readonly ["image/*"];
+        };
+        readonly picture: {
+            readonly getter: (doc: object) => string | undefined;
+        };
+        readonly group: {
+            readonly type: "string";
+        };
+        readonly self_registered: {
+            readonly type: "boolean";
+            readonly readOnly: true;
+        };
+        readonly updated_at: {
+            readonly type: "string";
+            readonly format: "date-time";
+        };
+    };
+    readonly presets: readonly ["crud", "duplicate"];
+    readonly layout: {
+        readonly name: "grid";
+        readonly options: {
+            readonly title: "name";
+            readonly badge: "roles";
+            readonly picture: "picture_file";
+            readonly information: "email";
+            readonly active: "active";
+        };
+    };
+    readonly individualActions: {
+        readonly changePassword: {
+            readonly label: "change_password";
+            readonly icon: "key";
+            readonly translate: true;
+            readonly route: {
+                readonly name: "/dashboard/user/changepass";
+                readonly fetchItem: true;
+            };
+        };
+        readonly copyActivationLink: {
+            readonly label: "copy_activation_link";
+            readonly icon: "link";
+            readonly translate: true;
+        };
+    };
+    readonly filters: readonly ["name", "roles", "email", "phone_number"];
+    readonly table: readonly ["name", "roles", "picture_file", "active", "updated_at"];
+    readonly tableMeta: readonly ["email"];
+    readonly formLayout: {
+        readonly fields: {
+            readonly given_name: {
+                readonly span: 3;
+            };
+            readonly family_name: {
+                readonly span: 3;
+            };
+        };
+    };
+}>>>;

package/dist/collections/user/createAccount.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAccount = void 0;
+exports.createAccount = exports.CreateAccountError = void 0;
 const types_1 = require("@aeriajs/types");
 const validation_1 = require("@aeriajs/validation");
 const bcrypt = require("bcrypt");
+var CreateAccountError;
+(function (CreateAccountError) {
+    CreateAccountError["SignupDisallowed"] = "SIGNUP_DISALLOWED";
+})(CreateAccountError || (exports.CreateAccountError = CreateAccountError = {}));
 const createAccount = async (payload, context) => {
     const userCandidate = Object.assign({}, payload);
     if (!context.config.security.allowSignup) {
-        throw new Error('signup disallowed');
+        return context.error(types_1.HTTPStatus.Forbidden, {
+            code: CreateAccountError.SignupDisallowed,
+        });
     }
     delete userCandidate._id;
     delete userCandidate.roles;
@@ -40,8 +46,9 @@ const createAccount = async (payload, context) => {
             details: error,
         });
     }
+    let roles = [], defaults = {};
     if (context.config.security.signupDefaults) {
-        Object.assign(user, context.config.security.signupDefaults);
+        ({ roles = [], ...defaults } = context.config.security.signupDefaults);
     }
     if (user.password) {
         user.password = await bcrypt.hash(user.password, 10);
@@ -51,13 +58,12 @@ const createAccount = async (payload, context) => {
             self_registered: true,
         });
     }
-    const { insertedId } = await context.collection.model.insertOne(user);
-    const newUser = await context.collection.model.findOne({
-        _id: insertedId,
+    return context.collections.user.functions.insert({
+        what: {
+            ...user,
+            ...defaults,
+            roles,
+        },
     });
-    if (!newUser) {
-        throw new Error();
-    }
-    return types_1.Result.result(newUser);
 };
 exports.createAccount = createAccount;

package/dist/collections/user/createAccount.mjs

@@ -1,11 +1,17 @@
 "use strict";
-import { Result, HTTPStatus, ACError } from "@aeriajs/types";
+import { HTTPStatus, ACError } from "@aeriajs/types";
 import { validate } from "@aeriajs/validation";
 import * as bcrypt from "bcrypt";
+export var CreateAccountError = /* @__PURE__ */ ((CreateAccountError2) => {
+  CreateAccountError2["SignupDisallowed"] = "SIGNUP_DISALLOWED";
+  return CreateAccountError2;
+})(CreateAccountError || {});
 export const createAccount = async (payload, context) => {
   const userCandidate = Object.assign({}, payload);
   if (!context.config.security.allowSignup) {
-    throw new Error("signup disallowed");
+    return context.error(HTTPStatus.Forbidden, {
+      code: "SIGNUP_DISALLOWED" /* SignupDisallowed */
+    });
   }
   delete userCandidate._id;
   delete userCandidate.roles;
@@ -38,8 +44,9 @@ export const createAccount = async (payload, context) => {
       details: error
     });
   }
+  let roles = [], defaults = {};
   if (context.config.security.signupDefaults) {
-    Object.assign(user, context.config.security.signupDefaults);
+    ({ roles = [], ...defaults } = context.config.security.signupDefaults);
   }
   if (user.password) {
     user.password = await bcrypt.hash(user.password, 10);
@@ -49,12 +56,11 @@ export const createAccount = async (payload, context) => {
       self_registered: true
     });
   }
-  const { insertedId } = await context.collection.model.insertOne(user);
-  const newUser = await context.collection.model.findOne({
-    _id: insertedId
+  return context.collections.user.functions.insert({
+    what: {
+      ...user,
+      ...defaults,
+      roles
+    }
   });
-  if (!newUser) {
-    throw new Error();
-  }
-  return Result.result(newUser);
 };

package/dist/collections/user/description.d.ts

@@ -13,10 +13,10 @@ export declare const description: {
             readonly type: "string";
         };
         readonly given_name: {
-            readonly getter: (document: any) => any;
+            readonly getter: (doc: object) => string | undefined;
         };
         readonly family_name: {
-            readonly getter: (document: any) => any;
+            readonly getter: (doc: object) => string | undefined;
         };
         readonly active: {
             readonly type: "boolean";
@@ -47,7 +47,7 @@ export declare const description: {
             readonly accept: readonly ["image/*"];
         };
         readonly picture: {
-            readonly getter: (value: any) => any;
+            readonly getter: (doc: object) => string | undefined;
         };
         readonly group: {
             readonly type: "string";

package/dist/collections/user/description.js

@@ -28,13 +28,17 @@ exports.description = (0, core_1.defineDescription)({
             type: 'string',
         },
         given_name: {
-            getter: (document) => {
-                return document.name?.split(' ')[0];
+            getter: (doc) => {
+                if ('name' in doc && typeof doc.name === 'string') {
+                    return doc.name.split(' ')[0];
+                }
             },
         },
         family_name: {
-            getter: (document) => {
-                return document.name?.split(' ')[1];
+            getter: (doc) => {
+                if ('name' in doc && typeof doc.name === 'string') {
+                    return doc.name.split(' ')[1];
+                }
             },
         },
         active: {
@@ -66,8 +70,10 @@ exports.description = (0, core_1.defineDescription)({
             accept: ['image/*'],
         },
         picture: {
-            getter: (value) => {
-                return value.picture_file?.link;
+            getter: (doc) => {
+                if ('picture_file' in doc && doc.picture_file instanceof Object && 'link' in doc.picture_file && typeof doc.picture_file.link === 'string') {
+                    return doc.picture_file.link;
+                }
             },
         },
         group: {

package/dist/collections/user/description.mjs

@@ -22,13 +22,17 @@ export const description = defineDescription({
       type: "string"
     },
     given_name: {
-      getter: (document) => {
-        return document.name?.split(" ")[0];
+      getter: (doc) => {
+        if ("name" in doc && typeof doc.name === "string") {
+          return doc.name.split(" ")[0];
+        }
       }
     },
     family_name: {
-      getter: (document) => {
-        return document.name?.split(" ")[1];
+      getter: (doc) => {
+        if ("name" in doc && typeof doc.name === "string") {
+          return doc.name.split(" ")[1];
+        }
       }
     },
     active: {
@@ -60,8 +64,10 @@ export const description = defineDescription({
       accept: ["image/*"]
     },
     picture: {
-      getter: (value) => {
-        return value.picture_file?.link;
+      getter: (doc) => {
+        if ("picture_file" in doc && doc.picture_file instanceof Object && "link" in doc.picture_file && typeof doc.picture_file.link === "string") {
+          return doc.picture_file.link;
+        }
       }
     },
     group: {

package/dist/collections/user/getCurrentUser.d.ts

@@ -19,10 +19,10 @@ export declare const getCurrentUser: (_payload: undefined, context: Context<type
                 readonly type: "string";
             };
             readonly given_name: {
-                readonly getter: (document: any) => any;
+                readonly getter: (doc: object) => string | undefined;
             };
             readonly family_name: {
-                readonly getter: (document: any) => any;
+                readonly getter: (doc: object) => string | undefined;
             };
             readonly active: {
                 readonly type: "boolean";
@@ -53,7 +53,7 @@ export declare const getCurrentUser: (_payload: undefined, context: Context<type
                 readonly accept: readonly ["image/*"];
             };
             readonly picture: {
-                readonly getter: (value: any) => any;
+                readonly getter: (doc: object) => string | undefined;
             };
             readonly group: {
                 readonly type: "string";