@dnax/core 0.0.5 → 0.0.7

package/app/index.ts

@@ -52,7 +52,7 @@ async function runApp(config?: any, clb?: Function) {
       console.log(
         boxen(info, {
           borderStyle: "round",
-          title: `@libv/server ${pkg.version}`.italic,
+          title: `@dnax/server ${pkg.version}`.italic,
           padding: 1,
           dimBorder: true,
           titleAlignment: "center",

package/driver/mongo/rest.ts

@@ -24,6 +24,7 @@ import {
   cleanData,
   transformAllDate,
   deepSetId,
+  setUUID,
 } from "./utils";
 import { Cfg } from "../../config";
 
@@ -208,6 +209,7 @@ class useRest {
         }
 
         // Processing before validation
+        data = await setUUID(data, col);
         data = await randomCode(data, col);
         data = await hashPasswordAuto(data, col);
         data = transformAllDate(data);
@@ -266,7 +268,7 @@ class useRest {
             c: this.#c,
             io: Cfg.io,
             driver: "mongodb",
-            result: data,
+            result: toJson(data),
             action: "insertOne",
             session: sessionStorage(),
             rest: new useRest({
@@ -309,6 +311,7 @@ class useRest {
 
         for await (let d of data) {
           // Processing before validation
+          d = await setUUID(d, col);
           d = await randomCode(d, col);
           d = await hashPasswordAuto(d, col);
           d = deepSetId(col, d);
@@ -367,7 +370,7 @@ class useRest {
             io: Cfg.io,
             driver: "mongodb",
             action: "insertMany",
-            result: data,
+            result: toJson(data),
             session: sessionStorage(),
             rest: new useRest({
               useHook: false,
@@ -709,7 +712,7 @@ class useRest {
             action: "updateOne",
             update: update,
             session: sessionStorage(),
-            result: result.doc,
+            result: toJson(result.doc),
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
@@ -965,7 +968,7 @@ class useRest {
               action: "updateMany",
               update: update,
               session: sessionStorage(),
-              result: result.docs,
+              result: toJson(result.docs),
               io: Cfg.io,
               rest: new useRest({
                 useHook: false,
@@ -1059,7 +1062,7 @@ class useRest {
             c: this.#c,
             driver: "mongodb",
             action: "deleteOne",
-            result: doc,
+            result: toJson(doc),
             io: Cfg.io,
             session: sessionStorage(),
             rest: new useRest({
@@ -1097,7 +1100,7 @@ class useRest {
           return resolve(result!);
         }
 
-        let deletedIds: any = [];
+        let deletedIds: any = ids || [];
 
         if (!ids) fn.error("List of id required", 400);
 

package/driver/mongo/utils.ts

@@ -1,3 +1,4 @@
+import { v4 } from "uuid";
 import type { findParam } from "./@types";
 import type { Actions, Collection } from "../../types";
 import { ObjectId } from "mongodb";
@@ -327,6 +328,35 @@ async function randomCode(
   return data;
 }
 
+async function setUUID(
+  data: any,
+  col: Collection,
+  action?: Actions
+): Promise<any> {
+  var code = null;
+  for await (let f of col?.fields || []) {
+    if (f?.type == "uuid") {
+      code = v4();
+      data[f.name] = code;
+      // if unique
+      if (f?.unique) {
+        let tenant = Cfg.tenants.find((t) => t.id == col.tenant_id);
+        if (tenant) {
+          let doc = await tenant.database.db
+            ?.collection(col.slug)
+            .findOne({ [f.name]: code });
+
+          if (doc) {
+            code = await setUUID(data, col);
+            data[f.name] = code;
+          }
+        }
+      }
+    }
+  }
+  return data;
+}
+
 function formatData(
   data: any,
   options: {
@@ -358,4 +388,5 @@ export {
   cleanData,
   hashPasswordAuto,
   transformAllDate,
+  setUUID,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {

package/types/index.ts

@@ -71,7 +71,8 @@ export type Field = {
     | "textarea"
     | "richText"
     | "json"
-    | "geojson";
+    | "geojson"
+    | "uuid";
   studio?: {
     display?: string;
     suffix?: string;
@@ -121,7 +122,7 @@ export type sessionCtx = {
 
 export type hooksCtx = (ctx: {
   filter?: any;
-  result?: any;
+  result?: any | null | object | undefined;
   driver?: "mongodb" | "postgres";
   data?: object;
   params?: findParam;

package/utils/index.ts

@@ -65,9 +65,13 @@ const jwt = {
   },
 };
 
-function toJson(data: object) {
-  let obj = JSON.stringify(data);
-  return JSON.parse(obj);
+function toJson(data: object): object | null | undefined | any {
+  try {
+    let obj = JSON.stringify(data);
+    return JSON.parse(obj);
+  } catch (err) {
+    return data;
+  }
 }
 
 function isDate(date: string): boolean {