@aws-amplify/datastore 3.7.8-cloud-logging.7 → 3.7.8-unstable.3

package/src/datastore/datastore.ts

@@ -565,7 +565,7 @@ function defaultConflictHandler(conflictData: SyncConflict): PersistentModel {
 }
 
 function defaultErrorHandler(error: SyncError) {
-	logger.warn('DataStore Mutation Error', error);
+	logger.warn(error);
 }
 
 function getModelConstructorByModelName(
@@ -728,9 +728,6 @@ class DataStore {
 
 		await this.storage.init();
 
-		logger.debug('Debug info before sync');
-		await this.storage.logDebugInfo();
-
 		await checkSchemaVersion(this.storage, schema.version);
 
 		const { aws_appsync_graphqlEndpoint } = this.amplifyConfig;
@@ -770,12 +767,6 @@ class DataStore {
 							this.initResolve();
 						}
 
-						if (type === ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY) {
-							logger.debug('Debug info after sync');
-							this.storage.logDebugInfo();
-						}
-
-						logger.debug({ event: type, data });
 						Hub.dispatch('datastore', {
 							event: type,
 							data,

package/src/storage/adapter/index.ts

@@ -32,5 +32,4 @@ export interface Adapter extends SystemComponent {
 		modelConstructor: PersistentModelConstructor<any>,
 		items: ModelInstanceMetadata[]
 	): Promise<[T, OpType][]>;
-	getDebugInfo?(): Promise<any>;
 }

package/src/storage/storage.ts

@@ -371,13 +371,6 @@ class StorageClass implements StorageFacade {
 			_deleted,
 		};
 	}
-
-	async logDebugInfo() {
-		if (typeof this.adapter.getDebugInfo === 'function') {
-			const results = await this.adapter.getDebugInfo();
-			logger.debug('DB Debug Info', results);
-		}
-	}
 }
 
 class ExclusiveStorage implements StorageFacade {
@@ -489,10 +482,6 @@ class ExclusiveStorage implements StorageFacade {
 		return this.storage.batchSave(modelConstructor, items);
 	}
 
-	async logDebugInfo(): Promise<void> {
-		return this.runExclusive(storage => storage.logDebugInfo());
-	}
-
 	async init() {
 		return this.storage.init();
 	}

package/src/sync/index.ts

@@ -303,11 +303,6 @@ export class SyncEngine {
 												isEmpty: !hasMore,
 											},
 										});
-
-										if (!hasMore) {
-											logger.debug('Debug info after queue drained');
-											this.storage.logDebugInfo();
-										}
 									})
 							);
 							//#endregion
@@ -345,9 +340,6 @@ export class SyncEngine {
 								},
 							});
 
-							logger.debug('Debug info after offline');
-							await this.storage.logDebugInfo();
-
 							subscriptions.forEach(sub => sub.unsubscribe());
 							subscriptions = [];
 						}

package/src/sync/processors/mutation.ts

@@ -251,14 +251,19 @@ class MutationProcessor {
 				MutationEvent: PersistentModelConstructor<MutationEvent>,
 				mutationEvent: MutationEvent
 			) => {
-				const [query, variables, graphQLCondition, opName, modelDefinition] =
-					this.createQueryVariables(
-						namespaceName,
-						model,
-						operation,
-						data,
-						condition
-					);
+				const [
+					query,
+					variables,
+					graphQLCondition,
+					opName,
+					modelDefinition,
+				] = this.createQueryVariables(
+					namespaceName,
+					model,
+					operation,
+					data,
+					condition
+				);
 
 				const authToken = await getTokenForCustomAuth(
 					authMode,
@@ -353,18 +358,17 @@ class MutationProcessor {
 								const namespace = this.schema.namespaces[namespaceName];
 
 								// convert retry with to tryWith
-								const updatedMutation =
-									createMutationInstanceFromModelOperation(
-										namespace.relationships,
-										modelDefinition,
-										opType,
-										modelConstructor,
-										retryWith,
-										graphQLCondition,
-										MutationEvent,
-										this.modelInstanceCreator,
-										mutationEvent.id
-									);
+								const updatedMutation = createMutationInstanceFromModelOperation(
+									namespace.relationships,
+									modelDefinition,
+									opType,
+									modelConstructor,
+									retryWith,
+									graphQLCondition,
+									MutationEvent,
+									this.modelInstanceCreator,
+									mutationEvent.id
+								);
 
 								await this.storage.save(updatedMutation);
 
@@ -376,7 +380,6 @@ class MutationProcessor {
 											modelConstructor,
 											variables.input
 										),
-										modelName: model,
 										message: error.message,
 										operation,
 										errorType: error.errorType,

package/src/types.ts

@@ -407,14 +407,15 @@ export type DataStoreSnapshot<T extends PersistentModel> = {
 
 //#region Predicates
 
-export type PredicateExpression<
-	M extends PersistentModel,
+export type PredicateExpression<M extends PersistentModel, FT> = TypeName<
 	FT
-> = TypeName<FT> extends keyof MapTypeToOperands<FT>
+> extends keyof MapTypeToOperands<FT>
 	? (
 			operator: keyof MapTypeToOperands<FT>[TypeName<FT>],
 			// make the operand type match the type they're trying to filter on
-			operand: MapTypeToOperands<FT>[TypeName<FT>][keyof MapTypeToOperands<FT>[TypeName<FT>]]
+			operand: MapTypeToOperands<FT>[TypeName<FT>][keyof MapTypeToOperands<
+				FT
+			>[TypeName<FT>]]
 	  ) => ModelPredicate<M>
 	: never;
 
@@ -482,7 +483,8 @@ export type PredicateGroups<T extends PersistentModel> = {
 
 export type ModelPredicate<M extends PersistentModel> = {
 	[K in keyof M]-?: PredicateExpression<M, NonNullable<M[K]>>;
-} & PredicateGroups<M>;
+} &
+	PredicateGroups<M>;
 
 export type ProducerModelPredicate<M extends PersistentModel> = (
 	condition: ModelPredicate<M>
@@ -572,10 +574,9 @@ export type SortPredicate<T extends PersistentModel> = {
 	[K in keyof T]-?: SortPredicateExpression<T, NonNullable<T[K]>>;
 };
 
-export type SortPredicateExpression<
-	M extends PersistentModel,
+export type SortPredicateExpression<M extends PersistentModel, FT> = TypeName<
 	FT
-> = TypeName<FT> extends keyof MapTypeToOperands<FT>
+> extends keyof MapTypeToOperands<FT>
 	? (sortDirection: keyof typeof SortDirection) => SortPredicate<M>
 	: never;
 
@@ -584,8 +585,9 @@ export enum SortDirection {
 	DESCENDING = 'DESCENDING',
 }
 
-export type SortPredicatesGroup<T extends PersistentModel> =
-	SortPredicateObject<T>[];
+export type SortPredicatesGroup<
+	T extends PersistentModel
+> = SortPredicateObject<T>[];
 
 export type SortPredicateObject<T extends PersistentModel> = {
 	field: keyof T;
@@ -776,7 +778,6 @@ export type SyncError = {
 	localModel: PersistentModel;
 	remoteModel: PersistentModel;
 	operation: string;
-	modelName?: string;
 };
 
 export const DISCARD = Symbol('DISCARD');