From a154d837a095e1b065902756a2cc7f1197f75a3d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 13 Sep 2016 16:40:13 -0500
Subject: [PATCH] chore(storage): move storage out of platform

---
 src/platform/storage.ts                     |  3 ---
 src/{platform => }/storage/local-storage.ts |  0
 src/{platform => }/storage/sql.ts           | 12 ++++++------
 src/{platform => }/storage/storage.ts       |  0
 4 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 src/platform/storage.ts
 rename src/{platform => }/storage/local-storage.ts (100%)
 rename src/{platform => }/storage/sql.ts (93%)
 rename src/{platform => }/storage/storage.ts (100%)

diff --git a/src/platform/storage.ts b/src/platform/storage.ts
deleted file mode 100644
index 50d8199b9c..0000000000
--- a/src/platform/storage.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './storage/storage'
-export * from './storage/local-storage'
-export * from './storage/sql'
diff --git a/src/platform/storage/local-storage.ts b/src/storage/local-storage.ts
similarity index 100%
rename from src/platform/storage/local-storage.ts
rename to src/storage/local-storage.ts
diff --git a/src/platform/storage/sql.ts b/src/storage/sql.ts
similarity index 93%
rename from src/platform/storage/sql.ts
rename to src/storage/sql.ts
index d2d7e2213b..05b5177c09 100644
--- a/src/platform/storage/sql.ts
+++ b/src/storage/sql.ts
@@ -1,6 +1,6 @@
 import { StorageEngine } from './storage';
 
-import { defaults, assign } from '../../util/util';
+import { defaults, assign } from '../util/util';
 
 const DB_NAME: string = '__ionicstorage';
 const win: any = window;
@@ -98,15 +98,15 @@ export class SqlStorage extends StorageEngine {
    * @param {array} params the additional params to use for query placeholders
    * @return {Promise} that resolves or rejects with an object of the form { tx: Transaction, res: Result (or err)}
    */
-  query(query: string, params = []): Promise<any> {
+  query(query: string, params: any[] = []): Promise<any> {
     return new Promise((resolve, reject) => {
       try {
-        this._db.transaction((tx) => {
+        this._db.transaction((tx: any) => {
           tx.executeSql(query, params,
-            (tx, res) => resolve({ tx: tx, res: res }),
-            (tx, err) => reject({ tx: tx, err: err }));
+            (tx: any, res: any) => resolve({ tx: tx, res: res }),
+            (tx: any, err: any) => reject({ tx: tx, err: err }));
         },
-          (err) => reject({ err: err }));
+          (err: any) => reject({ err: err }));
       } catch (err) {
         reject({ err: err });
       }
diff --git a/src/platform/storage/storage.ts b/src/storage/storage.ts
similarity index 100%
rename from src/platform/storage/storage.ts
rename to src/storage/storage.ts