changes to naming and updates regarding feedback from Draft PR

.vscode/settings.json

@@ -1,10 +1,11 @@
 {
-	"editor.formatOnSave": true,
 	"editor.insertSpaces": false,
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"prettier.requireConfig": true,
 	"editor.defaultFormatter": "esbenp.prettier-vscode",
 	"[typescript]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	}
+	},
+	"typescript.format.insertSpaceBeforeAndAfterBinaryOperators": false,
+	"javascript.format.insertSpaceBeforeAndAfterBinaryOperators": false
 }

package.json

@@ -114,5 +114,8 @@
 	"jest": {
 		"resetMocks": true,
 		"verbose": true
+	},
+	"dependencies": {
+		"@react-native-async-storage/async-storage": "^1.15.17"
 	}
 }

packages/datastore-storage-adapter/__tests__/SQLiteUtils.test.ts

@@ -12,7 +12,7 @@ import {
 	deleteByPredicateStatement,
 	modelCreateTableStatement,
 	implicitAuthFieldsForModel,
-} from '../src/commons/SQLiteUtils';
+} from '../src/common/SQLiteUtils';
 import {
 	InternalSchema,
 	PersistentModelConstructor,

packages/datastore-storage-adapter/src/ExpoSQLiteAdapter/ExpoSQLiteAdapter.ts

@@ -1,4 +1,4 @@
-import { CommonSQLiteAdapter } from '../commons/CommonSQLiteAdapter';
+import { CommonSQLiteAdapter } from '../common/CommonSQLiteAdapter';
 import ExpoSQLiteDatabase from './ExpoSQLiteDatabase';
 
 const ExpoSQLiteAdapter: CommonSQLiteAdapter = new CommonSQLiteAdapter(

packages/datastore-storage-adapter/src/ExpoSQLiteAdapter/ExpoSQLiteDatabase.ts

@@ -1,8 +1,8 @@
 import * as SQLite from 'expo-sqlite';
 import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import { PersistentModel } from '@aws-amplify/datastore';
-import { ParameterizedStatement } from '../commons/SQLiteUtils';
-import { Database } from '../commons/Database';
+import { ParameterizedStatement } from '../common/SQLiteUtils';
+import { CommonSQLiteDatabase } from '../common/types';
 
 const logger = new Logger('ExpoSQLiteDatabase');
 
@@ -20,7 +20,7 @@ I purposely used arrow functions () => {} in this class as expo-sqlite library i
 
 */
 
-class ExpoSQLiteDatabase implements Database {
+class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
 	private db: SQLite.WebSQLDatabase;
 
 	public async init(): Promise<void> {

packages/datastore-storage-adapter/src/SQLiteAdapter/SQLiteAdapter.ts

@@ -1,4 +1,4 @@
-import { CommonSQLiteAdapter } from '../commons/CommonSQLiteAdapter';
+import { CommonSQLiteAdapter } from '../common/CommonSQLiteAdapter';
 import SQLiteDatabase from './SQLiteDatabase';
 
 const SQLiteAdapter: CommonSQLiteAdapter = new CommonSQLiteAdapter(

packages/datastore-storage-adapter/src/SQLiteAdapter/SQLiteDatabase.ts

@@ -1,8 +1,8 @@
 import SQLite from 'react-native-sqlite-storage';
 import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import { PersistentModel } from '@aws-amplify/datastore';
-import { ParameterizedStatement } from '../commons/SQLiteUtils';
-import { Database } from '../commons/Database';
+import { ParameterizedStatement } from '../common/SQLiteUtils';
+import { CommonSQLiteDatabase } from '../common/types';
 
 const logger = new Logger('SQLiteDatabase');
 
@@ -32,7 +32,7 @@ get the result of an `executeSql` command inside of a transaction
 
 */
 
-class SQLiteDatabase implements Database {
+class SQLiteDatabase implements CommonSQLiteDatabase {
 	private db: SQLite.SQLiteDatabase;
 
 	public async init(): Promise<void> {

packages/datastore-storage-adapter/src/commons/CommonSQLiteAdapter.ts → packages/datastore-storage-adapter/src/common/CommonSQLiteAdapter.ts

@@ -9,7 +9,7 @@ import {
 	deleteByIdStatement,
 	deleteByPredicateStatement,
 	ParameterizedStatement,
-} from '../commons/SQLiteUtils';
+} from '../common/SQLiteUtils';
 
 import {
 	StorageAdapter,
@@ -30,7 +30,7 @@ import {
 	QueryOne,
 	utils,
 } from '@aws-amplify/datastore';
-import { Database } from './Database';
+import { CommonSQLiteDatabase } from './types';
 
 const { traverseModel, validatePredicate, isModelConstructor } = utils;
 
@@ -44,7 +44,7 @@ export class CommonSQLiteAdapter implements StorageAdapter {
 		namsespaceName: string,
 		modelName: string
 	) => PersistentModelConstructor<any>;
-	private db: Database;
+	private db: CommonSQLiteDatabase;
 	private initPromise: Promise<void>;
 	private resolve: (value?: any) => void;
 	private reject: (value?: any) => void;

packages/datastore-storage-adapter/src/common/types.ts

@@ -0,0 +1,54 @@
+import { GraphQLScalarType } from '@aws-amplify/datastore';
+import { PersistentModel } from '@aws-amplify/datastore';
+import { ParameterizedStatement } from './SQLiteUtils';
+
+export function getSQLiteType(
+	scalar: keyof Omit<
+		typeof GraphQLScalarType,
+		'getJSType' | 'getValidationFunction' | 'getSQLiteType'
+	>
+): 'TEXT' | 'INTEGER' | 'REAL' | 'BLOB' {
+	switch (scalar) {
+		case 'Boolean':
+		case 'Int':
+		case 'AWSTimestamp':
+			return 'INTEGER';
+		case 'ID':
+		case 'String':
+		case 'AWSDate':
+		case 'AWSTime':
+		case 'AWSDateTime':
+		case 'AWSEmail':
+		case 'AWSJSON':
+		case 'AWSURL':
+		case 'AWSPhone':
+		case 'AWSIPAddress':
+			return 'TEXT';
+		case 'Float':
+			return 'REAL';
+		default:
+			const _: never = scalar as never;
+			throw new Error(`unknown type ${scalar as string}`);
+	}
+}
+
+export interface CommonSQLiteDatabase {
+	init(): Promise<void>;
+	createSchema(statements: string[]): Promise<void>;
+	clear(): Promise<void>;
+	get<T extends PersistentModel>(statement: string, params: any[]): Promise<T>;
+	getAll<T extends PersistentModel>(
+		statement: string,
+		params: any[]
+	): Promise<T[]>;
+	save(statement: string, params: any[]): Promise<void>;
+	batchQuery(queryStatements: Set<ParameterizedStatement>): Promise<any[]>;
+	batchSave(
+		saveStatements: Set<ParameterizedStatement>,
+		deleteStatements?: Set<ParameterizedStatement>
+	): Promise<void>;
+	selectAndDelete(
+		query: ParameterizedStatement,
+		_delete: ParameterizedStatement
+	): Promise<any[]>;
+}