@cocreate/file 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.7.1](https://github.com/CoCreate-app/CoCreate-file/compare/v1.7.0...v1.7.1) (2023-09-17)
+
+
+### Bug Fixes
+
+* renamed filter to $filter ([c8e8390](https://github.com/CoCreate-app/CoCreate-file/commit/c8e83901429d2c370b327449a9f7f0081b03e6fd))
+* update broadcast to broadcastSender false ([b93ca93](https://github.com/CoCreate-app/CoCreate-file/commit/b93ca93f6b1bff1b1052c841f63919f4156e551e))
+* update data.filter to data.$filter, supports data.object.$filter to ad  filters per object ([7ccb455](https://github.com/CoCreate-app/CoCreate-file/commit/7ccb45521a8af3c67587c756c905d7ed4a557a60))
+
 # [1.7.0](https://github.com/CoCreate-app/CoCreate-file/compare/v1.6.3...v1.7.0) (2023-09-07)
 
 

package/CoCreate.config.js

@@ -22,4 +22,4 @@ module.exports = {
             }
         }
     ]
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "A headless file uploader that uses HTML5 attributes for customization. Allows easy upload of files to server.",
   "keywords": [
     "file",

package/src/client.js

@@ -15,10 +15,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  ********************************************************************************/
 
-// Commercial Licensing Information:
-// For commercial use of this software without the copyleft provisions of the AGPLv3,
-// you must obtain a commercial license from CoCreate LLC.
-// For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+/**
+ * Commercial Licensing Information:
+ * For commercial use of this software without the copyleft provisions of the AGPLv3,
+ * you must obtain a commercial license from CoCreate LLC.
+ * For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+ */
 
 import Observer from '@cocreate/observer';
 import Crud from '@cocreate/crud-client';
@@ -389,7 +391,7 @@ async function upload(element, data) {
             let Data = Elements.getObject(input);
             if (Data.type) {
                 if (input.getFilter)
-                    Data.filter = input.getFilter()
+                    Data.$filter = input.getFilter()
 
                 let files = await getFiles(input)
 
@@ -406,18 +408,16 @@ async function upload(element, data) {
                     }
                 }
 
-                let action = 'update' + Data.type.charAt(0).toUpperCase() + Data.type.slice(1)
-                if (Crud[action]) {
-                    let response = await Crud[action](Data)({
-                        array,
-                        object,
-                        upsert: true
-                    });
-
-                    data.push(response)
-                    if (response && (!object || object !== response.object)) {
-                        Elements.setTypeValue(element, response);
-                    }
+                Data.method = 'update.' + Data.type
+                let response = await Crud.send(Data)({
+                    array,
+                    object,
+                    upsert: true
+                });
+
+                data.push(response)
+                if (response && (!object || object !== response.object)) {
+                    Elements.setTypeValue(element, response);
                 }
             }
         }
@@ -471,7 +471,7 @@ async function Import(element, data) {
             let Data = Elements.getObject(element[i]);
             if (Data.type) {
                 if (element[i].getFilter)
-                    Data.filter = element[i].getFilter()
+                    Data.$filter = element[i].getFilter()
 
                 if (Data.type === 'key')
                     Data.type = 'object'
@@ -482,10 +482,8 @@ async function Import(element, data) {
 
         if (data.length) {
             for (let i = 0; i < data.length; i++) {
-                let action = 'create' + data[i].type.charAt(0).toUpperCase() + data[i].type.slice(1)
-                if (Crud[action]) {
-                    data[i] = await Crud[action](data[i])
-                }
+                data[i].method = 'create.' + data[i].type
+                data[i] = await Crud.send(data[i])
             }
         }
 
@@ -523,15 +521,14 @@ async function Export(element, data) {
         let Data = Elements.getObject(element[i]);
         if (Data.type) {
             if (element[i].getFilter)
-                Data.filter = element[i].getFilter()
+                Data.$filter = element[i].getFilter()
 
             if (Data.type === 'key')
                 Data.type = 'object'
-            let action = 'read' + Data.type.charAt(0).toUpperCase() + Data.type.slice(1)
-            if (Crud[action]) {
-                Data = await Crud[action](Data)
-                data.push(...Data[Data.type])
-            }
+            Data.method = 'read.' + Data.type
+            Data = await Crud.send(Data)
+            data.push(...Data[Data.type])
+
         }
 
         let queriedElements = queryElements({ element: element[i], prefix: 'export' })

package/src/index.js

@@ -15,10 +15,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  ********************************************************************************/
 
-// Commercial Licensing Information:
-// For commercial use of this software without the copyleft provisions of the AGPLv3,
-// you must obtain a commercial license from CoCreate LLC.
-// For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+/**
+ * Commercial Licensing Information:
+ * For commercial use of this software without the copyleft provisions of the AGPLv3,
+ * you must obtain a commercial license from CoCreate LLC.
+ * For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+ */
 
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {

package/src/server.js

@@ -121,13 +121,13 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
 
     crud.socket.create(config)
-    config.broadcast = false
+    config.broadcastSender = false
 
     if (config.email && config.password) {
         let request = {
             method: 'signIn',
             array: 'users',
-            filter: {
+            $filter: {
                 query: [
                     { key: 'email', value: config.email, operator: '$eq' },
                     { key: 'password', value: config.password, operator: '$eq' }
@@ -275,8 +275,8 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             }
 
             if (!newObject.object._id)
-                newObject.filter = {
-                    query: [{ key: 'path', value: pathName, operator: '$eq' }]
+                newObject.$filter = {
+                    query: [{ key: 'path', value: pathName, operator: '$or' }]
                 }
 
             response = await runStore(newObject);
@@ -378,8 +378,8 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
                     let data = { array, object }
                     if (!object._id && object.path)
-                        data.filter = {
-                            query: [{ key: 'path', value: object.path, operator: '$eq' }]
+                        data.$filter = {
+                            query: [{ key: 'path', value: object.path, operator: '$or' }]
                         }
 
                     if (match.length && isMatch)
@@ -408,7 +408,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
     async function runStore(data) {
         try {
             let response;
-            if (!data.object._id && !data.filter) {
+            if (!data.object._id && !data.$filter) {
                 response = await crud.send({
                     method: 'create.object',
                     ...config,