Allow parse queries to array

Author: fanatid

index.js

@@ -20,23 +20,34 @@ function parseLine (line) {
   return { type: 'query', value: line }
 }
 
-function parseText (text) {
-  let lastTag = null
+function arrayToObject (queries) {
+  return queries.reduce((obj, item) => {
+    obj[item.name] = item.query
+    return obj
+  }, {})
+}
+
+function parseTextToArray (text) {
   let lastLine = null
+  let lastTag = null
+
+  const queries = []
+  function pushQuery (name, query) {
+    const obj = queries.find((query) => query.name === name)
+    if (obj) obj.query += ' ' + query
+    else queries.push({ name, query })
+  }
 
-  return text.split('\n').reduce((queries, line) => {
-    line = parseLine(line)
+  for (const lineRaw of text.split('\n')) {
+    const line = parseLine(lineRaw)
     switch (line.type) {
       case 'blank':
       case 'comment':
         break
 
       case 'query':
         if (lastTag === null) throw new Error('Query without tag')
-
-        let query = line.value
-        if (queries[lastTag] !== undefined) query = queries[lastTag] + ' ' + query
-        queries[lastTag] = query
+        pushQuery(lastTag, line.value)
 
         break
 
@@ -48,10 +59,17 @@ function parseText (text) {
     }
 
     lastLine = line
-    return queries
-  }, {})
+  }
+
+  return queries
+}
+
+function parseTextToObject (text) {
+  return arrayToObject(parseTextToArray(text))
 }
 
 module.exports = {
-  parseText
+  parseTextToArray,
+  parseTextToObject,
+  parseText: parseTextToObject
 }

package.json

@@ -27,7 +27,7 @@
     "unit": "node test/*.js"
   },
   "devDependencies": {
-    "standard": "^10.0.3",
-    "tape": "^4.8.0"
+    "standard": "^12.0.1",
+    "tape": "^4.9.1"
   }
 }

test/parse-text-fixtures.json

@@ -2,6 +2,12 @@
   "name": "simple",
   "text": "-- name: selectAll\nSELECT * FROM table_name; -- comment",
   "queries": {
-    "selectAll": "SELECT * FROM table_name;"
+    "obj": {
+      "selectAll": "SELECT * FROM table_name;"
+    },
+    "array": [{
+      "name": "selectAll",
+      "query": "SELECT * FROM table_name;"
+    }]
   }
 }]

test/parse-text.js

@@ -4,8 +4,11 @@ const fixtures = require('./parse-text-fixtures.json')
 
 for (const fixture of fixtures) {
   test(`fixture#${fixture.name}`, (t) => {
-    const queries = jsyesql.parseText(fixture.text)
-    t.same(queries, fixture.queries)
+    const arr = jsyesql.parseTextToArray(fixture.text)
+    t.same(arr, fixture.queries.array)
+
+    const obj = jsyesql.parseTextToObject(fixture.text)
+    t.same(obj, fixture.queries.obj)
 
     t.end()
   })