flexible get() query

and get the result returned as Object if there is a sense in get query, otherwise Boolean (`false`) return.

Author: khensolomon

README.md

@@ -1,45 +1,50 @@
 # myanmar-notation
-...get Myanmar digital and notation
+...`get()` Myanmar digital and notation
 
 Install `npm i myanmar-notation` then require...
 
 
 ```js
 let notation = require('myanmar-notation');
 ```
-and get the results...
+... and get the result returned as Object if there is a sense in get query, otherwise Boolean (`false`) return.
+
+- [x] Return formatted Numeric
+- [x] Decimals are rounded (floor)
+- [x] Query `get(2700)`, `get('၂၇ဝဝ')`, `get('2,700.00')` is flexible
+
 ```js
-let result = notation.get('2700');
-// the result returned as Object
+notation.get('2700');
+// return
 {
   "Numeric": "၂,၇ဝဝ",
-  "Notation": [{
-    "sense": "နှစ်ထောင်နှင့် ခုနစ်ရာ"
-  }]
+  "Notation": [
+    {
+      "sense": "နှစ်ထောင်နှင့် ခုနစ်ရာ"
+    }
+  ]
 }
 
-let result = notation.get('27000000');
+notation.get('27000000');
+// return
 {
   "Numeric": "၂၇,ဝဝဝ,ဝဝဝ",
-  "Notation": [{
-      "sense": "သိန်းပေါင်း နှစ်ရာ့ခုနစ်ဆယ်",
-      "exam": {
-        "1": 22
-      }
+  "Notation": [
+    {
+      "sense": "သိန်းပေါင်း နှစ်ရာ့ခုနစ်ဆယ်"
     },
     {
-      "sense": "သန်းပေါင်း နှစ်ဆယ့်ခုနစ်",
-      "exam": {
-        "1": 22
-      }
+      "sense": "သန်းပေါင်း နှစ်ဆယ့်ခုနစ်"
     },
     {
       "sense": "နှစ်ကု​ဋေ​နှင့် ခုနစ်သန်း"
     }
   ]
 }
+
 // Reverse
-let result = notation.get('၈၆ဝ');
+notation.get('၈၆ဝ');
+// return
 {
   "Numeric": "860",
   "Notation": [

notation.js

@@ -26,7 +26,7 @@ module.exports = class Notation {
     return this.config.conjunction;
   }
   get(query) {
-    let q=Number(query).toString(),t=0;
+    let q=Math.floor(Number(query.replace(/,\s?/g, ""))).toString(),t=0;
     if (isNaN(q)){
       q=this.getUni(query),t=1;
       if (q<1 || isNaN(q)) return false;
@@ -35,12 +35,12 @@ module.exports = class Notation {
   }
   getUni(query) {
     let n = query.toString().split('').map(k=> {
-      if (this.config.digit.indexOf(k) >= 0) return this.config.digit.indexOf(k);
+      return (this.config.digit.indexOf(k) >= 0)?this.config.digit.indexOf(k):k;
     }).filter(function(e){return e == 0 || e}).join('');
-    return Number(n).toString();
+    return Math.floor(Number(n.replace(/,\s?/g, ""))).toString();
   }
   getResult(q,t) {
-    let n = this.requestFormat(q); // m = this.requestDigit(n);
+    let n = this.requestFormat(q);
     return {
       Numeric:(t)?n:this.requestDigit(n),
       Notation:this.config.task.map(k=>{
@@ -54,7 +54,7 @@ module.exports = class Notation {
         this.config.task=[];
         return {
           // "sense":this.requestCreakyTone(q)
-          "sense":this.requestNormalTone(q)
+          "sense":this.requestWrittenTone(q)
         }
       }
       return false;
@@ -82,7 +82,7 @@ module.exports = class Notation {
         // prime, base, baseName, rest, restName, tail, tailName
         rawSense.push(this.requestPrime(rulePrime,s)+this.requestCreakyTone(q,0,ruleExtract));
         rawSense.push(this.requestCreakyTone(q,rulePrime, s+1));
-        rawSense.push(this.requestNormalTone(q,s+1, q.length));
+        rawSense.push(this.requestWrittenTone(q,s+1, q.length));
         examNotation={
           1:21
         };
@@ -96,11 +96,8 @@ module.exports = class Notation {
         rawSense.push(this.requestPrime(rulePrime,s,true)+this.requestCreakyTone(q,0,ruleExtract));
         rawSense.push(this.requestCreakyTone(q,ruleExtract, q.length));
 
-        examNotation={
-          1:22
-        };
+        examNotation={1:22};
       }
-
     } else {
       if (s == rawEndCount) {
         ruleExtract=rawCount;
@@ -111,10 +108,7 @@ module.exports = class Notation {
 
         rawSense.push(this.requestPrime(rulePrime,s)+this.requestCreakyTone(q,0,ruleExtract)+rawOver);
 
-        examNotation={
-          test:'??',
-          1:31
-        };
+        examNotation={1:31};
       } else {
         let abc=false;
         ruleExtract=rawCount-1+rawEndCount;
@@ -169,7 +163,7 @@ module.exports = class Notation {
       return k.name+k.tone;
     }).join('')
   }
-  requestNormalTone(num,from,to) {
+  requestWrittenTone(num,from,to) {
     let str = this.strIntersect(num,from,to);
     return this.requestObject(str,(position,next,tone)=>{
       return tone;
@@ -217,7 +211,6 @@ module.exports = class Notation {
     return e;
   }
   strIntersect(str,from,to) {
-    // str.toString()
     if (to){
       return str.substring(from, to).split('');
     } else{

package.json

@@ -1,6 +1,6 @@
 {
   "name": "myanmar-notation",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "get Myanmar digital and notation",
   "main": "index.js",
   "scripts": {

test.js

@@ -1,14 +1,30 @@
 const fs = require('fs');
 let notation = require('./notation');
 let query = process.argv.slice(2)[0];
-// query = '၁,၂ဝဝဝဝဝ';
-query = '၈၆ဝ';
+// query = '10,000';
+// query = '၁,၂ဝဝဝဝဝ.၂ဝ';
+// query = '၈၆ဝ';
 
 let raw = new notation().get(query);
-// raw.Query=query;
+raw.Query=query;
 fs.writeFile("./test.json", JSON.stringify(raw, null, 2), 'utf8', function (err) {
     if (err) {
         return console.log(err);
     }
     console.log(" ...done");
-});
+});
+/*
+100000
+000000
+->10
+
+100000
+000000
+000000
+
+100000
+000000
+000000
+000000
+
+*/

test.json

@@ -1,8 +1,9 @@
 {
-  "Numeric": "860",
+  "Numeric": "၄၅",
   "Notation": [
     {
-      "sense": "ရှစ်ရာနှင့် ခြောက်ဆယ်"
+      "sense": "လေးဆယ်နှင့် ငါး"
     }
-  ]
+  ],
+  "Query": "45"
 }