@dnax/core 0.2.3 → 0.2.5

package/app/hono.ts

@@ -126,6 +126,18 @@ function HonoInstance(): typeof app {
     let colAccess = col?.access?.hasOwnProperty(action) || null;
     let nextLifecyle: any = false;
 
+    // Middleware for apis
+    for await (let midd of col?.middlewares!) {
+      await midd({
+        token: c.var["token"] || null,
+        action: action,
+        c: c,
+        isAuth: c.var?._v?.isAuth || false,
+        rest: new useRest({ tenant_id: tenant_id }),
+        session: session as any,
+      });
+    }
+
     if (col && col?.access?.beforeAction) {
       await col?.access?.beforeAction({
         token: c.var["token"] || null,
@@ -217,6 +229,7 @@ function HonoInstance(): typeof app {
       if (action == "execService") {
         if (!service) return fn.error("Service not found", 404);
         response = await service.fx({
+          io: Cfg.io,
           data: body?.data || {},
           rest: rest,
           error: fn.error,
@@ -243,6 +256,7 @@ function HonoInstance(): typeof app {
       ) {
         if (action == "authCollection") {
           let reponse;
+
           if (!col?.auth?.enabled) fn.error("Auth not enabled", 401);
           if (!col?.auth?.handler) fn.error("Auth handler not set", 401);
           if (col?.auth?.handler) {

package/bin/index.ts

@@ -2,6 +2,7 @@
 
 import ch from "chokidar";
 import { spinner } from "@clack/prompts";
+import "@colors/colors";
 var exec;
 var s = spinner();
 function runPkg(
@@ -52,7 +53,7 @@ ch.watch(".", {
   ],
 })
   .on("change", (path) => {
-    console.log(path);
+    console.log("Changed file:".gray, path.green);
     let dev = process.argv.includes("--dev");
     if (dev && (path?.endsWith(".ts") || path?.endsWith(".js"))) {
       s.start("Restarting due to changes ...");
@@ -61,7 +62,7 @@ ch.watch(".", {
       }
       setTimeout(() => {
         runPkg({ stopSpinner: true });
-      }, 600);
+      }, 1000);
     }
   })
   .on("ready", () => {

package/define/index.ts

@@ -1,4 +1,11 @@
-import type { Collection, Config, Endpoint, Service, Socket } from "../types";
+import type {
+  Collection,
+  Config,
+  Endpoint,
+  Service,
+  Socket,
+  middlewareCtx,
+} from "../types";
 import { Cfg } from "../config/";
 import { deepMerge, freeze } from "../utils";
 import { config } from "valibot";
@@ -23,6 +30,11 @@ function WebSocket(config: Socket) {
   return config;
 }
 
+function Middleware(ctx: middlewareCtx) {
+  console.log(ctx);
+  return ctx;
+}
+
 const define = {
   Service,
   Config,
@@ -30,6 +42,7 @@ const define = {
   Endpoint,
   App: Config,
   WebSocket,
+  Middleware,
 };
 
 export default define;

package/driver/mongo/rest.ts

@@ -27,6 +27,7 @@ import {
   setUUID,
 } from "./utils";
 import { Cfg } from "../../config";
+import cleanDeep from "clean-deep";
 
 type options = {
   tenant_id: string;
@@ -420,6 +421,9 @@ class useRest {
   ): Promise<object[]> {
     return new Promise(async (resolve, reject) => {
       try {
+        if (options?.cleanDeep) {
+          params = cleanDeep(params);
+        }
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let sharedData = {};

package/driver/mongo/utils.ts

@@ -60,13 +60,13 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
         if (field) {
           pipeline.push({
             $lookup: {
-              from: field.relationTo,
+              from: field.relation?.to,
               localField: inc,
               foreignField: "_id",
               as: inc,
             },
           });
-          if (field.relationType == "ref-to-one") {
+          if (!field.relation?.hasMany) {
             pipeline.push({
               $unwind: {
                 path: `$${inc}`,
@@ -81,7 +81,7 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
         let field = getFieldCollection(inc?.localField, col);
         pipeline.push({
           $lookup: {
-            from: inc?.from || field?.relationTo,
+            from: inc?.from || field?.relation?.to,
             localField: inc?.localField || field?.name,
             foreignField: inc?.foreignField || "_id",
             as: inc?.as || inc?.localField || field?.name,
@@ -89,7 +89,7 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
           },
         });
 
-        if (field?.relationType == "ref-to-one") {
+        if (!field?.relation?.hasMany) {
           pipeline.push({
             $unwind: {
               path: `$${inc?.as || inc?.localField || field?.name}`,

package/lib/schema.ts

@@ -49,11 +49,11 @@ function buildSchema(col: Collection) {
       propertySchema[f.name] = v.string().email();
     }
 
-    if (f?.type == "relationship" && f.relationType == "ref-to-one") {
+    if (f?.type == "relationship") {
       propertySchema[f.name] = v.string().optional();
     }
 
-    if (f?.type == "relationship" && f.relationType == "ref-to-many") {
+    if (f?.type == "relationship" && f.relation?.hasMany) {
       propertySchema[f.name] = v.array().optional();
     }
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dnax/core",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "module": "index.ts",
   "type": "module",
   "bin": {
-    "dnax": "./bin/index.ts"
+    "dnaxi": "./bin/index.ts"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/types/index.ts

@@ -102,9 +102,12 @@ export type Field = {
   unique?: boolean;
   index?: boolean | "text" | "2dsphere";
   description?: string;
-
+  relation?: {
+    to: string; // collection name
+    hasMany?: boolean;
+  };
   sparse?: boolean;
-  relationType?: "ref-to-one" | "ref-to-many";
+  // relationType?: "ref-to-one" | "ref-to-many";
   /**
    * Overwrite custom validation schema
    * use {v} from "@dnax/core"} to build your own validation
@@ -116,6 +119,15 @@ export type Field = {
   relationTo?: string;
 };
 
+export type middlewareCtx = (ctx: {
+  token?: string;
+  action?: Actions;
+  c?: Context;
+  isAuth: boolean;
+  rest: InstanceType<typeof useRest>;
+  session: sessionCtx;
+}) => boolean | undefined | void | Promise<any>;
+
 export type accessCtx = (ctx: {
   token?: string;
   action?: Actions;
@@ -123,7 +135,7 @@ export type accessCtx = (ctx: {
   isAuth: boolean;
   rest: InstanceType<typeof useRest>;
   session: sessionCtx;
-}) => boolean | undefined | void;
+}) => boolean | undefined | void | Promise<any>;
 
 export type sessionCtx = {
   set: (session: { state: object | any; token?: string; _v?: object }) => void;
@@ -209,6 +221,7 @@ export type Collection = {
       session: sessionCtx;
     }) => boolean | any;
   };
+  middlewares?: Array<middlewareCtx>;
   hooks?: {
     beforeOperation?: hooksCtx;
     beforeFind?: hooksCtx;