beanbagdb 0.5.77 → 0.5.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beanbagdb",
-  "version": "0.5.77",
+  "version": "0.5.80",
   "description": "A JS library to introduce a schema layer to a No-SQL local database",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/index.js

@@ -451,6 +451,11 @@ export class BeanBagDB {
     //   }
     // }
 
+    // system generated schemas cannot be edited 
+    if(full_doc.schema=="schema"&&full_doc.data.system_generated==true){
+      throw new DocUpdateError("System schemas cannot be updated using this API");
+    }
+
     // update new value depending on settings.non_editable_fields (if does not exists, all fields are editable)
     let all_fields = Object.keys(schema.schema.properties);
     let unedit_fields = schema.settings["non_editable_fields"];
@@ -462,7 +467,7 @@ export class BeanBagDB {
       //  todo : what if additionalField are allowed ??
       let updated_data = { ...full_doc.data, ...allowed_updates };
 
-      this.util_validate_data(schema.schema, updated_data);
+      updated_data = this.util_validate_data(schema.schema, updated_data);
   
       // primary key check if multiple records can  be created
       if (schema.settings["primary_keys"].length > 0) {
@@ -489,7 +494,7 @@ export class BeanBagDB {
       let m_sch = sys_sch.editable_metadata_schema;
       let editable_fields = Object.keys(m_sch["properties"]);
       let allowed_meta = this.util_filter_object(updates.meta, editable_fields);
-      this.util_validate_data(m_sch, allowed_meta);
+      allowed_meta = this.util_validate_data(m_sch, allowed_meta);
       // if update has a link ,then check if it already exists 
       if (allowed_meta.link){
         let search = await this.search({ selector: {"meta.link":allowed_meta.link} })
@@ -652,6 +657,7 @@ export class BeanBagDB {
               system_defined : doc.data.system_generated,
               description: doc.data.description,
               link: doc.meta.link,
+              title:doc.data.title,
               _id:doc._id
             })
           })
@@ -951,9 +957,9 @@ async _upgrade_schema_in_bulk(schemas,log_upgrade=false,log_message="Schema Upgr
    * @returns {Object}
    */
   _get_blank_schema_doc(schema_name, schema_object, data) {
-    this.util_validate_data(schema_object, data);
+    let new_data = this.util_validate_data(schema_object, data);
     let obj = this._get_blank_doc(schema_name);
-    obj["data"] = data;
+    obj["data"] = new_data;
     return obj;
   }
 
@@ -1024,11 +1030,13 @@ async _upgrade_schema_in_bulk(schemas,log_upgrade=false,log_message="Schema Upgr
     if (sch_search.docs.length == 0) {throw new DocCreationError(`The schema "${schema}" does not exists`)}
     let schemaDoc = sch_search.docs[0]["data"];
     // validate data
-    this.util_validate_data(schemaDoc.schema, data);
+    if(!schemaDoc.active){throw new DocCreationError(`The schema "${schema}" is not active`)}
+
+    let new_data = this.util_validate_data(schemaDoc.schema, data);
 
     // validate meta
-    if(Object.keys.length>0){
-      this.util_validate_data(sys_sch.editable_metadata_schema, meta)
+    if(Object.keys(meta).length>0){
+      meta = this.util_validate_data(sys_sch.editable_metadata_schema, meta)
     }
     
 
@@ -1042,25 +1050,25 @@ async _upgrade_schema_in_bulk(schemas,log_upgrade=false,log_message="Schema Upgr
     // @TODO : for schema dos: settings fields must be in schema field
     if (schema == "schema") {
       //more checks are required
-      this.util_validate_schema_object(data);
+      this.util_validate_schema_object(new_data);
     }
     // @TODO : check if single record setting is set to true
     //console.log(schemaDoc)
     // duplicate check
     if (schemaDoc.settings["primary_keys"].length > 0) {
       let primary_obj = { schema: schema };
-      schemaDoc.settings["primary_keys"].map((ky) => {primary_obj["data." + ky] = data[ky];});
+      schemaDoc.settings["primary_keys"].map((ky) => {primary_obj["data." + ky] = new_data[ky];});
       let prim_search = await this.search({ selector: primary_obj });
       if (prim_search.docs.length > 0) {
         throw new DocCreationError(`Document with the given primary key (${schemaDoc.settings["primary_keys"].join(",")}) already exists in the schema "${schema}"`);
       }
     }
     // encrypt if required
-    let new_data = { ...data };
+
     if (schemaDoc.settings["encrypted_fields"].length > 0) {
       // todo test if encryption is successful 
       for (let itm of schemaDoc.settings["encrypted_fields"]) {
-        new_data[itm] = await this.utils.encrypt(data[itm], this.encryption_key);
+        new_data[itm] = await this.utils.encrypt(new_data[itm], this.encryption_key);
       }
     }
 
@@ -1124,16 +1132,18 @@ async _upgrade_schema_in_bulk(schemas,log_upgrade=false,log_message="Schema Upgr
 
 
   /**
-   * Validates a data object against a provided JSON schema
+   * Validates a data object against a provided JSON schema and returns a valid data object (with default value for missing field for which default values are defined in the schema )
    * It relies on the external API provided by the user
    * @param {Object} schema_obj - The JSON schema object to validate against
    * @param {Object} data_obj - The data object to validate
    * @throws {Error} If the data object does not conform to the schema
    */
   util_validate_data(schema_obj, data_obj) {
-    const { valid, validate } = this.utils.validate_schema(schema_obj,data_obj)
+    const { valid, validate , data} = this.utils.validate_schema(schema_obj,data_obj)
     if (!valid) {
       throw new ValidationError(validate.errors);
+    }else{
+      return data
     }
   }
 

package/src/system_schema.js

@@ -6,9 +6,10 @@ export const default_app = {
   schemas:[
     {
       name: "schema",
+      active:true,
       description:"Meta-schema or the schema for defining other schemas",
       system_generated:true,
-      version:0.86,
+      version:0.87,
       title:"Schema document",
       schema: {
         type: "object",
@@ -19,6 +20,11 @@ export const default_app = {
             type:"boolean",
             default:false
           },
+          active:{
+            title:"This indicates where new documents can be created using this schema or not. Old documents can still be edited",
+            type:"boolean",
+            default:false
+          },
           version: {
             type: "number",
             title:"Version",
@@ -34,19 +40,19 @@ export const default_app = {
             pattern: "^[a-zA-Z][a-zA-Z0-9_]*$",
             description:"This is the name of the schema.It cannot be changed later"
           },
-          description:{
+          title:{
             type:"string",
-            title:"About",
+            title:"Title",
             minLength:0,
             maxLength:1000,
-            description:"A small description of what  data in this schema stores."
+            description:"A title to display with records."
           },
-          title:{
+          description:{
             type:"string",
             title:"About",
             minLength:0,
             maxLength:1000,
-            description:"A title to display with records."
+            description:"A small description of what  data in this schema stores."
           },
           schema: {
             type: "object",
@@ -55,6 +61,7 @@ export const default_app = {
             minProperties: 1,
             maxProperties: 50,
             description:"This must be a valid JSON Schema which will be used to validate documents created with this schema.See this https://tour.json-schema.org/",
+            default:{}
           },
           settings: {
             type: "object",
@@ -110,17 +117,18 @@ export const default_app = {
       },
       settings: {
         primary_keys: ["name"],
-        non_editable_fields:[],
+        non_editable_fields:["system_generated"],
         encrypted_fields:[],
-        display_fields:["name","version","description","title"]
+        display_fields:["name","version","description","title","active"]
       },
     },
     {
       system_generated:true,
-      version:0.62,
+      version:0.63,
       description:"To store user defined key. this can include anything like API tokens etc. There is a special method to fetch this. The values are encrypted",
       name: "system_key",
       title:"System key",
+      active:true,
       schema: {
         type: "object",
         additionalProperties: true,
@@ -153,11 +161,12 @@ export const default_app = {
       },
     },
     {
-      version:0.66,
+      version:0.67,
       system_generated:true,
       description:"The system relies on these settings for proper functioning or enabling optional features.",
       name: "system_setting",
       title:"System Setting",
+      active:true,
       schema: {
         required:["name","value"],
         type: "object",
@@ -184,7 +193,8 @@ export const default_app = {
       name:"system_edge_constraint",
       title:"Edge constraint",
       system_generated:true,
-      version:0.51,
+      active:true,
+      version:0.52,
       description: "To define edge constraints for simple directed graph of records.",
       schema:{
         type: "object",
@@ -236,8 +246,9 @@ export const default_app = {
     {
       name:"system_edge",
       title:"Edge in the system graph",
+      active:true,
       system_generated:true,
-      version:0.51,
+      version:0.52,
       description: "To define edges in the simple directed graph of records.",
       schema:{
         type: "object",
@@ -264,8 +275,9 @@ export const default_app = {
     {
       name:"system_media",
       title:"Media content",
+      active:true,
       system_generated:true,
-      version:0.61,
+      version:0.62,
       description: "To store images as Base64",
       schema:{
         type: "object",
@@ -296,7 +308,8 @@ export const default_app = {
       name:"system_log",
       system_generated:true,
       title:"System log",
-      version:0.51,
+      active:true,
+      version:0.52,
       description: "To define edges in the simple directed graph of records.",
       schema:{
         type: "object",

package/test/operations.test.js

@@ -563,6 +563,7 @@ describe("Doc insertion tests", async () => {
 
   const test_schema = {
     name:"book",
+    active:true,
     description:"Test schema 1",
     title:"Book",
     schema: {
@@ -761,6 +762,7 @@ describe("Doc insertion tests with encryption", async () => {
   const test_schema = {
     name:"book",
     title:"Book",
+    active:true,
     description:"Test schema 1",
     schema: {
       $schema: "http://json-schema.org/draft-07/schema#",
@@ -959,6 +961,7 @@ describe("Doc read tests", async () => {
     name:"book",
     description:"Test schema 1",
     title:"Book",
+    active:true,
     schema: {
       $schema: "http://json-schema.org/draft-07/schema#",
       type: "object",
@@ -1149,6 +1152,7 @@ describe("Doc update tests", async () => {
     name:"book",
     description:"Test schema 1",
     title:"Book",
+    active:true,
     schema: {
       $schema: "http://json-schema.org/draft-07/schema#",
       type: "object",
@@ -1391,6 +1395,7 @@ describe("Doc delete tests", async () => {
 
   const test_schema = {
     name:"book",
+    active:true,
     description:"Test schema 1",
     title:"Book",
     schema: {
@@ -1560,6 +1565,7 @@ describe("Doc search tests", async () => {
   const test_schema = {
     name:"book",
     title:"Book",
+    active:true,
     description:"Test schema 1",
     schema: {
       $schema: "http://json-schema.org/draft-07/schema#",

package/test/pouchdb.js

@@ -69,10 +69,12 @@ const pdb = new PouchDB(dbname);
         // @TODO ping the database to check connectivity when class is ready to use
       },
       validate_schema: (schema_obj, data_obj)=>{
-        const ajv = new Ajv({code: {esm: true}})  // options can be passed, e.g. {allErrors: true}
+        const ajv = new Ajv({code: {esm: true},strict:false,useDefaults:true})  // options can be passed, e.g. {allErrors: true}
+        const data_copy = {...data_obj}
         const validate = ajv.compile(schema_obj);
-        const valid = validate(data_obj);
-        return {valid,validate}
+        const valid = validate(data_copy);
+
+        return {valid,validate,data:data_copy}
       }
     },
   }

package/test/test1.js

@@ -5,157 +5,116 @@ import {BeanBagDB}  from '../src/index.js';
 import {text_command} from "../src/plugins/text_command.js"
 
 (async()=>{
-
-  // let schema_docs_invalid = [
-  //   {
-  //     name: "",
-  //     description: "",
-  //     schema: {},
-  //     settings: {},
-  //   }
-  //   ]
-//   let doc_obj = get_pdb_doc("test_database_27","qwertyuiopaqwsde1254")
-//   let database1 = new BeanBagDB(doc_obj);
-//   // await database.ready()
-//   // let a = await database.create("schema",schema_docs_invalid[0])
-
-//   const test_schema = {
-//     name:"book",
-//     description:"Test schema 1",
-//     schema: {
-//       $schema: "http://json-schema.org/draft-07/schema#",
-//       type: "object",
-//       properties: {
-//         title: {
-//           type: "string",
-//           minLength: 1,
-//           description: "The title of the book",
-//         },
-//         author: {
-//           type: "string",
-//           minLength: 1,
-//           description: "The author of the book",
-//         },
-//         isbn: {
-//           type: "string",
-//           pattern: "^(97(8|9))?\\d{9}(\\d|X)$",
-//           description: "The ISBN of the book, can be 10 or 13 digits",
-//         },
-//         publicationYear: {
-//           type: "integer",
-//           minimum: 1450,
-//           maximum: 2024,
-//           description:
-//             "The year the book was published (between 1450 and 2024)",
-//         },
-//         genre: {
-//           type: "string",
-//           enum: [
-//             "Fiction",
-//             "Non-Fiction",
-//             "Science",
-//             "History",
-//             "Fantasy",
-//             "Biography",
-//             "Children",
-//             "Mystery",
-//             "Horror",
-//           ],
-//           description: "The genre of the book",
-//         },
-//         language: {
-//           type: "string",
-//           description: "The language of the book",
-//           default: "English",
-//         },
-//         publisher: {
-//           type: "string",
-//           description: "The publisher of the book",
-//           minLength: 1,
-//         },
-//         pages: {
-//           type: "integer",
-//           minimum: 1,
-//           description: "The number of pages in the book",
-//         },
-//         secret: {
-//           type: "string",
-//           description: "Super secret related to the book",
-//           minLength: 1,
-//         },
-//       },
-//       required: ["title", "author", "isbn", "publicationYear", "genre"],
-//       additionalProperties: false,
-//     },
-//     settings : {
-//       primary_keys:['title','author'],
-//       encrypted_fields:['secret'],
-//       non_editable_fields:[],
-//       single_record:false
-//     }
-//   };
-
-
-//   await database1.ready(); // Ensure the database is ready before running tests
- 
-//   try {
-//     //console.log(test_schema)
-//     let a = await database1.create("schema",test_schema)
-
-//   } catch (error) {
-//     console.log("error in before")
-//     console.log(error)
-//   }
-
-//   const book1 = {
-//     title: "Harry Potter",
-//     author: "J.K. Rowling",
-//     isbn: "9780439139601",
-//     publicationYear: 1999,
-//     genre: "Fantasy",
-//     publisher: "ABC DEF",
-//     secret: "Super secret 1"
-// };
-
-// let d 
-//   try {
-//     d = await database1.create("book", book1,{link:"sample1"});   
-//     console.log(d)
-//     let rec = await database1.read({"_id":d._id});   
-//     console.log(rec)
-
-//     let e = await database1.create("book", {...book1,title:"Something"},{link:"sample2"});   
-//     console.log(e)
-
-//   } catch (error) {
-//     console.log(error)
-//     throw error
-//   }
-
-
-//   try {
-//     let s = await database1.search({selector:{}})
-//     console.log(s.docs.length)
-//     //console.log( JSON.stringify(s,null,2))
-//   } catch (error) {
-//     console.log(error)
-//   }
-
-
 let database; // this is the global db object
 let doc_obj = get_pdb_doc("test_database_40", "qwertyuiopaqwsde1254");
 database = new BeanBagDB(doc_obj);
 await database.ready(); // Ensure the database is ready before running tests
-await database.load_plugin("txtcmd",text_command)
-console.log()
-let command = await database.plugins["txtcmd"].parse_and_run("new/schema")
-console.log(command)
-let command2 = await database.plugins["txtcmd"].parse_and_run("new")
-console.log(command2)
-let command3 = await database.plugins["txtcmd"].parse_and_run("open/link/thunder-kangchenjunga-mango")
-console.log(command3)
-let command4 = await database.plugins["txtcmd"].parse_and_run("tool/info")
-console.log(command4)
+// await database.load_plugin("txtcmd",text_command)
+// console.log()
+// let command = await database.plugins["txtcmd"].parse_and_run("new/schema")
+// console.log(command)
+// let command2 = await database.plugins["txtcmd"].parse_and_run("new")
+// console.log(command2)
+// let command3 = await database.plugins["txtcmd"].parse_and_run("open/link/thunder-kangchenjunga-mango")
+// console.log(command3)
+// let command4 = await database.plugins["txtcmd"].parse_and_run("tool/info")
+// console.log(command4)
+const test_schema = {
+  name:"book",
+  title:"Book",
+  description:"Test schema 1",
+  schema: {
+    $schema: "http://json-schema.org/draft-07/schema#",
+    type: "object",
+    properties: {
+      title: {
+        type: "string",
+        minLength: 1,
+        description: "The title of the book",
+      },
+      author: {
+        type: "string",
+        minLength: 1,
+        description: "The author of the book",
+      },
+      isbn: {
+        type: "string",
+        pattern: "^(97(8|9))?\\d{9}(\\d|X)$",
+        description: "The ISBN of the book, can be 10 or 13 digits",
+      },
+      publicationYear: {
+        type: "integer",
+        minimum: 1450,
+        maximum: 2024,
+        description:
+          "The year the book was published (between 1450 and 2024)",
+      },
+      genre: {
+        type: "string",
+        enum: [
+          "Fiction",
+          "Non-Fiction",
+          "Science",
+          "History",
+          "Fantasy",
+          "Biography",
+          "Children",
+          "Mystery",
+          "Horror",
+        ],
+        description: "The genre of the book",
+      },
+      language: {
+        type: "string",
+        description: "The language of the book",
+        default: "English",
+      },
+      publisher: {
+        type: "string",
+        description: "The publisher of the book",
+        minLength: 1,
+      },
+      pages: {
+        type: "integer",
+        minimum: 1,
+        description: "The number of pages in the book",
+      },
+      secret: {
+        type: "string",
+        description: "Super secret related to the book",
+        minLength: 1,
+      },
+    },
+    required: ["title", "author", "isbn", "publicationYear", "genre"],
+    additionalProperties: false,
+  },
+  settings : {
+    primary_keys:['title','author'],
+    encrypted_fields:['secret'],
+    non_editable_fields:[],
+    single_record:false
+  }
+};
+
+try {
+      //console.log(test_schema)
+      let a = await database.create("schema",test_schema)
+      console.log(a)
+    } catch (error) {
+      console.log("error in before")
+      console.log(error)
+    }
+  
+
+    // try {
+    //   //console.log(test_schema)
+    //   let a = await database.update({link:"7f82b8"},{meta:{tags:["sample"]}})
+    //   console.log(a)
+    // } catch (error) {
+    //   console.log("error in before")
+    //   console.log(error)
+    // }
+
 })()