@dnax/core 0.1.6 → 0.1.8

package/driver/mongo/rest.ts

@@ -32,12 +32,13 @@ type options = {
   tenant_id: string;
   c?: Context;
   useHook?: boolean;
-  customApi?: boolean;
+  useCustomApi?: boolean;
 };
 
 type optionCb = {
   useHook?: boolean;
   cleanDeep?: boolean;
+  useCustomApi: boolean;
 };
 
 const omitUpdate = [
@@ -55,10 +56,10 @@ class useRest {
   #tenant: Tenant;
   #tenant_id: string;
   #session: ClientSession | null | undefined;
-  #customApi = false;
+  #useCustomApi = true;
   constructor(options: options) {
     this.#c = options.c;
-    this.#customApi = options.customApi ?? false;
+    this.#useCustomApi = options.useCustomApi ?? true;
     this.#tenant_id = options.tenant_id;
     this.#session = null;
     this.#tenant = getTenant(this.#tenant_id);
@@ -203,10 +204,12 @@ class useRest {
       try {
         let sharedData = {};
         let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
+
         let col = getCollection(collection, this.#tenant_id);
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
 
-        if (col?.customApi?.insertOne && !this.#customApi) {
+        if (col?.customApi?.insertOne && useCustomApi) {
           let result = await col?.customApi?.insertOne({
             io: Cfg.io,
             session: sessionStorage(),
@@ -214,7 +217,7 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result);
@@ -305,9 +308,10 @@ class useRest {
         let sharedData = {};
         let col = getCollection(collection, this.#tenant_id);
         let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
 
-        if (col?.customApi?.insertMany && !this.#customApi) {
+        if (col?.customApi?.insertMany && useCustomApi) {
           let result = await col?.customApi?.insertMany({
             io: Cfg.io,
             session: sessionStorage(),
@@ -315,7 +319,7 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result);
@@ -412,6 +416,7 @@ class useRest {
     return new Promise(async (resolve, reject) => {
       try {
         let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let sharedData = {};
         let result = {
           docs: [],
@@ -419,7 +424,7 @@ class useRest {
 
         let col = getCollection(collection, this.#tenant_id);
 
-        if (col?.customApi?.find && !this.#customApi) {
+        if (col?.customApi?.find && useCustomApi) {
           let result = await col?.customApi?.find({
             io: Cfg.io,
             session: sessionStorage(),
@@ -427,7 +432,7 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result);
@@ -506,10 +511,11 @@ class useRest {
         let sharedData = {};
         let docs: Array<any> | any = [];
         let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
 
         let col = getCollection(collection, this.#tenant_id);
 
-        if (col?.customApi?.findOne && !this.#customApi) {
+        if (col?.customApi?.findOne && useCustomApi) {
           let result = await col?.customApi?.findOne({
             io: Cfg.io,
             session: sessionStorage(),
@@ -518,7 +524,7 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result);
@@ -615,10 +621,13 @@ class useRest {
         let result = {
           doc: null,
         };
+        let sharedData = {};
+        let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let col = getCollection(collection, this.#tenant_id);
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
 
-        if (col?.customApi?.updateOne && !this.#customApi) {
+        if (col?.customApi?.updateOne && useCustomApi) {
           let result = await col?.customApi?.updateOne({
             io: Cfg.io,
             session: sessionStorage(),
@@ -627,15 +636,12 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result);
         }
 
-        let sharedData = {};
-        let useHook = options?.useHook ?? this.#useHook;
-
         //@ts-expect-error
         update = omit(update, omitUpdate);
 
@@ -865,9 +871,11 @@ class useRest {
           docs: [],
         };
         let col = getCollection(collection, this.#tenant_id);
+        let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
 
-        if (col?.customApi?.updateMany && !this.#customApi) {
+        if (col?.customApi?.updateMany && useCustomApi) {
           let result = await col?.customApi?.updateMany({
             io: Cfg.io,
             session: sessionStorage(),
@@ -876,14 +884,12 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result);
         }
 
-        let useHook = options?.useHook ?? this.#useHook;
-
         //@ts-expect-error
         update = omit(update, omitUpdate);
 
@@ -1007,11 +1013,12 @@ class useRest {
       try {
         if (!id) fn.error("Id is required", 400);
         let useHook = options?.useHook ?? this.#useHook;
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
 
         let col = getCollection(collection, this.#tenant_id);
         let sharedData = {};
 
-        if (col?.customApi?.deleteOne && !this.#customApi) {
+        if (col?.customApi?.deleteOne && useCustomApi) {
           let result = await col?.customApi?.deleteOne({
             io: Cfg.io,
             session: sessionStorage(),
@@ -1019,7 +1026,7 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result!);
@@ -1095,10 +1102,12 @@ class useRest {
       try {
         let useHook = options?.useHook ?? this.#useHook;
 
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
+
         let sharedData = {};
         let col = getCollection(collection, this.#tenant_id);
 
-        if (col?.customApi?.deleteMany && !this.#customApi) {
+        if (col?.customApi?.deleteMany && useCustomApi) {
           let result = await col?.customApi?.deleteMany({
             io: Cfg.io,
             session: sessionStorage(),
@@ -1106,7 +1115,7 @@ class useRest {
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
-              customApi: true,
+              useCustomApi: false,
             }),
           });
           return resolve(result!);

package/package.json

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