fix flat instead of custom function

Author: Gioee

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqlitecloud/drivers",
-  "version": "1.0.415",
+  "version": "1.0.416",
   "description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

src/drivers/utilities.ts

@@ -125,23 +125,14 @@ export function getUpdateResults(results?: any): Record<string, any> | undefined
   return undefined
 }
 
-/**
- * Allow compatibility with ORMs that call methods such as all(), get(), etc.
- * by passing parameters in an array
- */
-function removeDoubleArray(array: any[]): SQLiteCloudDataTypes[] {
-  if (Array.isArray(array) && array.length == 1 && Array.isArray(array[0])) {
-    return array[0]
-  }
-  return array
-}
-
 /**
  * Many of the methods in our API may contain a callback as their last argument.
  * This method will take the arguments array passed to the method and return an object
  * containing the arguments array with the callbacks removed (if any), and the callback itself.
  * If there are multiple callbacks, the first one is returned as 'callback' and the last one
  * as 'completeCallback'.
+ *
+ * @returns args is a simple list of SQLiteCloudDataTypes, we flat them into a single array
  */
 export function popCallback<T extends ErrorCallback = ErrorCallback>(
   args: (SQLiteCloudDataTypes | T | ErrorCallback)[]
@@ -151,11 +142,11 @@ export function popCallback<T extends ErrorCallback = ErrorCallback>(
   if (args && args.length > 0 && typeof args[args.length - 1] === 'function') {
     // at least 2 callbacks?
     if (args.length > 1 && typeof args[args.length - 2] === 'function') {
-      return { args: removeDoubleArray(remaining.slice(0, -2)), callback: args[args.length - 2] as T, complete: args[args.length - 1] as T }
+      return { args: remaining.slice(0, -2).flat(), callback: args[args.length - 2] as T, complete: args[args.length - 1] as T }
     }
-    return { args: removeDoubleArray(remaining.slice(0, -1)), callback: args[args.length - 1] as T }
+    return { args: remaining.slice(0, -1).flat(), callback: args[args.length - 1] as T }
   }
-  return { args: remaining }
+  return { args: remaining.flat() }
 }
 
 //

test/database.test.ts

@@ -138,6 +138,62 @@ describe('Database.all', () => {
     LONG_TIMEOUT
   )
 
+  it(
+    'select with one argument',
+    done => {
+      const chinook = getChinookDatabase()
+      chinook.all('SELECT * FROM tracks LIMIT ?', 1, (err: Error, rows: SQLiteCloudRowset) => {
+        expect(err).toBeNull()
+        expect(rows).toBeDefined()
+        expect(rows[0]).toMatchObject({
+          AlbumId: 1,
+          Bytes: 11170334,
+          Composer: 'Angus Young, Malcolm Young, Brian Johnson',
+          GenreId: 1,
+          MediaTypeId: 1,
+          Milliseconds: 343719,
+          Name: 'For Those About To Rock (We Salute You)',
+          TrackId: 1,
+          UnitPrice: 0.99
+        })
+
+        chinook.close(error => {
+          expect(error).toBeNull()
+          done()
+        })
+      })
+    },
+    LONG_TIMEOUT
+  )
+
+  it(
+    'select with one argument with array like ORMs',
+    done => {
+      const chinook = getChinookDatabase()
+      chinook.all('SELECT * FROM tracks LIMIT ?', [1], (err: Error, rows: SQLiteCloudRowset) => {
+        expect(err).toBeNull()
+        expect(rows).toBeDefined()
+        expect(rows[0]).toMatchObject({
+          AlbumId: 1,
+          Bytes: 11170334,
+          Composer: 'Angus Young, Malcolm Young, Brian Johnson',
+          GenreId: 1,
+          MediaTypeId: 1,
+          Milliseconds: 343719,
+          Name: 'For Those About To Rock (We Salute You)',
+          TrackId: 1,
+          UnitPrice: 0.99
+        })
+
+        chinook.close(error => {
+          expect(error).toBeNull()
+          done()
+        })
+      })
+    },
+    LONG_TIMEOUT
+  )
+
   it('select with empty space after semi-colon', done => {
     const chinook = getChinookDatabase()
     chinook.all('SELECT 1; ', (err: Error, rows: SQLiteCloudRowset) => {

test/statement.test.ts

@@ -110,6 +110,33 @@ it('Statement.all', done => {
   })
 })
 
+it('Statement.all like ORMs where parameters are passed as an array of bindings', done => {
+  const chinook = getChinookDatabase()
+  expect(chinook).toBeDefined()
+  const statement = chinook.prepare('SELECT * FROM tracks WHERE albumId = ?;', (err: Error, results: any) => {
+    expect(err).toBeNull()
+  })
+
+  statement.all([3], (error, rows) => {
+    expect(error).toBeNull()
+    expect(rows).toBeDefined()
+    expect(rows).toHaveLength(3)
+    expect(rows).toBeInstanceOf(SQLiteCloudRowset)
+
+    statement.all([4], (error, rows) => {
+      expect(error).toBeNull()
+      expect(rows).toBeDefined()
+      expect(rows).toHaveLength(8)
+      expect(rows).toBeInstanceOf(SQLiteCloudRowset)
+
+      chinook.close(error => {
+        expect(error).toBeNull()
+        done()
+      })
+    })
+  })
+})
+
 it('Statement.all withtout bindings', done => {
   const chinook = getChinookDatabase()
   expect(chinook).toBeDefined()