@dnax/core 0.65.5 → 0.65.7

package/driver/mongo/rest.ts

@@ -330,7 +330,9 @@ class useRest {
   async insertOne(
     collection: string,
     data: object,
-    options?: Omit<optionCb, "withMeta" | "elementAt">
+    options?: Omit<optionCb, "withMeta" | "elementAt"> & {
+      disableReadOnlyFields?: string[];
+    }
   ) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -340,6 +342,10 @@ class useRest {
 
         let col = getCollection(collection, this.#tenant_id);
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
 
         // before operation
         if (col?.hooks?.beforeOperation && useHook) {
@@ -397,7 +403,10 @@ class useRest {
         data = await hashPasswordAuto(data, col);
         data = transformAllDate(data);
         data = deepSetId(col, data);
-        data = omit(data, ["_id", "createdAt", "updatedAt"]);
+        data = omit(
+          data,
+          ["_id", "createdAt", "updatedAt"].concat(disableReadOnlyFields)
+        );
 
         var { valid, output, error } = this.validator(collection, data);
         if (!valid) fn.error(error, 400);
@@ -484,7 +493,9 @@ class useRest {
   async insertMany(
     collection: string,
     data: Array<object>,
-    options?: Omit<optionCb, "withMeta" | "elementAt">
+    options?: Omit<optionCb, "withMeta" | "elementAt"> & {
+      disableReadOnlyFields?: string[];
+    }
   ) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -493,7 +504,10 @@ class useRest {
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
-
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
             sharedData: sharedData,
@@ -548,6 +562,10 @@ class useRest {
           d = await setUUID(d, col);
           d = await randomCode(d, col);
           d = await hashPasswordAuto(d, col);
+          d = omit(
+            d,
+            ["_id", "createdAt", "updatedAt"].concat(disableReadOnlyFields)
+          );
           d = deepSetId(col, d);
           var { valid, output, error } = this.validator(collection, d);
           if (!valid) fn.error(error, 400);
@@ -1085,7 +1103,10 @@ class useRest {
         let allFieldKeys = getKeyFields(col);
 
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
-
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
             sharedData: sharedData,
@@ -1159,7 +1180,7 @@ class useRest {
             omit(
               update.$set,
               ["createdAt", "updatedAt", "_id"].concat(
-                options?.disableReadOnlyFields || []
+                disableReadOnlyFields || []
               )
             )
           );
@@ -1288,6 +1309,10 @@ class useRest {
         };
         let col = getCollection(collection, this.#tenant_id);
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
         update = toJson(update);
         let sharedData = {};
         //@ts-expect-error
@@ -1299,7 +1324,7 @@ class useRest {
             omit(
               update.$set,
               ["createdAt", "updatedAt", "_id"].concat(
-                options?.disableReadOnlyFields || []
+                disableReadOnlyFields || []
               )
             )
           );
@@ -1406,6 +1431,10 @@ class useRest {
         };
         let col = getCollection(collection, this.#tenant_id);
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
         update = toJson(update);
         let sharedData = {};
 
@@ -1419,7 +1448,7 @@ class useRest {
             omit(
               update.$set,
               ["createdAt", "updatedAt", "_id"].concat(
-                options?.disableReadOnlyFields || []
+                disableReadOnlyFields || []
               )
             )
           );
@@ -1553,6 +1582,10 @@ class useRest {
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
         let allFieldKeys = getKeyFields(col);
         update = toJson(update);
 
@@ -1621,7 +1654,7 @@ class useRest {
             omit(
               update.$set,
               ["createdAt", "updatedAt", "_id"].concat(
-                options?.disableReadOnlyFields || []
+                disableReadOnlyFields || []
               )
             )
           );

package/driver/mongo/utils.ts

@@ -241,6 +241,10 @@ function toBson<T>(
 function deepSetId(col: Collection, data: any) {
   if (col) {
     col?.fields?.map((f) => {
+      if (f?.type?.match(/(number|integer)/) && data[f.name] && f?.name) {
+        data[f.name] = Number(data[f.name]);
+      }
+
       if (f?.type?.match(/(json|array)/) && data[f?.name] && f?.name) {
         if (
           f?.injectAutoId &&

package/package.json

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