goby-database 2.1.17 → 2.1.19

package/dist/index.d.ts

@@ -81,10 +81,11 @@ export default class Project {
         value: any;
     }[]): void;
     action_make_relations(relations: [input_1: ItemRelationSide, input_2: ItemRelationSide][]): void;
-    retrieve_class_items({ class_id, class_name, class_data }: {
+    retrieve_class_items({ class_id, class_name, class_data, slim }: {
         class_id: number;
         class_name?: string;
         class_data?: ClassData;
+        slim?: boolean;
     }): ClassRow[];
     retrieve_all_classes(): ClassData[];
     parse_sql_prop(class_id: number, sql_prop: {
@@ -108,9 +109,9 @@ export default class Project {
         id?: number;
     }): number | undefined;
     create_workspace(open: ApplicationWindow["open"], metadata: ApplicationWindow["metadata"]): number;
-    action_create_workspace_block({ workspace_id, thing_type, block_metadata, thing_id }: {
+    action_create_workspace_block({ workspace_id, type, block_metadata, thing_id }: {
         workspace_id: ApplicationWindow["id"];
-        thing_type: WorkspaceBlock["thing_type"];
+        type: WorkspaceBlock["type"];
         block_metadata: WorkspaceBlock["metadata"];
         thing_id: WorkspaceBlock["thing_id"];
     }): number;
@@ -118,14 +119,14 @@ export default class Project {
         workspace_id: number;
         block_id: number;
     }): void;
-    action_create_and_add_to_workspace({ workspace_id, thing_type, block_metadata, thing_data }: {
+    action_create_and_add_to_workspace({ workspace_id, type, block_metadata, thing_data }: {
         workspace_id: number;
-        thing_type: WorkspaceBlock["thing_type"];
+        type: WorkspaceBlock["type"];
         block_metadata: WorkspaceBlock["metadata"];
         thing_data: any;
     }): {
         thing_id: number;
         block_id: number;
     };
-    action_remove_from_workspace_and_delete(workspace_id: number, block_id: number, thing_type: WorkspaceBlock["thing_type"], thing_id: number): void;
+    action_remove_from_workspace_and_delete(workspace_id: number, block_id: number, type: WorkspaceBlock["type"], thing_id: number): void;
 }

package/dist/index.js

@@ -111,6 +111,7 @@ export default class Project {
         if (caches.includes('items')) {
             let refreshed_items = [];
             for (let class_data of this.class_cache) {
+                // NOTE: add pagination to this
                 let items = this.retrieve_class_items({ class_id: class_data.id });
                 refreshed_items.push({
                     class_id: class_data.id,
@@ -149,6 +150,10 @@ export default class Project {
         const class_meta = {
             style: {
                 color: '#b5ffd5'
+            },
+            label: {
+                // TODO: build functionality to change label property in the future
+                properties: [1]
             }
         };
         // create entry for class in classlist
@@ -807,7 +812,8 @@ export default class Project {
         this.refresh_caches(['items']);
         // NOTE: should this trigger a refresh to items?
     }
-    retrieve_class_items({ class_id, class_name, class_data }) {
+    retrieve_class_items({ class_id, class_name, class_data, slim = false }) {
+        var _a, _b, _c, _d;
         if (class_name == undefined || class_data == undefined) {
             class_data = this.lookup_class(class_id);
             class_name = class_data.name;
@@ -821,48 +827,68 @@ export default class Project {
         // //joined+added between SELECT and FROM, built from relations
         const relation_selections = [];
         let relation_properties = class_data.properties.filter(a => a.type == 'relation');
-        for (let prop of relation_properties) {
-            const target_selects = [];
-            let property_junction_column_name = junction_col_name(class_id, prop.id);
-            if (prop.relation_targets.length > 0) {
-                for (let i = 0; i < prop.relation_targets.length; i++) {
-                    // find the side that does not match both the class and prop IDs
-                    let target = prop.relation_targets[i];
-                    if (target) {
-                        let target_junction_column_name = junction_col_name(target.class_id, target.prop_id);
-                        let junction_id = target.junction_id;
-                        let target_select = `SELECT "${property_junction_column_name}", json_object('class_id',${target.class_id},'id',"${target_junction_column_name}") AS target_data FROM junction_${junction_id}`;
-                        target_selects.push(target_select);
-                    }
-                    else {
-                        throw Error('Something went wrong trying to retrieve relationship data');
+        if (!slim) {
+            for (let prop of relation_properties) {
+                const target_selects = [];
+                let property_junction_column_name = junction_col_name(class_id, prop.id);
+                if (prop.relation_targets.length > 0) {
+                    for (let i = 0; i < prop.relation_targets.length; i++) {
+                        // find the side that does not match both the class and prop IDs
+                        let target = prop.relation_targets[i];
+                        const target_class = this.class_cache.find((a) => a.id == (target === null || target === void 0 ? void 0 : target.class_id));
+                        if (target && target_class) {
+                            let target_junction_column_name = junction_col_name(target.class_id, target.prop_id);
+                            // NOTE: as mentioned elsewhere, possibly allow multiple label props
+                            const target_label_id = (_b = (_a = target_class === null || target_class === void 0 ? void 0 : target_class.metadata) === null || _a === void 0 ? void 0 : _a.label) === null || _b === void 0 ? void 0 : _b.properties[0];
+                            const target_label = target_class === null || target_class === void 0 ? void 0 : target_class.properties.find((p) => p.id == target_label_id);
+                            const label_sql_string = target_label ? `,'user_${target_label.name}',target_class."user_${target_label.name}"` : '';
+                            let junction_id = target.junction_id;
+                            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 
+                                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
+                            `;
+                            target_selects.push(target_select);
+                        }
+                        else {
+                            throw Error('Something went wrong trying to retrieve relationship data');
+                        }
                     }
+                    // uses built-in aggregate json function instead of group_concat craziness
+                    const cte = `[${prop.id}_cte] AS (
+                        SELECT "${property_junction_column_name}", json_group_array( json(target_data) ) AS [user_${prop.name}]
+                        FROM 
+                        (
+                            ${target_selects.join(` 
+                            UNION 
+                            `)}
+                        )
+                        GROUP BY "${property_junction_column_name}"
+                    )`;
+                    cte_strings.push(cte);
+                    relation_selections.push(`[${prop.id}_cte].[user_${prop.name}]`);
+                    cte_joins.push(`LEFT JOIN [${prop.id}_cte] ON [${prop.id}_cte]."${property_junction_column_name}" = ${class_string}.system_id`);
+                }
+                else {
+                    relation_selections.push(`'[]' AS [user_${prop.name}]`);
                 }
-                // uses built-in aggregate json function instead of group_concat craziness
-                const cte = `[${prop.id}_cte] AS (
-                    SELECT "${property_junction_column_name}", json_group_array( json(target_data) ) AS [user_${prop.name}]
-                    FROM 
-                    (
-                        ${target_selects.join(` 
-                        UNION 
-                        `)}
-                    )
-                    GROUP BY "${property_junction_column_name}"
-                )`;
-                cte_strings.push(cte);
-                relation_selections.push(`[${prop.id}_cte].[user_${prop.name}]`);
-                cte_joins.push(`LEFT JOIN [${prop.id}_cte] ON [${prop.id}_cte]."${property_junction_column_name}" = ${class_string}.system_id`);
-            }
-            else {
-                relation_selections.push(`'[]' AS [user_${prop.name}]`);
             }
         }
         let orderby = `ORDER BY ${class_string}.system_order`;
+        let table_selection = `[class_${class_name}].*`;
+        if (slim) {
+            const label_prop_ids = (_d = (_c = class_data.metadata.label) === null || _c === void 0 ? void 0 : _c.properties) !== null && _d !== void 0 ? _d : [];
+            const label_props = class_data.properties.filter((p) => label_prop_ids.includes(p.id));
+            const label_prop_sql_string = label_props.map((p) => `[user_${p.name}]`).join(',');
+            table_selection = `system_id,system_order,${label_prop_sql_string}`;
+        }
         let comma_break = `,
             `;
         let query = `
             ${cte_strings.length > 0 ? "WITH " + cte_strings.join(comma_break) : ''}
-            SELECT [class_${class_name}].* ${relation_selections.length > 0 ? ', ' + relation_selections.join(`, `) : ''}
+            SELECT ${table_selection} ${relation_selections.length > 0 ? ', ' + relation_selections.join(`, `) : ''}
             FROM [class_${class_name}]
             ${cte_joins.join(' ')}
             ${orderby}`;
@@ -949,7 +975,7 @@ export default class Project {
             WHERE workspace_${id}.type = 'item';
         `).all();
         // get any relevant classes
-        const classes = this.class_cache.filter((cls) => blocks.find((block) => { block.thing_type == 'class' && block.thing_id == cls.id; }));
+        const classes = this.class_cache.filter((cls) => blocks.some((block) => block.type == 'class' && block.thing_id == cls.id));
         // NOTE: could possibly add class items as well in the future
         return {
             blocks,
@@ -988,11 +1014,11 @@ export default class Project {
         ]);
         return id;
     }
-    action_create_workspace_block({ workspace_id, thing_type, block_metadata, thing_id }) {
+    action_create_workspace_block({ workspace_id, type, block_metadata, thing_id }) {
         var _a;
         // should return block id
         this.db.prepare(`INSERT INTO workspace_${workspace_id}(type,metadata,thing_id) VALUES (@type,@metadata,@thing_id)`).run({
-            type: thing_type,
+            type: type,
             metadata: JSON.stringify(block_metadata),
             thing_id
         });
@@ -1005,10 +1031,10 @@ export default class Project {
         this.db.prepare(`DELETE FROM workspace_${workspace_id} WHERE block_id = ${block_id}`).run();
     }
     ;
-    action_create_and_add_to_workspace({ workspace_id, thing_type, block_metadata, thing_data }) {
+    action_create_and_add_to_workspace({ workspace_id, type, block_metadata, thing_data }) {
         let thing_id;
         // thing creation
-        switch (thing_type) {
+        switch (type) {
             case 'item':
                 let { value: item_value, type: item_type } = thing_data;
                 thing_id = this.create_item_in_root({ type: item_type, value: item_value });
@@ -1019,7 +1045,7 @@ export default class Project {
             throw Error('Something went wrong saving an item from a workspace');
         let block_id = this.action_create_workspace_block({
             workspace_id,
-            thing_type,
+            type,
             block_metadata,
             thing_id
         });
@@ -1029,9 +1055,9 @@ export default class Project {
         };
         // should return the block id and item id
     }
-    action_remove_from_workspace_and_delete(workspace_id, block_id, thing_type, thing_id) {
+    action_remove_from_workspace_and_delete(workspace_id, block_id, type, thing_id) {
         this.action_remove_workspace_block({ workspace_id, block_id });
-        switch (thing_type) {
+        switch (type) {
             case 'item':
                 this.delete_item_from_root(thing_id);
                 break;

package/dist/types.d.ts

@@ -96,6 +96,9 @@ export type ClassMetadata = {
     style: {
         color?: string;
     };
+    label?: {
+        properties: number[];
+    };
 };
 export type PropertyType = 'data' | 'relation';
 export type BinaryBoolean = 0 | 1;
@@ -163,7 +166,7 @@ export type ThingType = 'item' | 'class';
 export type BaseWorkspaceBlock = {
     /** this is the ID of the display element in the workspace, generated by the workspace table */
     block_id: number;
-    thing_type: ThingType;
+    type: ThingType;
     /** this is the ID of the class, item, or other “thing” represented in the data */
     thing_id: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goby-database",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "description": "This will hold the core better-sqlite3-powered application for creating and modifying goby databases",
   "main": "dist/index.js",
   "files": [
@@ -10,10 +10,7 @@
     "!dist/utils.js.map",
     "!dist/sandbox.js",
     "!dist/sandbox.d.ts",
-    "!dist/sandbox.js.map",
-    "!dist/unit-tests.js",
-    "!dist/unit-tests.d.ts",
-    "!dist/unit-tests.js.map"
+    "!dist/sandbox.js.map"
   ],
   "types": "dist/index.d.ts",
   "scripts": {