@xuda.io/xuda-dbs-plugin-xuda 1.0.147 → 1.0.149

package/package.json

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

package/studio.mjs

@@ -747,9 +747,8 @@ const query_db = async function (e, db, table_obj) {
               name: index_name,
               ddoc: `mango_index_table_${e.table_id}`,
             };
-            db.createIndex(mango_index_obj).then((result) => {
-              console.log(result);
-            });
+            const result = await db.createIndex(mango_index_obj);
+            console.log("createIndex", result);
             throw new Error("creating index in progress");
           } catch (err) {
             return { code: -1, data: err.message };
@@ -1162,16 +1161,11 @@ export const del = async (params, resolve, reject) => {
   const e = params.e;
   const db = params.db;
 
-  const table_obj = params.table_obj;
-  const data = await db.fetch({ keys: e.ids });
-  var docs_to_delete = [];
-
-  for await (var val of data.rows) {
-    var doc = val.doc;
-
-    if (doc && doc._id) {
+  for await (let row_id of e.ids) {
+    try {
+      let doc = await db.get(row_id);
       if (e.permanent) {
-        docs_to_delete.push({
+        await db.put({
           _id: doc._id,
           _rev: doc._rev,
           _deleted: true,
@@ -1179,41 +1173,38 @@ export const del = async (params, resolve, reject) => {
       } else {
         doc.stat = 4;
         doc.ts = Date.now();
-        docs_to_delete.push(doc);
+        await db.put(doc);
       }
+    } catch (err) {
+      return { code: -110, data: err };
     }
   }
-  try {
-    await db.bulk({ docs: docs_to_delete });
-    resolve(docs_to_delete);
-  } catch (error) {
-    return { code: -110, data: error };
-  }
+  resolve(e.ids);
 };
 
-export const restore = async (params, resolve, reject) => {
-  const e = params.e;
-  const db = params.db;
-  var docs_to_restore = [];
-  const data = await db.fetch({ keys: e.ids });
-
-  for await (var val of data.rows) {
-    var doc = val.doc;
-
-    if (doc && doc._id) {
-      doc.stat = 3;
-      doc.ts = Date.now();
-      docs_to_restore.push(doc);
-    }
-  }
-
-  try {
-    await db.bulk({ docs: docs_to_restore });
-    resolve(docs_to_restore);
-  } catch (error) {
-    return reject(error);
-  }
-};
+// export const restore = async (params, resolve, reject) => {
+//   const e = params.e;
+//   const db = params.db;
+//   var docs_to_restore = [];
+//   const data = await db.fetch({ keys: e.ids });
+
+//   for await (var val of data.rows) {
+//     var doc = val.doc;
+
+//     if (doc && doc._id) {
+//       doc.stat = 3;
+//       doc.ts = Date.now();
+//       docs_to_restore.push(doc);
+//     }
+//   }
+
+//   try {
+//     await db.bulk({ docs: docs_to_restore });
+//     resolve(docs_to_restore);
+//   } catch (error) {
+//     return reject(error);
+//   }
+// };
 
 export const create_design = async (params, resolve, reject) => {
   const db = params.db;