@cocreate/file 1.7.2 → 1.7.3

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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)
 
 

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.2",
+  "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.1",
-    "@cocreate/config": "^1.5.1",
-    "@cocreate/render": "^1.27.2",
-    "@cocreate/utils": "^1.24.1"
+    "@cocreate/actions": "^1.11.2",
+    "@cocreate/config": "^1.5.2",
+    "@cocreate/render": "^1.27.3",
+    "@cocreate/utils": "^1.24.2"
   }
 }

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.broadcastBrowser = 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,35 +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 || '';
 
             const fileExtension = path.extname(file);
             let mimeType = mimeTypes[fileExtension]
 
-            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
 
-            let Path = '';
-            if (directoryName.endsWith("/"))
-                Path = directoryName
-            else if (directoryName)
-                Path = directoryName + '/'
-            else
-                Path = '/'
-
-            let pathname = Path + name;
+            if (!Path) {
+                if (directoryName === '/')
+                    Path = directoryName
+                else
+                    Path = '/' + directoryName
+            }
 
-            let folder = ''
+            let pathname
             if (Path === '/')
-                folder = Path
-            else {
-                let result = Path.split('/');
-                folder = result[result.length - 2];
-            }
+                pathname = Path + name;
+            else
+                pathname = Path + '/' + name;
 
             if (isDirectory)
                 mimeType = "text/directory"
@@ -230,12 +226,12 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 source = getSource(`${entryPath}/${file}`, mimeType)
 
             let values = {
-                '{{name}}': name,
-                '{{source}}': source,
-                '{{directory}}': folder,
-                '{{path}}': Path,
+                '{{name}}': name || '',
+                '{{source}}': source || '',
+                '{{directory}}': directoryName || '',
+                '{{path}}': Path || '',
                 '{{pathname}}': pathname,
-                '{{content-type}}': mimeType
+                '{{content-type}}': mimeType || ''
             }
 
             let object = { ...directory.object }
@@ -244,7 +240,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             if (!object.src)
                 object.src = "{{source}}"
             if (!object.directory)
-                object.directory = "/{{directory}}"
+                object.directory = "{{directory}}"
             if (!object.path)
                 object.path = "{{path}}"
             if (!object.pathname)
@@ -264,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 (folder)
-                                    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]);
                         }
                     }
 
@@ -286,6 +273,8 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 }
 
             response = await runStore(newObject);
+            console.log(`Uploaded: ${entryPath}/${file}`, `To: ${pathname}`)
+
             if (response.error)
                 errorLog.push(response.error)
 
@@ -296,7 +285,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 else
                     newEntry = entry + '/' + name
 
-                await runFiles(directory, newEntry, exclude, pathname)
+                await runFiles(directory, newEntry, exclude, pathname, name)
             }
         }
         if (errorLog.length)