@aeriajs/core 0.0.94 → 0.0.96

package/dist/functions/builtin/getAll.mjs

@@ -1,6 +1,6 @@
 "use strict";
 import { useSecurity } from "@aeriajs/security";
-import { throwIfLeft } from "@aeriajs/common";
+import { Result, throwIfError } from "@aeriajs/common";
 import {
   traverseDocument,
   normalizeProjection,
@@ -17,7 +17,7 @@ export const getAll = async (_payload, context, options = {}) => {
     sort,
     project = [],
     offset = 0
-  } = !options.bypassSecurity ? throwIfLeft(await security.beforeRead(payload)) : payload;
+  } = !options.bypassSecurity ? throwIfError(await security.beforeRead(payload)) : payload;
   const { $text, ...filtersRest } = filters;
   const pipeline = [];
   const references = await getReferences(context.description.properties, {
@@ -40,7 +40,7 @@ export const getAll = async (_payload, context, options = {}) => {
   }
   if (Object.keys(filtersRest).length > 0) {
     pipeline.push({
-      $match: throwIfLeft(await traverseDocument(filtersRest, context.description, {
+      $match: throwIfError(await traverseDocument(filtersRest, context.description, {
         autoCast: true,
         allowOperators: true
       }))
@@ -73,12 +73,12 @@ export const getAll = async (_payload, context, options = {}) => {
   const result = await context.collection.model.aggregate(pipeline).toArray();
   const documents = [];
   for (const document of result) {
-    documents.push(throwIfLeft(await traverseDocument(fill(document, context.description), context.description, {
+    documents.push(throwIfError(await traverseDocument(fill(document, context.description), context.description, {
       getters: true,
       fromProperties: true,
       recurseReferences: true,
       recurseDeep: true
     })));
   }
-  return documents;
+  return Result.result(documents);
 };

package/dist/functions/builtin/insert.d.ts

@@ -5,28 +5,20 @@ export type InsertOptions = {
 };
 export declare const insertErrorSchema: () => {
     readonly type: "object";
+    readonly required: readonly ["httpStatus", "code"];
     readonly properties: {
-        readonly _tag: {
-            readonly const: "Error";
+        readonly httpStatus: {
+            readonly enum: [HTTPStatus.UnprocessableContent, HTTPStatus.NotFound];
         };
-        readonly value: {
+        readonly code: {
+            readonly enum: [ACError.InsecureOperator, ACError.OwnershipError, ACError.ResourceNotFound, ACError.TargetImmutable, ValidationErrorCode.EmptyTarget, ValidationErrorCode.InvalidProperties, ValidationErrorCode.MissingProperties];
+        };
+        readonly message: {
+            readonly type: "string";
+        };
+        readonly details: {
             readonly type: "object";
-            readonly required: readonly ["httpStatus", "code"];
-            readonly properties: {
-                readonly httpStatus: {
-                    readonly enum: [HTTPStatus.UnprocessableContent, HTTPStatus.NotFound];
-                };
-                readonly code: {
-                    readonly enum: [ACError.InsecureOperator, ACError.OwnershipError, ACError.ResourceNotFound, ACError.TargetImmutable, ValidationErrorCode.EmptyTarget, ValidationErrorCode.InvalidProperties, ValidationErrorCode.MissingProperties];
-                };
-                readonly message: {
-                    readonly type: "string";
-                };
-                readonly details: {
-                    readonly type: "object";
-                    readonly variable: true;
-                };
-            };
+            readonly variable: true;
         };
     };
 };

package/dist/functions/builtin/insert.js

@@ -5,7 +5,7 @@ const types_1 = require("@aeriajs/types");
 const security_1 = require("@aeriajs/security");
 const common_1 = require("@aeriajs/common");
 const index_js_1 = require("../../collection/index.js");
-const insertErrorSchema = () => (0, common_1.errorSchema)({
+const insertErrorSchema = () => (0, common_1.endpointErrorSchema)({
     httpStatus: [
         types_1.HTTPStatus.UnprocessableContent,
         types_1.HTTPStatus.NotFound,
@@ -24,9 +24,9 @@ exports.insertErrorSchema = insertErrorSchema;
 const insert = async (payload, context, options) => {
     const security = (0, security_1.useSecurity)(context);
     const query = !options?.bypassSecurity
-        ? (0, common_1.throwIfLeft)(await security.beforeWrite(payload))
+        ? (0, common_1.throwIfError)(await security.beforeWrite(payload))
         : payload;
-    const whatEither = await (0, index_js_1.traverseDocument)(query.what, context.description, {
+    const { error, result: what } = await (0, index_js_1.traverseDocument)(query.what, context.description, {
         recurseDeep: true,
         autoCast: true,
         validate: true,
@@ -36,8 +36,7 @@ const insert = async (payload, context, options) => {
         moveFiles: true,
         context,
     });
-    if ((0, common_1.isLeft)(whatEither)) {
-        const error = (0, common_1.unwrapEither)(whatEither);
+    if (error) {
         if (typeof error === 'string') {
             return context.error(types_1.HTTPStatus.UnprocessableContent, {
                 code: error,
@@ -48,7 +47,6 @@ const insert = async (payload, context, options) => {
             details: error.errors,
         });
     }
-    const what = (0, common_1.unwrapEither)(whatEither);
     const docId = '_id' in what
         ? what._id
         : null;
@@ -96,11 +94,11 @@ const insert = async (payload, context, options) => {
             code: types_1.ACError.ResourceNotFound,
         });
     }
-    const result = (0, common_1.throwIfLeft)(await (0, index_js_1.traverseDocument)(doc, context.description, {
+    const result = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
         getters: true,
         fromProperties: true,
         recurseReferences: true,
     }));
-    return result;
+    return common_1.Result.result(result);
 };
 exports.insert = insert;

package/dist/functions/builtin/insert.mjs

@@ -1,9 +1,9 @@
 "use strict";
 import { HTTPStatus, ACError, ValidationErrorCode } from "@aeriajs/types";
 import { useSecurity } from "@aeriajs/security";
-import { isLeft, unwrapEither, throwIfLeft, errorSchema } from "@aeriajs/common";
+import { Result, throwIfError, endpointErrorSchema } from "@aeriajs/common";
 import { traverseDocument, normalizeProjection, prepareInsert } from "../../collection/index.mjs";
-export const insertErrorSchema = () => errorSchema({
+export const insertErrorSchema = () => endpointErrorSchema({
   httpStatus: [
     HTTPStatus.UnprocessableContent,
     HTTPStatus.NotFound
@@ -20,8 +20,8 @@ export const insertErrorSchema = () => errorSchema({
 });
 export const insert = async (payload, context, options) => {
   const security = useSecurity(context);
-  const query = !options?.bypassSecurity ? throwIfLeft(await security.beforeWrite(payload)) : payload;
-  const whatEither = await traverseDocument(query.what, context.description, {
+  const query = !options?.bypassSecurity ? throwIfError(await security.beforeWrite(payload)) : payload;
+  const { error, result: what } = await traverseDocument(query.what, context.description, {
     recurseDeep: true,
     autoCast: true,
     validate: true,
@@ -29,8 +29,7 @@ export const insert = async (payload, context, options) => {
     moveFiles: true,
     context
   });
-  if (isLeft(whatEither)) {
-    const error = unwrapEither(whatEither);
+  if (error) {
     if (typeof error === "string") {
       return context.error(HTTPStatus.UnprocessableContent, {
         code: error
@@ -41,7 +40,6 @@ export const insert = async (payload, context, options) => {
       details: error.errors
     });
   }
-  const what = unwrapEither(whatEither);
   const docId = "_id" in what ? what._id : null;
   const content = prepareInsert(what, context.description);
   const projection = payload.project ? normalizeProjection(payload.project, context.description) : {};
@@ -83,10 +81,10 @@ export const insert = async (payload, context, options) => {
       code: ACError.ResourceNotFound
     });
   }
-  const result = throwIfLeft(await traverseDocument(doc, context.description, {
+  const result = throwIfError(await traverseDocument(doc, context.description, {
     getters: true,
     fromProperties: true,
     recurseReferences: true
   }));
-  return result;
+  return Result.result(result);
 };

package/dist/functions/builtin/remove.d.ts

@@ -1,2 +1,11 @@
 import type { Context, SchemaWithId, RemovePayload } from '@aeriajs/types';
-export declare const remove: <TContext extends Context>(payload: RemovePayload<SchemaWithId<TContext['description']>>, context: TContext) => Promise<any>;
+import { HTTPStatus, ACError } from '@aeriajs/types';
+export declare const remove: <TContext extends Context>(payload: RemovePayload<SchemaWithId<TContext['description']>>, context: TContext) => Promise<{
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: any;
+} | import("@aeriajs/types/result.js").Result.Error<{
+    readonly code: ACError.ResourceNotFound;
+} & {
+    httpStatus: HTTPStatus.NotFound;
+}>>;

package/dist/functions/builtin/remove.js

@@ -10,7 +10,7 @@ const remove = async (payload, context) => {
             code: types_1.ACError.ResourceNotFound,
         });
     }
-    const filters = (0, common_1.throwIfLeft)(await (0, index_js_1.traverseDocument)(payload.filters, context.description, {
+    const filters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(payload.filters, context.description, {
         autoCast: true,
     }));
     const target = await context.collection.model.findOne(filters);
@@ -20,6 +20,6 @@ const remove = async (payload, context) => {
         });
     }
     await (0, index_js_1.cascadingRemove)(target, context);
-    return context.collection.model.findOneAndDelete(filters);
+    return common_1.Result.result(await context.collection.model.findOneAndDelete(filters));
 };
 exports.remove = remove;

package/dist/functions/builtin/remove.mjs

@@ -1,6 +1,6 @@
 "use strict";
 import { HTTPStatus, ACError } from "@aeriajs/types";
-import { throwIfLeft } from "@aeriajs/common";
+import { Result, throwIfError } from "@aeriajs/common";
 import { traverseDocument, cascadingRemove } from "../../collection/index.mjs";
 export const remove = async (payload, context) => {
   if (!payload.filters._id) {
@@ -8,7 +8,7 @@ export const remove = async (payload, context) => {
       code: ACError.ResourceNotFound
     });
   }
-  const filters = throwIfLeft(await traverseDocument(payload.filters, context.description, {
+  const filters = throwIfError(await traverseDocument(payload.filters, context.description, {
     autoCast: true
   }));
   const target = await context.collection.model.findOne(filters);
@@ -18,5 +18,5 @@ export const remove = async (payload, context) => {
     });
   }
   await cascadingRemove(target, context);
-  return context.collection.model.findOneAndDelete(filters);
+  return Result.result(await context.collection.model.findOneAndDelete(filters));
 };

package/dist/functions/builtin/removeAll.d.ts

@@ -1,2 +1,6 @@
 import type { Context, RemoveAllPayload } from '@aeriajs/types';
-export declare const removeAll: <TContext extends Context>(payload: RemoveAllPayload, context: TContext) => Promise<any>;
+export declare const removeAll: <TContext extends Context>(payload: RemoveAllPayload, context: TContext) => Promise<{
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: any;
+}>;

package/dist/functions/builtin/removeAll.js

@@ -10,14 +10,14 @@ const removeAll = async (payload, context) => {
             $in: payload.filters,
         },
     };
-    const filters = (0, common_1.throwIfLeft)(await (0, index_js_1.traverseDocument)(filtersWithId, context.description, {
+    const filters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filtersWithId, context.description, {
         autoCast: true,
     }));
     const it = context.collection.model.find(filters);
-    let document;
-    while (document = await it.next()) {
-        await (0, index_js_1.cascadingRemove)(document, context);
+    let doc;
+    while (doc = await it.next()) {
+        await (0, index_js_1.cascadingRemove)(doc, context);
     }
-    return context.collection.model.deleteMany(filters);
+    return common_1.Result.result(await context.collection.model.deleteMany(filters));
 };
 exports.removeAll = removeAll;

package/dist/functions/builtin/removeAll.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { throwIfLeft } from "@aeriajs/common";
+import { Result, throwIfError } from "@aeriajs/common";
 import { traverseDocument, cascadingRemove } from "../../collection/index.mjs";
 export const removeAll = async (payload, context) => {
   const filtersWithId = {
@@ -8,13 +8,13 @@ export const removeAll = async (payload, context) => {
       $in: payload.filters
     }
   };
-  const filters = throwIfLeft(await traverseDocument(filtersWithId, context.description, {
+  const filters = throwIfError(await traverseDocument(filtersWithId, context.description, {
     autoCast: true
   }));
   const it = context.collection.model.find(filters);
-  let document;
-  while (document = await it.next()) {
-    await cascadingRemove(document, context);
+  let doc;
+  while (doc = await it.next()) {
+    await cascadingRemove(doc, context);
   }
-  return context.collection.model.deleteMany(filters);
+  return Result.result(await context.collection.model.deleteMany(filters));
 };

package/dist/functions/builtin/removeFile.d.ts

@@ -1,2 +1,6 @@
 import type { Context, RemoveFilePayload } from '@aeriajs/types';
-export declare const removeFile: <TContext extends Context>(payload: RemoveFilePayload, context: TContext) => Promise<any>;
+export declare const removeFile: <TContext extends Context>(payload: RemoveFilePayload, context: TContext) => Promise<{
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: any;
+}>;

package/dist/functions/builtin/removeFile.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeFile = void 0;
 const security_1 = require("@aeriajs/security");
+const common_1 = require("@aeriajs/common");
 const removeFile = async (payload, context) => {
     const { propertyName, parentId, ...props } = payload;
     await (0, security_1.checkImmutability)({
@@ -10,6 +11,7 @@ const removeFile = async (payload, context) => {
         childId: props.filters._id,
         payload: props,
     }, context);
-    return context.collections.file.functions.remove(props);
+    const doc = await context.collections.file.functions.remove(props);
+    return common_1.Result.result(doc);
 };
 exports.removeFile = removeFile;

package/dist/functions/builtin/removeFile.mjs

@@ -1,5 +1,6 @@
 "use strict";
 import { checkImmutability } from "@aeriajs/security";
+import { Result } from "@aeriajs/common";
 export const removeFile = async (payload, context) => {
   const {
     propertyName,
@@ -12,5 +13,6 @@ export const removeFile = async (payload, context) => {
     childId: props.filters._id,
     payload: props
   }, context);
-  return context.collections.file.functions.remove(props);
+  const doc = await context.collections.file.functions.remove(props);
+  return Result.result(doc);
 };

package/dist/functions/builtin/upload.d.ts

@@ -1,9 +1,13 @@
 import { ACError, HTTPStatus, type Context } from '@aeriajs/types';
-export declare const upload: <TContext extends Context>(_props: unknown, context: TContext) => Promise<import("@aeriajs/types").EndpointError<{
+export declare const upload: <TContext extends Context>(_props: unknown, context: TContext) => Promise<import("@aeriajs/types/result").Result.Error<{
     readonly code: ACError.MalformedInput;
     readonly details: import("@aeriajs/types").ValidationError | import("@aeriajs/types").PropertyValidationError;
 } & {
     httpStatus: HTTPStatus.BadRequest;
 }> | {
-    tempId: any;
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: {
+        readonly tempId: any;
+    };
 }>;

package/dist/functions/builtin/upload.js

@@ -25,9 +25,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
 const types_1 = require("@aeriajs/types");
-const common_1 = require("@aeriajs/common");
 const entrypoint_1 = require("@aeriajs/entrypoint");
 const validation_1 = require("@aeriajs/validation");
+const common_1 = require("@aeriajs/common");
 const path = __importStar(require("path"));
 const fs_1 = require("fs");
 const crypto_1 = require("crypto");
@@ -65,7 +65,7 @@ const upload = async (_props, context) => {
     if (!tempFileCollection) {
         throw new Error('The "tempFile" collection is absent, yet it is required to upload files.');
     }
-    const headersEither = (0, validation_1.validate)(context.request.headers, {
+    const { error: headersError } = (0, validation_1.validate)(context.request.headers, {
         type: 'object',
         properties: {
             'x-stream-request': {
@@ -78,20 +78,19 @@ const upload = async (_props, context) => {
     }, {
         extraneous: true,
     });
-    if ((0, common_1.isLeft)(headersEither)) {
+    if (headersError) {
         return context.error(types_1.HTTPStatus.BadRequest, {
             code: types_1.ACError.MalformedInput,
-            details: (0, common_1.unwrapEither)(headersEither),
+            details: headersError,
         });
     }
-    const metadataEither = validateFileMetadata(context.request.query);
-    if ((0, common_1.isLeft)(metadataEither)) {
+    const { error, result: metadata } = validateFileMetadata(context.request.query);
+    if (error) {
         return context.error(types_1.HTTPStatus.BadRequest, {
             code: types_1.ACError.MalformedInput,
-            details: (0, common_1.unwrapEither)(metadataEither),
+            details: error,
         });
     }
-    const metadata = (0, common_1.unwrapEither)(metadataEither);
     const path = await streamToFs(metadata, context);
     const file = await context.collections.tempFile.model.insertOne({
         created_at: new Date(),
@@ -101,8 +100,8 @@ const upload = async (_props, context) => {
         collection: context.description.$id,
         name: metadata.name,
     });
-    return {
+    return common_1.Result.result({
         tempId: file.insertedId,
-    };
+    });
 };
 exports.upload = upload;

package/dist/functions/builtin/upload.mjs

@@ -1,8 +1,8 @@
 "use strict";
 import { ACError, HTTPStatus } from "@aeriajs/types";
-import { isLeft, unwrapEither } from "@aeriajs/common";
 import { getCollection } from "@aeriajs/entrypoint";
 import { validate, validator } from "@aeriajs/validation";
+import { Result } from "@aeriajs/common";
 import * as path from "path";
 import { createWriteStream } from "fs";
 import { createHash } from "crypto";
@@ -34,7 +34,7 @@ export const upload = async (_props, context) => {
   if (!tempFileCollection) {
     throw new Error('The "tempFile" collection is absent, yet it is required to upload files.');
   }
-  const headersEither = validate(context.request.headers, {
+  const { error: headersError } = validate(context.request.headers, {
     type: "object",
     properties: {
       "x-stream-request": {
@@ -47,20 +47,19 @@ export const upload = async (_props, context) => {
   }, {
     extraneous: true
   });
-  if (isLeft(headersEither)) {
+  if (headersError) {
     return context.error(HTTPStatus.BadRequest, {
       code: ACError.MalformedInput,
-      details: unwrapEither(headersEither)
+      details: headersError
     });
   }
-  const metadataEither = validateFileMetadata(context.request.query);
-  if (isLeft(metadataEither)) {
+  const { error, result: metadata } = validateFileMetadata(context.request.query);
+  if (error) {
     return context.error(HTTPStatus.BadRequest, {
       code: ACError.MalformedInput,
-      details: unwrapEither(metadataEither)
+      details: error
     });
   }
-  const metadata = unwrapEither(metadataEither);
   const path2 = await streamToFs(metadata, context);
   const file = await context.collections.tempFile.model.insertOne({
     created_at: /* @__PURE__ */ new Date(),
@@ -70,7 +69,7 @@ export const upload = async (_props, context) => {
     collection: context.description.$id,
     name: metadata.name
   });
-  return {
+  return Result.result({
     tempId: file.insertedId
-  };
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,13 +41,13 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.94",
-    "@aeriajs/common": "^0.0.59",
-    "@aeriajs/entrypoint": "^0.0.60",
-    "@aeriajs/http": "^0.0.68",
-    "@aeriajs/security": "^0.0.94",
-    "@aeriajs/types": "^0.0.55",
-    "@aeriajs/validation": "^0.0.62"
+    "@aeriajs/builtins": "^0.0.96",
+    "@aeriajs/common": "^0.0.60",
+    "@aeriajs/entrypoint": "^0.0.61",
+    "@aeriajs/http": "^0.0.69",
+    "@aeriajs/security": "^0.0.96",
+    "@aeriajs/types": "^0.0.56",
+    "@aeriajs/validation": "^0.0.63"
   },
   "dependencies": {
     "mongodb": "^6.5.0",