@cocreate/file 1.6.3 → 1.7.1

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [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)
+
+
+### Features
+
+* support match param. An array of files to match with config. if match found upload or save source ([30e6d57](https://github.com/CoCreate-app/CoCreate-file/commit/30e6d57da184f9533a0b75e8acc3a09e68b48629))
+
 ## [1.6.3](https://github.com/CoCreate-app/CoCreate-file/compare/v1.6.2...v1.6.3) (2023-08-21)
 
 

package/CoCreate.config.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file",
-  "version": "1.6.3",
+  "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

@@ -77,9 +77,15 @@ const mimeTypes = {
     ".7z": "application/x-7z-compressed"
 }
 
-module.exports = async function file(CoCreateConfig, configPath) {
+module.exports = async function file(CoCreateConfig, configPath, match) {
     let directories = CoCreateConfig.directories
     let sources = CoCreateConfig.sources
+    let configDirectoryPath = path.dirname(configPath)
+
+    if (match && !Array.isArray(match))
+        match = [match]
+    else if (!match)
+        match = []
 
     let config = await Config({
         organization_id: {
@@ -115,13 +121,13 @@ module.exports = async function file(CoCreateConfig, configPath) {
 
 
     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' }
@@ -143,7 +149,7 @@ module.exports = async function file(CoCreateConfig, configPath) {
 
     }
 
-    console.log('Uploading files...')
+    // console.log('Uploading files...')
 
     /**
      * Store files by config directories
@@ -153,14 +159,15 @@ module.exports = async function file(CoCreateConfig, configPath) {
     async function runDirectories() {
         for (const directory of directories) {
             const entry = directory.entry
-            const exclude = directory.exclude
+            const exclude = directory.exclude || []
             await runFiles(directory, entry, exclude)
         }
         return
     }
 
     async function runFiles(directory, entry, exclude, parentDirectory = '') {
-        let files = fs.readdirSync(entry);
+        const entryPath = path.resolve(configDirectoryPath, entry)
+        let files = fs.readdirSync(entryPath);
 
         for (let file of files) {
             let skip = false
@@ -172,8 +179,19 @@ module.exports = async function file(CoCreateConfig, configPath) {
             }
             if (skip) continue
 
+            for (let i = 0; i < match.length; i++) {
+                skip = true
+                const filePath = path.resolve(entryPath, file);
+                if (filePath.startsWith(match[i])) {
+                    skip = false
+                    console.log('Uploaded: ', filePath)
+                    break;
+                }
+            }
 
-            let isDirectory = fs.existsSync(`${entry}/${file}`) && fs.lstatSync(`${entry}/${file}`).isDirectory();
+            if (skip) continue
+
+            let isDirectory = fs.existsSync(`${entryPath}/${file}`) && fs.lstatSync(`${entryPath}/${file}`).isDirectory();
             let name = file
             let source = ''
             let directoryName = parentDirectory || '';
@@ -203,7 +221,7 @@ module.exports = async function file(CoCreateConfig, configPath) {
             if (isDirectory)
                 mimeType = "text/directory"
             else
-                source = getSource(`${entry}/${file}`, mimeType)
+                source = getSource(`${entryPath}/${file}`, mimeType)
 
             let values = {
                 '{{name}}': name,
@@ -257,8 +275,8 @@ module.exports = async function file(CoCreateConfig, configPath) {
             }
 
             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);
@@ -304,6 +322,7 @@ module.exports = async function file(CoCreateConfig, configPath) {
             let source = { ...sources[i] };
             let keys = new Map()
             let response = {};
+            let isMatch = false
 
             try {
                 if (array) {
@@ -316,7 +335,8 @@ module.exports = async function file(CoCreateConfig, configPath) {
 
                             let variables = object[key].match(/{{([A-Za-z0-9_.,\[\]\-\/ ]*)}}/g);
                             if (variables) {
-                                keys.set(key, `${object[key]}`)
+                                let originalValue = object[key]
+                                keys.set(key, originalValue)
                                 let value = ""
                                 for (let variable of variables) {
                                     let entry = /{{\s*([\w\W]+)\s*}}/g.exec(variable);
@@ -325,6 +345,17 @@ module.exports = async function file(CoCreateConfig, configPath) {
                                         if (!fs.existsSync(entry))
                                             continue
 
+                                        if (!isMatch) {
+                                            const filePath = path.resolve(configDirectoryPath, entry);
+                                            for (let i = 0; i < match.length; i++) {
+                                                if (filePath.startsWith(match[i])) {
+                                                    console.log('Source saved', sources[i])
+                                                    isMatch = true
+                                                    break;
+                                                }
+                                            }
+                                        }
+
                                         let read_type = 'utf8'
                                         const fileExtension = path.extname(entry);
                                         let mime_type = mimeTypes[fileExtension] || 'text/html'
@@ -347,24 +378,24 @@ module.exports = async function file(CoCreateConfig, configPath) {
 
                     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' }]
                         }
 
-                    response = await runStore(data);
+                    if (match.length && isMatch)
+                        response = await runStore(data);
                 }
             } catch (err) {
                 console.log(err)
                 process.exit()
             }
+
             if (response.object && response.object[0] && response.object[0]._id) {
-                for (const [key, value] of keys) {
-                    source.object[key] = value
-                }
                 source.object._id = response.object[0]._id
-            } else {
-                console.log('_id could not be found')
-                process.exit()
+            }
+
+            for (const [key, value] of keys) {
+                source.object[key] = value
             }
 
             updatedSources.push(source)
@@ -377,7 +408,7 @@ module.exports = async function file(CoCreateConfig, configPath) {
     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,
@@ -404,10 +435,10 @@ module.exports = async function file(CoCreateConfig, configPath) {
         if (directories)
             await runDirectories()
 
-        if (sources) {
+        if (sources && sources.length) {
             let sources = await runSources()
             let newConfig = { ...CoCreateConfig }
-            if (directories)
+            if (directories && directories.length)
                 newConfig.directories = directories
 
             newConfig.sources = sources
@@ -427,11 +458,13 @@ module.exports = async function file(CoCreateConfig, configPath) {
             fs.writeFileSync(configPath, `module.exports = ${JSON.stringify(newConfig, null, 4)};`);
         }
 
-        console.log('upload complete!');
+        if (!match.length) {
+            console.log('upload complete!');
 
-        setTimeout(function () {
-            process.exit()
-        }, 2000)
+            setTimeout(function () {
+                process.exit()
+            }, 2000)
+        }
     }
 
     run()