@aeriajs/common 0.0.144 → 0.0.146

package/dist/convertConditionToQuery.d.ts

@@ -0,0 +1,2 @@
+import type { Condition } from '@aeriajs/types';
+export declare const convertConditionToQuery: (condition: Condition, subject?: Record<string, unknown>) => Record<string, unknown>;

package/dist/convertConditionToQuery.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertConditionToQuery = void 0;
+const getValueFromPath_js_1 = require("./getValueFromPath.js");
+const convertExpression = (condition, subject) => {
+    let term2 = null;
+    if ('term2' in condition) {
+        if (condition.fromState) {
+            term2 = subject && typeof condition.term2 === 'string'
+                ? (0, getValueFromPath_js_1.getValueFromPath)(subject, condition.term2)
+                : null;
+        }
+        else {
+            term2 = condition.term2;
+        }
+    }
+    switch (condition.operator) {
+        case 'truthy': return {
+            $ne: [
+                null,
+                undefined,
+            ],
+        };
+        case 'equal': return term2;
+        case 'gt': return {
+            $gt: term2,
+        };
+        case 'lt': return {
+            $lt: term2,
+        };
+        case 'gte': return {
+            $gte: term2,
+        };
+        case 'lte': return {
+            $lte: term2,
+        };
+        case 'regex': return {
+            $regex: term2,
+            $options: condition.regexOptions,
+        };
+        case 'in': {
+            return Array.isArray(term2)
+                ? {
+                    $in: term2,
+                }
+                : term2;
+        }
+    }
+};
+const convertConditionToQuery = (condition, subject) => {
+    if ('or' in condition) {
+        return {
+            $or: condition.or.map((sub) => (0, exports.convertConditionToQuery)(sub, subject)),
+        };
+    }
+    if ('and' in condition) {
+        return {
+            $and: condition.and.map((sub) => (0, exports.convertConditionToQuery)(sub, subject)),
+        };
+    }
+    if ('not' in condition) {
+        return {
+            $not: (0, exports.convertConditionToQuery)(condition.not, subject),
+        };
+    }
+    return {
+        [condition.term1]: convertExpression(condition, subject),
+    };
+};
+exports.convertConditionToQuery = convertConditionToQuery;

package/dist/convertConditionToQuery.mjs

@@ -0,0 +1,69 @@
+"use strict";
+import { getValueFromPath } from "./getValueFromPath.mjs";
+const convertExpression = (condition, subject) => {
+  let term2 = null;
+  if ("term2" in condition) {
+    if (condition.fromState) {
+      term2 = subject && typeof condition.term2 === "string" ? getValueFromPath(subject, condition.term2) : null;
+    } else {
+      term2 = condition.term2;
+    }
+  }
+  switch (condition.operator) {
+    case "truthy":
+      return {
+        $ne: [
+          null,
+          void 0
+        ]
+      };
+    case "equal":
+      return term2;
+    case "gt":
+      return {
+        $gt: term2
+      };
+    case "lt":
+      return {
+        $lt: term2
+      };
+    case "gte":
+      return {
+        $gte: term2
+      };
+    case "lte":
+      return {
+        $lte: term2
+      };
+    case "regex":
+      return {
+        $regex: term2,
+        $options: condition.regexOptions
+      };
+    case "in": {
+      return Array.isArray(term2) ? {
+        $in: term2
+      } : term2;
+    }
+  }
+};
+export const convertConditionToQuery = (condition, subject) => {
+  if ("or" in condition) {
+    return {
+      $or: condition.or.map((sub) => convertConditionToQuery(sub, subject))
+    };
+  }
+  if ("and" in condition) {
+    return {
+      $and: condition.and.map((sub) => convertConditionToQuery(sub, subject))
+    };
+  }
+  if ("not" in condition) {
+    return {
+      $not: convertConditionToQuery(condition.not, subject)
+    };
+  }
+  return {
+    [condition.term1]: convertExpression(condition, subject)
+  };
+};

package/dist/http.d.ts

@@ -3,21 +3,18 @@ export type RequestParams = Omit<RequestInit, 'headers'> & {
 };
 export type RequestConfig = {
     params?: RequestParams;
-    requestTransformer?: (...args: Parameters<typeof defaultRequestTransformer>) => Promise<{
-        url: string;
-        params: RequestParams;
-    }>;
-    responseTransformer?: typeof defaultResponseTransformer;
+    requestTransformer?: RequestTransformer;
+    responseTransformer?: ResponseTransformer;
 };
-export declare const defaultRequestTransformer: (url: string, payload: unknown, params: RequestParams) => Promise<{
+type OmitLastParameter<TFunction> = TFunction extends (...args: [...infer Tail, infer _Head]) => infer Return ? (...args: Tail) => Return : never;
+export type RequestTransformer = (url: string, payload: unknown, params: RequestParams, next: (url: string, payload: unknown, params: RequestParams) => ReturnType<RequestTransformer>) => Promise<{
     url: string;
     params: RequestParams;
 }>;
-export declare const defaultResponseTransformer: (response: Awaited<ReturnType<typeof fetch>>) => Promise<Response & {
-    data: unknown;
-}>;
+export type ResponseTransformer = (response: Awaited<ReturnType<typeof fetch>>, next: (response: Awaited<ReturnType<typeof fetch>>) => ReturnType<ResponseTransformer>) => Promise<Awaited<ReturnType<typeof fetch>>>;
+export declare const defaultRequestTransformer: OmitLastParameter<RequestTransformer>;
+export declare const defaultResponseTransformer: OmitLastParameter<ResponseTransformer>;
 export declare const request: <TResponseType = unknown>(url: string, payload?: unknown, config?: RequestConfig) => Promise<Response & {
-    data: unknown;
-} & {
     data: TResponseType;
 }>;
+export {};

package/dist/http.js

@@ -29,19 +29,29 @@ const defaultResponseTransformer = async (response) => {
 };
 exports.defaultResponseTransformer = defaultResponseTransformer;
 const request = async (url, payload, config = {}) => {
-    const { requestTransformer = exports.defaultRequestTransformer, responseTransformer = exports.defaultResponseTransformer, params = {
-        method: payload
-            ? 'POST'
-            : 'GET',
-        headers: payload
-            ? {
-                'content-type': 'application/json',
-            }
-            : {},
-    }, } = config;
-    const transformedRequest = await requestTransformer(url, payload, params);
+    const { requestTransformer = (url, payload, params, next) => next(url, payload, params), responseTransformer = (response, next) => next(response), } = config;
+    let params;
+    if (config.params) {
+        params = config.params;
+    }
+    else {
+        if (payload) {
+            params = {
+                method: 'POST',
+                headers: {
+                    'content-type': 'application/json',
+                },
+            };
+        }
+        else {
+            params = {
+                method: 'GET',
+            };
+        }
+    }
+    const transformedRequest = await requestTransformer(url, payload, params, exports.defaultRequestTransformer);
     const response = await fetch(transformedRequest.url, transformedRequest.params);
-    const transformedResponse = await responseTransformer(response);
+    const transformedResponse = await responseTransformer(response, exports.defaultResponseTransformer);
     return transformedResponse;
 };
 exports.request = request;

package/dist/http.mjs

@@ -23,17 +23,28 @@ export const defaultResponseTransformer = async (response) => {
 };
 export const request = async (url, payload, config = {}) => {
   const {
-    requestTransformer = defaultRequestTransformer,
-    responseTransformer = defaultResponseTransformer,
-    params = {
-      method: payload ? "POST" : "GET",
-      headers: payload ? {
-        "content-type": "application/json"
-      } : {}
-    }
+    requestTransformer = (url2, payload2, params2, next) => next(url2, payload2, params2),
+    responseTransformer = (response2, next) => next(response2)
   } = config;
-  const transformedRequest = await requestTransformer(url, payload, params);
+  let params;
+  if (config.params) {
+    params = config.params;
+  } else {
+    if (payload) {
+      params = {
+        method: "POST",
+        headers: {
+          "content-type": "application/json"
+        }
+      };
+    } else {
+      params = {
+        method: "GET"
+      };
+    }
+  }
+  const transformedRequest = await requestTransformer(url, payload, params, defaultRequestTransformer);
   const response = await fetch(transformedRequest.url, transformedRequest.params);
-  const transformedResponse = await responseTransformer(response);
+  const transformedResponse = await responseTransformer(response, defaultResponseTransformer);
   return transformedResponse;
 };

package/dist/index.d.ts

@@ -16,5 +16,6 @@ export * from './isGranted.js';
 export * from './isReference.js';
 export * from './isRequired.js';
 export * from './isValidCollection.js';
+export * from './convertConditionToQuery.js';
 export * from './pipe.js';
 export * from './serialize.js';

package/dist/index.js

@@ -32,5 +32,6 @@ __exportStar(require("./isGranted.js"), exports);
 __exportStar(require("./isReference.js"), exports);
 __exportStar(require("./isRequired.js"), exports);
 __exportStar(require("./isValidCollection.js"), exports);
+__exportStar(require("./convertConditionToQuery.js"), exports);
 __exportStar(require("./pipe.js"), exports);
 __exportStar(require("./serialize.js"), exports);

package/dist/index.mjs

@@ -17,5 +17,6 @@ export * from "./isGranted.mjs";
 export * from "./isReference.mjs";
 export * from "./isRequired.mjs";
 export * from "./isValidCollection.mjs";
+export * from "./convertConditionToQuery.mjs";
 export * from "./pipe.mjs";
 export * from "./serialize.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/common",
-  "version": "0.0.144",
+  "version": "0.0.146",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
     "bson": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/types": "^0.0.126",
+    "@aeriajs/types": "^0.0.127",
     "bson": "^6.5.0"
   },
   "scripts": {