Refactoring of params

Author: lahmatiy

lib/params.js

@@ -1,38 +1,29 @@
 module.exports = class Params {
-    constructor(description = '') {
-        // params [..<required>] [..[optional]]
-        // <foo> - require
+    constructor(params = '', context) {
+        // params = ..<required> ..[optional]
+        // <foo> - required
         // [foo] - optional
-        let tmp;
-        let left = description.trim();
+        let left = params.trim();
+        let m;
 
-        this.minCount = 0;
-        this.maxCount = 0;
         this.args = [];
 
-        do {
-            tmp = left;
-            left = left.replace(/^<([a-z][a-z0-9\-\_]*)>\s*/i, (_, name) => {
-                this.args.push({ name, required: true });
-                this.minCount++;
-                this.maxCount++;
+        while (m = left.match(/^<([^>]+)>\s*/)) {
+            left = left.slice(m[0].length);
+            this.args.push({ name: m[1], required: true });
+        }
 
-                return '';
-            });
-        } while (tmp !== left);
+        this.minCount = this.args.length;
 
-        do {
-            tmp = left;
-            left = left.replace(/^\[([a-z][a-z0-9\-\_]*)\]\s*/i, (_, name) => {
-                this.args.push({ name, required: false });
-                this.maxCount++;
+        while (m = left.match(/^\[([^\]]+)\]\s*/)) {
+            left = left.slice(m[0].length);
+            this.args.push({ name: m[1], required: false });
+        }
 
-                return '';
-            });
-        } while (tmp !== left);
+        this.maxCount = this.args.length;
 
         if (left) {
-            throw new Error(`Bad parameter description "${description.trim()}" in ${context}`);
+            throw new Error(`Bad parameters description "${params.trim()}" in ${context}`);
         }
     }
 };