@cocreate/file 1.7.1 → 1.7.3

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.7.3](https://github.com/CoCreate-app/CoCreate-file/compare/v1.7.2...v1.7.3) (2023-09-19)
+
+
+### Bug Fixes
+
+* directory, path, pathname ([9fdad2d](https://github.com/CoCreate-app/CoCreate-file/commit/9fdad2d90d67b08b74d5027999fb1989ca67c853))
+* removed crud.socket.create() as it is handeled automatically duing socket.send ([ca012d0](https://github.com/CoCreate-app/CoCreate-file/commit/ca012d0789b6e66af472de688979b8f21b4f73e7))
+
+## [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)
 
 

package/CoCreate.config.js

@@ -8,17 +8,16 @@ 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/docs/index.html

@@ -377,7 +377,6 @@
                     src="/assets/svg/pencil-alt.svg"></i>
             </button>
         </main>
-        <script src="/apikey.js"></script>
         <script src="https://CoCreate.app/dist/CoCreate.js"></script>
     </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "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.2",
+    "@cocreate/config": "^1.5.2",
+    "@cocreate/render": "^1.27.3",
+    "@cocreate/utils": "^1.24.2"
   }
 }

package/src/client.js

@@ -117,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])
@@ -159,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
 
@@ -631,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/server.js

@@ -95,11 +95,11 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             prompt: 'Enter the host: '
         },
         prompt: {
-            prompt: 'Choose an authentication option: \n1.key\n2.Sign In\n',
+            prompt: 'Choose an authentication option: \n1.apikey\n2.Sign In\n',
             choices: {
                 '1': {
-                    key: {
-                        prompt: 'Enter your key: '
+                    apikey: {
+                        prompt: 'Enter your apikey: '
                     }
                 },
                 '2': {
@@ -114,15 +114,11 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
         }
     }, null, null, configPath)
 
-    if (!config.organization_id || !config.host || !config.key && (!config.password || config.email)) {
+    if (!config.organization_id || !config.apikey && (!config.password || config.email)) {
         console.log('One or more required config params could not be found')
         process.exit()
     }
 
-
-    crud.socket.create(config)
-    config.broadcastSender = false
-
     if (config.email && config.password) {
         let request = {
             method: 'signIn',
@@ -132,10 +128,11 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                     { key: 'email', value: config.email, operator: '$eq' },
                     { key: 'password', value: config.password, operator: '$eq' }
                 ]
-            }
+            },
+            ...config
         }
 
-        let response = await crud.socket.send(request)
+        let response = await crud.send(request)
         let { success, token } = response;
 
         if (success) {
@@ -165,7 +162,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
         return
     }
 
-    async function runFiles(directory, entry, exclude, parentDirectory = '') {
+    async function runFiles(directory, entry, exclude, Path, directoryName) {
         const entryPath = path.resolve(configDirectoryPath, entry)
         let files = fs.readdirSync(entryPath);
 
@@ -184,7 +181,6 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 const filePath = path.resolve(entryPath, file);
                 if (filePath.startsWith(match[i])) {
                     skip = false
-                    console.log('Uploaded: ', filePath)
                     break;
                 }
             }
@@ -194,29 +190,35 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             let isDirectory = fs.existsSync(`${entryPath}/${file}`) && fs.lstatSync(`${entryPath}/${file}`).isDirectory();
             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()
-            else if (!directoryName)
-                directoryName = '/'
+            if (!directoryName) {
+                if (directory.object && directory.object.directory) {
+                    if (directory.object.directory === "{{directory}}") {
+                        directoryName = entry.split('/')
+                        directoryName = directoryName[directoryName.length - 1]
+                    } else
+                        directoryName = directory.object.directory
+                } else
+                    directoryName = '/'
+            }
 
             if (exclude && exclude.includes(directoryName)) continue
 
-            if (directoryName.endsWith("/"))
-                pathName = directoryName + name
-            else if (directoryName)
-                pathName = directoryName + '/' + name
+            if (!Path) {
+                if (directoryName === '/')
+                    Path = directoryName
+                else
+                    Path = '/' + directoryName
+            }
+
+            let pathname
+            if (Path === '/')
+                pathname = Path + name;
             else
-                pathName = '/' + name
+                pathname = Path + '/' + name;
 
             if (isDirectory)
                 mimeType = "text/directory"
@@ -224,12 +226,12 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 source = getSource(`${entryPath}/${file}`, mimeType)
 
             let values = {
-                '{{name}}': name,
-                '{{source}}': source,
-                '{{directory}}': directoryName,
-                '{{parentDirectory}}': parentDirectoryOnly,
-                '{{path}}': pathName,
-                '{{content-type}}': mimeType
+                '{{name}}': name || '',
+                '{{source}}': source || '',
+                '{{directory}}': directoryName || '',
+                '{{path}}': Path || '',
+                '{{pathname}}': pathname,
+                '{{content-type}}': mimeType || ''
             }
 
             let object = { ...directory.object }
@@ -238,11 +240,11 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             if (!object.src)
                 object.src = "{{source}}"
             if (!object.directory)
-                object.directory = "/{{directory}}"
-            if (!object.parentDirectory)
-                object.parentDirectory = "{{parentDirectory}}"
+                object.directory = "{{directory}}"
             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')
@@ -258,16 +260,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                     let variables = directory.object[key].match(/{{([A-Za-z0-9_.,\[\]\-\/ ]*)}}/g);
                     if (variables) {
                         for (let variable of variables) {
-                            if (variable == '{{directory}}') {
-                                if (parentDirectory)
-                                    newObject.object[key] = values[variable]
-                                else
-                                    newObject.object[key] = newObject.object[key].replace(variable, '');
-                            }
-                            else if (isDirectory && variable == '{{source}}')
-                                delete newObject.object[key]
-                            else
-                                newObject.object[key] = newObject.object[key].replace(variable, values[variable]);
+                            newObject.object[key] = newObject.object[key].replace(variable, values[variable]);
                         }
                     }
 
@@ -276,21 +269,23 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
             if (!newObject.object._id)
                 newObject.$filter = {
-                    query: [{ key: 'path', value: pathName, operator: '$or' }]
+                    query: [{ key: 'pathname', value: pathname, operator: '$or' }]
                 }
 
             response = await runStore(newObject);
+            console.log(`Uploaded: ${entryPath}/${file}`, `To: ${pathname}`)
+
             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, name)
             }
         }
         if (errorLog.length)
@@ -377,9 +372,9 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                         }
 
                     let data = { array, object }
-                    if (!object._id && object.path)
+                    if (!object._id && object.pathname)
                         data.$filter = {
-                            query: [{ key: 'path', value: object.path, operator: '$or' }]
+                            query: [{ key: 'pathname', value: object.pathname, operator: '$or' }]
                         }
 
                     if (match.length && isMatch)