@cocreate/crdt 1.8.19 → 1.8.23

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.8.23](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.22...v1.8.23) (2021-11-26)
+
+
+### Bug Fixes
+
+* getDocs will request generateText with changeLog true or false ([2309736](https://github.com/CoCreate-app/CoCreate-crdt/commit/230973632f96a8a65f1bea430e626a8a7e6223af))
+
+## [1.8.22](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.21...v1.8.22) (2021-11-23)
+
+
+### Bug Fixes
+
+* update dependencies ([e4f1d13](https://github.com/CoCreate-app/CoCreate-crdt/commit/e4f1d136b47f11120a61ddaa91dd782cdd42ab5d))
+
+## [1.8.21](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.20...v1.8.21) (2021-11-23)
+
+
+### Bug Fixes
+
+* await generateText ([917dd9a](https://github.com/CoCreate-app/CoCreate-crdt/commit/917dd9acdeae8b6dc9185aa2049dd28b0337e3eb))
+
+## [1.8.20](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.19...v1.8.20) (2021-11-22)
+
+
+### Bug Fixes
+
+* if crud or save will not save to crud ([b8f51ac](https://github.com/CoCreate-app/CoCreate-crdt/commit/b8f51ac606fc3d1894404ef8ec82c3895b16d6cc))
+
 ## [1.8.19](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.18...v1.8.19) (2021-11-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crdt",
-  "version": "1.8.19",
+  "version": "1.8.23",
   "description": "CoCreate crdt",
   "author": "CoCreate LLC",
   "license": "SEE LICENSE",
@@ -43,9 +43,9 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/action": "^1.3.15",
-    "@cocreate/crud-client": "^1.4.29",
-    "@cocreate/message-client": "^1.1.49",
-    "@cocreate/utils": "^1.3.10"
+    "@cocreate/action": "^1.3.18",
+    "@cocreate/crud-client": "^1.4.34",
+    "@cocreate/message-client": "^1.1.52",
+    "@cocreate/utils": "^1.3.12"
   }
 }

package/src/index.js

@@ -34,7 +34,6 @@ async function getDoc(info) {
 		
 		if (!docs.get(docName).get(typeName).has('changeLog')) {
 			let changeLog = [];
-			docs.get(docName).get(typeName).set('changeLog', changeLog);
 			
 			if (info.read != 'false') {
 				let response = await crud.readDocumentList({		      
@@ -49,10 +48,13 @@ async function getDoc(info) {
 				});
 				if (response.data.length && response.data[0][typeName]) {
 					changeLog = response.data[0][typeName];
-					docs.get(docName).get(typeName).set('changeLog', changeLog);
 				}
+				docs.get(docName).get(typeName).set('changeLog', changeLog);
+				await generateText(info, true);
 			}
-			generateText(info);
+		}
+		else if (!docs.get(docName).get(typeName).has('text')){
+			await generateText(info, false);
 		}
 		return true;
 	}
@@ -65,7 +67,7 @@ String.prototype.customSplice = function (index, absIndex, string) {
     return this.slice(0, index) + string+ this.slice(index + Math.abs(absIndex));
 };
 
-async function generateText(info) {
+async function generateText(info, flag) {
 	try {
 		let name = docs.get(`${info.collection}${info.document_id}`).get(info.name);
 		let string = '';
@@ -73,26 +75,27 @@ async function generateText(info) {
 		for (let change of changeLog) {
 			string = string.customSplice(change.start, change.length, change.value);
 		}
+		if (string == '' && info.read != 'false'){
+			string = await checkDb(info, flag);
+		}
 		name.set('text', string);
-		if (string == '' && info.read != 'false')
-			checkDb(info);
+		return;
 	}
 	catch (e) {
 		console.error(e);
 	}
 }
 
-function checkDb(info) {
+async function checkDb(info, flag) {
 	let { collection, document_id, name } = info;
-	crud.readDocument({ collection, document_id, name }).then(response => {
-		if (!response) return;
-		let string = response.data[name];
-		if (string) {
-			info.value = string;
-			info.start = 0;
-			insertChange(info);
-		}
-	});
+	let response = await crud.readDocument({ collection, document_id, name })
+	let string = response.data[name];
+	if (string && flag != false) {
+		info.value = string;
+		info.start = 0;
+		insertChange(info);
+	}
+	return string || '';
 }
 
 function insertChange(info, broadcast, flag) {
@@ -228,7 +231,13 @@ async function getText(info) {
 		let typeName = info.name;
 		let doc = await getDoc(info);
 		if (doc) {
-			return docs.get(docName).get(typeName).get('text');
+			let value = docs.get(docName).get(typeName).get('text')
+			if (!value)
+			console.log(value)
+			return value;
+		}
+		else {
+			console.log('undefined')
 		}
 	}
 	catch (e) {
@@ -286,7 +295,7 @@ async function updateText(info, flag) {
 		
 		insertChange(info, broadcast, flag);
 		
-		if (info.crud != 'false') {
+		if (info.crud != 'false' && info.save != 'false') {
 			let wholestring = await getText(info);
 			crud.updateDocument({
 				collection: info.collection,