hola-server 0.5.5 → 0.6.1

package/core/number.js

@@ -167,12 +167,12 @@ const random_sample = (obj) => {
  * @returns 
  */
 const extract_number = (value) => {
-    const number = value.match(/[+\-0-9\\.]+/g);
-    if (!number) {
+    const numbers = value.match(/([+\-0-9\\.]+)/g);
+    if (!numbers) {
         return 0;
     }
 
-    const values = number.map(Number);
+    const values = numbers.map(Number).filter(v => has_value(v));
     return values.length == 1 ? values[0] : 0;
 }
 

package/core/validate.js

@@ -3,7 +3,7 @@ const is_undefined = function (value) {
 }
 
 const has_value = function (value) {
-    if (value === undefined || value === null) {
+    if (value === undefined || value === null || isNaN(value)) {
         return false
     }
     if (typeof value == 'undefined') {

package/db/entity.js

@@ -138,6 +138,15 @@ class Entity {
                 }
             }
 
+            if (param_obj["_id"] && param_obj["_id"].trim().length > 0) {
+                const ids = param_obj["_id"].split(",");
+                if (ids.length == 1) {
+                    and_array.push(oid_query(ids[0]));
+                } else if (ids.length > 1) {
+                    and_array.push(oid_queries(ids));
+                }
+            }
+
             if (and_array.length > 0) {
                 query["$and"] = and_array;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.5.5",
+  "version": "0.6.1",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {

package/test/core/number.js

@@ -0,0 +1,17 @@
+const { strictEqual } = require('assert');
+const { extract_number } = require('../../core/number');
+
+describe('number', function () {
+    describe('test number related method', function () {
+        it('should extract number successfully', function () {
+            strictEqual(extract_number("123"), 123);
+            strictEqual(extract_number("123 abc"), 123);
+            strictEqual(extract_number("123 abc . efg"), 123);
+            strictEqual(extract_number(" abc 134.56 efg"), 134.56);
+            strictEqual(extract_number(" abc 134.56 efg . rg"), 134.56);
+            strictEqual(extract_number(" abc 134.56 efg 123 rg"), 0);
+            strictEqual(extract_number("123.67"), 123.67);
+        });
+    });
+}
+);