@aws-amplify/datastore-storage-adapter 2.0.67 → 2.0.69

package/dist/aws-amplify-datastore-storage-adapter.js

@@ -443,11 +443,11 @@ var CommonSQLiteAdapter = /** @class */function () {
     });
   };
   CommonSQLiteAdapter.prototype.save = function (model, condition) {
-    var e_1, _a;
     return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__awaiter)(this, void 0, void 0, function () {
-      var modelConstructor, tableName, connectedModels, connectionStoreNames, _b, queryStatement, params, fromDB, predicates, predicateObjs, type, isValid, msg, result, saveStatements, connectionStoreNames_1, connectionStoreNames_1_1, resItem, modelName, item, instance, id, _c, queryStatement_1, params_1, fromDB_1, opType, saveStatement, e_1_1;
-      return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__generator)(this, function (_d) {
-        switch (_d.label) {
+      var modelConstructor, tableName, connectedModels, connectionStoreNames, _a, queryStatement, params, fromDB, predicates, predicateObjs, type, isValid, msg, result, saveStatements, _b, connectionStoreNames_1, connectionStoreNames_1_1, resItem, modelName, item, instance, id, _c, queryStatement_1, params_1, fromDB_1, opType, saveStatement, e_1_1;
+      var _d, e_1, _e, _f;
+      return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__generator)(this, function (_g) {
+        switch (_g.label) {
           case 0:
             modelConstructor = Object.getPrototypeOf(model).constructor;
             tableName = modelConstructor.name;
@@ -462,10 +462,10 @@ var CommonSQLiteAdapter = /** @class */function () {
                 instance: instance
               };
             });
-            _b = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__read)((0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.queryByIdStatement)(model.id, tableName), 2), queryStatement = _b[0], params = _b[1];
+            _a = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__read)((0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.queryByIdStatement)(model.id, tableName), 2), queryStatement = _a[0], params = _a[1];
             return [4 /*yield*/, this.db.get(queryStatement, params)];
           case 1:
-            fromDB = _d.sent();
+            fromDB = _g.sent();
             if (condition && fromDB) {
               predicates = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.ModelPredicateCreator.getPredicates(condition);
               predicateObjs = predicates.predicates, type = predicates.type;
@@ -481,46 +481,49 @@ var CommonSQLiteAdapter = /** @class */function () {
             }
             result = [];
             saveStatements = new Set();
-            _d.label = 2;
+            _g.label = 2;
           case 2:
-            _d.trys.push([2, 8, 9, 14]);
-            connectionStoreNames_1 = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__asyncValues)(connectionStoreNames);
-            _d.label = 3;
+            _g.trys.push([2, 8, 9, 14]);
+            _b = true, connectionStoreNames_1 = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__asyncValues)(connectionStoreNames);
+            _g.label = 3;
           case 3:
             return [4 /*yield*/, connectionStoreNames_1.next()];
           case 4:
-            if (!(connectionStoreNames_1_1 = _d.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 7];
-            resItem = connectionStoreNames_1_1.value;
+            if (!(connectionStoreNames_1_1 = _g.sent(), _d = connectionStoreNames_1_1.done, !_d)) return [3 /*break*/, 7];
+            _f = connectionStoreNames_1_1.value;
+            _b = false;
+            resItem = _f;
             modelName = resItem.modelName, item = resItem.item, instance = resItem.instance;
             id = item.id;
             _c = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__read)((0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.queryByIdStatement)(id, modelName), 2), queryStatement_1 = _c[0], params_1 = _c[1];
             return [4 /*yield*/, this.db.get(queryStatement_1, params_1)];
           case 5:
-            fromDB_1 = _d.sent();
+            fromDB_1 = _g.sent();
             opType = fromDB_1 === undefined ? _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.OpType.INSERT : _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.OpType.UPDATE;
             saveStatement = fromDB_1 ? (0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.modelUpdateStatement)(instance, modelName) : (0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.modelInsertStatement)(instance, modelName);
             if (id === model.id || opType === _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.OpType.INSERT) {
               saveStatements.add(saveStatement);
               result.push([instance, opType]);
             }
-            _d.label = 6;
+            _g.label = 6;
           case 6:
+            _b = true;
             return [3 /*break*/, 3];
           case 7:
             return [3 /*break*/, 14];
           case 8:
-            e_1_1 = _d.sent();
+            e_1_1 = _g.sent();
             e_1 = {
               error: e_1_1
             };
             return [3 /*break*/, 14];
           case 9:
-            _d.trys.push([9,, 12, 13]);
-            if (!(connectionStoreNames_1_1 && !connectionStoreNames_1_1.done && (_a = connectionStoreNames_1["return"]))) return [3 /*break*/, 11];
-            return [4 /*yield*/, _a.call(connectionStoreNames_1)];
+            _g.trys.push([9,, 12, 13]);
+            if (!(!_b && !_d && (_e = connectionStoreNames_1["return"]))) return [3 /*break*/, 11];
+            return [4 /*yield*/, _e.call(connectionStoreNames_1)];
           case 10:
-            _d.sent();
-            _d.label = 11;
+            _g.sent();
+            _g.label = 11;
           case 11:
             return [3 /*break*/, 13];
           case 12:
@@ -531,7 +534,7 @@ var CommonSQLiteAdapter = /** @class */function () {
           case 14:
             return [4 /*yield*/, this.db.batchSave(saveStatements)];
           case 15:
-            _d.sent();
+            _g.sent();
             return [2 /*return*/, result];
         }
       });
@@ -647,12 +650,12 @@ var CommonSQLiteAdapter = /** @class */function () {
     });
     return idPredicate && idPredicate.operand;
   };
-  CommonSQLiteAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
-    if (firstOrLast === void 0) {
-      firstOrLast = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.QueryOne.FIRST;
-    }
-    return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__awaiter)(this, void 0, void 0, function () {
+  CommonSQLiteAdapter.prototype.queryOne = function (modelConstructor_1) {
+    return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__awaiter)(this, arguments, void 0, function (modelConstructor, firstOrLast) {
       var tableName, _a, queryStatement, params, result, modelInstance;
+      if (firstOrLast === void 0) {
+        firstOrLast = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.QueryOne.FIRST;
+      }
       return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__generator)(this, function (_b) {
         switch (_b.label) {
           case 0:
@@ -858,7 +861,7 @@ var USER = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.utils.USER,
   isModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.utils.isModelConstructor;
 var keysFromModel = function keysFromModel(model) {
   return Object.keys(model).map(function (k) {
-    return "\"" + k + "\"";
+    return "\"".concat(k, "\"");
   }).join(', ');
 };
 var valuesFromModel = function valuesFromModel(model) {
@@ -879,7 +882,7 @@ var updateSet = function updateSet(model) {
       k = _b[0],
       v = _b[1];
     values.push(prepareValueForDML(v));
-    return "\"" + k + "\"=?";
+    return "\"".concat(k, "\"=?");
   }).join(', ');
   return [paramaterized, values];
 };
@@ -893,7 +896,7 @@ function prepareValueForDML(value) {
   if (Array.isArray(value) || isObjectType) {
     return JSON.stringify(value);
   }
-  return "" + value;
+  return "".concat(value);
 }
 function getSQLiteType(scalar) {
   switch (scalar) {
@@ -916,7 +919,7 @@ function getSQLiteType(scalar) {
       return 'REAL';
     default:
       var _ = scalar;
-      throw new Error("unknown type " + scalar);
+      throw new Error("unknown type ".concat(scalar));
   }
 }
 function generateSchemaStatements(schema) {
@@ -957,16 +960,16 @@ function modelCreateTableStatement(model, userModel) {
   var fields = Object.values(model.fields).reduce(function (acc, field) {
     if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isGraphQLScalarType)(field.type)) {
       if (field.name === 'id') {
-        return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(acc, ['"id" PRIMARY KEY NOT NULL']);
+        return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ['"id" PRIMARY KEY NOT NULL'], false);
       }
-      var columnParam_1 = "\"" + field.name + "\" " + getSQLiteType(field.type);
+      var columnParam_1 = "\"".concat(field.name, "\" ").concat(getSQLiteType(field.type));
       if (field.isRequired) {
         columnParam_1 += ' NOT NULL';
       }
-      return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(acc, ["" + columnParam_1]);
+      return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ["".concat(columnParam_1)], false);
     }
     if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isModelFieldType)(field.type)) {
-      var columnParam_2 = "\"" + field.name + "\" TEXT";
+      var columnParam_2 = "\"".concat(field.name, "\" TEXT");
       // add targetName as well as field name for BELONGS_TO relations
       if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isTargetNameAssociation)(field.association)) {
         // check if this field has been explicitly defined in the model
@@ -977,27 +980,27 @@ function modelCreateTableStatement(model, userModel) {
         // if the FK is not explicitly defined in the model, we have to add it here
         if (!fkDefinedInModel) {
           var required = field.isRequired ? ' NOT NULL' : '';
-          columnParam_2 += ", \"" + field.association.targetName + "\" TEXT" + required;
+          columnParam_2 += ", \"".concat(field.association.targetName, "\" TEXT").concat(required);
         }
       }
       // ignore isRequired param for model fields, since they will not contain
       // the related data locally
-      return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(acc, ["" + columnParam_2]);
+      return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ["".concat(columnParam_2)], false);
     }
     // default to TEXT
-    var columnParam = "\"" + field.name + "\" TEXT";
+    var columnParam = "\"".concat(field.name, "\" TEXT");
     if (field.isRequired) {
       columnParam += ' NOT NULL';
     }
-    return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(acc, ["" + columnParam]);
+    return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ["".concat(columnParam)], false);
   }, []);
   implicitAuthFields.forEach(function (authField) {
-    fields.push(authField + " TEXT");
+    fields.push("".concat(authField, " TEXT"));
   });
   if (userModel) {
-    fields = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(fields, ["\"_version\" INTEGER", "\"_lastChangedAt\" INTEGER", "\"_deleted\" INTEGER"]);
+    fields = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(fields), false), ["\"_version\" INTEGER", "\"_lastChangedAt\" INTEGER", "\"_deleted\" INTEGER"], false);
   }
-  var createTableStatement = "CREATE TABLE IF NOT EXISTS \"" + model.name + "\" (" + fields.join(', ') + ");";
+  var createTableStatement = "CREATE TABLE IF NOT EXISTS \"".concat(model.name, "\" (").concat(fields.join(', '), ");");
   return createTableStatement;
 }
 function modelInsertStatement(model, tableName) {
@@ -1005,18 +1008,18 @@ function modelInsertStatement(model, tableName) {
   var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(valuesFromModel(model), 2),
     paramaterized = _a[0],
     values = _a[1];
-  var insertStatement = "INSERT INTO \"" + tableName + "\" (" + keys + ") VALUES (" + paramaterized + ")";
+  var insertStatement = "INSERT INTO \"".concat(tableName, "\" (").concat(keys, ") VALUES (").concat(paramaterized, ")");
   return [insertStatement, values];
 }
 function modelUpdateStatement(model, tableName) {
   var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(updateSet(model), 2),
     paramaterized = _a[0],
     values = _a[1];
-  var updateStatement = "UPDATE \"" + tableName + "\" SET " + paramaterized + " WHERE id=?";
-  return [updateStatement, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(values, [model.id])];
+  var updateStatement = "UPDATE \"".concat(tableName, "\" SET ").concat(paramaterized, " WHERE id=?");
+  return [updateStatement, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(values), false), [model.id], false)];
 }
 function queryByIdStatement(id, tableName) {
-  return ["SELECT * FROM \"" + tableName + "\" WHERE \"id\" = ?", [id]];
+  return ["SELECT * FROM \"".concat(tableName, "\" WHERE \"id\" = ?"), [id]];
 }
 /*
     Predicates supported by DataStore:
@@ -1053,9 +1056,9 @@ var logicalOperatorMap = {
 function buildSpecialNullComparison(field, operator, operand) {
   if (operand === null || operand === undefined) {
     if (operator === 'eq') {
-      return "\"" + field + "\" IS NULL";
+      return "\"".concat(field, "\" IS NULL");
     } else if (operator === 'ne') {
-      return "\"" + field + "\" IS NOT NULL";
+      return "\"".concat(field, "\" IS NOT NULL");
     }
   }
   // no special null handling required
@@ -1071,7 +1074,7 @@ var whereConditionFromPredicateObject = function whereConditionFromPredicateObje
   }
   var comparisonOperator = comparisonOperatorMap[operator];
   if (comparisonOperator) {
-    return ["\"" + field + "\" " + comparisonOperator + " ?", [operand]];
+    return ["\"".concat(field, "\" ").concat(comparisonOperator, " ?"), [operand]];
   }
   var logicalOperatorKey = operator;
   var logicalOperator = logicalOperatorMap[logicalOperatorKey];
@@ -1081,14 +1084,14 @@ var whereConditionFromPredicateObject = function whereConditionFromPredicateObje
     switch (logicalOperatorKey) {
       case 'between':
         rightExp = operand; // operand is a 2-tuple
-        statement = ["\"" + field + "\" " + logicalOperator + " " + rightExp.map(function (_) {
+        statement = ["\"".concat(field, "\" ").concat(logicalOperator, " ").concat(rightExp.map(function (_) {
           return '?';
-        }).join(' AND '), rightExp];
+        }).join(' AND ')), rightExp];
         break;
       case 'beginsWith':
       case 'contains':
       case 'notContains':
-        statement = ["instr(\"" + field + "\", ?) " + logicalOperator, [operand]];
+        statement = ["instr(\"".concat(field, "\", ?) ").concat(logicalOperator), [operand]];
         break;
       default:
         var _ = logicalOperatorKey;
@@ -1102,7 +1105,7 @@ function whereClauseFromPredicate(predicate) {
   var result = [];
   var params = [];
   recurse(predicate, result, params);
-  var whereClause = "WHERE " + result.join(' ');
+  var whereClause = "WHERE ".concat(result.join(' '));
   return [whereClause, params];
   function recurse(predicate, result, params) {
     var e_1, _a;
@@ -1129,7 +1132,7 @@ function whereClauseFromPredicate(predicate) {
           break;
         default:
           var _ = groupType;
-          throw new Error("Invalid " + groupType);
+          throw new Error("Invalid ".concat(groupType));
       }
       var groupResult = [];
       try {
@@ -1148,13 +1151,13 @@ function whereClauseFromPredicate(predicate) {
           if (e_1) throw e_1.error;
         }
       }
-      result.push((isNegation ? 'NOT' : '') + "(" + groupResult.join(" " + filterType + " ") + ")");
+      result.push("".concat(isNegation ? 'NOT' : '', "(").concat(groupResult.join(" ".concat(filterType, " ")), ")"));
     } else if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isPredicateObj)(predicate)) {
       var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereConditionFromPredicateObject(predicate), 2),
         condition = _b[0],
         conditionParams = _b[1];
       result.push(condition);
-      params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(conditionParams));
+      params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(conditionParams), false));
     }
   }
 }
@@ -1169,11 +1172,11 @@ function orderByClauseFromSort(sortPredicate) {
   var orderByParts = sortPredicate.map(function (_a) {
     var field = _a.field,
       sortDirection = _a.sortDirection;
-    return "\"" + field + "\" " + sortDirectionMap[sortDirection];
+    return "\"".concat(String(field), "\" ").concat(sortDirectionMap[sortDirection]);
   });
   // We always sort by _rowid_ last
-  orderByParts.push("_rowid_ " + sortDirectionMap.ASCENDING);
-  return "ORDER BY " + orderByParts.join(', ');
+  orderByParts.push("_rowid_ ".concat(sortDirectionMap.ASCENDING));
+  return "ORDER BY ".concat(orderByParts.join(', '));
 }
 function limitClauseFromPagination(limit, page) {
   if (page === void 0) {
@@ -1189,23 +1192,23 @@ function limitClauseFromPagination(limit, page) {
   return [clause, params];
 }
 function queryAllStatement(tableName, predicate, sort, limit, page) {
-  var statement = "SELECT * FROM \"" + tableName + "\"";
+  var statement = "SELECT * FROM \"".concat(tableName, "\"");
   var params = [];
   if (predicate && predicate.predicates.length) {
     var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereClauseFromPredicate(predicate), 2),
       whereClause = _a[0],
       whereParams = _a[1];
-    statement += " " + whereClause;
-    params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(whereParams));
+    statement += " ".concat(whereClause);
+    params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereParams), false));
   }
   var orderByClause = orderByClauseFromSort(sort);
-  statement += " " + orderByClause;
+  statement += " ".concat(orderByClause);
   if (limit) {
     var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(limitClauseFromPagination(limit, page), 2),
       limitClause = _b[0],
       limitParams = _b[1];
-    statement += " " + limitClause;
-    params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(limitParams));
+    statement += " ".concat(limitClause);
+    params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(limitParams), false));
   }
   return [statement, params];
 }
@@ -1214,24 +1217,24 @@ function queryOneStatement(firstOrLast, tableName) {
     // ORDER BY rowid will no longer work as expected if a customer has
     // a field by that name in their schema. We may want to enforce it
     // as a reserved keyword in Codegen
-    return ["SELECT * FROM " + tableName + " ORDER BY _rowid_ LIMIT 1", []];
+    return ["SELECT * FROM ".concat(tableName, " ORDER BY _rowid_ LIMIT 1"), []];
   } else {
-    return ["SELECT * FROM " + tableName + " ORDER BY _rowid_ DESC LIMIT 1", []];
+    return ["SELECT * FROM ".concat(tableName, " ORDER BY _rowid_ DESC LIMIT 1"), []];
   }
 }
 function deleteByIdStatement(id, tableName) {
-  var deleteStatement = "DELETE FROM \"" + tableName + "\" WHERE \"id\"=?";
+  var deleteStatement = "DELETE FROM \"".concat(tableName, "\" WHERE \"id\"=?");
   return [deleteStatement, [id]];
 }
 function deleteByPredicateStatement(tableName, predicate) {
-  var statement = "DELETE FROM \"" + tableName + "\"";
+  var statement = "DELETE FROM \"".concat(tableName, "\"");
   var params = [];
   if (predicate && predicate.predicates.length) {
     var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereClauseFromPredicate(predicate), 2),
       whereClause = _a[0],
       whereParams = _a[1];
-    statement += " " + whereClause;
-    params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spread)(whereParams));
+    statement += " ".concat(whereClause);
+    params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereParams), false));
   }
   return [statement, params];
 }