@cocreate/file 1.9.7 → 1.9.9

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.9.9](https://github.com/CoCreate-app/CoCreate-file/compare/v1.9.8...v1.9.9) (2023-10-25)
+
+
+### Bug Fixes
+
+* bump dependencies ([e785667](https://github.com/CoCreate-app/CoCreate-file/commit/e785667854cbc76da7650ff99fc39eb18387b843))
+
+## [1.9.8](https://github.com/CoCreate-app/CoCreate-file/compare/v1.9.7...v1.9.8) (2023-10-22)
+
+
+### Bug Fixes
+
+* base64 conditions ([55ef6e3](https://github.com/CoCreate-app/CoCreate-file/commit/55ef6e3b29ccc2b5b40669ffa16eb92802b6eb2c))
+* support watch upload of deeply nested files ([db8b460](https://github.com/CoCreate-app/CoCreate-file/commit/db8b4601aa92ed76ff10095d2505cffbda54a8ac))
+
 ## [1.9.7](https://github.com/CoCreate-app/CoCreate-file/compare/v1.9.6...v1.9.7) (2023-10-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file",
-  "version": "1.9.7",
+  "version": "1.9.9",
   "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.6",
-    "@cocreate/config": "^1.6.4",
-    "@cocreate/render": "^1.28.3",
-    "@cocreate/utils": "^1.25.3"
+    "@cocreate/actions": "^1.12.0",
+    "@cocreate/config": "^1.6.5",
+    "@cocreate/render": "^1.29.0",
+    "@cocreate/utils": "^1.26.1"
   }
 }

package/src/client.js

@@ -226,57 +226,38 @@ async function getCustomData(file) {
 
 // This function reads the file and returns its src
 function readFile(file) {
-    // Return a new promise that resolves the file object
     return new Promise((resolve) => {
-        // Split the file type into an array
         const fileType = file.type.split('/');
         let readAs;
 
-        // Check if the file type is a directory
         if (fileType[1] === 'directory') {
             return resolve(file)
-        }
-        // Check if the file type is a image
-        else if (['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(fileType[1])
+        } else if (['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(fileType[1])
             || fileType[0] === 'image') {
             readAs = 'readAsDataURL';
-        }
-        // Check if the file type is a video
-        else if (['mp4', 'avi', 'mov', 'mpeg', 'flv'].includes(fileType[1])
+        } else if (['mp4', 'avi', 'mov', 'mpeg', 'flv'].includes(fileType[1])
             || fileType[0] === 'video') {
             readAs = 'readAsDataURL';
-        }
-        // Check if the file type is an audio
-        else if (['mp3', 'wav', 'wma', 'aac', 'ogg'].includes(fileType[1])
+        } if (['mp3', 'wav', 'wma', 'aac', 'ogg'].includes(fileType[1])
             || fileType[0] === 'audio') { // updated condition
             readAs = 'readAsDataURL';
-        }
-        // Check if the file type is a pdf
-        else if (fileType[1] === 'pdf') {
+        } else if (fileType[1] === 'pdf') {
             readAs = 'readAsDataURL';
-        }
-        // Check if the file type is a document
-        else if (['doc', 'msword', 'docx', 'xlsx', 'pptx'].includes(fileType[1])) {
+        } else if (['doc', 'msword', 'docx', 'xlsx', 'pptx'].includes(fileType[1])) {
             readAs = 'readAsBinaryString';
-        }
-        // Otherwise, assume the file type is text
-        else {
+        } else {
             readAs = 'readAsText';
         }
 
-        // Create a FileReader instance to read the file
         const reader = new FileReader();
-        // Read the file based on the file type
         reader[readAs](file);
-        // When the file is loaded, resolve the file object
+
         reader.onload = () => {
             file.src = reader.result;
-            // If the file type is a document, convert it to base64 encoding
             if (['doc', 'msword', 'docx', 'xlsx', 'pptx'].includes(fileType)) {
                 file.src = btoa(file.src);
             }
 
-            // Resolve the file object
             resolve(file);
         };
     });

package/src/server.js

@@ -176,20 +176,23 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             }
             if (skip) continue
 
+            let isDirectory = fs.existsSync(`${entryPath}/${file}`) && fs.lstatSync(`${entryPath}/${file}`).isDirectory();
+            let name = file
+            let source = ''
+
             for (let i = 0; i < match.length; i++) {
                 skip = true
                 const filePath = path.resolve(entryPath, file);
                 if (filePath.startsWith(match[i])) {
                     skip = false
                     break;
+                } else if (isDirectory && match[i].startsWith(filePath)) {
+                    skip = 'directory'
+                    break;
                 }
             }
 
-            if (skip) continue
-
-            let isDirectory = fs.existsSync(`${entryPath}/${file}`) && fs.lstatSync(`${entryPath}/${file}`).isDirectory();
-            let name = file
-            let source = ''
+            if (skip === true) continue
 
             const fileExtension = path.extname(file);
             let mimeType = mimeTypes[fileExtension]
@@ -267,16 +270,19 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 }
             }
 
-            if (!newObject.object._id)
-                newObject.$filter = {
-                    query: [{ key: 'pathname', value: pathname, operator: '$eq' }]
-                }
 
-            response = await runStore(newObject);
-            console.log(`Uploaded: ${entryPath}/${file}`, `To: ${pathname}`)
+            if (skip !== 'directory') {
+                if (!newObject.object._id)
+                    newObject.$filter = {
+                        query: [{ key: 'pathname', value: pathname, operator: '$eq' }]
+                    }
+
+                response = await runStore(newObject);
+                console.log(`Uploaded: ${entryPath}/${file}`, `To: ${pathname}`)
 
-            if (response.error)
-                errorLog.push(response.error)
+                if (response.error)
+                    errorLog.push(response.error)
+            }
 
             if (isDirectory && pathname) {
                 let newEntry