Fixed numeric query

added Query.toString()
fixed formatting

Author: khensolomon

README.md

@@ -11,7 +11,7 @@ let notation = require('myanmar-notation');
 
 - [x] Return formatted Numeric
 - [x] Decimals are rounded (floor)
-- [x] Query `get(2700)`, `get('၂၇ဝဝ')`, `get('2,700.00')` is flexible
+- [x] Query `get(2700)`, `get('၂၇ဝဝ')`, `get('27,000,000.00')` is flexible
 
 ```js
 notation.get('2700');
@@ -25,31 +25,30 @@ notation.get('2700');
   ]
 }
 
-notation.get('27000000');
+notation.get('၂၇ဝဝ');
 // return
 {
-  "Numeric": "၂၇,ဝဝဝ,ဝဝဝ",
+  "Numeric": "2,700",
   "Notation": [
     {
-      "sense": "သိန်းပေါင်း နှစ်ရာ့ခုနစ်ဆယ်"
-    },
-    {
-      "sense": "သန်းပေါင်း နှစ်ဆယ့်ခုနစ်"
-    },
-    {
-      "sense": "နှစ်ကု​ဋေ​နှင့် ခုနစ်သန်း"
+      "sense": "နှစ်ထောင်နှင့် ခုနစ်ရာ"
     }
   ]
 }
 
-// Reverse
-notation.get('၈၆ဝ');
+notation.get('27,000,000.00');
 // return
 {
-  "Numeric": "860",
+  "Numeric": "၂၇,ဝဝဝ,ဝဝဝ",
   "Notation": [
     {
-      "sense": "ရှစ်ရာနှင့် ခြောက်ဆယ်"
+      "sense": "သိန်းပေါင်း နှစ်ရာ့ ခုနစ်ဆယ်"
+    },
+    {
+      "sense": "သန်းပေါင်း နှစ်ဆယ့် ခုနစ်"
+    },
+    {
+      "sense": "နှစ်ကု​ဋေ​နှင့် ခုနစ်သန်း"
     }
   ]
 }

index.js

@@ -3,10 +3,10 @@ module.exports = {
   get:function (q) {
     return new notation().get(q);
   },
-  getCreaky:function (q) {
-  },
-  getNormal:function (q) {
-  },
+  // getCreaky:function (q) {
+  // },
+  // getNormal:function (q) {
+  // },
   name:function () {
     return new notation().configName();
   },

notation.js

@@ -26,7 +26,7 @@ module.exports = class Notation {
     return this.config.conjunction;
   }
   get(query) {
-    let q=Math.floor(Number(query.replace(/,\s?/g, ""))).toString(),t=0;
+    let q=Math.floor(Number(query.toString().replace(/,\s?/g, ""))).toString(),t=0;
     if (isNaN(q)){
       q=this.getUni(query),t=1;
       if (q<1 || isNaN(q)) return false;
@@ -53,8 +53,8 @@ module.exports = class Notation {
       if (this.config.task.length) {
         this.config.task=[];
         return {
-          // "sense":this.requestCreakyTone(q)
-          "sense":this.requestWrittenTone(q)
+          // sense:this.requestCreakyTone(q)
+          sense:this.requestWrittenTone(q)
         }
       }
       return false;
@@ -83,9 +83,7 @@ module.exports = class Notation {
         rawSense.push(this.requestPrime(rulePrime,s)+this.requestCreakyTone(q,0,ruleExtract));
         rawSense.push(this.requestCreakyTone(q,rulePrime, s+1));
         rawSense.push(this.requestWrittenTone(q,s+1, q.length));
-        examNotation={
-          1:21
-        };
+        // examNotation={1:21};
       } else {
         if (rawCount > rawEndCount) {
           ruleExtract=rawCount;
@@ -95,8 +93,7 @@ module.exports = class Notation {
         rulePrime=1;
         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) {
@@ -105,40 +102,48 @@ module.exports = class Notation {
         if (Number(q.substring(ruleExtract, q.length))){
           rawOver=this.config.conjunction.over;
         }
-
         rawSense.push(this.requestPrime(rulePrime,s)+this.requestCreakyTone(q,0,ruleExtract)+rawOver);
-
-        examNotation={1:31};
+        // examNotation={1:31};
       } else {
-        let abc=false;
         ruleExtract=rawCount-1+rawEndCount;
         rulePrime=rawCount-1;
         // ruleExtract=rawCount;
         if (ruleExtract > ruleMax){
           ruleExtract=rawEndCount-3;
           rulePrime=rawCount;
-          abc=true;
         }
         let rawOver='';
-        if (Number(q.substring(ruleExtract, q.length))){
+        // if (Number(q.substring(ruleExtract, q.length))){
+        //   rawOver=this.config.conjunction.over;
+        // }
+        let leftOver = q.substring(ruleExtract, q.length);
+        if (Number(leftOver)){
           rawOver=this.config.conjunction.over;
+          // leftOver = q.substring(ruleExtract, q.length-s);
+          leftOver = q.substring(ruleExtract, q.length-s);
         }
 
         rawSense.push(this.requestPrime(rulePrime,s)+this.requestCreakyTone(q,0,ruleExtract)+rawOver);
-        examNotation={
-          abc:abc,
-          1:32
-        };
+        // examNotation={
+        //   working:true,
+        //   a1:q,
+        //   a2:q.substring(0,ruleExtract),
+        //   a3:leftOver,
+        //   a4:leftOver.length,
+        //   a5:this.strSeparate(q.substring(ruleExtract, q.length),ruleExtract),
+        //   raw:raw
+        // };
       }
     }
 
     return {
       sense:this.createString(rawSense),
-      exam: examNotation
+      // exam: examNotation
     };
   }
   requestObject(str,callback) {
     let strCount = str.length, e=[];
+    // let testing = this.config.tone.reverse()
     // let strReverse = str.reverse(); index += to, ++index
     for (let index = 0; index < strCount;++index){
       let position = strCount - index;
@@ -161,7 +166,7 @@ module.exports = class Notation {
       return tone;
     }).map((k,index)=>{
       return k.name+k.tone;
-    }).join('')
+    }).join(' ')
   }
   requestWrittenTone(num,from,to) {
     let str = this.strIntersect(num,from,to);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "myanmar-notation",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "get Myanmar digital and notation",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,8 @@
     "Myanmar",
     "Number",
     "Notation",
-    "Convertor"
+    "Convertor",
+    "Num2Word"
   ],
   "author": "Khen Solomon Lethil",
   "license": "MIT",

test.js

@@ -1,9 +1,9 @@
 const fs = require('fs');
 let notation = require('./notation');
 let query = process.argv.slice(2)[0];
-// query = '10,000';
+// query = '27,000,000.00';
 // query = '၁,၂ဝဝဝဝဝ.၂ဝ';
-// query = '၈၆ဝ';
+// query = '၂၇ဝဝ';
 
 let raw = new notation().get(query);
 raw.Query=query;
@@ -26,5 +26,4 @@ fs.writeFile("./test.json", JSON.stringify(raw, null, 2), 'utf8', function (err)
 000000
 000000
 000000
-
 */

test.json

@@ -1,9 +1,15 @@
 {
-  "Numeric": "၄၅",
+  "Numeric": "၁၂,၃၄၅,၆၇ဝ,ဝဝဝ,ဝဝဝ,ဝဝဝ,ဝဝဝ",
   "Notation": [
     {
-      "sense": "လေးဆယ်နှင့် ငါး"
+      "sense": "သိန်းပေါင်း သိန်းပေါင်း သိန်းတစ်သောင်း နှစ်ထောင့် သုံးရာ့ လေးဆယ့် ငါးကျော်"
+    },
+    {
+      "sense": "သန်းပေါင်း သန်းတစ်ကု​ဋေ​ နှစ်သန်း သုံးသိန်း လေးသောင်း ငါးထောင့် ခြောက်ရာ့ ခုနစ်ဆယ်"
+    },
+    {
+      "sense": "ကု​ဋေ​ပေါင်း ကု​ဋေ​တစ်သိန်း နှစ်သောင်း သုံးထောင့် လေးရာ့ ငါးဆယ့် ခြောက်ကျော်"
     }
   ],
-  "Query": "45"
+  "Query": "12345670000000000000"
 }