@aeriajs/common 0.0.101 → 0.0.102

package/dist/arraysIntersect.d.ts

@@ -1 +1 @@
-export declare const arraysIntersect: <T extends any[] | readonly any[]>(subject: T | string, arr: T | undefined) => boolean;
+export declare const arraysIntersect: <T extends unknown[] | readonly unknown[]>(subject: T | string, arr: T | undefined) => boolean;

package/dist/deepMerge.js

@@ -14,7 +14,7 @@ const deepMerge = (left, right, options) => {
                 continue;
             }
         }
-        if (Array.isArray(leftVal) && Array.isArray(rightVal)) {
+        if (Array.isArray(result[key]) && Array.isArray(rightVal)) {
             result[key] = arrays
                 ? result[key].concat(...rightVal)
                 : rightVal;

package/dist/deepMerge.mjs

@@ -12,7 +12,7 @@ export const deepMerge = (left, right, options) => {
         continue;
       }
     }
-    if (Array.isArray(leftVal) && Array.isArray(rightVal)) {
+    if (Array.isArray(result[key]) && Array.isArray(rightVal)) {
       result[key] = arrays ? result[key].concat(...rightVal) : rightVal;
       continue;
     }

package/dist/endpointError.d.ts

@@ -5,4 +5,4 @@ export declare const endpointError: <const TEndpointError extends EndpointError>
     readonly error: TEndpointError;
     readonly result: undefined;
 };
-export declare const isEndpointError: (object: EndpointError | any) => object is Result.Error<EndpointError<any>>;
+export declare const isEndpointError: (object: EndpointError | unknown) => object is Result.Error<EndpointError>;

package/dist/endpointError.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEndpointError = exports.endpointError = void 0;
 const types_1 = require("@aeriajs/types");
+const result_js_1 = require("./result.js");
 const endpointError = (value) => {
     return types_1.Result.error(Object.assign({
         [types_1.ERROR_SYMBOL]: true,
@@ -9,9 +10,9 @@ const endpointError = (value) => {
 };
 exports.endpointError = endpointError;
 const isEndpointError = (object) => {
-    return object
+    return !!((0, result_js_1.isError)(object)
         && object.error
         && typeof object.error === 'object'
-        && (types_1.ERROR_SYMBOL in object.error || types_1.ERROR_SYMBOL_DESCRIPTION in object.error);
+        && (types_1.ERROR_SYMBOL in object.error || types_1.ERROR_SYMBOL_DESCRIPTION in object.error));
 };
 exports.isEndpointError = isEndpointError;

package/dist/endpointError.mjs

@@ -1,10 +1,11 @@
 "use strict";
 import { Result, ERROR_SYMBOL, ERROR_SYMBOL_DESCRIPTION } from "@aeriajs/types";
+import { isError } from "./result.mjs";
 export const endpointError = (value) => {
   return Result.error(Object.assign({
     [ERROR_SYMBOL]: true
   }, value));
 };
 export const isEndpointError = (object) => {
-  return object && object.error && typeof object.error === "object" && (ERROR_SYMBOL in object.error || ERROR_SYMBOL_DESCRIPTION in object.error);
+  return !!(isError(object) && object.error && typeof object.error === "object" && (ERROR_SYMBOL in object.error || ERROR_SYMBOL_DESCRIPTION in object.error));
 };

package/dist/evaluateCondition.d.ts

@@ -1,5 +1,5 @@
 import type { Condition } from '@aeriajs/types';
-export declare const evaluateCondition: (subject: any, condition: Condition) => {
+export declare const evaluateCondition: (subject: unknown, condition: Condition) => {
     satisfied: boolean;
-    else: null;
+    else: unknown;
 };

package/dist/evaluateCondition.js

@@ -15,7 +15,7 @@ const equalOrContains = (term1, term2) => {
 };
 const evaluatesToTrue = (subject, condition) => {
     if ('term1' in condition) {
-        if (!subject) {
+        if (!subject || typeof subject !== 'object') {
             return false;
         }
         const term1 = subject[condition.term1];
@@ -26,10 +26,10 @@ const evaluatesToTrue = (subject, condition) => {
         switch (operator) {
             case 'equal': return term1 === term2;
             case 'in': return !!equalOrContains(term1, term2);
-            case 'gt': return term1 > term2;
-            case 'lt': return term1 < term2;
-            case 'gte': return term1 >= term2;
-            case 'lte': return term1 <= term2;
+            case 'gt': return term1 > Number(term2);
+            case 'lt': return term1 < Number(term2);
+            case 'gte': return term1 >= Number(term2);
+            case 'lte': return term1 <= Number(term2);
             case 'regex': return new RegExp(term2).test(term1);
         }
     }

package/dist/evaluateCondition.mjs

@@ -13,7 +13,7 @@ const equalOrContains = (term1, term2) => {
 };
 const evaluatesToTrue = (subject, condition) => {
   if ("term1" in condition) {
-    if (!subject) {
+    if (!subject || typeof subject !== "object") {
       return false;
     }
     const term1 = subject[condition.term1];
@@ -27,13 +27,13 @@ const evaluatesToTrue = (subject, condition) => {
       case "in":
         return !!equalOrContains(term1, term2);
       case "gt":
-        return term1 > term2;
+        return term1 > Number(term2);
       case "lt":
-        return term1 < term2;
+        return term1 < Number(term2);
       case "gte":
-        return term1 >= term2;
+        return term1 >= Number(term2);
       case "lte":
-        return term1 <= term2;
+        return term1 <= Number(term2);
       case "regex":
         return new RegExp(term2).test(term1);
     }

package/dist/getValueFromPath.d.ts

@@ -1 +1 @@
-export declare const getValueFromPath: (object: any, path: string) => any;
+export declare const getValueFromPath: <TValue>(object: Record<string, unknown>, path: string) => TValue;

package/dist/http.d.ts

@@ -9,7 +9,7 @@ export type RequestConfig = {
     }>;
     responseTransformer?: typeof defaultResponseTransformer;
 };
-export declare const defaultRequestTransformer: (url: string, payload: any, params: RequestParams) => Promise<{
+export declare const defaultRequestTransformer: (url: string, payload: unknown, params: RequestParams) => Promise<{
     url: string;
     params: RequestParams;
 }>;

package/dist/http.js

@@ -13,7 +13,7 @@ const defaultRequestTransformer = async (url, payload, params) => {
         else {
             request.params.body = params.headers?.['content-type']?.startsWith('application/json')
                 ? JSON.stringify(payload)
-                : payload;
+                : Buffer.from(String(payload));
         }
     }
     return request;

package/dist/http.mjs

@@ -8,7 +8,7 @@ export const defaultRequestTransformer = async (url, payload, params) => {
     if (params.method === "GET" || params.method === "HEAD") {
       request2.url += `?${new URLSearchParams(payload)}`;
     } else {
-      request2.params.body = params.headers?.["content-type"]?.startsWith("application/json") ? JSON.stringify(payload) : payload;
+      request2.params.body = params.headers?.["content-type"]?.startsWith("application/json") ? JSON.stringify(payload) : Buffer.from(String(payload));
     }
   }
   return request2;

package/dist/isRequired.d.ts

@@ -1,2 +1,9 @@
-import type { Description } from '@aeriajs/types';
-export declare const isRequired: (propName: string, required: NonNullable<Description["required"]>, subject: any) => boolean;
+import type { JsonSchema } from '@aeriajs/types';
+export declare const isRequired: (propName: string, required: NonNullable<JsonSchema["required"]>, subject: unknown) => number | boolean | {
+    (...items: ConcatArray<string>[]): string[];
+    (...items: (string | ConcatArray<string>)[]): string[];
+} | ((separator?: string) => string) | ((start?: number, end?: number) => string[]) | ((searchElement: string, fromIndex?: number) => number) | ((callbackfn: (value: string, index: number, array: readonly string[]) => void, thisArg?: any) => void) | {
+    (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: readonly string[]) => string): string;
+    (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: readonly string[]) => string, initialValue: string): string;
+    <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: readonly string[]) => U, initialValue: U): U;
+} | ((searchElement: string, fromIndex?: number) => boolean) | (<A, D extends number = 1>(this: A, depth?: D | undefined) => FlatArray<A, D>[]) | ((index: number) => string | undefined) | ((compareFn?: ((a: string, b: string) => number) | undefined) => string[]) | ((index: number, value: string) => string[]) | undefined;

package/dist/isRequired.js

@@ -10,7 +10,7 @@ const isRequired = (propName, required, subject) => {
         return false;
     }
     const requiredProp = required[propName];
-    if (typeof requiredProp === 'boolean') {
+    if (typeof requiredProp !== 'object') {
         return requiredProp;
     }
     return (0, evaluateCondition_js_1.evaluateCondition)(subject, requiredProp).satisfied;

package/dist/isRequired.mjs

@@ -8,7 +8,7 @@ export const isRequired = (propName, required, subject) => {
     return false;
   }
   const requiredProp = required[propName];
-  if (typeof requiredProp === "boolean") {
+  if (typeof requiredProp !== "object") {
     return requiredProp;
   }
   return evaluateCondition(subject, requiredProp).satisfied;

package/dist/pipe.d.ts

@@ -1,4 +1,4 @@
-export type PipeOptions = {
-    returnFirst?: boolean | ((value: unknown) => unknown);
+export type PipeOptions<TReturn> = {
+    returnFirst?: boolean | ((value: unknown) => Awaited<TReturn> | undefined);
 };
-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<{} | ReturnType<TFunction> | null>;
+export declare const pipe: <TArgs extends unknown[], TReturn>(functions: ((p1: TReturn, ...args: TArgs) => TReturn)[], options?: PipeOptions<TReturn>) => (value: Awaited<TReturn>, ...args: TArgs) => Promise<TReturn>;

package/dist/pipe.js

@@ -7,6 +7,7 @@ const pipe = (functions, options) => {
         let ret = value;
         for (const fn of functions) {
             ret = await fn(ret, ...args);
+            // eslint-disable-next-line
             if (returnFirst && ret !== undefined) {
                 switch (typeof returnFirst) {
                     case 'function': {

package/dist/result.d.ts

@@ -1,4 +1,5 @@
 import type { Result } from '@aeriajs/types';
-export declare const isResult: (value: any) => value is Result.Either<unknown, unknown>;
-export declare const isError: (object: any) => object is Result.Error<unknown>;
-export declare const throwIfError: <TValue>(either: Result.Either<unknown, TValue>, message?: any) => NonNullable<TValue>;
+export declare const isEither: (value: unknown) => value is Result.Either<unknown, unknown>;
+export declare const isResult: (value: unknown) => value is Result.Result<unknown>;
+export declare const isError: (value: unknown) => value is Result.Error<unknown>;
+export declare const throwIfError: <TValue>(either: Result.Either<unknown, TValue>, message?: unknown) => NonNullable<TValue>;

package/dist/result.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwIfError = exports.isError = exports.isResult = void 0;
+exports.throwIfError = exports.isError = exports.isResult = exports.isEither = void 0;
+const isEither = (value) => {
+    return !!(value
+        && typeof value === 'object'
+        && '_tag' in value
+        && (value._tag === 'Error' || value._tag === 'Result'));
+};
+exports.isEither = isEither;
 const isResult = (value) => {
-    return value
-        && value.constructor === Object
-        && (value._tag === 'Error' || value._tag === 'Result');
+    return !!((0, exports.isEither)(value) && value.result);
 };
 exports.isResult = isResult;
-const isError = (object) => {
-    return object
-        && object._tag === 'Error'
-        && 'error' in object;
+const isError = (value) => {
+    return !!((0, exports.isEither)(value) && value.error);
 };
 exports.isError = isError;
 const throwIfError = (either, message) => {

package/dist/result.mjs

@@ -1,9 +1,12 @@
 "use strict";
+export const isEither = (value) => {
+  return !!(value && typeof value === "object" && "_tag" in value && (value._tag === "Error" || value._tag === "Result"));
+};
 export const isResult = (value) => {
-  return value && value.constructor === Object && (value._tag === "Error" || value._tag === "Result");
+  return !!(isEither(value) && value.result);
 };
-export const isError = (object) => {
-  return object && object._tag === "Error" && "error" in object;
+export const isError = (value) => {
+  return !!(isEither(value) && value.error);
 };
 export const throwIfError = (either, message) => {
   if (either.error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/common",
-  "version": "0.0.101",
+  "version": "0.0.102",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
     "bson": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/types": "^0.0.86",
+    "@aeriajs/types": "^0.0.87",
     "bson": "^6.5.0"
   },
   "scripts": {