@dnax/core 0.0.9 → 0.1.1

package/driver/mongo/rest.ts

@@ -6,7 +6,7 @@ import type { Actions, Collection, Tenant } from "./../../types/index";
 import { isArray, omit } from "radash";
 import { ClientSession, MongoClient, ObjectId } from "mongodb";
 import { contextError, fn, toJson } from "../../utils";
-import * as v from "valibot";
+import v, { type Schema } from "joi";
 import type { Context } from "hono";
 
 import type {
@@ -79,35 +79,47 @@ class useRest {
   ): { valid: boolean; output: any; error: any } {
     let col = getCollection(collection, this.#tenant_id);
     let valid = true;
-    let output = data;
-    let error;
+    let output = { ...data };
+    let errorMxg;
     /*  let issue = err?.issues[0] || {};
     let msg = `Field : ${issue?.path[0]?.key} - ${issue?.message}`;
     */
-    try {
-      if (col?.schema) {
-        if (options.partial) {
-          var issue = v.safeParse(v.partial(col.schema), data);
-          output = issue.output;
-        } else {
-          var issue = v.safeParse(col.schema, data);
-          output = issue.output;
-        }
-        if (issue?.success) {
-        } else {
-          valid = false;
-          error = `Field : ${issue?.issues[0]?.path[0]?.key} - ${issue?.issues[0]?.message}`;
-        }
+
+    if (col?.schema) {
+      let schema = col.schema as Schema;
+
+      if (options.partial) {
+        let partialSchema = schema.fork(
+          Object.keys(schema.describe().keys),
+          (sc) => {
+            return sc.optional();
+          }
+        );
+        const { error, value } = partialSchema.validate(data);
+      } else {
+        const { error, value } = schema.validate(data);
+      }
+
+      const { error, value } = schema.validate(data);
+
+      if (error) {
+        valid = false;
+        errorMxg = error?.message;
+      } else {
+        output = value;
+        data = {
+          ...data,
+          ...output,
+        };
+
+        console.log(value);
       }
-    } catch (err: any) {
-      error = err?.message;
-      valid = false;
     }
 
     return {
       valid: valid,
       output,
-      error: error,
+      error: errorMxg,
     };
   }
 

package/index.ts

@@ -2,10 +2,17 @@ import "@colors/colors";
 import { MongoClient, useRest } from "./driver/mongo";
 import { toBson } from "./driver/mongo/utils";
 import { runApp } from "./app";
+import Joi from "joi";
 import define from "./define";
 import moment from "moment";
 import * as utils from "./utils";
-import * as v from "valibot";
+
 import * as ai from "./ai";
+/**
+ *  v is internal data validation and based of Joi validation.
+ *  Note : v is an alias of Joi object API .
+ * @see {@link https://joi.dev/api}
+ */
+const v = Joi;
 
-export { runApp, define, v, utils, useRest, ai };
+export { runApp, define, utils, useRest, ai, v };

package/lib/schema.ts

@@ -1,15 +1,16 @@
+import type { Schema } from "hono";
 import type { Collection } from "../types";
-import * as v from "valibot";
+import v, { type AnySchema } from "joi";
 function buildSchema(col: Collection) {
-  let propertySchema = {};
+  let propertySchema = {} as { [key: string]: AnySchema };
 
   if (col?.media) {
-    propertySchema["_file"] = v.object({});
+    propertySchema["_file"] = v.object();
   }
 
   col?.fields?.map((f) => {
     if (f?.type == "array") {
-      propertySchema[f.name] = v.array(v.any());
+      propertySchema[f.name] = v.array();
     }
 
     if (f?.type == "uuid" && f?.random?.toNumber) {
@@ -31,17 +32,17 @@ function buildSchema(col: Collection) {
       propertySchema[f.name] = v.number();
     }
     if (f.type == "integer") {
-      propertySchema[f.name] = v.pipe(v.number(), v.integer());
+      propertySchema[f.name] = v.number().integer();
     }
 
     if (f?.type == "boolean") {
       propertySchema[f.name] = v.boolean();
     }
     if (f?.type == "json") {
-      propertySchema[f.name] = v.object({});
+      propertySchema[f.name] = v.object();
     }
     if (f?.type == "email") {
-      propertySchema[f.name] = v.pipe(v.string(), v.email());
+      propertySchema[f.name] = v.string().email();
     }
 
     if (f?.type == "relationship" && f.relationType == "ref-to-one") {
@@ -49,7 +50,7 @@ function buildSchema(col: Collection) {
     }
 
     if (f?.type == "relationship" && f.relationType == "ref-to-many") {
-      propertySchema[f.name] = v.array(v.string());
+      propertySchema[f.name] = v.array();
     }
 
     if (f?.type?.match(/(date)/)) {
@@ -61,20 +62,26 @@ function buildSchema(col: Collection) {
     }
 
     if (f?.type == "url") {
-      propertySchema[f.name] = v.pipe(v.string(), v.url());
+      propertySchema[f.name] = v.string().uri();
     }
 
     if (f?.type == "ipv4") {
-      propertySchema[f.name] = v.pipe(v.string(), v.ipv4());
+      propertySchema[f.name] = v.string().ip({
+        version: ["ipv4"],
+      });
     }
     if (f?.type == "ipv6") {
-      propertySchema[f.name] = v.pipe(v.string(), v.ipv6());
+      propertySchema[f.name] = v.string().ip({
+        version: ["ipv6"],
+      });
     }
 
     if (f?.type == "geojson") {
       propertySchema[f.name] = v.object({
-        type: v.picklist(["Point", "LineString", "Polygon", "MultiPoint"]),
-        coordinates: v.array(v.number()),
+        type: v
+          .string()
+          .valid(["Point", "LineString", "Polygon", "MultiPoint"]),
+        coordinats: v.array().items(v.number()),
       });
     }
 
@@ -99,18 +106,31 @@ function buildSchema(col: Collection) {
       items = [...new Set(items)];
 
       if (f?.enum?.multiple) {
-        propertySchema[f.name] = v.array(v.picklist(items || []));
+        propertySchema[f.name] = v.string().valid([...items]);
       } else {
-        propertySchema[f.name] = v.picklist(items || []);
+        propertySchema[f.name] = v.string().valid([...items]);
       }
     }
 
-    if (f?.nullable) {
-      propertySchema[f.name] = v.nullish(propertySchema[f.name]);
+    if (f?.validate?.schema) {
+      propertySchema[f.name] = f.validate.schema;
+    }
+    if (f?.defaultValue) {
+      propertySchema[f.name] = propertySchema[f.name]?.default(f.defaultValue);
+    }
+
+    if (!f?.validate?.schema) {
+      if (f?.nullable) {
+        propertySchema[f.name] = propertySchema[f.name];
+      } else {
+        propertySchema[f.name] = propertySchema[f.name].required();
+      }
     }
   });
 
-  return v.object(propertySchema, v.never());
+  let buildSchema = v.object(propertySchema).unknown();
+
+  return buildSchema;
 }
 
 export { buildSchema };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.0.9",
+  "version": "0.1.1",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {
@@ -23,6 +23,7 @@
     "generate-unique-id": "^2.0.3",
     "hono": "^4.4.3",
     "hono-sessions": "^0.5.8",
+    "joi": "^17.13.3",
     "json-joy": "^16.8.0",
     "jsonwebtoken": "^9.0.2",
     "mingo": "^6.4.15",

package/types/index.ts

@@ -1,3 +1,4 @@
+import type { AnySchema } from "joi";
 import { updateParams } from "./../driver/mongo/@types";
 import * as v from "valibot";
 import type { Db, MongoClient } from "mongodb";
@@ -100,9 +101,17 @@ export type Field = {
   unique?: boolean;
   index?: boolean | "text" | "2dsphere";
   description?: string;
+
   sparse?: boolean;
   relationType?: "ref-to-one" | "ref-to-many";
-  validate?: Array<any>;
+  /**
+   * Overwrite custom validation schema
+   * use {v} from "@dnax/core"} to build your own validation
+   *
+   */
+  validate?: {
+    schema?: AnySchema;
+  };
   relationTo?: string;
 };