@cocreate/elements 1.20.1 → 1.21.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.21.0](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.20.2...v1.21.0) (2023-09-17)
+
+
+### Bug Fixes
+
+* filter renamed to $filter ([02ecdcf](https://github.com/CoCreate-app/CoCreate-elements/commit/02ecdcf8f12fc49b7e1537caa7b1f56625b693be))
+
+
+### Features
+
+* support key {}, merges object with value ([dba003a](https://github.com/CoCreate-app/CoCreate-elements/commit/dba003a8bd327021f639ba93f4cba662a8c5ea43))
+
+## [1.20.2](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.20.1...v1.20.2) (2023-09-07)
+
+
+### Bug Fixes
+
+* get type from method ([274751e](https://github.com/CoCreate-app/CoCreate-elements/commit/274751e8ef66e8ef19cf8d323297599e78c82ef9))
+
 ## [1.20.1](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.20.0...v1.20.1) (2023-08-21)
 
 

package/CoCreate.config.js

@@ -1,25 +1,25 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "601f4b1c6b402c72efc07e0b",
-                "name": "index.html",
-                "path": "/docs/elements/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "*",
-                    "general.cocreate.app"
-                ],
-                "directory": "/docs/elements",
-                "parentDirectory": "{{parentDirectory}}",
-                "content-type": "{{content-type}}",
-                "public": "true",
-                "website_id": "644d4bff8036fb9d1d1fd69c"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "entry": "./docs",
+            "exclude": [
+                "demo"
+            ],
+            "array": "files",
+            "object": {
+                "name": "{{name}}",
+                "src": "{{source}}",
+                "host": [
+                    "*"
+                ],
+                "directory": "/docs/{{directory}}",
+                "path": "{{path}}",
+                "content-type": "{{content-type}}",
+                "public": "true"
+            }
+        }
+    ]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/elements",
-  "version": "1.20.1",
+  "version": "1.21.0",
   "description": "Fetch content into any html element by using html5 attributes to query data stored in CoCreate headless CMS. If data is changed it will instantly reflect in html tags as changes are broadcasted in realtime",
   "keywords": [
     "elements",

package/src/index.js

@@ -15,10 +15,13 @@
  * 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 Actions from '@cocreate/actions';
@@ -118,9 +121,9 @@ function initElement(el) {
     }
 
     if (el.getFilter) {
-        data.filter = el.getFilter();
+        data.$filter = el.getFilter();
         el.setFilter = (filter) => {
-            data.filter = filter
+            data.$filter = filter
             let dataKey = initDataKey(el, data)
             read(el, data, dataKey)
         }
@@ -217,7 +220,7 @@ async function read(element, data, dataKey) {
     if (!dataKey)
         dataKey = elements.get(element)
     if (!data)
-        data = { ...keys.get(dataKey).data }
+        data = { ...keys.get(dataKey).dataKey.object }
 
     let delayTimer = debounce.get(dataKey.string)
     clearTimeout(delayTimer);
@@ -232,7 +235,8 @@ async function read(element, data, dataKey) {
                 return
         }
 
-        data.method = 'read' + '.' + data.type
+        data.method = 'read.' + data.type
+
         CRUD.send(data).then((data) => {
             setData(element, data);
         })
@@ -240,7 +244,7 @@ async function read(element, data, dataKey) {
     debounce.set(dataKey.string, delayTimer)
 }
 
-function setData(element, data, action) {
+function setData(element, data) {
     if (!element) {
         element = getDataElements(data)
         if (!element.length) return
@@ -250,8 +254,8 @@ function setData(element, data, action) {
         element = [element]
 
     let type = data.type
-    if (!type && action) {
-        type = action.split('.')[0]
+    if (!type && data.method) {
+        type = data.method.split('.')[1]
     } else if (type == 'key')
         type = 'object'
 
@@ -263,7 +267,7 @@ function setData(element, data, action) {
         if (!data[type])
             continue;
 
-        action = el.getAttribute('actions')
+        let action = el.getAttribute('actions')
         if (action && ['database', 'array', 'object', 'key'].includes(action)) continue;
 
         const { key, isRead, isListen, isCrdt } = getAttributes(el);
@@ -364,20 +368,20 @@ function checkIndex(element, data, Data, newData, type, filter, action) {
         index = Data.findIndex(obj => obj.name === newData.name);
     }
 
-    if (!data.filter)
-        data.filter = {}
+    if (!data.$filter)
+        data.$filter = {}
 
     if (action.startsWith('delete')) {
         if (!index && index !== 0)
             return
-        data.filter.remove = true
+        data.$filter.remove = true
     } else {
         if (!index && index !== 0) {
-            data.filter.create = true
+            data.$filter.create = true
             Data.push(newData)
         } else {
-            data.filter.update = true
-            data.filter.currentIndex = index
+            data.$filter.update = true
+            data.$filter.currentIndex = index
             Data[index] = dotNotationToObject(newData, Data[index])
         }
 
@@ -388,9 +392,9 @@ function checkIndex(element, data, Data, newData, type, filter, action) {
         }
 
         if (index >= 0) {
-            if (data.filter.currentIndex === index)
-                delete data.filter.currentIndex
-            data.filter.index = index
+            if (data.$filter.currentIndex === index)
+                delete data.$filter.currentIndex
+            data.$filter.index = index
             if (element.renderValue)
                 element.renderValue(data);
             // render({ element, data, key: type });
@@ -585,17 +589,22 @@ async function save(element) {
             return save(form);
 
         let dataKey = elements.get(element)
-        data = { ...keys.get(dataKey).data }
+        data = { ...keys.get(dataKey).dataKey.object }
 
         value = element.getValue();
 
-        if (typeof data[data.type] === 'string')
-            data[data.type] = { _id: data[data.type], [data.key]: value }
-        else if (Array.isArray(data[data.type])) {
-            console.log('data.type is an array function incomplete')
-        } else if (typeof data[data.type] === 'object')
-            data[data.type][data.key] = value
+        let key = element.getAttribute('key')
 
+        if (typeof data[data.type] === 'string')
+            if (key == '{}')
+                data[data.type] = { _id: data[data.type], ...value }
+            else
+                data[data.type] = { _id: data[data.type], [key]: value }
+        else if (typeof data[data.type] === 'object')
+            if (key == '{}')
+                data[data.type] = { ...data[data.type], ...value }
+            else
+                data[data.type][key] = value
 
         if (/\.([0-9]*)/g.test(data.key)) {
             let splice = element.getAttribute('splice')
@@ -603,14 +612,15 @@ async function save(element) {
             let update = element.getAttribute('update')
 
             if (splice || splice === "") {
-                data[data.type][data.key] = { $splice: value }
+                data[data.type][key] = { $splice: value }
             } else if (slice) {
-                data[data.type][data.key] = '$delete'
+                data[data.type][key] = '$delete'
             } else if (update) {
                 value = data.key.replace(/\[.*?\]/, '[' + value + ']')
-                data.updateKey[data.key] = value
-                data[data.type][data.key] = { $update: value } // $update is string use the value as the key name
-                // data[data.type][data.key] = { $update: {[value]: value} } // $update is an object use the key as the value to use for the new key
+                data.updateKey[key] = value
+                data[data.type][key] = { $update: value } // $update is string use the value as the key name
+
+                // data[data.type][key] = { $update: {[value]: value} } // $update is an object use the key as the value to use for the new key
             }
 
         }
@@ -619,6 +629,8 @@ async function save(element) {
     }
 
     for (let i = 0; i < data.length; i++) {
+        data[i].method = 'update.' + data[i].type
+
         if (data[i].method && data[i].method.startsWith('create'))
             element.setAttribute(data[i].type, 'pending');
         else if (data[i].method && data[i].method.startsWith('update') && data[i].type == 'object' && typeof value == 'string' && window.CoCreate.crdt && !'crdt') {
@@ -751,13 +763,13 @@ function initSocket() {
             const action = array[i] + '.' + attributes[j];
 
             CRUD.listen(action, function (data) {
-                setData(null, data, action);
+                setData(null, data);
             });
         }
     }
 
     CRUD.listen('sync', function (data) {
-        setData(null, data, action);
+        setData(null, data);
     });
 
 }
@@ -838,6 +850,8 @@ function dndCrudData(element, parent, operator) {
                 newData[newData.type].push({ ...previousData, ...Data })
             }
         }
+
+
     } else {
         newData[newData.type] = [{ ...data[data.type][index], ...Data }]
     }
@@ -847,7 +861,7 @@ function dndCrudData(element, parent, operator) {
 
 function dndNewData(element, data) {
     let Data = {}
-    let query = data.filter.query
+    let query = data.$filter.query
     if (query && query.length) {
         for (let i = 0; i < query.length; i++) {
             if (query.operator === "$eq")
@@ -858,7 +872,7 @@ function dndNewData(element, data) {
     }
 
     let sortName, sortDirection
-    let sort = data.filter.sort
+    let sort = data.$filter.sort
     if (sort && sort.length) {
         // for (let i = 0; i < sort.length; i++) {
         for (let i = sort.length - 1; i >= 0; i--) {
@@ -870,6 +884,7 @@ function dndNewData(element, data) {
         }
     }
 
+
     let keyPath, clonesMap, clones, index
 
     let renderedNode = CoCreate.render.renderedNodes.get(element)