@aws-amplify/datastore-storage-adapter 1.2.3 → 1.2.4-custom-pk.79

package/lib-esm/{SQLiteAdapter → common}/SQLiteUtils.js

@@ -30,7 +30,6 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { isGraphQLScalarType, QueryOne, isPredicateObj, isPredicateGroup, isModelFieldType, isTargetNameAssociation, isModelAttributeAuth, utils, } from '@aws-amplify/datastore';
-import { getSQLiteType } from './types';
 var USER = utils.USER, isNonModelConstructor = utils.isNonModelConstructor, isModelConstructor = utils.isModelConstructor;
 var keysFromModel = function (model) {
     return Object.keys(model)
@@ -72,6 +71,30 @@ function prepareValueForDML(value) {
     }
     return "" + value;
 }
+export function getSQLiteType(scalar) {
+    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:
+            var _ = scalar;
+            throw new Error("unknown type " + scalar);
+    }
+}
 export function generateSchemaStatements(schema) {
     return Object.keys(schema.namespaces).flatMap(function (namespaceName) {
         var namespace = schema.namespaces[namespaceName];
@@ -117,7 +140,7 @@ export function modelCreateTableStatement(model, userModel) {
             // add targetName as well as field name for BELONGS_TO relations
             if (isTargetNameAssociation(field.association)) {
                 // check if this field has been explicitly defined in the model
-                var fkDefinedInModel = Object.values(model.fields).find(function (f) { return f.name === field.association.targetName; });
+                var fkDefinedInModel = Object.values(model.fields).find(function (f) { var _a; return f.name === ((_a = field === null || field === void 0 ? void 0 : field.association) === null || _a === void 0 ? void 0 : _a.targetName); });
                 // if the FK is not explicitly defined in the model, we have to add it here
                 if (!fkDefinedInModel) {
                     var required = field.isRequired ? ' NOT NULL' : '';
@@ -180,8 +203,35 @@ var logicalOperatorMap = {
     notContains: 'NOT LIKE',
     between: 'BETWEEN',
 };
+/**
+ * If the given (operator, operand) indicate the need for a special `NULL` comparison,
+ * that `WHERE` clause condition will be returned. If not special `NULL` handling is
+ * needed, `null` will be returned, and the caller should construct the `WHERE`
+ * clause component using the normal operator map(s) and parameterization.
+ *
+ * @param operator "beginsWith" | "contains" | "notContains" | "between"
+ * | "eq" | "ne" | "le" | "lt" | "ge" | "gt"
+ * @param operand any
+ * @returns (string | null) The `WHERE` clause component or `null` if N/A.
+ */
+function buildSpecialNullComparison(field, operator, operand) {
+    if (operand === null || operand === undefined) {
+        if (operator === 'eq') {
+            return "\"" + field + "\" IS NULL";
+        }
+        else if (operator === 'ne') {
+            return "\"" + field + "\" IS NOT NULL";
+        }
+    }
+    // no special null handling required
+    return null;
+}
 var whereConditionFromPredicateObject = function (_a) {
     var field = _a.field, operator = _a.operator, operand = _a.operand;
+    var specialNullClause = buildSpecialNullComparison(field, operator, operand);
+    if (specialNullClause) {
+        return [specialNullClause, []];
+    }
     var comparisonOperator = comparisonOperatorMap[operator];
     if (comparisonOperator) {
         return ["\"" + field + "\" " + comparisonOperator + " ?", [operand]];

package/lib-esm/common/SQLiteUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLiteUtils.js","sourceRoot":"","sources":["../../src/common/SQLiteUtils.ts"],"names":[],"mappings":"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"}

package/lib-esm/common/constants.d.ts

@@ -0,0 +1 @@
+export declare const DB_NAME = "AmplifyDatastore";

package/lib-esm/common/constants.js

@@ -0,0 +1,2 @@
+export var DB_NAME = 'AmplifyDatastore';
+//# sourceMappingURL=constants.js.map

package/lib-esm/common/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,OAAO,GAAG,kBAAkB,CAAC"}

package/lib-esm/common/types.d.ts

@@ -0,0 +1,13 @@
+import { PersistentModel } from '@aws-amplify/datastore';
+export interface CommonSQLiteDatabase {
+    init(): Promise<void>;
+    createSchema(statements: string[]): Promise<void>;
+    clear(): Promise<void>;
+    get<T extends PersistentModel>(statement: string, params: (string | number)[]): Promise<T>;
+    getAll<T extends PersistentModel>(statement: string, params: (string | number)[]): Promise<T[]>;
+    save(statement: string, params: (string | number)[]): Promise<void>;
+    batchQuery<T = any>(queryParameterizedStatement: Set<ParameterizedStatement>): Promise<T[]>;
+    batchSave(saveParameterizedStatements: Set<ParameterizedStatement>, deleteParameterizedStatements?: Set<ParameterizedStatement>): Promise<void>;
+    selectAndDelete<T = any>(queryParameterizedStatement: ParameterizedStatement, deleteParameterizedStatement: ParameterizedStatement): Promise<T[]>;
+}
+export declare type ParameterizedStatement = [string, any[]];

package/lib-esm/common/types.js

@@ -0,0 +1 @@
+//# sourceMappingURL=types.js.map

package/lib-esm/common/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/datastore-storage-adapter",
-	"version": "1.2.3",
+	"version": "1.2.4-custom-pk.79+0b6fc9dc5",
 	"description": "SQLite storage adapter for Amplify DataStore ",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -34,9 +34,13 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@aws-amplify/core": "4.3.11",
-		"@aws-amplify/datastore": "3.7.3",
-		"react-native-sqlite-storage": "5.0.0"
+		"@aws-amplify/core": "4.3.12-custom-pk.79+0b6fc9dc5",
+		"@aws-amplify/datastore": "3.7.4-custom-pk.79+0b6fc9dc5",
+		"@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",
+		"sqlite3": "^5.0.2"
 	},
 	"jest": {
 		"globals": {
@@ -62,7 +66,8 @@
 		"testPathIgnorePatterns": [
 			"__tests__/model.ts",
 			"__tests__/schema.ts",
-			"__tests__/helpers.ts"
+			"__tests__/helpers.ts",
+			"__tests__/SQLiteAdapter.test.ts"
 		],
 		"moduleFileExtensions": [
 			"ts",
@@ -85,8 +90,9 @@
 			"/node_modules/",
 			"dist",
 			"lib",
-			"lib-esm"
+			"lib-esm",
+			"../datastore"
 		]
 	},
-	"gitHead": "b567fc3b9ad28043fd07ce93e78ec5958414e82f"
+	"gitHead": "0b6fc9dc572459650749e5beb992c5060eadb920"
 }

package/src/ExpoSQLiteAdapter/ExpoSQLiteAdapter.ts

@@ -0,0 +1,8 @@
+import { CommonSQLiteAdapter } from '../common/CommonSQLiteAdapter';
+import ExpoSQLiteDatabase from './ExpoSQLiteDatabase';
+
+const ExpoSQLiteAdapter: CommonSQLiteAdapter = new CommonSQLiteAdapter(
+	new ExpoSQLiteDatabase()
+);
+
+export default ExpoSQLiteAdapter;

package/src/ExpoSQLiteAdapter/ExpoSQLiteDatabase.ts

@@ -0,0 +1,282 @@
+import { ConsoleLogger as Logger } from '@aws-amplify/core';
+import { PersistentModel } from '@aws-amplify/datastore';
+import { deleteAsync, documentDirectory } from 'expo-file-system';
+import { openDatabase, WebSQLDatabase } from 'expo-sqlite';
+import { DB_NAME } from '../common/constants';
+import { CommonSQLiteDatabase, ParameterizedStatement } from '../common/types';
+
+const logger = new Logger('ExpoSQLiteDatabase');
+
+/*
+
+Note: 
+ExpoSQLite transaction error callbacks require returning a boolean value to indicate whether the 
+error was handled or not. Returning a true value indicates the error was handled and does not 
+rollback the whole transaction.
+
+*/
+
+class ExpoSQLiteDatabase implements CommonSQLiteDatabase {
+	private db: WebSQLDatabase;
+
+	public async init(): Promise<void> {
+		// only open database once.
+
+		if (!this.db) {
+			// As per expo docs version, description and size arguments are ignored,
+			// but are accepted by the function for compatibility with the WebSQL specification.
+			// Hence, we do not need those arguments.
+			this.db = openDatabase(DB_NAME);
+		}
+	}
+
+	public createSchema(statements: string[]): Promise<void> {
+		return this.executeStatements(statements);
+	}
+
+	public async clear(): Promise<void> {
+		try {
+			logger.debug('Clearing database');
+			await this.closeDB();
+			// delete database is not supported by expo-sqlite.
+			// Database file needs to be deleted using deleteAsync from expo-file-system
+			await deleteAsync(`${documentDirectory}SQLite/${DB_NAME}`);
+			logger.debug('Database cleared');
+		} catch (error) {
+			logger.warn('Error clearing the database.', error);
+			// open database if it was closed earlier and this.db was set to undefined.
+			this.init();
+		}
+	}
+
+	public async get<T extends PersistentModel>(
+		statement: string,
+		params: (string | number)[]
+	): Promise<T> {
+		const results: T[] = await this.getAll(statement, params);
+		return results[0];
+	}
+
+	public getAll<T extends PersistentModel>(
+		statement: string,
+		params: (string | number)[]
+	): Promise<T[]> {
+		return new Promise((resolve, reject) => {
+			this.db.readTransaction(transaction => {
+				transaction.executeSql(
+					statement,
+					params,
+					(_, result) => {
+						resolve(result.rows._array || []);
+					},
+					(_, error) => {
+						reject(error);
+						logger.warn(error);
+						return true;
+					}
+				);
+			});
+		});
+	}
+
+	public save(statement: string, params: (string | number)[]): Promise<void> {
+		return new Promise((resolve, reject) => {
+			this.db.transaction(transaction => {
+				transaction.executeSql(
+					statement,
+					params,
+					() => {
+						resolve(null);
+					},
+					(_, error) => {
+						reject(error);
+						logger.warn(error);
+						return true;
+					}
+				);
+			});
+		});
+	}
+
+	public batchQuery<T = any>(
+		queryParameterizedStatements: Set<ParameterizedStatement> = new Set()
+	): Promise<T[]> {
+		return new Promise((resolveTransaction, rejectTransaction) => {
+			this.db.transaction(async transaction => {
+				try {
+					const results: any[] = await Promise.all(
+						[...queryParameterizedStatements].map(
+							([statement, params]) =>
+								new Promise((resolve, reject) => {
+									transaction.executeSql(
+										statement,
+										params,
+										(_, result) => {
+											resolve(result.rows._array[0]);
+										},
+										(_, error) => {
+											reject(error);
+											logger.warn(error);
+											return true;
+										}
+									);
+								})
+						)
+					);
+					resolveTransaction(results);
+				} catch (error) {
+					rejectTransaction(error);
+					logger.warn(error);
+				}
+			});
+		});
+	}
+
+	public batchSave(
+		saveParameterizedStatements: Set<ParameterizedStatement> = new Set(),
+		deleteParameterizedStatements?: Set<ParameterizedStatement>
+	): Promise<void> {
+		return new Promise((resolveTransaction, rejectTransaction) => {
+			this.db.transaction(async transaction => {
+				try {
+					// await for all sql statements promises to resolve
+					await Promise.all(
+						[...saveParameterizedStatements].map(
+							([statement, params]) =>
+								new Promise((resolve, reject) => {
+									transaction.executeSql(
+										statement,
+										params,
+										() => {
+											resolve(null);
+										},
+										(_, error) => {
+											reject(error);
+											logger.warn(error);
+											return true;
+										}
+									);
+								})
+						)
+					);
+					if (deleteParameterizedStatements) {
+						await Promise.all(
+							[...deleteParameterizedStatements].map(
+								([statement, params]) =>
+									new Promise((resolve, reject) =>
+										transaction.executeSql(
+											statement,
+											params,
+											() => {
+												resolve(null);
+											},
+											(_, error) => {
+												reject(error);
+												logger.warn(error);
+												return true;
+											}
+										)
+									)
+							)
+						);
+					}
+					resolveTransaction(null);
+				} catch (error) {
+					rejectTransaction(error);
+					logger.warn(error);
+				}
+			});
+		});
+	}
+
+	public selectAndDelete<T = any>(
+		queryParameterizedStatement: ParameterizedStatement,
+		deleteParameterizedStatement: ParameterizedStatement
+	): Promise<T[]> {
+		const [queryStatement, queryParams] = queryParameterizedStatement;
+		const [deleteStatement, deleteParams] = deleteParameterizedStatement;
+
+		return new Promise((resolveTransaction, rejectTransaction) => {
+			this.db.transaction(async transaction => {
+				try {
+					const result: T[] = await new Promise((resolve, reject) => {
+						transaction.executeSql(
+							queryStatement,
+							queryParams,
+							(_, result) => {
+								resolve(result.rows._array || []);
+							},
+							(_, error) => {
+								reject(error);
+								logger.warn(error);
+								return true;
+							}
+						);
+					});
+					await new Promise((resolve, reject) => {
+						transaction.executeSql(
+							deleteStatement,
+							deleteParams,
+							() => {
+								resolve(null);
+							},
+							(_, error) => {
+								reject(error);
+								logger.warn(error);
+								return true;
+							}
+						);
+					});
+					resolveTransaction(result);
+				} catch (error) {
+					rejectTransaction(error);
+					logger.warn(error);
+				}
+			});
+		});
+	}
+
+	private executeStatements(statements: string[]): Promise<void> {
+		return new Promise((resolveTransaction, rejectTransaction) => {
+			this.db.transaction(async transaction => {
+				try {
+					await Promise.all(
+						statements.map(
+							statement =>
+								new Promise((resolve, reject) => {
+									transaction.executeSql(
+										statement,
+										[],
+										() => {
+											resolve(null);
+										},
+										(_, error) => {
+											reject(error);
+											return true;
+										}
+									);
+								})
+						)
+					);
+					resolveTransaction(null);
+				} catch (error) {
+					rejectTransaction(error);
+					logger.warn(error);
+				}
+			});
+		});
+	}
+
+	private async closeDB() {
+		if (this.db) {
+			logger.debug('Closing Database');
+			// closing database is not supported by expo-sqlite.
+			// Workaround is to access the private db variable and call the close() method.
+			await (this.db as any)._db.close();
+			logger.debug('Database closed');
+			this.db = undefined;
+		}
+	}
+}
+
+export default ExpoSQLiteDatabase;