gina 0.1.6-alpha.16 → 0.1.6-alpha.161

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.161}/lib/cmd/protocol/list.js

@@ -13,12 +13,12 @@ var console = lib.logger;
  *
  * */
 function List(opt, cmd) {
-    
+
     // self will be pre filled if you call `new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled })`
     var self = {}, local = {};
 
-    var init = function() {      
-        //debugger;  
+    var init = function() {
+        //debugger;
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
@@ -56,7 +56,7 @@ function List(opt, cmd) {
 
 
     var listAllByProject = function() {
-        
+
         var protocols       = null
             , schemes       = null
             , projects      = self.projects
@@ -78,7 +78,7 @@ function List(opt, cmd) {
 
         p = 0;
         for (; p < list.length; ++p) {
-                           
+
             str += '------------------------------------\n\r';
             if (!projects[list[p]].exists) {
                 str += '?! '
@@ -87,61 +87,62 @@ function List(opt, cmd) {
             str += '------------------------------------\n\r';
             protocols = projects[list[p]].protocols;
             schemes = projects[list[p]].schemes;
-            
+
             if (!protocols) continue;
-            
+
             str += '      Protocol(s)        Scheme(s)\n\r';
-            
-            
+
+
             indexObj = {}; index = 2;
             i = 0; len = protocols.length;
             for (; i < len; ++i) {
-                protocolStr = '';               
-                if (self.defaultProtocol == protocols[i]) {
+                protocolStr = '';
+                if (projects[list[p]].def_protocol == protocols[i]) {
                     protocolStr += '[ * ] ' + protocols[i]
                 } else {
                     protocolStr += '[   ] ' + protocols[i]
-                }                
-                
+                }
+
                 if ( (index % 2) == 0 ){
                     indexObj[index] = protocolStr;
                     index += 2
                 }
             }
-            
-            
+
+
             index = 3;
             i = 0; len = schemes.length;
             for (; i < len; ++i) {
                 schemeStr = '';
-                if (self.defaultScheme == schemes[i]) {
+                if (projects[list[p]].def_scheme == schemes[i]) {
                     schemeStr += '           [ * ] ' + schemes[i]
                 } else {
                     schemeStr += '           [   ] ' + schemes[i]
                 }
-                      
+
                 if ( (index % 2) != 0 ){
                     indexObj[index] = schemeStr;
-                    index += 2               
-                }                   
+                    index += 2
+                }
             }
-            
+
             i = null;
             for (i in indexObj) {
                 str += indexObj[i];
                 if ( (~~i % 3) == 0 ){
                     str += '\n\r'
-                }                
-            }            
-            
+                }
+            }
+
             str += '\n\r'
         }
-        
-        console.log(str)
+
+        console.log(str);
+        end();
     }
 
     var listByBundle = function(bundleName) {
-        
+
         var protocols       = null
             , schemes       = null
             , bundles       = self.bundlesByProject[self.projectName]
@@ -155,7 +156,7 @@ function List(opt, cmd) {
             , indexObj      = null
             , index         = null
         ;
-        
+
         if ( typeof(bundleName) != 'undefined' ) {
             list.push(bundleName)
         } else {
@@ -165,44 +166,44 @@ function List(opt, cmd) {
             list.sort();
         }
 
-        
+
 
         p = 0;
         for (; p < list.length; ++p) {
-                        
-            
+
+
             str += '------------------------------------\n\r';
             if (!bundles[list[p]].exists) {
                 str += '?! '
             }
             str += list[p] + '\n\r';
             str += '------------------------------------\n\r';
-            
+
             protocols = bundles[list[p]].protocols;
-            schemes = bundles[list[p]].schemes;            
+            schemes = bundles[list[p]].schemes;
             if (!protocols || protocols.length == 0) continue;
-            
-            
+
+
             str += '      Protocol(s)        Scheme(s)\n\r';
-            
-            
+
+
             indexObj = {}; index = 2;
             i = 0; len = protocols.length;
             for (; i < len; ++i) {
-                protocolStr = '';               
+                protocolStr = '';
                 if (bundles[list[p]].def_protocol == protocols[i]) {
                     protocolStr += '[ * ] ' + protocols[i]
                 } else {
                     protocolStr += '[   ] ' + protocols[i]
-                }                
-                
+                }
+
                 if ( (index % 2) == 0 ){
                     indexObj[index] = protocolStr;
                     index += 2
                 }
             }
-            
-            
+
+
             index = 3;
             i = 0; len = schemes.length;
             for (; i < len; ++i) {
@@ -212,27 +213,47 @@ function List(opt, cmd) {
                 } else {
                     schemeStr += '           [   ] ' + schemes[i]
                 }
-                      
+
                 if ( (index % 2) != 0 ){
                     indexObj[index] = schemeStr;
-                    index += 2               
-                }                   
+                    index += 2
+                }
             }
-            
+
             i = null;
             for (i in indexObj) {
                 str += indexObj[i];
                 if ( (~~i % 3) == 0 ){
                     str += '\n\r'
-                }                
-            }            
-            
+                }
+            }
+
             str += '\n\r'
         }
-        
-        console.log(str)
+
+        console.log(str);
+        end();
     };
 
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init()
 };
 

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.161}/lib/collection/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "collection",
+  "name": "gina-lib-collection",
   "version": "1.0.0",
   "description": "Collections hanlder",
 
@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2026 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.161}/lib/collection/src/main.js

@@ -13,6 +13,7 @@ if ( typeof(module) !== 'undefined' && module.exports ) {
  *
  * @param {array} collection
  * @param {object} [options]
+ *      TODO - eg.: deduplicat: true
  *
  * @returns {object} instance
  *
@@ -60,7 +61,8 @@ function Collection(content, options) {
             true: {
                 re: '^%s$'
             }
-        }
+        },
+        skipEval: false
     };
     var withOrClause = false;
     var notInSearchModeEnabled = false;
@@ -100,7 +102,12 @@ function Collection(content, options) {
         if (!content[entry]) {
             content[entry] = {};
         }
-        content[entry]._uuid = uuid.v4();
+        if ( typeof(content[entry]._uuid) != 'undefined' ) {
+            content[entry]._hasItsOwnUuid = true;
+        } else {
+            content[entry]._uuid = uuid.v4();
+        }
+
         // To avoid duplicate entries
         searchIndex[idx] = content[entry]._uuid;
         ++idx;
@@ -113,13 +120,13 @@ function Collection(content, options) {
      * eg.:
      *  var recCollection = new Collection(arrayCollection);
      *  var rec =  recCollection
-     *                  .setSearchOption('name', 'isCaseSensitive', false)
+     *                  .setSearchOption('city', 'isCaseSensitive', false)
      *                  .find({ city: 'cap Town' });
      *
      * eg.:
      *  var recCollection = new Collection(arrayCollection);
      *  var searchOptions = {
-     *      name: {
+     *      city: {
      *          isCaseSensitive: false
      *      }
      *  };
@@ -145,7 +152,7 @@ function Collection(content, options) {
             , len   = arguments.length
         ;
 
-        if (arguments.length == 1) {
+        if (len == 1) {
             if ( typeof(arguments[0]) != 'object' )
                 throw new Error('searchOption must be an object');
 
@@ -245,11 +252,17 @@ function Collection(content, options) {
              * @param {number} matched
              */
             var search = function(filter, field, _content, matched, searchOptionRules) {
-                var reValidCount = null, searchOptCount = null;
-                if (filter === null && _content === null) { // null case
+                if (
+                    localSearchOptions
+                    && typeof(localSearchOptions[field]) != 'undefined'
+                ) {
+                    searchOptionRules = merge(localSearchOptions, searchOptionRules);
+                }
 
+                var reValidCount = null, searchOptCount = null;
+                 // null case
+                if (filter === null && _content === null) {
                     ++matched;
-
                 } else if (
                     filter
                     && keywords.indexOf(localeLowerCase) > -1
@@ -269,6 +282,7 @@ function Collection(content, options) {
                     && typeof(_content) !== 'object'
                     && /(<|>|=)/.test(filter)
                     && !/undefined|function/.test(typeof(_content))
+                    && !searchOptionRules.skipEval
                 ) { // with operations
                     let originalFilter = filter;
                     let condition = _content + filter;
@@ -306,6 +320,12 @@ function Collection(content, options) {
                     && typeof(_content) !== 'object'
                     && _content === filter
                     && typeof(searchOptions[field]) == 'undefined'
+                    ||
+                    typeof(_content) != 'undefined'
+                    && typeof(_content) !== 'object'
+                    && _content === filter
+                    && typeof(searchOptions[field]) != 'undefined'
+                    && searchOptionRules.skipEval
                 ) {
 
                     ++matched;
@@ -315,10 +335,13 @@ function Collection(content, options) {
                     && searchOptions
                     && typeof(searchOptions[field]) != 'undefined'
                 ) {
-
                     reValidCount    = 0;
                     searchOptCount  = searchOptions[field].count();
-                    for ( var rule in searchOptions[field]) {
+                    for ( let rule in searchOptions[field]) {
+                        if ( typeof(searchOptionRules[rule][searchOptions[field][rule]]) == 'undefined' ) {
+                            continue
+                        }
+
                         searchOptionRules[rule][searchOptions[field][rule]].re = searchOptionRules[rule][searchOptions[field][rule]].re.replace(/\%s/, filter);
 
                         if (searchOptionRules[rule][searchOptions[field][rule]].modifiers) {
@@ -414,7 +437,7 @@ function Collection(content, options) {
 
                 field = arr[1];
                 if (/^\./.test(field) )
-                    field = field.substr(1);
+                    field = field.substring(1);
 
                 var subMatched = 0;
                 if (collection) {
@@ -565,6 +588,7 @@ function Collection(content, options) {
      *
      * Available options :
      *  isCaseSensitive: [true|false] - set to true by default
+     *  skipEval: [true|false] - set to false by default
      *
      * @param {object} filter
      *
@@ -741,15 +765,15 @@ function Collection(content, options) {
             }
 
             // fast search with key
-            var r       = 0
-                , rLen  = foundResults.length
-                , c     = 0
-                , cLen  = currentResult.length
-                , f     = 0
-                , fLen  = filters.count()
-                , keyLen    = null
-                , matched = 0
-                , fullFiltersMatched = 0
+            var r                       = 0
+                , rLen                  = foundResults.length
+                , c                     = 0
+                , cLen                  = currentResult.length
+                , f                     = 0
+                , fLen                  = filters.count()
+                , keyLen                = null
+                , matched               = 0
+                , fullFiltersMatched    = 0
             ;
             if ( uuidSearchModeEnabled && typeof(currentResult[c]) != 'undefined' && currentResult[c].hasOwnProperty(key) ) {
                 // for every single result found
@@ -1056,7 +1080,7 @@ function Collection(content, options) {
      *
      *  N.B.: will not affect current result - just returning the DIFF
      *  If you
-     * @param {object} filter - samme as `.find(filter)`
+     * @param {object} filter - same as `.find(filter)`
      * @param {string|boolean} [ uuid | disabled ] - by default, Collection is using its internal _uuid
      * If you want to delete without key comparison, disable `uuid` search mode
      * .delete({ name: 'Jordan' }, false)
@@ -1210,6 +1234,13 @@ function Collection(content, options) {
 
 
                     if ( typeof(a) == 'string' && a != '' ||  typeof(b) == 'string' ) {
+                        // Fixed on 2025-03-08: allowed to compare with one of the fields being NULL or not defined
+                        if ( typeof(a) == 'undefined' || a == null) {
+                            a = ''; // cast to string
+                        }
+                        if ( typeof(b) == 'undefined' || b == null) {
+                            b = ''; // cast to string
+                        }
 
                         if ( typeof(a) == 'number' ) {
                             a = ''+a; // cast to string
@@ -1218,6 +1249,7 @@ function Collection(content, options) {
                             b = ''+b; // cast to string
                         }
 
+
                         return a.localeCompare(b, undefined, {sensitivity: 'case', caseFirst: 'upper'})
                     }
 
@@ -1387,9 +1419,16 @@ function Collection(content, options) {
         var result = ( Array.isArray(this) ) ? this.slice() : content.slice();
         // cleanup
         for (var i = 0, len = result.length; i < len; ++i) {
-            if (result[i]._uuid)
+            if (result[i]._hasItsOwnUuid) {
+                let hasItsOwnUuid = (/^true$/i.test(result[i]._hasItsOwnUuid) ) ? true : false;
+                delete result[i]._hasItsOwnUuid;
+                if (hasItsOwnUuid) {
+                    continue;
+                }
+            }
+            if (result[i]._uuid) {
                 delete result[i]._uuid;
-
+            }
         }
 
         // return JSON.clone(result);

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.161}/lib/config.js

@@ -1,7 +1,7 @@
 /* Gina.Lib.Config
  *
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2026 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.161}/lib/cron/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "cron",
+  "name": "gina-lib-cron",
   "version": "1.0.0",
   "description": "Crons hanlder",
 
@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2026 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },