@xuda.io/xuda-dbs-plugin-xuda 1.0.316 → 1.0.318

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.316",
+  "version": "1.0.318",
   "description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
   "scripts": {
     "pub": "npm version patch --force && npm publish --access public"
@@ -17,6 +17,6 @@
   "dependencies": {
     "@xuda.io/xu_cast": "^1.0.3",
     "lodash": "^4.17.21",
-    "nano": "^10.0.0"
+    "nano": "^10.0.4"
   }
 }

package/{server.js → server.mjs}

@@ -1,5 +1,8 @@
-const _ = require('lodash');
-const crypto = require('node:crypto');
+import { createRequire } from 'module';
+import _ from 'lodash';
+import crypto from 'node:crypto';
+
+const require = createRequire(import.meta.url);
 
 const check_unique = async function (e, docP, table_obj, db, app_id_reference) {
   var len = docP.udfIndex.length;
@@ -43,7 +46,6 @@ const check_unique = async function (e, docP, table_obj, db, app_id_reference) {
     var keyValue = [];
 
     for await (const [keySegment, valSegment] of Object.entries(keysArr)) {
-      // run on key segment
       let _fieldType = find_item_by_key(table_obj.tableFields, 'field_id', valSegment).props.fieldType;
       let _val = await get_cast_val('check_unique', valSegment, _fieldType, val.keyValue[Number(keySegment)]);
       keyValue.push(_val);
@@ -55,8 +57,6 @@ const check_unique = async function (e, docP, table_obj, db, app_id_reference) {
       const ret = await query_db(e, db, app_id_reference, table_obj);
       const json = ret.data;
 
-      // var data;
-
       if (json.code > 0) {
         var data = json.data;
         if (data?.rows?.length) {
@@ -70,7 +70,6 @@ const check_unique = async function (e, docP, table_obj, db, app_id_reference) {
           }
         }
       }
-      // throw json.data;
       return { code: 1, data: 'ok' };
     } catch (msg) {
       console.error(msg);
@@ -89,22 +88,15 @@ const get_index_json = async function (docInP, table_obj) {
     var key_val = [];
 
     if (docInP.udfData && table_obj) {
-      // check for udf data array
       if (table_obj.tableIndexes) {
-        // console.log(udfDicIndexT.rows);
         for await (var valIndex of table_obj.tableIndexes) {
-          // run on index rows
-          keysArr = valIndex.data.keys; // create array from keys string segment
+          keysArr = valIndex.data.keys;
           key_val = [];
           for await (var valSegment of keysArr) {
-            // run on key segment
-            // find keys values
             if (docInP.udfData.data[valSegment]) {
               key_val.push(docInP.udfData.data[valSegment]);
               continue;
             }
-            // put the value
-            // debugger;
             const field_obj = find_item_by_key(table_obj.tableFields, 'field_id', valSegment);
             if (!field_obj) {
               throw 'field not found in key: ' + valSegment;
@@ -121,7 +113,6 @@ const get_index_json = async function (docInP, table_obj) {
             keyValue: key_val,
           });
         }
-        // );
       }
     }
     return { code: 1, data: index_json };
@@ -249,7 +240,6 @@ const get_opt = function (e, table_obj) {
     }
     opt.fields = fields;
   }
-  // fix names
 
   for (const [key, val] of Object.entries(opt.fields)) {
     opt.fields[key] = 'udfData.data.' + val;
@@ -257,9 +247,7 @@ const get_opt = function (e, table_obj) {
 
   const _sort_model = typeof e.sortModel === 'string' ? JSON.parse(e.sortModel) : e.sortModel;
 
-  // if (!e?.sortModel || !JSON.parse(e.sortModel).length) {
   if (!e?.sortModel || !_sort_model.length) {
-    // added 2021 09 10
     if (opt.sort) {
       for (const [key, val] of Object.entries(opt.sort)) {
         opt.sort[key] = {
@@ -276,68 +264,51 @@ const get_opt = function (e, table_obj) {
       return e?.data?.field_id;
     });
 
-    // Helper function to recursively process the query object
     function recursiveReplace(obj) {
       if (typeof obj === 'object' && obj !== null) {
-        // Create a new object to store the modified query
         let newObj = Array.isArray(obj) ? [] : {};
 
-        // Traverse through the object
         for (let key in obj) {
           if (obj.hasOwnProperty(key)) {
-            // If the key is in the keys_to_replace array, replace it
             let newKey = keys_to_replace.includes(key) ? `udfData.data.${key}` : key;
-
-            // Recursively process nested objects
             newObj[newKey] = recursiveReplace(obj[key]);
           }
         }
 
         return newObj;
       } else {
-        // If it's not an object or array, return the value as is
         return obj;
       }
     }
 
-    // Start the recursive replacement
     return recursiveReplace(query);
   }
 
   function replaceRegexOptions(query) {
-    // Helper function to recursively process the query object
     function recursiveReplace(obj) {
       if (typeof obj === 'object' && obj !== null) {
-        // Create a new object to store the modified query
         let newObj = Array.isArray(obj) ? [] : {};
 
-        // Traverse through the object
         for (let key in obj) {
           if (obj.hasOwnProperty(key)) {
             if (key === '$regex') {
               newObj[key] = obj.$options ? `(?${obj.$options})${obj[key]}` : obj[key];
               return newObj;
             }
-
-            // Recursively process nested objects
-
             newObj[key] = recursiveReplace(obj[key]);
           }
         }
 
         return newObj;
       } else {
-        // If it's not an object or array, return the value as is
         return obj;
       }
     }
 
-    // Start the recursive replacement
     return recursiveReplace(query);
   }
 
   if (e.dataSourceFilterModelType === 'query' && e.filterModelMongo) {
-    // selector_new['$and'] = [replaceRegexOptions(replaceKeysInQuery(JSON.parse(e.filterModelMongo)))];
     selector_new['$and'] = [replaceRegexOptions(replaceKeysInQuery(typeof e.filterModelMongo === 'string' ? JSON.parse(e.filterModelMongo) : e.filterModelMongo))];
   }
 
@@ -438,7 +409,6 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
             });
           }
         } else {
-          // no index
           rows.push({ key: '', value: body.docs.length });
         }
         return { code: 1, data: { rows: rows, total_rows: rows.length, opt } };
@@ -523,9 +493,9 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
                 }
 
                 if (typeof totals_obj[field_id][value] === 'undefined') {
-                  totals_obj[field_id][value] = 1; //value;
+                  totals_obj[field_id][value] = 1;
                 } else {
-                  totals_obj[field_id][value]++; //+= value;
+                  totals_obj[field_id][value]++;
                 }
 
                 break;
@@ -545,11 +515,8 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       return raw_data();
     };
 
-    // xuda
-
     try {
       try {
-        // console.log("opt", opt);
         const doc = await db.find(opt);
         var mango_index_obj;
         if (doc?.warning?.includes('No matching index found')) {
@@ -603,7 +570,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
             return { code: -1, data: err.message };
           }
         } else {
-          return { code: -1, data: err.message };
+          return { code: -1, data: err.message, opt };
         }
       }
     } catch (err) {
@@ -691,34 +658,9 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
         rows.push({
           id: val.id,
           value: val.doc.udfData,
-          // value: { udfData: val.doc.udfData, _id: val.id },
         });
       }
 
-      // const reduce_rows = () => {
-      // const reduce_obj = body.docs.reduce(
-      //   (params, data) => {
-      //     const fx = (val, idx) => {
-      //       const group_by_field = data[params.sort[idx]];
-
-      //       if (params.sort[idx + 1]) {
-      //         val[group_by_field] = val[group_by_field] ?? {};
-      //         val[group_by_field][data[params.sort[idx + 1]]] = 0;
-      //         idx++;
-      //         fx(val[group_by_field], idx);
-      //         return;
-      //       }
-
-      //       val[group_by_field] = val[group_by_field] ?? 0;
-      //       val[group_by_field] += 1;
-      //     };
-      //     fx(params.group, 0);
-
-      //     return params;
-      //   },
-      //   { sort: opt.sort, group: {} }
-      // );}
-
       return { code: 1, data: { rows: rows, total_rows: rows.length, opt } };
     } catch (err) {
       return { code: -1, data: err.message };
@@ -751,14 +693,13 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
   }
 
   if (e.count && !e.filter_from) {
-    // count tables
     return await count_tables();
   }
 
   return await runtime_get_mango_data();
 };
 
-exports.create = async (params, setup_doc, resolve, reject) => {
+export const create = async (params, setup_doc, resolve, reject) => {
   const e = params.e;
   const db = params.db;
   const app_id_reference = params.app_id_reference;
@@ -852,7 +793,8 @@ exports.create = async (params, setup_doc, resolve, reject) => {
   }
   return await single();
 };
-exports.read = async (params, setup_doc, resolve, reject) => {
+
+export const read = async (params, setup_doc, resolve, reject) => {
   const e = params.e;
   const db = params.db;
   const app_id_reference = params.app_id_reference;
@@ -865,23 +807,22 @@ exports.read = async (params, setup_doc, resolve, reject) => {
 
   return resolve(ret.data);
 };
-exports.update = async (params, setup_doc, resolve, reject) => {
+
+export const update = async (params, setup_doc, resolve, reject) => {
   const e = params.e;
   const db = params.db;
   const app_id_reference = params.app_id_reference;
   const table_obj = params.table_obj;
   try {
     if (e.row_id === 'newRecord') {
-      return this.create(params, setup_doc, resolve, reject);
+      return create(params, setup_doc, resolve, reject);
     }
     var doc = await db.get(e.row_id, {});
-    // let data = doc.udfData.data;
     var error = undefined;
     if (!e.field_id && !e.table_data) {
       error = 'Invalid field_id or table_data object to save';
       return reject(error);
     }
-    // single value save
     if (e.field_id) {
       let _tableFieldsObj = find_item_by_key(table_obj.tableFields, 'field_id', e.field_id);
       if (!_tableFieldsObj || _.isEmpty(_tableFieldsObj)) {
@@ -891,9 +832,7 @@ exports.update = async (params, setup_doc, resolve, reject) => {
       doc.udfData.data[e.field_id] = await get_cast_val('dbs_update', e.field_id, _tableFieldsObj.props.fieldType, e.field_value);
     }
 
-    // object value save
     if (e.table_data) {
-      // data = {};
       for await (const [key, val] of Object.entries(e.table_data)) {
         let _tableFieldsObj = find_item_by_key(table_obj.tableFields, 'field_id', key);
         if (!_tableFieldsObj || _.isEmpty(_tableFieldsObj)) {
@@ -928,7 +867,8 @@ exports.update = async (params, setup_doc, resolve, reject) => {
     return reject(error);
   }
 };
-exports.delete = async (params, setup_doc, resolve, reject) => {
+
+export const deleteFunc = async (params, setup_doc, resolve, reject) => {
   const e = params.e;
   const db = params.db;
   const app_id_reference = params.app_id_reference;
@@ -961,7 +901,9 @@ exports.delete = async (params, setup_doc, resolve, reject) => {
   }
 };
 
-exports.restore = async (params, setup_doc, resolve, reject) => {
+export { deleteFunc as delete }; // Renaming export to avoid reserved keyword conflict
+
+export const restore = async (params, setup_doc, resolve, reject) => {
   const e = params.e;
   const db = params.db;
   const app_id_reference = params.app_id_reference;
@@ -986,7 +928,8 @@ exports.restore = async (params, setup_doc, resolve, reject) => {
     return reject(error);
   }
 };
-exports.check_unique = async (params, setup_doc, resolve, reject) => {
+
+export const check_unique_export = async (params, setup_doc, resolve, reject) => {
   const e = params.e;
   const db = params.db;
   const app_id_reference = params.app_id_reference;
@@ -1003,7 +946,10 @@ exports.check_unique = async (params, setup_doc, resolve, reject) => {
     return reject(error);
   }
 };
-exports.get_connection = async (params, setup_doc, resolve, reject) => {
+
+export { check_unique_export as check_unique };
+
+export const get_connection = async (params, setup_doc, resolve, reject) => {
   try {
     if (!setup_doc.db_connection_string) throw 'db_connection_string missing';
     const nano = require('nano')(setup_doc.db_connection_string);