@dnax/core 0.65.3 → 0.65.5

package/app/hono.ts

@@ -198,7 +198,7 @@ function HonoInstance(): typeof app {
         action: action,
         c: c,
         isAuth: sessionStorage()?.get()?.isAuth ?? false,
-        rest: new useRest({ tenant_id: tenant_id }),
+        rest: new useRest({ tenant_id: tenant_id, c: c }),
         session: session as any,
       });
     }
@@ -223,7 +223,7 @@ function HonoInstance(): typeof app {
         action: action,
         c: c,
         isAuth: sessionStorage()?.get()?.isAuth ?? false,
-        rest: new useRest({ tenant_id: tenant_id }),
+        rest: new useRest({ tenant_id: tenant_id, c: c }),
         session: sessionStorage(),
       });
     } else {
@@ -251,7 +251,7 @@ function HonoInstance(): typeof app {
             action: action,
             c: c,
             isAuth: sessionStorage()?.get()?.isAuth ?? false,
-            rest: new useRest({ tenant_id: tenant_id }),
+            rest: new useRest({ tenant_id: tenant_id, c: c }),
           });
         }
       }

package/driver/mongo/@types.ts

@@ -26,8 +26,8 @@ export type findParam = {
 
 export type findOneParam = {
   $match: object;
-  $include: Array<object>;
-  $matchInclude: object;
+  $include?: Array<object>;
+  $matchInclude?: object;
 };
 
 export type updateParams = {

package/driver/mongo/rest.ts

@@ -3,7 +3,8 @@ import { sessionStorage } from "../../lib/asyncLocalStorage";
 import { getCollection, getKeyFields } from "../../lib/collection";
 import { getTenant } from "../../lib/tenant";
 import type { Actions, Collection, Tenant } from "./../../types/index";
-import { isArray, omit } from "radash";
+import { isArray } from "radash";
+import { omit } from "../../utils";
 import {
   ChangeStream,
   ClientSession,
@@ -1066,6 +1067,7 @@ class useRest {
     options?: Omit<optionCb, "withMeta" | "elementAt" | "withMeta"> & {
       arrayFilters?: Array<object>;
       upsert?: boolean;
+      disableReadOnlyFields?: string[];
     }
   ): Promise<object> {
     return new Promise(async (resolve, reject) => {
@@ -1078,6 +1080,7 @@ class useRest {
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let col = getCollection(collection, this.#tenant_id);
+
         if (!col) return;
         let allFieldKeys = getKeyFields(col);
 
@@ -1153,7 +1156,12 @@ class useRest {
 
           update.$set = deepSetId(
             col,
-            omit(update.$set, ["createdAt", "updatedAt", "_id"])
+            omit(
+              update.$set,
+              ["createdAt", "updatedAt", "_id"].concat(
+                options?.disableReadOnlyFields || []
+              )
+            )
           );
           update.$set = transformAllDate(update.$set);
           update.$set = await hashPasswordAuto(update.$set, col);
@@ -1268,6 +1276,7 @@ class useRest {
     options?: Omit<
       optionCb & {
         upsert: boolean;
+        disableReadOnlyFields?: string[];
       },
       "useHook" | "useCustomApi" | "elementAt" | "withMeta"
     >
@@ -1285,7 +1294,15 @@ class useRest {
         update = omit(update, omitUpdate);
         if (update.$set) {
           //  update.$set = deepSetId(col, update.$set);
-          update.$set = deepSetId(col, update.$set);
+          update.$set = deepSetId(
+            col,
+            omit(
+              update.$set,
+              ["createdAt", "updatedAt", "_id"].concat(
+                options?.disableReadOnlyFields || []
+              )
+            )
+          );
           update.$set = transformAllDate(update.$set);
           update.$set = await hashPasswordAuto(update.$set, col);
           var { valid, output, error } = this.validator(
@@ -1377,6 +1394,7 @@ class useRest {
     options?: Omit<
       optionCb & {
         upsert: boolean;
+        disableReadOnlyFields?: string[];
       },
       "useHook" | "useCustomApi" | "elementAt" | "withMeta"
     >
@@ -1396,7 +1414,15 @@ class useRest {
 
         if (update.$set) {
           //  update.$set = deepSetId(col, update.$set);
-          update.$set = deepSetId(col, update.$set);
+          update.$set = deepSetId(
+            col,
+            omit(
+              update.$set,
+              ["createdAt", "updatedAt", "_id"].concat(
+                options?.disableReadOnlyFields || []
+              )
+            )
+          );
           update.$set = transformAllDate(update.$set);
           update.$set = await hashPasswordAuto(update.$set, col);
           var { valid, output, error } = this.validator(
@@ -1513,7 +1539,9 @@ class useRest {
     collection: string,
     ids: Array<string>,
     update: updateParams,
-    options?: optionCb
+    options?: optionCb & {
+      disableReadOnlyFields?: string[];
+    }
   ): Promise<object> {
     return new Promise(async (resolve, reject) => {
       try {
@@ -1590,7 +1618,12 @@ class useRest {
 
           update.$set = deepSetId(
             col,
-            omit(update.$set, ["createdAt", "updatedAt", "_id"])
+            omit(
+              update.$set,
+              ["createdAt", "updatedAt", "_id"].concat(
+                options?.disableReadOnlyFields || []
+              )
+            )
           );
           update.$set = transformAllDate(update.$set);
           update.$set = await hashPasswordAuto(update.$set, col);
@@ -2024,7 +2057,10 @@ class useRest {
       .dropIndex(indexName);
   }
 
-  startTransaction() {
+  startTransaction(options?: { forceNew?: boolean }) {
+    if (options?.forceNew) {
+      this.#session = null;
+    }
     if (!this.#session) {
       this.#session = this.#tenant.database.client?.startSession();
       this.#session?.startTransaction();

package/lib/schema.ts

@@ -1,7 +1,7 @@
 import type { Schema } from "hono";
 import type { Collection } from "../types";
 import v, { type AnySchema } from "joi";
-function buildSchema(col: Collection) {
+function buildSchema(col: Collection): AnySchema {
   let propertySchema = {} as { [key: string]: AnySchema };
 
   if (col?.timestamps) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.65.3",
+  "version": "0.65.5",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/index.ts

@@ -139,14 +139,13 @@ export type Field = {
    */
   injectAutoId?: boolean;
   sparse?: boolean;
-  // relationType?: "ref-to-one" | "ref-to-many";
   /**
    * Overwrite custom validation schema
    * use {v} from "@dnax/core"} to build your own validation
    *
    */
   validate?: {
-    schema?: AnySchema;
+    schema?: AnySchema; // Basic Schema validation
   };
   //relationTo?: string;
 };
@@ -445,6 +444,7 @@ export type Collection = {
   api?: {
     //privateFields?: string[];
     fields: {
+      readOnly?:string[];
       select?:
         | string[]
         | ((ctx: {
@@ -473,6 +473,9 @@ export type Collection = {
   autoRemoveIndexes?: Array<{
     [key: string]: any;
   }>;
+  /* validate?:{
+    updateSchema?:AnySchema;
+  }; */
 };
 
 interface ApiError {