sorla-db 1.0.0 → 1.1.0

package/src/query_language/query.js

@@ -1,104 +1,74 @@
-const manipulation = require('./manipulation.js');
-const operators = require('./operators.js');
-const cursor = require('../documents/cursor.js');
-
-class query extends manipulation
-{
-    constructor(validationSchema)
-    {
-        super(validationSchema);
-        this._operators = new operators();
-    }
-
-    /**
-     * Count documents
-     * @return int
-     */
-    count()
-    {
-        return this._documents.length;
-    }
-
-    /**
-     * Deeps find in object
-     * @param object query
-     * @param object projection
-     * @param bool firstOne
-     * @return array
-     */
-    _deepFind(query, projection, single=false)
-    {
-        const c = new cursor();
-        const find = (documents, query, single, debug=false) => {
-            let finded = [];
-            const queryKeys = Object.keys(query);
-            docsLoop: for(let doc of documents)
-            {
-                for(let k of queryKeys)
-                {
-                    if(!this._operators.isAnyOperator(k))
-                    {
-                        this._operators.currentField = k;
-
-                        if(typeof query[k] === 'object')
-                        {
-                            if(find([doc], query[k], single).length === 0)
-                            {
-                                continue docsLoop;
-                            }
-
-                            continue;
-                        }
-                    }
-
-                    const isLogicalOperator = this._operators.isLogicalOperator(k);
-                    if((isLogicalOperator && !this._operators[k](query[k], doc)) || (!isLogicalOperator && !this._operators.handleComparison(k, query[k], doc)))
-                    {
-                        continue docsLoop;
-                    }
-                }
-
-                finded.push(doc.clone());
-                if(single) break;
-            }
-
-            return finded;
-        };
-
-        const result = find(this._documents, query, single);
-        const finded = new cursor(result, projection);
-
-        return finded;
-    }
-
-    /**
-     * Find one document
-     * @param query
-     * @param projection
-     * @return object
-     */
-    findOne(query, projection = null)
-    {
-        const finded = this._deepFind(query, projection, true);
-        return finded.first();
-    }
-
-    /**
-     * Find documents
-     * @param query
-     * @param projection
-     * @return array
-     */
-    find(query, projection = null)
-    {
-        const finded = this._deepFind(query, projection);
-        return finded;
-    }
-
-    //find
-    //find one and delete
-    //find one and update
-    //find one and replace
-}
-
+const manipulation = require('./manipulation.js');
+const operators = require('./operators.js');
+const cursor = require('../documents/cursor.js');
+
+class query extends manipulation
+{
+    constructor(validationSchema)
+    {
+        super(validationSchema);
+        this._operators = new operators();
+    }
+
+    /**
+     * Count documents
+     * @return int
+     */
+    count()
+    {
+        return this._documents.length;
+    }
+
+    /**
+     * Deeps find in object
+     * @param object query
+     * @param object projection
+     * @param bool firstOne
+     * @return array
+     */
+    _deepFind(query, projection, single=false)
+    {
+        const finded = [];
+        for(const doc of this._documents)
+        {
+            if(!this._operators.matches(doc, query))
+                continue;
+
+            finded.push(doc.clone());
+            if(single) break;
+        }
+
+        return new cursor(finded, projection);
+    }
+
+    /**
+     * Find one document
+     * @param query
+     * @param projection
+     * @return object
+     */
+    findOne(query, projection = null)
+    {
+        const finded = this._deepFind(query, projection, true);
+        return finded.first();
+    }
+
+    /**
+     * Find documents
+     * @param query
+     * @param projection
+     * @return array
+     */
+    find(query, projection = null)
+    {
+        const finded = this._deepFind(query, projection);
+        return finded;
+    }
+
+    //find
+    //find one and delete
+    //find one and update
+    //find one and replace
+}
+
 module.exports =  query;

package/src/sorla.js

@@ -1,123 +1,123 @@
-const database = require('./dbs/database.js');
-
-class sorla{
-    /**
-     * Constructs class Sorla to manage databases
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 1.0.0
-     * @param 
-     * @return void
-     */
-    constructor()
-    {
-        this._dbs = [];
-        this._selectedDb = null;
-    }
-
-    /**
-     * Search a database`s position in the list of databases by its name and mark it as selected
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 
-     * @param 
-     * @return 
-    **/
-    _findDbIndex(name)
-    {
-        return this._dbs.findIndex(db => db.name == name);
-    }
-
-    /**
-     * Verify if a database name already exists in the list of databases
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 1.0.0
-     * @param  string name
-     * @return boolean
-     */
-    dbExists(name)
-    {
-        return this._findDbIndex(name) > -1;
-    }
-
-    /**
-     * Mark a database as selected
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 1.0.0
-     * @param 
-     * @return 
-    **/
-    _selectDb(pos)
-    {
-        if(!this._dbs.hasOwnProperty(pos))
-        {
-            throw new Error('Database does not exists');
-        }
-        this._selectedDb = this._dbs[pos];
-    }
-
-    /**
-     * Creates a new database
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 1.0.0
-     * @param string name
-     * @return int "The position of the new database in the list of databases"
-    **/
-    createDb(name)
-    {
-        if(this.dbExists(name))
-        {
-            return false;
-        }
-
-        let pos = this._dbs.length;
-        this._dbs.push(new database(name));
-        return pos;
-    }
-
-    /**
-     * Selects a database by its name or creates a new one if it does not exists and then selects it
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 1.0.0
-     * @param string name
-     * @return void
-    **/
-    useDb(name)
-    {
-        let pos = null;
-        if(!this.dbExists(name))
-        {
-            pos = this.createDb(name);
-        }
-
-        this._selectDb(pos === null ? this._findDbIndex(name) : pos);
-    }
-
-    /**
-     * Get the number of created databases
-     * @author Anderson Arruda < andmarruda@gmail.com >
-     * @version 1.0.0
-     * @param 
-     * @return int
-    **/
-    countDb()
-    {
-        return this._dbs.length;
-    }
-
-    /**
-     * Return selected db
-     * @author Anderson Arruda < anderson@sysborg.com.br >
-     * @version 1.0.0
-     * @param 
-     * @return instanceof database
-    **/
-    get db()
-    {
-        return this._selectedDb;
-    }
-}
-
-module.exports = sorla;
-if(typeof window !== 'undefined')
-{
-    window.sorla = sorla;
+const database = require('./dbs/database.js');
+
+class sorla{
+    /**
+     * Constructs class Sorla to manage databases
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 1.0.0
+     * @param 
+     * @return void
+     */
+    constructor()
+    {
+        this._dbs = [];
+        this._selectedDb = null;
+    }
+
+    /**
+     * Search a database`s position in the list of databases by its name and mark it as selected
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 
+     * @param 
+     * @return 
+    **/
+    _findDbIndex(name)
+    {
+        return this._dbs.findIndex(db => db.name == name);
+    }
+
+    /**
+     * Verify if a database name already exists in the list of databases
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 1.0.0
+     * @param  string name
+     * @return boolean
+     */
+    dbExists(name)
+    {
+        return this._findDbIndex(name) > -1;
+    }
+
+    /**
+     * Mark a database as selected
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 1.0.0
+     * @param 
+     * @return 
+    **/
+    _selectDb(pos)
+    {
+        if(!this._dbs.hasOwnProperty(pos))
+        {
+            throw new Error('Database does not exists');
+        }
+        this._selectedDb = this._dbs[pos];
+    }
+
+    /**
+     * Creates a new database
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 1.0.0
+     * @param string name
+     * @return int "The position of the new database in the list of databases"
+    **/
+    createDb(name)
+    {
+        if(this.dbExists(name))
+        {
+            return false;
+        }
+
+        let pos = this._dbs.length;
+        this._dbs.push(new database(name));
+        return pos;
+    }
+
+    /**
+     * Selects a database by its name or creates a new one if it does not exists and then selects it
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 1.0.0
+     * @param string name
+     * @return void
+    **/
+    useDb(name)
+    {
+        let pos = null;
+        if(!this.dbExists(name))
+        {
+            pos = this.createDb(name);
+        }
+
+        this._selectDb(pos === null ? this._findDbIndex(name) : pos);
+    }
+
+    /**
+     * Get the number of created databases
+     * @author Anderson Arruda < andmarruda@gmail.com >
+     * @version 1.0.0
+     * @param 
+     * @return int
+    **/
+    countDb()
+    {
+        return this._dbs.length;
+    }
+
+    /**
+     * Return selected db
+     * @author Anderson Arruda < anderson@sysborg.com.br >
+     * @version 1.0.0
+     * @param 
+     * @return instanceof database
+    **/
+    get db()
+    {
+        return this._selectedDb;
+    }
+}
+
+module.exports = sorla;
+if(typeof window !== 'undefined')
+{
+    window.sorla = sorla;
 }

package/src/utils.js

@@ -1,41 +1,41 @@
-class utils
-{
-    /**
-     * Get a uuid v4 string
-     * @author Anderson Arruda < anderson@sysborg.com.br >
-     * @version 1.0.0
-     * @param 
-     * @return string
-    **/
-    get uuid()
-    {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c)
-        {
-            let r = Math.random() * 16 | 0,
-                v = c == 'x' ? r : (r & 0x3 | 0x8);
-
-            return v.toString(16);
-        });
-    }
-
-    /**
-     * Get data using dots to access subfields
-     * @param object data
-     * @param string field
-     */
-    getDotData(data, field)
-    {
-        let fields = field.split('.');
-
-        fields.forEach(field => {
-            if(typeof data[field] !== 'undefined')
-            {
-                data = data[field];
-            }
-        });
-
-        return data;
-    }
-}
-
+class utils
+{
+    /**
+     * Get a uuid v4 string
+     * @author Anderson Arruda < anderson@sysborg.com.br >
+     * @version 1.0.0
+     * @param 
+     * @return string
+    **/
+    get uuid()
+    {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c)
+        {
+            let r = Math.random() * 16 | 0,
+                v = c == 'x' ? r : (r & 0x3 | 0x8);
+
+            return v.toString(16);
+        });
+    }
+
+    /**
+     * Get data using dots to access subfields
+     * @param object data
+     * @param string field
+     */
+    getDotData(data, field)
+    {
+        let fields = field.split('.');
+
+        fields.forEach(field => {
+            if(typeof data[field] !== 'undefined')
+            {
+                data = data[field];
+            }
+        });
+
+        return data;
+    }
+}
+
 module.exports = utils;

package/test/feature_collection.test.js

@@ -1,73 +1,75 @@
-const chai = require('chai')
-const expect = chai.expect
-const faker = require('faker')
-const sorla = require('../src/sorla.js')
-
-describe('SORLA Collection Feature Test', () => {
-    beforeAll(() => {
-        this.srla = new sorla();
-        this.dbname = faker.random.word();
-        this.srla.createDb(this.dbname);
-        this.srla.useDb(this.dbname);
-    });
-
-    beforeEach(() => {
-        this.collectionName = faker.random.word();
-        this.srla.db.createCollection(this.collectionName);
-    });
-
-    it('Create a single document inside of a collection and check by length', () => {
-        this.srla.db[this.collectionName].insertOne({name: 'Anderson'});
-        expect(this.srla.db[this.collectionName].count()).to.equal(1);
-    });
-
-    it('create multiple documents and check by length', () => {
-        this.srla.db[this.collectionName].insertMany([
-            {name: 'Anderson'},
-            {name: 'Arruda'},
-            {name: 'Sorla'}
-        ]);
-        expect(this.srla.db[this.collectionName].count()).to.equal(3);
-    });
-
-    it('create a document with prohibited character $', () => {
-        expect(() => this.srla.db[this.collectionName].insertOne({name: 'Anderson', $test: '123'})).to.throw();
-    });
-
-    it('create a document with prohibited character .', () => {
-        expect(() => this.srla.db[this.collectionName].insertOne({"name.name": 'Anderson', test: {test: '123'}})).to.throw();
-    });
-
-    it('create a document with prohibited character . inside of an array', () => {
-        expect(() => this.srla.db[this.collectionName].insertOne({name: 'Anderson', test: [{"test.number": '123'}, {"test.number": '123'}]})).to.throw();
-    });
-
-    it('create a document with prohibited character . inside of an object', () => {
-        expect(() => this.srla.db[this.collectionName].insertOne({name: 'Anderson', test: {"test.number": '123'}})).to.throw();
-    });
-
-    /*it('get a document by his subfield using test.inscription', () => {
-        this.srla.db[this.collectionName].insertMany([
-            {name: 'Anderson', test: {inscription: 123}},
-            {name: 'Arruda', test: {inscription: 321}},
-            {name: 'Sorla', test: {inscription: 213}}
-        ]);
-        expect(this.srla.db[this.collectionName].findOne({'test.inscription': 123}).length).to.equal(1);
-    });
-
-    it('Try to create a document without beeing a valid object', () => {
-        expect(() => this.srla.db[this.collectionName].insertOne('Anderson')).to.throw();
-    });
-
-    it('Try to create a document with array', () => {
-        expect(() => this.srla.db[this.collectionName].insertOne(['Anderson'])).to.throw();
-    });
-
-    it('Try to create many documents without beeing a valid array', () => {
-        expect(() => this.srla.db[this.collectionName].insertMany('Anderson')).to.throw();
-    });
-
-    it('Try to create many documents without having valid object', () => {
-        expect(() => this.srla.db[this.collectionName].insertMany([{test: '123', }, 'anderson'])).to.throw();
-    });*/
+const chai = require('chai')
+const expect = chai.expect
+const faker = require('faker')
+const sorla = require('../src/sorla.js')
+
+describe('SORLA Collection Feature Test', () => {
+    beforeAll(() => {
+        this.srla = new sorla();
+        this.dbname = faker.random.word();
+        this.srla.createDb(this.dbname);
+        this.srla.useDb(this.dbname);
+    });
+
+    let sequence = 0;
+    beforeEach(() => {
+        // random words repeat or clash with database properties ("name"), so make them unique
+        this.collectionName = `collection_${++sequence}`;
+        this.srla.db.createCollection(this.collectionName);
+    });
+
+    it('Create a single document inside of a collection and check by length', () => {
+        this.srla.db[this.collectionName].insertOne({name: 'Anderson'});
+        expect(this.srla.db[this.collectionName].count()).to.equal(1);
+    });
+
+    it('create multiple documents and check by length', () => {
+        this.srla.db[this.collectionName].insertMany([
+            {name: 'Anderson'},
+            {name: 'Arruda'},
+            {name: 'Sorla'}
+        ]);
+        expect(this.srla.db[this.collectionName].count()).to.equal(3);
+    });
+
+    it('create a document with prohibited character $', () => {
+        expect(() => this.srla.db[this.collectionName].insertOne({name: 'Anderson', $test: '123'})).to.throw();
+    });
+
+    it('create a document with prohibited character .', () => {
+        expect(() => this.srla.db[this.collectionName].insertOne({"name.name": 'Anderson', test: {test: '123'}})).to.throw();
+    });
+
+    it('create a document with prohibited character . inside of an array', () => {
+        expect(() => this.srla.db[this.collectionName].insertOne({name: 'Anderson', test: [{"test.number": '123'}, {"test.number": '123'}]})).to.throw();
+    });
+
+    it('create a document with prohibited character . inside of an object', () => {
+        expect(() => this.srla.db[this.collectionName].insertOne({name: 'Anderson', test: {"test.number": '123'}})).to.throw();
+    });
+
+    /*it('get a document by his subfield using test.inscription', () => {
+        this.srla.db[this.collectionName].insertMany([
+            {name: 'Anderson', test: {inscription: 123}},
+            {name: 'Arruda', test: {inscription: 321}},
+            {name: 'Sorla', test: {inscription: 213}}
+        ]);
+        expect(this.srla.db[this.collectionName].findOne({'test.inscription': 123}).length).to.equal(1);
+    });
+
+    it('Try to create a document without beeing a valid object', () => {
+        expect(() => this.srla.db[this.collectionName].insertOne('Anderson')).to.throw();
+    });
+
+    it('Try to create a document with array', () => {
+        expect(() => this.srla.db[this.collectionName].insertOne(['Anderson'])).to.throw();
+    });
+
+    it('Try to create many documents without beeing a valid array', () => {
+        expect(() => this.srla.db[this.collectionName].insertMany('Anderson')).to.throw();
+    });
+
+    it('Try to create many documents without having valid object', () => {
+        expect(() => this.srla.db[this.collectionName].insertMany([{test: '123', }, 'anderson'])).to.throw();
+    });*/
 });