@cocreate/elements 1.24.2 → 1.25.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.25.0](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.24.3...v1.25.0) (2023-10-22)
+
+
+### Bug Fixes
+
+* conditions ([484ad35](https://github.com/CoCreate-app/CoCreate-elements/commit/484ad358f13fc07e92ebafbf710ccdc1fb740950))
+
+
+### Features
+
+* ObjectId() returns an object containg the parts iof the _id along with a toString() function ([82e3956](https://github.com/CoCreate-app/CoCreate-elements/commit/82e3956db5c5bc966d160a04d9067bc039c34d37))
+
+## [1.24.3](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.24.2...v1.24.3) (2023-10-20)
+
+
+### Bug Fixes
+
+* condition on read ([fe53a8e](https://github.com/CoCreate-app/CoCreate-elements/commit/fe53a8ea9808502af64a8298a14dd38bbfd07940))
+
 ## [1.24.2](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.24.1...v1.24.2) (2023-10-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/elements",
-  "version": "1.24.2",
+  "version": "1.25.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/form.js

@@ -38,7 +38,7 @@ function runObjectId(form) {
     // Sets the object id for each array in the array.
     for (let i = 0; i < arrays.length; i++) {
         // TODO: needs access to setTypeValue
-        setTypeValue(form, { array: arrays[i], object: [{ _id: ObjectId() }] });
+        setTypeValue(form, { array: arrays[i], object: [{ _id: ObjectId().toString() }] });
     }
 }
 

package/src/index.js

@@ -28,7 +28,7 @@ import Actions from '@cocreate/actions';
 import CRUD from '@cocreate/crud-client';
 import { dotNotationToObject, queryElements, queryData, sortData, getAttributes, getAttributeNames, checkValue } from '@cocreate/utils';
 import filter from '@cocreate/filter';
-import { render, renderedNodes } from '@cocreate/render';
+import render from '@cocreate/render';
 import '@cocreate/element-prototype';
 import './fetchSrc';
 import { reset } from './form'
@@ -73,13 +73,13 @@ async function initElement(el) {
         // if found add the node as an element, if the element has crud attributes also add as the element
         for (let attribute of el.attributes) {
             if (attribute.match(/{{(.*?)}}/)) {
-                let value = renderValue(attribute, undefined, attribute.value)
+                let value = render.renderValue(attribute, undefined, attribute.value)
                 if (value)
                     attribute.value = value
             }
         }
         if (el.innerHTML.match(/{{(.*?)}}/)) {
-            let value = renderValue(el, undefined, el.innerHTML)
+            let value = render.renderValue(el, undefined, el.innerHTML)
             if (value)
                 attribute.value = value
         }
@@ -110,9 +110,8 @@ async function initElement(el) {
             el.addEventListener('input', function (e) {
                 const { object, key, isRealtime, isCrdt } = getAttributes(el);
                 if (isRealtime == "false" || key == "_id") return;
-
                 if (isCrdt == "true" && object && object !== 'pending') return
-                if (object && e.detail && e.detail.skip == true) return;
+                if (e.detail && e.detail.skip == true) return;
                 if (data.type !== 'object' && data[data.type] === 'pending') return
 
                 save(el);
@@ -231,13 +230,14 @@ async function read(element, data, dataKey) {
         debounce.delete(dataKey.string)
         // TODO: should server support string and string array for type object, methods create, read, delete
         if (!data.$filter && data.type === 'object') {
-            if (typeof data.object === 'string')
+            if (!data.object)
+                return
+            else if (typeof data.object === 'string')
                 data.object = { _id: data.object }
-
-            if (Array.isArray(data.object))
-                data.object = { _id: data.object[0]._id }
-
-            if (!data.object._id.match(/^[0-9a-fA-F]{24}$/))
+            else if (Array.isArray(data.object)) {
+                if (data.object.length)
+                    data.object = { _id: data.object[0]._id }
+            } else if (!data.object._id.match(/^[0-9a-fA-F]{24}$/))
                 return
         }
 
@@ -284,7 +284,7 @@ async function setData(element, data) {
             if (key) {
                 if (!data[type].length) continue;
                 if (isRead == "false" || isCrdt == "true") continue;
-                if (isListen == "false" && !data.method.startsWith('read')) continue;
+                if (isListen == "false" && !data.method.startsWith('read.')) continue;
             }
             // TODO: update.object data returned from server will not include $operator
             el.setValue(value);
@@ -311,7 +311,7 @@ async function filterData(element, data, type, key) {
         }
     }
 
-    if (element.getFilter && data.method && !data.method.startsWith('read'))
+    if (element.getFilter && data.method && !data.method.startsWith('read.'))
         await checkFilters(element, data, type)
     else if (element.renderValue)
         element.renderValue(data);
@@ -697,9 +697,9 @@ async function save(element) {
             }
         }
 
-        if (data[i].method && data[i].method.startsWith('create')) {
+        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') {
+        } else if (data[i].method && data[i].method.startsWith('update.') && data[i].type == 'object' && typeof value == 'string' && window.CoCreate.crdt && !'crdt') {
             return window.CoCreate.crdt.replaceText({
                 array: data[i].array,
                 key: data[i].key,
@@ -713,7 +713,7 @@ async function save(element) {
 
         Data.push(data[i])
 
-        if (data[i] && (data[i].method.startsWith('create') || data[i].type !== 'object' && data[i].method.startsWith('update'))) {
+        if (data[i] && (data[i].method.startsWith('create.') || data[i].type !== 'object' && data[i].method.startsWith('update.'))) {
             setTypeValue(element, data[i])
         } else if (data[i])
             document.dispatchEvent(new CustomEvent('saved', {
@@ -822,7 +822,10 @@ async function remove(element) {
         element = [element]
     for (let i = 0; i < element.length; i++) {
         if (element[i].tagName === 'FORM') {
-            let form = forms.get(element[i]).elements
+            let form = forms.get(element[i])
+            if (!form) return
+
+            form = form.elements
             for (let el of form.keys()) {
                 let key = elements.get(el)
                 if (key) {
@@ -878,7 +881,7 @@ Observer.init({
         clearTimeout(delayTimer);
         debounce.delete(mutation.target)
 
-        let renderedNode = renderedNodes.get(mutation.target)
+        let renderedNode = render.renderedNodes.get(mutation.target)
         if (!renderedNode) return
 
         if (!mutation.movedFrom) return
@@ -985,7 +988,7 @@ function dndNewData(element, data) {
 
     let keyPath, clonesMap, clones, index
 
-    let renderedNode = renderedNodes.get(element)
+    let renderedNode = render.renderedNodes.get(element)
     if (renderedNode) {
         keyPath = renderedNode.keyPath
         clonesMap = renderedNode.template.clones