@cocreate/file 1.7.0 → 1.7.2

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.7.2](https://github.com/CoCreate-app/CoCreate-file/compare/v1.7.1...v1.7.2) (2023-09-18)
+
+
+### Bug Fixes
+
+*  Add path and pathname ([8dda8ed](https://github.com/CoCreate-app/CoCreate-file/commit/8dda8edb80c4dca324d6250ef5eb2a8588aa73ab))
+* Update CoCreate depndencies to latest versions ([955f3b2](https://github.com/CoCreate-app/CoCreate-file/commit/955f3b2567d6cbb288c25e93f4dd8fa9adc96a27))
+
+## [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

@@ -8,18 +8,17 @@ module.exports = {
             "object": {
                 "_id": "61a12db2a8b6b4001a9f5a2e",
                 "name": "index.html",
-                "path": "/docs/file/index.html",
+                "path": "/docs/file/",
+                "pathname": "/docs/file/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
                     "*",
                     "general.cocreate.app"
                 ],
-                "directory": "/docs/file",
-                "parentDirectory": "{{parentDirectory}}",
+                "directory": "file",
                 "content-type": "{{content-type}}",
-                "public": "true",
-                "website_id": "644d4bff8036fb9d1d1fd69c"
+                "public": "true"
             }
         }
     ]
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "A headless file uploader that uses HTML5 attributes for customization. Allows easy upload of files to server.",
   "keywords": [
     "file",
@@ -59,9 +59,9 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.11.0",
-    "@cocreate/config": "^1.5.0",
-    "@cocreate/render": "^1.27.0",
-    "@cocreate/utils": "^1.24.0"
+    "@cocreate/actions": "^1.11.1",
+    "@cocreate/config": "^1.5.1",
+    "@cocreate/render": "^1.27.2",
+    "@cocreate/utils": "^1.24.1"
   }
 }

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';
@@ -115,8 +117,8 @@ async function fileEvent(event) {
                 files[i] = await readFile(files[i])
 
             files[i].directory = handle.directory || '/'
-            files[i].parentDirectory = handle.parentDirectory || ''
-            files[i].path = handle.path || '/' + handle.name
+            files[i].path = handle.path || '/'
+            files[i].pathname = handle.pathname || '/' + handle.name
             files[i]['content-type'] = files[i].type
             files[i].input = input
             files[i].id = await getFileId(files[i])
@@ -157,9 +159,9 @@ async function fileEvent(event) {
 async function getDirectoryHandles(handle, name) {
     let handles = [];
     for await (const entry of handle.values()) {
-        entry.directory = '/' + name
-        entry.parentDirectory = name.split("/").pop();
-        entry.path = '/' + name + '/' + entry.name
+        entry.directory = name
+        entry.path = '/' + name + '/'
+        entry.pathname = '/' + name + '/' + entry.name
         if (!entry.webkitRelativePath)
             entry.webkitRelativePath = name
 
@@ -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' })
@@ -634,8 +631,8 @@ async function create(directory, type, name, src = "") {
             }
 
             if (directory.input) {
-                file.directory = directory.path
-                file.parentDirectory = directory.name
+                file.directory = directory.name
+                file.pathname = directory.path + '/' + file.name
                 file.path = directory.path + '/' + file.name
                 file.input = directory.input
                 file.handle = handle

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.broadcastBrowser = 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' }
@@ -195,14 +195,9 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             let name = file
             let source = ''
             let directoryName = parentDirectory || '';
-            let parentDirectoryOnly = parentDirectory || '';
-            let index = parentDirectoryOnly.lastIndexOf('/') + 1
-            if (parentDirectoryOnly && index) {
-                parentDirectoryOnly = parentDirectoryOnly.substring(index)
-            }
+
             const fileExtension = path.extname(file);
             let mimeType = mimeTypes[fileExtension]
-            let pathName = '';
 
             if (!directoryName && directory.object && directory.object.directory)
                 directoryName = directory.object.directory.replace('{{directory}}', '').trim()
@@ -211,12 +206,23 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
             if (exclude && exclude.includes(directoryName)) continue
 
+            let Path = '';
             if (directoryName.endsWith("/"))
-                pathName = directoryName + name
+                Path = directoryName
             else if (directoryName)
-                pathName = directoryName + '/' + name
+                Path = directoryName + '/'
             else
-                pathName = '/' + name
+                Path = '/'
+
+            let pathname = Path + name;
+
+            let folder = ''
+            if (Path === '/')
+                folder = Path
+            else {
+                let result = Path.split('/');
+                folder = result[result.length - 2];
+            }
 
             if (isDirectory)
                 mimeType = "text/directory"
@@ -226,9 +232,9 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             let values = {
                 '{{name}}': name,
                 '{{source}}': source,
-                '{{directory}}': directoryName,
-                '{{parentDirectory}}': parentDirectoryOnly,
-                '{{path}}': pathName,
+                '{{directory}}': folder,
+                '{{path}}': Path,
+                '{{pathname}}': pathname,
                 '{{content-type}}': mimeType
             }
 
@@ -239,10 +245,10 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 object.src = "{{source}}"
             if (!object.directory)
                 object.directory = "/{{directory}}"
-            if (!object.parentDirectory)
-                object.parentDirectory = "{{parentDirectory}}"
             if (!object.path)
                 object.path = "{{path}}"
+            if (!object.pathname)
+                object.pathname = "{{pathname}}"
             if (!object["content-type"])
                 object["content-type"] = '{{content-type}}'
             if (!object.public && object.public != false && object.public != 'false')
@@ -259,7 +265,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                     if (variables) {
                         for (let variable of variables) {
                             if (variable == '{{directory}}') {
-                                if (parentDirectory)
+                                if (folder)
                                     newObject.object[key] = values[variable]
                                 else
                                     newObject.object[key] = newObject.object[key].replace(variable, '');
@@ -275,22 +281,22 @@ 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: 'pathname', value: pathname, operator: '$or' }]
                 }
 
             response = await runStore(newObject);
             if (response.error)
                 errorLog.push(response.error)
 
-            if (isDirectory && pathName) {
+            if (isDirectory && pathname) {
                 let newEntry
                 if (entry.endsWith("/"))
                     newEntry = entry + name
                 else
                     newEntry = entry + '/' + name
 
-                await runFiles(directory, newEntry, exclude, pathName)
+                await runFiles(directory, newEntry, exclude, pathname)
             }
         }
         if (errorLog.length)
@@ -377,9 +383,9 @@ 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' }]
+                    if (!object._id && object.pathname)
+                        data.$filter = {
+                            query: [{ key: 'pathname', value: object.pathname, operator: '$or' }]
                         }
 
                     if (match.length && isMatch)
@@ -408,7 +414,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,