@aeriajs/common 0.0.54 → 0.0.56

package/dist/either.d.ts

@@ -1,7 +1,7 @@
 import type { Either, Left, Right } from '@aeriajs/types';
-export declare const left: <const T>(value: T) => Left<T>;
-export declare const right: <const T>(value: T) => Right<T>;
-export declare const isLeft: <L>(either: Either<L, any>) => either is Left<L>;
-export declare const isRight: <R>(either: Either<any, R>) => either is Right<R>;
+export declare const left: <const TValue>(value: TValue) => Left<TValue>;
+export declare const right: <const TValue>(value: TValue) => Right<TValue>;
+export declare const isLeft: <TValue>(either: Either<TValue, any>) => either is Left<TValue>;
+export declare const isRight: <TValue>(either: Either<any, TValue>) => either is Right<TValue>;
 export declare const unwrapEither: <L, R>(either: Either<L, R>) => L | R;
-export declare const unsafe: <L, R>(either: Either<L, R>, message?: any) => R;
+export declare const throwIfLeft: <L, R>(either: Either<L, R>, message?: any) => R;

package/dist/either.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unsafe = exports.unwrapEither = exports.isRight = exports.isLeft = exports.right = exports.left = void 0;
+exports.throwIfLeft = exports.unwrapEither = exports.isRight = exports.isLeft = exports.right = exports.left = void 0;
 const left = (value) => ({
     _tag: 'Left',
     value,
@@ -23,13 +23,13 @@ const unwrapEither = (either) => {
     return either.value;
 };
 exports.unwrapEither = unwrapEither;
-const unsafe = (either, message) => {
+const throwIfLeft = (either, message) => {
     if (either._tag !== 'Right') {
         if (process.env.NODE_ENV !== 'production') {
             console.trace(JSON.stringify(either.value, null, 2));
         }
-        throw new Error(`unsafe threw: ${either.value} (${message || '-'})`);
+        throw new Error(`throwIfLeft threw: ${either.value} (${message || '-'})`);
     }
     return either.value;
 };
-exports.unsafe = unsafe;
+exports.throwIfLeft = throwIfLeft;

package/dist/either.mjs

@@ -16,12 +16,12 @@ export const isRight = (either) => {
 export const unwrapEither = (either) => {
   return either.value;
 };
-export const unsafe = (either, message) => {
+export const throwIfLeft = (either, message) => {
   if (either._tag !== "Right") {
     if (true) {
       console.trace(JSON.stringify(either.value, null, 2));
     }
-    throw new Error(`unsafe threw: ${either.value} (${message || "-"})`);
+    throw new Error(`throwIfLeft threw: ${either.value} (${message || "-"})`);
   }
   return either.value;
 };

package/dist/error.d.ts

@@ -1,6 +1,7 @@
-import type { EndpointError, EndpointErrorContent, RouteContext } from '@aeriajs/types';
-export declare const error: <TEndpointErrorContent extends EndpointErrorContent>(error: TEndpointErrorContent, context: Pick<RouteContext, 'response'>) => {
-    readonly _tag: "Error";
-    readonly error: TEndpointErrorContent;
+import type { EndpointError, EndpointErrorContent } from '@aeriajs/types';
+export declare const error: <const TEndpointErrorContent extends EndpointErrorContent>(value: TEndpointErrorContent) => EndpointError & {
+    value: TEndpointErrorContent;
 };
-export declare const isError: (object: any) => object is EndpointError<any>;
+export declare const isError: <TEndpointErrorContent extends EndpointErrorContent>(object: EndpointError<TEndpointErrorContent> | any) => object is EndpointError<TEndpointErrorContent>;
+export declare const unwrapError: <TEndpointErrorContent extends EndpointErrorContent>(error: EndpointError<TEndpointErrorContent>) => TEndpointErrorContent;
+export declare const throwIfError: <TValue>(value: TValue, message?: any) => Exclude<TValue, EndpointError<any>>;

package/dist/error.js

@@ -1,18 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isError = exports.error = void 0;
-const error = (error, context) => {
-    const { httpStatus = 500 } = error;
-    context.response.writeHead(httpStatus, {
-        'content-type': 'application/json',
-    });
-    return {
+exports.throwIfError = exports.unwrapError = exports.isError = exports.error = void 0;
+const types_1 = require("@aeriajs/types");
+const error = (value) => {
+    const wrappedError = {
+        [types_1.ERROR_SYMBOL]: true,
         _tag: 'Error',
-        error,
+        value,
     };
+    return wrappedError;
 };
 exports.error = error;
 const isError = (object) => {
-    return object._tag === 'Error';
+    return object
+        && typeof object === 'object'
+        && (types_1.ERROR_SYMBOL in object || types_1.ERROR_SYMBOL_DESCRIPTION in object);
 };
 exports.isError = isError;
+const unwrapError = (error) => {
+    return error.value;
+};
+exports.unwrapError = unwrapError;
+const throwIfError = (value, message) => {
+    if ((0, exports.isError)(value)) {
+        const error = (0, exports.unwrapError)(value);
+        if (process.env.NODE_ENV !== 'production') {
+            console.trace(JSON.stringify(error, null, 2));
+        }
+        throw new Error(`throwIfLeft threw: ${error.code} (${message || '-'})`);
+    }
+    return value;
+};
+exports.throwIfError = throwIfError;

package/dist/error.mjs

@@ -1,14 +1,26 @@
 "use strict";
-export const error = (error2, context) => {
-  const { httpStatus = 500 } = error2;
-  context.response.writeHead(httpStatus, {
-    "content-type": "application/json"
-  });
-  return {
+import { ERROR_SYMBOL, ERROR_SYMBOL_DESCRIPTION } from "@aeriajs/types";
+export const error = (value) => {
+  const wrappedError = {
+    [ERROR_SYMBOL]: true,
     _tag: "Error",
-    error: error2
+    value
   };
+  return wrappedError;
 };
 export const isError = (object) => {
-  return object._tag === "Error";
+  return object && typeof object === "object" && (ERROR_SYMBOL in object || ERROR_SYMBOL_DESCRIPTION in object);
+};
+export const unwrapError = (error2) => {
+  return error2.value;
+};
+export const throwIfError = (value, message) => {
+  if (isError(value)) {
+    const error2 = unwrapError(value);
+    if (true) {
+      console.trace(JSON.stringify(error2, null, 2));
+    }
+    throw new Error(`throwIfLeft threw: ${error2.code} (${message || "-"})`);
+  }
+  return value;
 };

package/dist/pipe.d.ts

@@ -1,4 +1,4 @@
 export type PipeOptions = {
-    returnFirst?: boolean | ((value: any) => boolean);
+    returnFirst?: boolean | ((value: any) => any);
 };
-export declare const pipe: <TFunction extends (...args: any) => any>(functions: TFunction[], options?: PipeOptions) => (value: Parameters<TFunction>[0], ...args: Parameters<TFunction> extends [unknown, ...infer Tail] ? Tail : []) => Promise<true | ReturnType<TFunction>>;
+export declare const pipe: <TFunction extends (...args: any) => any>(functions: TFunction[], options?: PipeOptions) => (value: Parameters<TFunction>[0], ...args: Parameters<TFunction> extends [unknown, ...infer Tail] ? Tail : []) => Promise<any>;

package/dist/pipe.js

@@ -11,7 +11,7 @@ const pipe = (functions, options) => {
                 switch (typeof returnFirst) {
                     case 'function': {
                         const result = returnFirst(ret);
-                        if (result) {
+                        if (result !== undefined) {
                             return result;
                         }
                         break;

package/dist/pipe.mjs

@@ -9,7 +9,7 @@ export const pipe = (functions, options) => {
         switch (typeof returnFirst) {
           case "function": {
             const result = returnFirst(ret);
-            if (result) {
+            if (result !== void 0) {
               return result;
             }
             break;

package/dist/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Property, ObjectToSchema, EndpointErrorContent } from '@aeriajs/types';
+import type { Property, ObjectToSchema, HTTPStatus } from '@aeriajs/types';
 export declare const fromLiteral: <const TObject, TRequired extends (keyof TObject & string)[]>(object: TObject, required?: TRequired) => ObjectToSchema<TObject, TRequired>;
 export declare const leftSchema: <const TObject extends Property>(object: TObject) => {
     readonly type: "object";
@@ -18,28 +18,33 @@ export declare const rightSchema: <const TObject extends Property>(object: TObje
         readonly value: Property;
     };
 };
-export declare const endpointErrorSchema: (error: EndpointErrorContent) => {
+export declare const endpointErrorSchema: <const THTTPStatus extends HTTPStatus[], const TCode extends string[]>(error: {
+    httpStatus: THTTPStatus;
+    code: TCode;
+}) => {
     readonly type: "object";
     readonly properties: {
-        readonly httpCode: {
-            readonly const: string;
-        };
-        readonly code: {
-            readonly const: string;
-        };
-        readonly message: {
-            readonly const: string;
-        };
-    };
-} | {
-    readonly type: "object";
-    readonly properties: {
-        readonly httpCode: {
-            readonly const: string;
+        readonly _tag: {
+            readonly const: "Error";
         };
-        readonly code: {
-            readonly const: string;
+        readonly value: {
+            readonly type: "object";
+            readonly required: readonly ["httpStatus", "code"];
+            readonly properties: {
+                readonly httpStatus: {
+                    readonly enum: THTTPStatus;
+                };
+                readonly code: {
+                    readonly enum: TCode;
+                };
+                readonly message: {
+                    readonly type: "string";
+                };
+                readonly details: {
+                    readonly type: "object";
+                    readonly variable: true;
+                };
+            };
         };
-        readonly message?: undefined;
     };
 };

package/dist/schema.js

@@ -73,30 +73,33 @@ const rightSchema = (object) => {
 };
 exports.rightSchema = rightSchema;
 const endpointErrorSchema = (error) => {
-    if (error.message) {
-        return {
-            type: 'object',
-            properties: {
-                httpCode: {
-                    const: error.code,
-                },
-                code: {
-                    const: error.code,
-                },
-                message: {
-                    const: error.message,
-                },
-            },
-        };
-    }
     return {
         type: 'object',
         properties: {
-            httpCode: {
-                const: error.code,
+            _tag: {
+                const: 'Error',
             },
-            code: {
-                const: error.code,
+            value: {
+                type: 'object',
+                required: [
+                    'httpStatus',
+                    'code',
+                ],
+                properties: {
+                    httpStatus: {
+                        enum: error.httpStatus,
+                    },
+                    code: {
+                        enum: error.code,
+                    },
+                    message: {
+                        type: 'string',
+                    },
+                    details: {
+                        type: 'object',
+                        variable: true,
+                    },
+                },
             },
         },
     };

package/dist/schema.mjs

@@ -68,30 +68,33 @@ export const rightSchema = (object) => {
   };
 };
 export const endpointErrorSchema = (error) => {
-  if (error.message) {
-    return {
-      type: "object",
-      properties: {
-        httpCode: {
-          const: error.code
-        },
-        code: {
-          const: error.code
-        },
-        message: {
-          const: error.message
-        }
-      }
-    };
-  }
   return {
     type: "object",
     properties: {
-      httpCode: {
-        const: error.code
+      _tag: {
+        const: "Error"
       },
-      code: {
-        const: error.code
+      value: {
+        type: "object",
+        required: [
+          "httpStatus",
+          "code"
+        ],
+        properties: {
+          httpStatus: {
+            enum: error.httpStatus
+          },
+          code: {
+            enum: error.code
+          },
+          message: {
+            type: "string"
+          },
+          details: {
+            type: "object",
+            variable: true
+          }
+        }
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/common",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
     "bson": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/types": "^0.0.51",
+    "@aeriajs/types": "^0.0.53",
     "bson": "^6.5.0"
   },
   "scripts": {