backendless 6.3.0 → 6.3.4

package/lib/unit-of-work/index.js

@@ -308,6 +308,37 @@ var UnitOfWork = /*#__PURE__*/function () {
 
       return this.addOperations(_constants.OperationType.FIND, tableName, payload);
     }
+    /**
+     * upsert(object: object): OpResult;
+     * upsert(tableName: string, object: object): OpResult;
+     * **/
+
+  }, {
+    key: "upsert",
+    value: function upsert() {
+      var tableName;
+      var changes;
+
+      if (arguments.length === 1) {
+        tableName = _utils["default"].getClassName(arguments.length <= 0 ? undefined : arguments[0]);
+        changes = arguments.length <= 0 ? undefined : arguments[0];
+      } else if (arguments.length === 2) {
+        tableName = arguments.length <= 0 ? undefined : arguments[0];
+        changes = arguments.length <= 1 ? undefined : arguments[1];
+      } else {
+        throw new Error('Invalid arguments');
+      }
+
+      if (!tableName || typeof tableName !== 'string') {
+        throw new Error('Invalid arguments');
+      }
+
+      if (!changes || (0, _typeof2["default"])(changes) !== 'object' || Array.isArray(changes)) {
+        throw new Error('Invalid arguments');
+      }
+
+      return this.addOperations(_constants.OperationType.UPSERT, tableName, changes);
+    }
     /**
      * create(object: object): OpResult;
      * create(tableName: string, object: object): OpResult;
@@ -436,6 +467,29 @@ var UnitOfWork = /*#__PURE__*/function () {
 
       return this.addOperations(_constants.OperationType.DELETE, tableName, object);
     }
+    /**
+     * bulkUpsert(tableName: string, objects: object[]): OpResult;
+     * bulkUpsert(objects: object[]): OpResult;
+     * **/
+
+  }, {
+    key: "bulkUpsert",
+    value: function bulkUpsert(tableName, objects) {
+      if (Array.isArray(tableName)) {
+        objects = tableName;
+        tableName = _utils["default"].getClassName(objects[0]);
+      }
+
+      if (!objects || !Array.isArray(objects)) {
+        throw new Error('Objects must be an array of objects.');
+      }
+
+      if (!tableName || typeof tableName !== 'string') {
+        throw new Error('Table Name must be a string.');
+      }
+
+      return this.addOperations(_constants.OperationType.UPSERT_BULK, tableName, objects);
+    }
     /**
      * bulkCreate(tableName: string, objects: object[]): OpResult;
      * bulkCreate(objects: object[]): OpResult;

package/lib/unit-of-work/json-adapter.js

@@ -63,9 +63,14 @@ var OperationJSONAdapter = {
         payload = _ref3.payload;
     return uow.update.call(uow, table, resolveOpResultValueReference(uow, payload));
   },
-  UPDATE_BULK: function UPDATE_BULK(uow, _ref4) {
+  UPSERT: function UPSERT(uow, _ref4) {
     var table = _ref4.table,
         payload = _ref4.payload;
+    return uow.upsert.call(uow, table, resolveOpResultValueReference(uow, payload));
+  },
+  UPDATE_BULK: function UPDATE_BULK(uow, _ref5) {
+    var table = _ref5.table,
+        payload = _ref5.payload;
     var args = baseBulkArgs(uow, {
       table: table,
       payload: payload
@@ -73,55 +78,60 @@ var OperationJSONAdapter = {
     args.push(resolveOpResultValueReference(uow, payload.changes));
     return uow.bulkUpdate.apply(uow, args);
   },
-  DELETE_BULK: function DELETE_BULK(uow, _ref5) {
-    var table = _ref5.table,
-        payload = _ref5.payload;
+  DELETE_BULK: function DELETE_BULK(uow, _ref6) {
+    var table = _ref6.table,
+        payload = _ref6.payload;
     var args = baseBulkArgs(uow, {
       table: table,
       payload: payload
     });
     return uow.bulkDelete.apply(uow, args);
   },
-  CREATE_BULK: function CREATE_BULK(uow, _ref6) {
-    var table = _ref6.table,
-        payload = _ref6.payload;
-    return uow.bulkCreate.call(uow, table, resolveOpResultValueReference(uow, payload));
-  },
-  SET_RELATION: function SET_RELATION(uow, _ref7) {
+  CREATE_BULK: function CREATE_BULK(uow, _ref7) {
     var table = _ref7.table,
         payload = _ref7.payload;
+    return uow.bulkCreate.call(uow, table, resolveOpResultValueReference(uow, payload));
+  },
+  UPSERT_BULK: function UPSERT_BULK(uow, _ref8) {
+    var table = _ref8.table,
+        payload = _ref8.payload;
+    return uow.bulkUpsert.call(uow, table, resolveOpResultValueReference(uow, payload));
+  },
+  SET_RELATION: function SET_RELATION(uow, _ref9) {
+    var table = _ref9.table,
+        payload = _ref9.payload;
     return updateRelations(uow, 'setRelation', {
       table: table,
       payload: payload
     });
   },
-  DELETE_RELATION: function DELETE_RELATION(uow, _ref8) {
-    var table = _ref8.table,
-        payload = _ref8.payload;
+  DELETE_RELATION: function DELETE_RELATION(uow, _ref10) {
+    var table = _ref10.table,
+        payload = _ref10.payload;
     return updateRelations(uow, 'deleteRelation', {
       table: table,
       payload: payload
     });
   },
-  ADD_RELATION: function ADD_RELATION(uow, _ref9) {
-    var table = _ref9.table,
-        payload = _ref9.payload;
+  ADD_RELATION: function ADD_RELATION(uow, _ref11) {
+    var table = _ref11.table,
+        payload = _ref11.payload;
     return updateRelations(uow, 'addToRelation', {
       table: table,
       payload: payload
     });
   },
-  FIND: function FIND(uow, _ref10) {
-    var table = _ref10.table,
-        payload = _ref10.payload;
+  FIND: function FIND(uow, _ref12) {
+    var table = _ref12.table,
+        payload = _ref12.payload;
     return uow.addOperations(_constants.OperationType.FIND, table, payload);
   }
 };
 exports.OperationJSONAdapter = OperationJSONAdapter;
 
-function baseBulkArgs(uow, _ref11) {
-  var table = _ref11.table,
-      payload = _ref11.payload;
+function baseBulkArgs(uow, _ref13) {
+  var table = _ref13.table,
+      payload = _ref13.payload;
   var args = [];
 
   if (payload.conditional) {
@@ -141,9 +151,9 @@ function baseBulkArgs(uow, _ref11) {
   return args;
 }
 
-function updateRelations(uow, method, _ref12) {
-  var table = _ref12.table,
-      payload = _ref12.payload;
+function updateRelations(uow, method, _ref14) {
+  var table = _ref14.table,
+      payload = _ref14.payload;
   var args = [table];
 
   if (typeof payload.parentObject === 'string') {

package/lib/urls.js

@@ -142,6 +142,11 @@ var Urls = /*#__PURE__*/function () {
     value: function dataTable(tableName) {
       return "".concat(this.data(), "/").concat(tableName);
     }
+  }, {
+    key: "dataTableUpsert",
+    value: function dataTableUpsert(tableName) {
+      return "".concat(this.data(), "/").concat(tableName, "/upsert");
+    }
   }, {
     key: "dataTableDeepSave",
     value: function dataTableDeepSave(tableName) {
@@ -182,6 +187,11 @@ var Urls = /*#__PURE__*/function () {
     value: function dataBulkTable(tableName) {
       return "".concat(this.data(), "/bulk/").concat(tableName);
     }
+  }, {
+    key: "dataBulkTableUpsert",
+    value: function dataBulkTableUpsert(tableName) {
+      return "".concat(this.data(), "/bulkupsert/").concat(tableName);
+    }
   }, {
     key: "dataBulkTableDelete",
     value: function dataBulkTableDelete(tableName) {
@@ -314,6 +324,16 @@ var Urls = /*#__PURE__*/function () {
     key: "fileBinaryPath",
     value: function fileBinaryPath(path) {
       return "".concat(this.files(), "/binary/").concat(path);
+    }
+  }, {
+    key: "fileAppendPath",
+    value: function fileAppendPath(path) {
+      return "".concat(this.files(), "/append/").concat(path);
+    }
+  }, {
+    key: "fileAppendBinaryPath",
+    value: function fileAppendBinaryPath(path) {
+      return "".concat(this.files(), "/append/binary/").concat(path);
     } //users
 
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "6.3.0",
+  "version": "6.3.4",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",
@@ -83,7 +83,7 @@
     "rimraf": "^3.0.2",
     "socket.io": "^2.3.0",
     "terser-webpack-plugin": "^2.3.8",
-    "typescript": "^4.3.4",
+    "typescript": "^4.5.4",
     "watch": "^1.0.2",
     "watchify": "^4.0.0",
     "webpack": "^4.46.0",

package/src/data/rt-handlers.js

@@ -1,13 +1,15 @@
 import { RTListeners } from '../rt'
 
 const ChangesTypes = {
-  CREATED: 'created',
-  UPDATED: 'updated',
-  DELETED: 'deleted',
-
-  BULK_CREATED: 'bulk-created',
-  BULK_UPDATED: 'bulk-updated',
-  BULK_DELETED: 'bulk-deleted',
+  CREATED : 'created',
+  UPDATED : 'updated',
+  DELETED : 'deleted',
+  UPSERTED: 'upserted',
+
+  BULK_CREATED : 'bulk-created',
+  BULK_UPDATED : 'bulk-updated',
+  BULK_DELETED : 'bulk-deleted',
+  BULK_UPSERTED: 'bulk-upserted',
 }
 
 const RelationsChangesTypes = {
@@ -20,6 +22,7 @@ const SingleChangesTypes = [
   ChangesTypes.CREATED,
   ChangesTypes.UPDATED,
   ChangesTypes.DELETED,
+  ChangesTypes.UPSERTED,
 ]
 
 export default class RTHandlers extends RTListeners {
@@ -53,6 +56,22 @@ export default class RTHandlers extends RTListeners {
     this.removeCreateListeners(undefined, callback)
   }
 
+  addUpsertListener(whereClause, callback, onError) {
+    this.addChangesListener(ChangesTypes.UPSERTED, whereClause, callback, onError)
+  }
+
+  removeUpsertListeners(whereClause, callback) {
+    this.removeChangesListeners(ChangesTypes.UPSERTED, whereClause, callback)
+  }
+
+  removeUpsertListener(callback) {
+    if (!callback || typeof callback !== 'function') {
+      throw new Error('Listener Function must be passed.')
+    }
+
+    this.removeUpsertListeners(undefined, callback)
+  }
+
   addUpdateListener(whereClause, callback, onError) {
     this.addChangesListener(ChangesTypes.UPDATED, whereClause, callback, onError)
   }
@@ -133,6 +152,22 @@ export default class RTHandlers extends RTListeners {
     this.removeBulkDeleteListeners(undefined, callback)
   }
 
+  addBulkUpsertListener(whereClause, callback, onError) {
+    this.addChangesListener(ChangesTypes.BULK_UPSERTED, whereClause, callback, onError)
+  }
+
+  removeBulkUpsertListeners() {
+    this.removeChangesListeners(ChangesTypes.BULK_UPSERTED)
+  }
+
+  removeBulkUpsertListener(callback) {
+    if (!callback || typeof callback !== 'function') {
+      throw new Error('Listener Function must be passed.')
+    }
+
+    this.removeChangesListeners(ChangesTypes.BULK_UPSERTED, undefined, callback)
+  }
+
   addSetRelationListener(relationColumnName, parentObjects, callback, onError) {
     this.addRelationsChangesListener(RelationsChangesTypes.SET, relationColumnName, parentObjects, callback, onError)
   }

package/src/data/store.js

@@ -48,10 +48,14 @@ export default class DataStore {
     return this.rtHandlers = this.rtHandlers || new RTHandlers(this)
   }
 
-  async save(object) {
+  async save(object, isUpsert) {
+    const url = isUpsert
+      ? this.app.urls.dataTableUpsert(this.className)
+      : this.app.urls.dataTable(this.className)
+
     return this.app.request
       .put({
-        url : this.app.urls.dataTable(this.className),
+        url,
         data: convertToServerRecord(object),
       })
       .then(result => this.parseResponse(result))
@@ -229,6 +233,27 @@ export default class DataStore {
     })
   }
 
+  async bulkUpsert(objects) {
+    const errorMessage = 'Objects must be provided and must be an array of objects.'
+
+    if (!objects || !Array.isArray(objects) || !objects.length) {
+      throw new Error(errorMessage)
+    }
+
+    objects = objects.map(object => {
+      if (!object || typeof object !== 'object' || Array.isArray(object)) {
+        throw new Error(errorMessage)
+      }
+
+      return object
+    })
+
+    return this.app.request.put({
+      url : this.app.urls.dataBulkTableUpsert(this.className),
+      data: objects,
+    })
+  }
+
   async bulkUpdate(condition, changes) {
     if (!condition || typeof condition !== 'string') {
       throw new Error('Condition must be provided and must be a string.')

package/src/files/index.js

@@ -29,7 +29,7 @@ export default class Files {
       query.overwrite = overwrite
     }
 
-    filePath = FilesUtils.preventSlashInPath(filePath)
+    filePath = FilesUtils.trimSlashesInPath(filePath)
     fileName = FilesUtils.sanitizeFileName(fileName)
 
     return this.app.request.put({
@@ -47,7 +47,7 @@ export default class Files {
       query.overwrite = overwrite
     }
 
-    filePath = FilesUtils.preventSlashInPath(filePath)
+    filePath = FilesUtils.trimSlashesInPath(filePath)
 
     const pathTokens = FilesUtils.parseFilePath(filePath)
 
@@ -66,7 +66,7 @@ export default class Files {
       }
 
       return this.app.request.post({
-        url  : `${this.app.urls.filePath(filePath)}/${fileName || ''}`,
+        url  : `${this.app.urls.filePath(filePath)}/${fileName}`,
         query: query,
         data : {
           url: file
@@ -93,6 +93,94 @@ export default class Files {
     })
   }
 
+  async append(filePath, fileName, fileContent) {
+    if (!filePath || typeof filePath !== 'string') {
+      throw new Error('"filePath" must be provided and must be a string.')
+    }
+
+    filePath = FilesUtils.trimSlashesInPath(filePath)
+
+    if (arguments.length === 2) {
+      fileContent = fileName
+      fileName = undefined
+
+      const pathTokens = FilesUtils.parseFilePath(filePath)
+
+      if (pathTokens.fileName) {
+        filePath = pathTokens.filePath
+        fileName = pathTokens.fileName
+      }
+    }
+
+    if (!fileName) {
+      throw new Error('Can not resolve target file name')
+    }
+
+    fileName = FilesUtils.sanitizeFileName(fileName)
+
+    if (typeof fileContent === 'string') {
+      return this.app.request.post({
+        url : `${this.app.urls.fileAppendPath(filePath)}/${fileName}`,
+        data: {
+          url: fileContent
+        },
+      })
+    }
+
+    if (FilesUtils.isBytesArray(fileContent)) {
+      fileContent = await FilesUtils.toBase64(fileContent)
+
+      return this.app.request.put({
+        url    : `${this.app.urls.fileAppendBinaryPath(filePath)}/${fileName}`,
+        headers: { 'Content-Type': 'text/plain' },
+        data   : fileContent,
+      })
+    }
+
+    return this.app.request.post({
+      url : `${this.app.urls.fileAppendPath(filePath)}/${fileName}`,
+      form: {
+        file: fileContent
+      },
+    })
+  }
+
+  async appendText(filePath, fileName, textContent) {
+    if (!filePath || typeof filePath !== 'string') {
+      throw new Error('"filePath" must be provided and must be a string.')
+    }
+
+    filePath = FilesUtils.trimSlashesInPath(filePath)
+
+    if (arguments.length === 2) {
+      textContent = fileName
+      fileName = undefined
+
+      const pathTokens = FilesUtils.parseFilePath(filePath)
+
+      if (pathTokens.fileName) {
+        filePath = pathTokens.filePath
+        fileName = pathTokens.fileName
+      }
+    }
+
+    if (!fileName) {
+      throw new Error('Can not resolve target file name')
+    }
+
+    if (typeof textContent !== 'string') {
+      throw new Error('"textContent" must be a string')
+    }
+
+    fileName = FilesUtils.sanitizeFileName(fileName)
+
+    return this.app.request.put({
+      url    : `${this.app.urls.fileAppendPath(filePath)}/${fileName}`,
+      headers: { 'Content-Type': 'text/plain' },
+      data   : textContent,
+    })
+  }
+
   async listing(filePath, pattern, sub, pagesize, offset) {
     const query = {}
 
@@ -100,7 +188,7 @@ export default class Files {
       throw new Error('"filePath" must be provided and must be a string.')
     }
 
-    filePath = FilesUtils.preventSlashInPath(filePath)
+    filePath = FilesUtils.trimSlashesInPath(filePath)
 
     if (pattern && typeof pattern === 'string') {
       query.pattern = pattern
@@ -181,7 +269,7 @@ export default class Files {
       throw new Error('"filePath" must be provided and must be a string.')
     }
 
-    filePath = FilesUtils.preventSlashInPath(filePath)
+    filePath = FilesUtils.trimSlashesInPath(filePath)
 
     return this.app.request.get({
       url  : this.app.urls.filePath(filePath),
@@ -196,7 +284,7 @@ export default class Files {
       throw new Error('Directory "path" must be provided and must be a string.')
     }
 
-    directoryPath = FilesUtils.preventSlashInPath(directoryPath)
+    directoryPath = FilesUtils.trimSlashesInPath(directoryPath)
 
     return this.app.request.delete({
       url: this.app.urls.filePath(directoryPath),
@@ -212,7 +300,7 @@ export default class Files {
       throw new Error('Files Pattern must be provided and must be a string.')
     }
 
-    filesPath = FilesUtils.preventSlashInPath(filesPath)
+    filesPath = FilesUtils.trimSlashesInPath(filesPath)
 
     return this.app.request.get({
       url  : this.app.urls.filePath(filesPath),

package/src/files/utils.js

@@ -1,10 +1,33 @@
 const FilesUtils = {
+
+  isBytesArray(data) {
+    if (typeof Buffer !== 'undefined' && data instanceof Buffer) {
+      return true
+    }
+
+    if (typeof ArrayBuffer !== 'undefined' && data instanceof ArrayBuffer) {
+      return true
+    }
+
+    return Array.isArray(data)
+  },
+
   ensureSlashInPath(path) {
     return !path.startsWith('/') ? `/${path}` : path
   },
 
-  preventSlashInPath(path) {
-    return (path && path.startsWith('/')) ? path.slice(1) : path
+  trimSlashesInPath(path) {
+    if (path) {
+      if (path.startsWith('/')) {
+        path = path.slice(1)
+      }
+
+      if (path.endsWith('/')) {
+        path = path.slice(0, path.length - 1)
+      }
+    }
+
+    return path
   },
 
   parseFilePath(path) {

package/src/index.js

@@ -420,7 +420,8 @@ class Backendless {
   /** @deprecated */
   get applicationId() {
     // eslint-disable-next-line no-console
-    console.warn('getter/setter for Backendless.applicationId is deprecated, instead use Backendless.appId')
+    // temporary comment it because it breaks JS-CodeRunner version less than 6.3.0
+    // console.warn('getter/setter for Backendless.applicationId is deprecated, instead use Backendless.appId')
 
     return this.appId
   }

package/src/messaging/helpers/email-envelope.js

@@ -18,6 +18,7 @@ export default class EmailEnvelope {
     this.ccAddresses = Utils.castArray(data.ccAddresses)
     this.bccAddresses = Utils.castArray(data.bccAddresses)
     this.query = data.query || null
+    this.uniqueEmails = data.uniqueEmails || false
   }
 
   /**
@@ -129,6 +130,23 @@ export default class EmailEnvelope {
     return this.query
   }
 
+  /**
+   * @param {boolean} uniqueEmails
+   * @returns {EmailEnvelope}
+   */
+  setUniqueEmails(uniqueEmails) {
+    this.uniqueEmails = uniqueEmails
+
+    return this
+  }
+
+  /**
+   * @returns {uniqueEmails|boolean}
+   */
+  getUniqueEmails() {
+    return this.uniqueEmails
+  }
+
   toJSON() {
     const data = {}
 
@@ -148,6 +166,8 @@ export default class EmailEnvelope {
       data.criteria = this.query
     }
 
+    data.uniqueEmails = this.uniqueEmails
+
     return data
   }
 }

package/src/messaging/index.js

@@ -118,10 +118,14 @@ export default class Messaging {
 
     data['template-name'] = templateName
 
-    if (templateValues) {
+    if (templateValues && !Array.isArray(templateValues)) {
       data['template-values'] = templateValues
     }
 
+    if (Array.isArray(templateValues) && !attachments) {
+      attachments = templateValues
+    }
+
     if (attachments) {
       data.attachment = attachments
     }

package/src/unit-of-work/constants.js

@@ -5,6 +5,8 @@ export const OperationType = {
   UPDATE_BULK    : 'UPDATE_BULK',
   DELETE         : 'DELETE',
   DELETE_BULK    : 'DELETE_BULK',
+  UPSERT         : 'UPSERT',
+  UPSERT_BULK    : 'UPSERT_BULK',
   FIND           : 'FIND',
   ADD_RELATION   : 'ADD_RELATION',
   SET_RELATION   : 'SET_RELATION',