@xuda.io/xuda-dbs-plugin-xuda 1.0.79 → 1.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.79",
+  "version": "1.0.81",
   "description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
   "scripts": {
     "pub": "npm version patch --force && npm publish --access public"

package/server.js

@@ -57,7 +57,7 @@ const check_unique = async function (e, docP, table_obj, db, app_id_reference) {
         "check_unique",
         valSegment,
         _fieldType,
-        val.keyValue[keySegment]
+        val.keyValue[Number(keySegment)]
       );
       keyValue.push(_val);
     }
@@ -195,10 +195,10 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       const raw_data = async function () {
         var rows = [];
 
-        for await (var val of body.docs) {
+        for (var val of body.docs) {
           var data = {};
           if (e.fields) {
-            for await (const [key2, val2] of Object.entries(
+            for (const [key2, val2] of Object.entries(
               typeof e.fields === "string" ? e.fields.split(",") : e.fields
             )) {
               if (val.udfData) {
@@ -208,9 +208,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
               }
             }
           } else {
-            for await (const [key2, val2] of Object.entries(
-              table_obj.tableFields
-            )) {
+            for (const [key2, val2] of Object.entries(table_obj.tableFields)) {
               if (val.udfData) {
                 data[val2.data.field_id] =
                   val["udfData"]["data"][val2.data.field_id];
@@ -223,11 +221,6 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           rows.push({
             id: val._id,
             value: data,
-            // value: {
-            //   udfData: { data: data },
-            //   _id: val._id,
-            //   _rev: val._rev,
-            // },
           });
         }
 
@@ -245,7 +238,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           var index_keys = table_index.data.keys;
           var index_id = e.indexId;
 
-          for await (var val of body.docs) {
+          for (var val of body.docs) {
             var data = {};
             const _tableFieldsObj = find_item_by_key(
               table_obj.tableFields,
@@ -253,24 +246,20 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
               e.field_id
             );
 
-            for await (const [key2, val2] of Object.entries(
-              table_obj.tableFields
-            )) {
+            for (const [key2, val2] of Object.entries(table_obj.tableFields)) {
               data[val2.data.field_id] =
                 val["udfData"]["data"][val2.data.field_id];
             }
 
             var key_arr = [];
 
-            for await (const [key_idx, key_name] of Object.entries(
-              index_keys
-            )) {
+            for (const [key_idx, key_name] of Object.entries(index_keys)) {
               key_arr.push(data[key_name]);
             }
             keys_obj[key_arr]++;
           }
 
-          for await (const [key_arr, key_count] of Object.entries(keys_obj)) {
+          for (const [key_arr, key_count] of Object.entries(keys_obj)) {
             rows.push({
               key: [e.key, index_id, key_arr],
               value: body.docs.length,
@@ -300,7 +289,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
         var totals_sums = {};
         var totals_group_obj = {};
 
-        for await (const [key, val] of Object.entries(total_fields_info)) {
+        for (const [key, val] of Object.entries(total_fields_info)) {
           totals_counts[val.field_id] = 0;
           totals_prop[val.field_id] = val;
           totals_arr[val.field_id] = [];
@@ -308,10 +297,8 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           totals_group_obj[val.field_id] = {};
         }
 
-        for await (var row_data of body.docs) {
-          for await (const [key, val] of Object.entries(
-            row_data.udfData.data
-          )) {
+        for (var row_data of body.docs) {
+          for (const [key, val] of Object.entries(row_data.udfData.data)) {
             var field_id = key;
             var value = val;
             totals_counts[field_id]++;
@@ -386,7 +373,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
         }
         return { code: 1, data: totals_obj };
       };
-      if (e.count === "true" || e.count === true) {
+      if (e.count) {
         return count_data();
       }
       if (e.total_fields_info) {
@@ -408,13 +395,13 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
     var fields = [];
     if (e.fields) {
-      for await (const [key, val] of Object.entries(
+      for (const [key, val] of Object.entries(
         typeof e.fields === "string" ? e.fields.split(",") : e.fields
       )) {
         fields.push(val);
       }
     } else {
-      for await (const [key, val] of Object.entries(table_obj.tableFields)) {
+      for (const [key, val] of Object.entries(table_obj.tableFields)) {
         fields.push(val.data.field_id);
       }
     }
@@ -423,7 +410,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     var from = e.filter_from ? JSON.parse(e.filter_from) : {};
     var to = e.filter_to ? JSON.parse(e.filter_to) : {};
     var sort = [];
-    for await (const [key, val] of Object.entries(from)) {
+    for (const [key, val] of Object.entries(from)) {
       var field_name = key;
 
       sort.push(field_name);
@@ -435,7 +422,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       }
     }
 
-    for await (const [key, val] of Object.entries(to)) {
+    for (const [key, val] of Object.entries(to)) {
       var field_name = key;
 
       if (val !== from[key]) {
@@ -463,7 +450,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     if (e.sort_fields && JSON.parse(e.sort_fields).length) {
       opt.sort = JSON.parse(e.sort_fields);
       if (opt.sort) {
-        for await (const [key, val] of Object.entries(opt.sort)) {
+        for (const [key, val] of Object.entries(opt.sort)) {
           var field_name = val.colId;
           opt.sort[key] = {
             ["udfData.data." + field_name]: val.sort,
@@ -473,9 +460,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     }
 
     if (e.grid_filter_info) {
-      for await (const [key, val] of Object.entries(
-        JSON.parse(e.grid_filter_info)
-      )) {
+      for (const [key, val] of Object.entries(JSON.parse(e.grid_filter_info))) {
         var field_name = key;
         var condition = "$and";
         const make_selector = function (val) {
@@ -660,7 +645,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
     if (e.total_fields_info) {
       fields = [];
-      for await (const [key, val] of Object.entries(
+      for (const [key, val] of Object.entries(
         JSON.parse(e.total_fields_info)
       )) {
         var field_name = val.field_id;
@@ -671,13 +656,13 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     }
     // fix names
 
-    for await (const [key, val] of Object.entries(opt.fields)) {
+    for (const [key, val] of Object.entries(opt.fields)) {
       opt.fields[key] = "udfData.data." + val;
     }
     if (!e.sort_fields || !JSON.parse(e.sort_fields).length) {
       // added 2021 09 10
       if (opt.sort) {
-        for await (const [key, val] of Object.entries(opt.sort)) {
+        for (const [key, val] of Object.entries(opt.sort)) {
           opt.sort[key] = {
             ["udfData.data." + val]: e.sortOrder === "des" ? "desc" : "asc",
           };
@@ -687,12 +672,12 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
     var selector_new = {};
 
-    for await (const [key, val] of Object.entries(opt.selector)) {
+    for (const [key, val] of Object.entries(opt.selector)) {
       selector_new["udfData.data." + key] = val;
     }
 
     if (e.viewDbQuery) {
-      for await (const [key, val] of Object.entries(table_obj.tableFields)) {
+      for (const [key, val] of Object.entries(table_obj.tableFields)) {
         if (e.viewDbQuery.includes(val.id)) {
           const replacer = new RegExp(val.id, "g");
           e.viewDbQuery = e.viewDbQuery.replace(
@@ -704,7 +689,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
       let viewDbQuery = JSON.parse(e.viewDbQuery.replace(/\\/g, ""));
 
-      for await (const [key, val] of Object.entries(viewDbQuery)) {
+      for (const [key, val] of Object.entries(viewDbQuery)) {
         selector_new[key] = val;
       }
     }
@@ -718,29 +703,9 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
     // xuda
 
-    // var cache_string = JSON.stringify(opt);
-
-    // if (__.CACHE_QUERY_REQ?.[app_id_reference]?.[e.table_id]?.[cache_string]) {
-    //   return await done(
-    //     __.CACHE_QUERY_REQ[app_id_reference][e.table_id][cache_string].doc
-    //   );
-    // }
-
     try {
       try {
         const doc = await db.find(opt);
-        // if (!__.CACHE_QUERY_REQ[app_id_reference]) {
-        //   __.CACHE_QUERY_REQ[app_id_reference] = {};
-        // }
-
-        // if (!__.CACHE_QUERY_REQ[app_id_reference][e.table_id]) {
-        //   __.CACHE_QUERY_REQ[app_id_reference][e.table_id] = {};
-        // }
-
-        // __.CACHE_QUERY_REQ[app_id_reference][e.table_id][cache_string] = {
-        //   doc: doc,
-        //   ts: Date.now(),
-        // };
 
         if (doc?.warning?.includes("No matching index found")) {
           const index_name = `index_${e.table_id}_${new Date()
@@ -748,7 +713,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
             .toString()}`;
           var index = [];
 
-          for await (const [key, val] of Object.entries(opt.selector)) {
+          for (const [key, val] of Object.entries(opt.selector)) {
             index.push(key);
           }
           mango_index_obj = {
@@ -782,15 +747,15 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
             const doc = await db.find(opt);
             return await done(doc);
-          } catch (error) {
-            return { code: -1, data: error };
+          } catch (err) {
+            return { code: -1, data: err.message };
           }
         } else {
           return { code: -1, data: err.message };
         }
       }
     } catch (err) {
-      return { code: -1, data: err.error };
+      return { code: -1, data: err.message };
     }
   };
 
@@ -806,8 +771,6 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       skip = e.skipP;
     }
 
-    var desc = e.desc === "true" ? true : false;
-
     var opt = undefined;
     if (key) {
       opt = {
@@ -817,7 +780,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
         skip: skip,
       };
     } else {
-      if (e.reduce == "true") {
+      if (e.reduce) {
         opt = {
           startkey: e.startkey ? JSON.parse(e.startkey) : "",
           endkey: e.endkey ? JSON.parse(e.endkey) : "",
@@ -825,7 +788,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           reduce: true,
           group_level: 3,
 
-          descending: desc,
+          descending: e.desc,
         };
       } else {
         opt = {
@@ -834,7 +797,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           include_docs: !e.ids,
           limit: limit,
           skip: skip,
-          descending: desc,
+          descending: e.desc,
         };
       }
     }
@@ -855,7 +818,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
           var obj = {};
           for await (const [arr_key, arr_val] of Object.entries(arr)) {
-            let field_id = table_index.data.keys[arr_key];
+            let field_id = table_index.data.keys[Number(arr_key)];
 
             const _tableFieldsObj = find_item_by_key(
               table_obj.tableFields,
@@ -918,11 +881,26 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       // );}
 
       return { code: 1, data: { rows: rows, total_rows: rows.length } };
-    } catch (error) {
-      return { code: -1, data: error };
+    } catch (err) {
+      return { code: -1, data: err.message };
     }
   };
 
+  const count_tables = async function () {
+    var opt = {
+      reduce: true,
+      group_level: 1,
+    };
+
+    if (e.table_id) {
+      opt.key = e.table_id;
+    }
+
+    const body = await db.view(`xuda`, "db_table_counts", opt);
+
+    return { code: 1, data: body };
+  };
+
   if (e.reduce && JSON.parse(e.reduce)) {
     view = "db_index_reduce";
     return await runtime_get_query_data();
@@ -932,6 +910,12 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     view = e.view;
     return await runtime_get_query_data();
   }
+
+  if (e.count && !e.filter_from) {
+    // count tables
+    return await count_tables();
+  }
+
   return await runtime_get_mango_data();
 };