goby-database 1.0.4 → 1.0.5

package/index.js

@@ -35,6 +35,7 @@ class Project{
             begin:this.db.prepare('BEGIN IMMEDIATE'),
             commit:this.db.prepare('COMMIT'),
             rollback:this.db.prepare('ROLLBACK'),
+            create_item:this.db.prepare('INSERT INTO system_root(type,value) VALUES (@type, @value)'),
             get_junctionlist:this.db.prepare('SELECT id, junction_obj(side_a, side_b) AS sides, metadata FROM system_junctionlist'),
             get_class:this.db.prepare(`SELECT name, metadata FROM system_classlist WHERE id = ?`),
             get_class_id:this.db.prepare(`SELECT id FROM system_classlist WHERE name = ?`),
@@ -72,8 +73,12 @@ class Project{
     init(){
 
 
-        //System table to contain all objects in the project.
-        this.create_table('system','root',['id INTEGER NOT NULL PRIMARY KEY']);
+        //System table to contain all items in the project.
+        this.create_table('system','root',[
+            'id INTEGER NOT NULL PRIMARY KEY',
+            'type TEXT',
+            'value TEXT'
+        ]);
         
     
         //System table to contain metadata for all classes created by user
@@ -100,7 +105,7 @@ class Project{
             ('home',0,'${JSON.stringify({pos:[null,null], size:[540,400]})}'),
             ('hopper',0,'${JSON.stringify({pos:[null,null], size:[300,400]})}')`).run();
 
-        // [TO ADD: special junction table for root objects to reference themselves in individual relation]
+        // [TO ADD: special junction table for root items to reference themselves in individual relation]
         this.create_table('system','junction_root',[
             'id_1 INTEGER',
             'id_2 INTEGER',
@@ -164,7 +169,7 @@ class Project{
 
         this.create_table('class',name,columns);
 
-        const table_meta={
+        const class_meta={
             properties:[
                 {
                     name:'name',
@@ -188,7 +193,7 @@ class Project{
             }
         };
 
-        this.db.prepare(`INSERT INTO system_classlist (name, metadata) VALUES ('${name}','${JSON.stringify(table_meta)}')`).run();
+        this.db.prepare(`INSERT INTO system_classlist (name, metadata) VALUES ('${name}','${JSON.stringify(class_meta)}')`).run();
         //get the id of newest value from system_classlist and return
         const class_id=this.db.prepare('SELECT id FROM system_classlist ORDER BY id DESC').get().id;
 
@@ -559,8 +564,8 @@ class Project{
 
         let cls=this.retrieve_class(class_id);
         let prop_name='user_'+cls.metadata.properties.find(a=>a.id==prop_id).name;
-        for(let object of cls.objects){
-            let prop_values=object[prop_name];
+        for(let item of cls.items){
+            let prop_values=item[prop_name];
             console.log(prop_name,prop_values);
         }
 
@@ -573,15 +578,26 @@ class Project{
         if(this.db.inTransaction) this.run.commit.run();
         this.db.close();
     }
+
+    action_create_item_in_root({type=null,value=''}){
+        // this.db.prepare('INSERT INTO system_root VALUES (null)').run();
+        this.run.create_item.run({type,value});
+        let id=this.db.prepare('SELECT id FROM system_root ORDER BY id DESC').get().id;
+        return id;
+    }
+
+    action_delete_item_from_root(id){
+        this.db.prepare(`DELETE FROM system_root WHERE id = ${id}`).run();
+    }
     
 
     action_add_row(class_id,class_name){
         //first add new row to root and get id
         if(class_name==undefined) class_name=this.class_cache[class_id].name;
-        // console.log(class_name)
-        this.db.prepare('INSERT INTO system_root VALUES (null)').run();
-        const root_id=this.db.prepare('SELECT id FROM system_root ORDER BY id DESC').get().id;
 
+        // note for future: instead of letting class_id be undefined, locate it 
+        const root_id=this.action_create_item_in_root({type:class_id!==undefined?'class_'+class_id:null});
+        
         //get the last item in class table order and use it to get the order for the new item
         const last_order=this.db.prepare(`SELECT system_order FROM [class_${class_name}] ORDER BY system_order DESC`).get();
         const new_order=last_order?last_order.system_order+1:1;
@@ -595,7 +611,7 @@ class Project{
         /* input = {
             class_id: INT,
             prop_id: INT,
-            object_id: INT
+            item_id: INT
         }
         */
 
@@ -604,7 +620,7 @@ class Project{
             input_2:`${input_2.class_id}.${input_2.prop_id || ''}`
         }
         let junction_id=this.run.match_junction.get(sides)?.id;
-        this.db.prepare(`INSERT INTO junction_${junction_id} ("${sides.input_1}", "${sides.input_2}") VALUES (${input_1.object_id},${input_2.object_id})`).run();
+        this.db.prepare(`INSERT INTO junction_${junction_id} ("${sides.input_1}", "${sides.input_2}") VALUES (${input_1.item_id},${input_2.item_id})`).run();
         
     }
 
@@ -667,16 +683,16 @@ class Project{
             ${cte_joins.join(' ')}
             ${orderby}`;
         
-        let objects=this.db.prepare(query).all();
+        let items=this.db.prepare(query).all();
 
         let stringified_properties=class_meta.properties.filter(a=>a.type=='relation'||a.conditions?.max>1);
-        objects.map(row=>{
+        items.map(row=>{
           for (let prop of stringified_properties){
             row['user_'+prop.name]=JSON.parse(row['user_'+prop.name]);
           }
         })
         return {
-            objects,
+            items,
             metadata:class_meta,
             name:class_name
         };
@@ -699,6 +715,25 @@ class Project{
         return windows;
     }
 
+    retrieve_workspace_contents(id){
+        // get the workspace table
+        let blocks=this.db.prepare(`SELECT * FROM workspace_${id}`).all();
+        for(let block of blocks) block.properties=JSON.parse(block.properties);
+        // get any relevant root items
+        let items=this.db.prepare(`SELECT system_root.* 
+            FROM system_root 
+            LEFT JOIN workspace_${id} 
+            ON system_root.id = workspace_1.concept_id
+            WHERE workspace_${id}.type = 'item';
+        `).all();
+        // get any relevant classes (going to hold off from this for now)
+        
+        return {
+            blocks,
+            items
+        }
+    }
+
     action_config_window(type,open,meta={pos:[null,null], size:[1000,700]},id){
         if(id!==undefined){
             this.run.update_window.run({
@@ -709,22 +744,93 @@ class Project{
             })
         }else{
  
-            this.run.create_window.run({
-                open,
-                type,
-                meta:JSON.stringify(meta)
-            })
-            let id=this.get_latest_id('system_windows')
+            let id=this.create_workspace(open,meta)
+            
             return id;
         }
-        // {pos:[null,null], size:[1000,700]}
 
-        // this.db.prepare(`INSERT INTO system_classlist (name, metadata) VALUES ('${name}','${JSON.stringify(table_meta)}')`)
     }
 
 
+    create_workspace(open,meta){
+
+        this.run.create_window.run({
+            type:'workspace',
+            open,
+            meta:JSON.stringify(meta)
+        })
+        
+        let id=this.get_latest_id('system_windows')
+        
+        this.create_table('workspace',id,[
+            'block_id INTEGER NOT NULL PRIMARY KEY',
+            'type TEXT',
+            'properties TEXT',
+            'concept_id INTEGER'
+        ]);
+
+        
+        
+        return id;
+    }
+
+    action_create_workspace_block({workspace_id,type,properties,concept_id}){
+        // should return block id
+        this.db.prepare(`INSERT INTO workspace_${workspace_id}(type,properties,concept_id) VALUES (@type,@properties,@concept_id)`).run({
+            type,
+            properties:JSON.stringify(properties),
+            concept_id
+        });
+        let block_id=this.db.prepare(`SELECT block_id FROM workspace_${workspace_id} ORDER BY block_id DESC`).get().id;
+        return block_id;
+
+    }
+
+    action_remove_workspace_block({workspace_id,block_id}){
+        this.db.prepare(`DELETE FROM workspace_${workspace_id} WHERE block_id = ${block_id}`).run();
+    }
+
+    action_create_and_add_to_workspace(workspace_id,blocktype,block_properties,concept_data){        
+        let concept_id;
+        // concept creation
+        switch(blocktype){
+            case 'item':
+                let {
+                    value:item_value,
+                    type:item_type
+                } = concept_data;
+                concept_id=this.action_create_item_in_root({type:item_type,value:item_value});
+            break;
+            // add cases for class and anything else in the future
+        }
+
+        let block_id=this.action_create_workspace_block({
+            workspace_id,
+            type:blocktype,
+            properties:block_properties,
+            concept_id
+        })
+
+        return {
+            concept_id,
+            block_id
+        }
+        // should return the block id and item id
+    }
+
+    action_remove_from_workspace_and_delete(workspace_id,block_id,blocktype,concept_id){
+        action_remove_workspace_block({workspace_id,block_id});
+        switch(blocktype){
+            case 'item':
+                this.action_delete_item_from_root(concept_id);
+            break;
+        }
+    }
+
 }
 
+
+
 // export default Project;
 module.exports=Project;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goby-database",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "This will hold the core better-sqlite3-powered application for creating and modifying goby databases",
   "main": "index.js",
   "scripts": {