goby-database 2.1.20 → 2.2.21

package/dist/index.js

@@ -797,7 +797,7 @@ export default class Project {
     }
     // MARKER: modify item retrieval
     retrieve_class_items({ class_id, class_name, class_data, pagination = {} }) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const pagination_defaults = {
             page_size: null,
             property_range: 'all'
@@ -837,7 +837,7 @@ export default class Project {
                             let target_select = `
                             SELECT 
                                 "${property_junction_column_name}", 
-                                json_object('class_id',${target.class_id},'id',junction."${target_junction_column_name}"${label_sql_string}) AS target_data 
+                                json_object('class_id',${target.class_id},'system_id',junction."${target_junction_column_name}"${label_sql_string}) AS target_data 
                                 FROM junction_${junction_id} AS junction
                                 LEFT JOIN "class_${target_class === null || target_class === void 0 ? void 0 : target_class.name}" AS target_class ON junction."${target_junction_column_name}" =  target_class.system_id
                             `;
@@ -896,12 +896,9 @@ export default class Project {
                 }
             }
         });
-        return Object.assign(Object.assign({}, pagination), { loaded: items });
+        let total = (_e = this.db.prepare(`SELECT COUNT(1) AS total FROM ${class_string}`).all()[0]) === null || _e === void 0 ? void 0 : _e.total;
+        return Object.assign(Object.assign({}, pagination), { loaded: items, total });
     }
-    // include:{
-    //     class_id:number;
-    //     pagination:ItemPagination
-    // }[] = []
     // MARKER: modify item retrieval
     retrieve_all_classes(include = {}) {
         const classes_data = this.run.get_all_classes.all();
@@ -915,7 +912,8 @@ export default class Project {
                 class_name: name,
                 pagination
             }) : {
-                loaded: []
+                loaded: [],
+                total: 0
             };
             return {
                 id,

package/dist/types.d.ts

@@ -146,6 +146,8 @@ export type ItemPagination = {
 };
 export type PaginatedItems = ItemPagination & {
     loaded: ClassRow[];
+    /** a count of all the items in the class, not just those loaded */
+    total: number;
 };
 export type JunctionSides = [RelationshipSide, RelationshipSide];
 export type JunctionTable = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goby-database",
-  "version": "2.1.20",
+  "version": "2.2.21",
   "description": "This will hold the core better-sqlite3-powered application for creating and modifying goby databases",
   "main": "dist/index.js",
   "files": [