goby-database 2.1.16 → 2.1.18

package/dist/index.d.ts

@@ -99,6 +99,7 @@ export default class Project {
     retrieve_workspace_contents(id: number): {
         blocks: WorkspaceBlock[];
         items: unknown[];
+        classes: ClassData[];
     };
     action_config_window({ type, open, metadata, id }: {
         type: ApplicationWindow["type"];
@@ -107,9 +108,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;
@@ -117,14 +118,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

@@ -942,16 +942,19 @@ export default class Project {
         let blocks = blocks_sql.map(a => (Object.assign(Object.assign({}, a), { metadata: JSON.parse(a.metadata) })));
         // for(let block of blocks) block.metadata=JSON.parse(block.metadata);
         // get any relevant root items
-        let items = this.db.prepare(`SELECT system_root.* 
+        const items = this.db.prepare(`SELECT system_root.* 
             FROM system_root 
             LEFT JOIN workspace_${id} 
             ON system_root.id = workspace_${id}.thing_id
             WHERE workspace_${id}.type = 'item';
         `).all();
-        // get any relevant classes (going to hold off from this for now)
+        // get any relevant classes
+        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,
-            items
+            items,
+            classes
         };
     }
     action_config_window({ type, open, metadata = { pos: [null, null], size: [1000, 700] }, id }) {
@@ -985,11 +988,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
         });
@@ -1002,10 +1005,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 });
@@ -1016,7 +1019,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
         });
@@ -1026,9 +1029,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

@@ -163,7 +163,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.16",
+  "version": "2.1.18",
   "description": "This will hold the core better-sqlite3-powered application for creating and modifying goby databases",
   "main": "dist/index.js",
   "files": [