Remove unnecesary async, alphabetic order for import statements and n…

…pm packages, single transaction for batchSave
stocaaro · Mar 16, 2022 · 55c76e6 · 55c76e6
1 parent 0145017
commit 55c76e6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/packages/datastore-storage-adapter/ExpoSQLiteAdapter.js b/packages/datastore-storage-adapter/ExpoSQLiteAdapter.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {
-	module.exports = require('./dist/aws-amplify-datastore-storage-adapter-expo.min.js');
+	module.exports = require('./dist/aws-amplify-datastore-sqlite-adapter-expo.min.js');
 } else {
-	module.exports = require('./dist/aws-amplify-datastore-storage-adapter-expo.js');
+	module.exports = require('./dist/aws-amplify-datastore-sqlite-adapter-expo.js');
 }
diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json
@@ -37,9 +37,9 @@
 		"@aws-amplify/core": "4.3.14",
 		"@aws-amplify/datastore": "3.7.6",
 		"@types/react-native-sqlite-storage" : "5.0.1",
+		"expo-file-system" : "13.1.4",
 		"expo-sqlite": "10.1.0",
-		"react-native-sqlite-storage": "5.0.0",
-		"expo-file-system" : "13.1.4"
+		"react-native-sqlite-storage": "5.0.0"
 	},
 	"jest": {
 		"globals": {

diff --git a/packages/datastore-storage-adapter/src/ExpoSQLiteAdapter/ExpoSQLiteDatabase.ts b/packages/datastore-storage-adapter/src/ExpoSQLiteAdapter/ExpoSQLiteDatabase.ts
@@ -1,8 +1,9 @@
-import { openDatabase, WebSQLDatabase } from 'expo-sqlite';
 import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import { PersistentModel } from '@aws-amplify/datastore';
-import { CommonSQLiteDatabase, ParameterizedStatement } from '../common/types';
 import { deleteAsync, documentDirectory } from 'expo-file-system';
+import { openDatabase, WebSQLDatabase } from 'expo-sqlite';
+
+import { CommonSQLiteDatabase, ParameterizedStatement } from '../common/types';
 
 const logger = new Logger('ExpoSQLiteDatabase');
 
@@ -33,7 +34,7 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 		}
 	}
 
-	public async createSchema(statements: string[]): Promise<void> {
+	public createSchema(statements: string[]): Promise<void> {
 		return this.executeStatements(statements);
 	}
 
@@ -60,7 +61,7 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 		return results[0];
 	}
 
-	public async getAll<T extends PersistentModel>(
+	public getAll<T extends PersistentModel>(
 		statement: string,
 		params: (string | number)[]
 	): Promise<T[]> {
@@ -82,10 +83,7 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 		});
 	}
 
-	public async save(
-		statement: string,
-		params: (string | number)[]
-	): Promise<void> {
+	public save(statement: string, params: (string | number)[]): Promise<void> {
 		return new Promise((resolve, reject) => {
 			this.db.transaction(transaction => {
 				transaction.executeSql(
@@ -104,7 +102,7 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 		});
 	}
 
-	public async batchQuery<T = any>(
+	public batchQuery<T = any>(
 		queryParameterizedStatements: Set<ParameterizedStatement> = new Set()
 	): Promise<T[]> {
 		return new Promise((resolveTransaction, rejectTransaction) => {
@@ -137,14 +135,14 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 		});
 	}
 
-	public async batchSave(
+	public batchSave(
 		saveParameterizedStatements: Set<ParameterizedStatement> = new Set(),
 		deleteParameterizedStatements?: Set<ParameterizedStatement>
 	): Promise<void> {
 		return new Promise((resolveTransaction, rejectTransaction) => {
 			try {
 				this.db.transaction(async transaction => {
-					// await for all sql statments promises to resolve
+					// await for all sql statements promises to resolve
 					await Promise.all(
 						[...saveParameterizedStatements].map(
 							([statement, params]) =>
@@ -164,9 +162,7 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 								)
 						)
 					);
-				});
-				if (deleteParameterizedStatements) {
-					this.db.transaction(async transaction => {
+					if (deleteParameterizedStatements) {
 						await Promise.all(
 							[...deleteParameterizedStatements].map(
 								([statement, params]) =>
@@ -186,16 +182,16 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 									)
 							)
 						);
-					});
-				}
-				resolveTransaction(null);
+					}
+					resolveTransaction(null);
+				});
 			} catch (error) {
 				rejectTransaction(error);
 			}
 		});
 	}
 
-	public async selectAndDelete<T = any>(
+	public selectAndDelete<T = any>(
 		queryParameterizedStatement: ParameterizedStatement,
 		deleteParameterizedStatement: ParameterizedStatement
 	): Promise<T[]> {
@@ -241,7 +237,7 @@ class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 		});
 	}
 
-	private async executeStatements(statements: string[]): Promise<void> {
+	private executeStatements(statements: string[]): Promise<void> {
 		return new Promise((resolveTransaction, rejectTransaction) => {
 			this.db.transaction(async transaction => {
 				try {

diff --git a/packages/datastore-storage-adapter/webpack.config.dev.js b/packages/datastore-storage-adapter/webpack.config.dev.js
@@ -2,7 +2,7 @@ var config = require('./webpack.config.js');
 
 var entry = {
 	'aws-amplify-datastore-storage-adapter': './lib-esm/index.js',
-	'aws-amplify-datastore-storage-adapter-expo':
+	'aws-amplify-datastore-sqlite-adapter-expo':
 		'./lib-esm/ExpoSQLiteAdapter/ExpoSQLiteAdapter.js',
 };
 module.exports = Object.assign(config, { entry, mode: 'development' });
diff --git a/packages/datastore-storage-adapter/webpack.config.js b/packages/datastore-storage-adapter/webpack.config.js
@@ -1,15 +1,15 @@
 module.exports = {
 	entry: {
 		'aws-amplify-datastore-storage-adapter.min': './lib-esm/index.js',
-		'aws-amplify-datastore-storage-adapter-expo.min':
+		'aws-amplify-datastore-sqlite-adapter-expo.min':
 			'./lib-esm/ExpoSQLiteAdapter/ExpoSQLiteAdapter.js',
 	},
 	externals: [
 		'@aws-amplify/datastore',
 		'@aws-amplify/core',
-		'react-native-sqlite-storage',
-		'expo-sqlite',
 		'expo-file-system',
+		'expo-sqlite',
+		'react-native-sqlite-storage',
 	],
 	output: {
 		filename: '[name].js',