move count into SqlContainer (#9)

yannvgn · lucleray · commit d0c7ead1c0c7 · 2018-09-18T18:53:58.000+02:00
diff --git a/sql.js b/sql.js
@@ -10,11 +10,11 @@ const sqlText = (count, chains, expressions) => {
       text += chains[i + 1]
     } else if (expression && expression._sql instanceof SqlContainer) {
       // if expression is a sub `sql` template literal
-      const { text: _text, values: _values, count: _count } = sqlText(
-        count,
-        expression._sql.chains,
-        expression._sql.expressions
-      )
+      const {
+        text: _text,
+        values: _values,
+        _sql: { count: _count }
+      } = sqlText(count, expression._sql.chains, expression._sql.expressions)
       count = _count
       text += _text + chains[i + 1]
       values.push(..._values)
@@ -27,10 +27,9 @@ const sqlText = (count, chains, expressions) => {
   }
 
   return {
-    _sql: new SqlContainer(chains, expressions),
+    _sql: new SqlContainer(chains, expressions, count),
     text,
-    values,
-    count
+    values
   }
 }
 
@@ -40,9 +39,10 @@ const sql = (chains, ...expressions) => {
 }
 
 class SqlContainer {
-  constructor(chains, expressions) {
+  constructor(chains, expressions, count) {
     this.chains = chains
     this.expressions = expressions
+    this.count = count
   }
 }
 
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -14,9 +14,14 @@ declare module '@sequencework/sql' {
     }
 
     class SqlContainer {
-      constructor(chains: ReadonlyArray<string>, expressions: any[])
+      constructor(
+        chains: ReadonlyArray<string>,
+        expressions: any[],
+        count: number
+      )
       readonly chains: ReadonlyArray<string>
       readonly expressions: any[]
+      readonly count: number
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,14 @@ declare module '@sequencework/sql' {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`class SqlContainer {`
`17`		`- constructor(chains: ReadonlyArray<string>, expressions: any[])`
	`17`	`+ constructor(`
	`18`	`+ chains: ReadonlyArray<string>,`
	`19`	`+ expressions: any[],`
	`20`	`+ count: number`
	`21`	`+ )`
`18`	`22`	`readonly chains: ReadonlyArray<string>`
`19`	`23`	`readonly expressions: any[]`
	`24`	`+ readonly count: number`
`20`	`25`	`}`
`21`	`26`	`}`
`22`	`27`