@cocreate/crdt 1.13.11 → 1.14.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.14.0](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.13.12...v1.14.0) (2022-11-21)
+
+
+### Bug Fixes
+
+* if no changeLog return ([f49fe1b](https://github.com/CoCreate-app/CoCreate-crdt/commit/f49fe1b11df5dccd03dcc793cb7fb184ebaa7a9d))
+* renamed data.data to data.document ([c72f10c](https://github.com/CoCreate-app/CoCreate-crdt/commit/c72f10ce530c5ec3e3c7dad84af3c0b3f8cfbac9))
+* update crud functions to receive an array of objects as the response ([89e0713](https://github.com/CoCreate-app/CoCreate-crdt/commit/89e0713bff990100a0cb7e98dfd1258c16f51050))
+
+
+### Features
+
+* newDocument to set newValue or overide existing value. ([4a811c6](https://github.com/CoCreate-app/CoCreate-crdt/commit/4a811c66362c60138dc27d723168c4d2d54417cc))
+
+## [1.13.12](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.13.11...v1.13.12) (2022-10-02)
+
+
+### Bug Fixes
+
+* minor bug fixes ([667c10e](https://github.com/CoCreate-app/CoCreate-crdt/commit/667c10e026a5eef8296fe75a0551132c24c6bd2f))
+
 ## [1.13.11](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.13.10...v1.13.11) (2022-10-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crdt",
-  "version": "1.13.11",
+  "version": "1.14.0",
   "description": "CoCreate crdt",
   "author": "CoCreate LLC",
   "license": "SEE LICENSE",
@@ -43,8 +43,8 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/crud-client": "^1.12.9",
-    "@cocreate/message-client": "^1.1.83",
-    "@cocreate/utils": "^1.10.10"
+    "@cocreate/crud-client": "^1.12.11",
+    "@cocreate/message-client": "^1.1.85",
+    "@cocreate/utils": "^1.10.11"
   }
 }

package/src/index.js

@@ -1,8 +1,14 @@
 /*globals config, atob, btoa, localStorage, CustomEvent*/
-import crud from '@cocreate/crud-client';
+import CRUD from '@cocreate/crud-client';
 import message from '@cocreate/message-client';
 import uuid from '@cocreate/uuid';
 
+let crud
+if(CRUD && CRUD.default)
+	crud = CRUD.default
+else
+	crud = CRUD
+
 const docs = new Map();
 const clientId = crud.socket.clientId || uuid.generate(12);
 const checkedDb = new Map();
@@ -47,23 +53,24 @@ async function getDoc(info) {
 			type.set('redoLog', redoLog)
 			
 			if (info.read != 'false') {
-				let response = await crud.readDocuments({		      
-					collection: "crdt-transactions",
-					filter: {
-						query: [{
-							name: 'docName',
-							operator: "$eq",
-							value: docName
-						}]
+				if (!info.newDocument) {
+					let response = await crud.readDocument({		      
+						collection: "crdt-transactions",
+						filter: {
+							query: [{
+								name: 'docName',
+								operator: "$eq",
+								value: docName
+							}]
+						}
+					});
+					if (response.document.length && response.document[0][typeName]) {
+						changeLog = response.document[0][typeName];
 					}
-				});
-				if (response.data.length && response.data[0][typeName]) {
-					changeLog = response.data[0][typeName];
 				}
 				type.set('changeLog', changeLog);
 				await generateText(info, true);
-			}
-
+			} 
 		}
 		else if (!type.has('text')){
 			await generateText(info, false);
@@ -88,9 +95,8 @@ async function generateText(info, flag) {
 			if (change || change !== null ) {
 				string = string.customSplice(change.start, change.length, change.value);
 			}		
-			// string = string.customSplice(change.start, change.length, change.value);
 		}
-		if (string === '' && info.read !== 'false'){
+		if (string === '' && info.read !== 'false') {
 			string = await checkDb(info, flag);
 		}
 		name.set('text', string);
@@ -105,8 +111,14 @@ async function checkDb(info, flag) {
 	let { collection, document_id, name } = info;
 	if (checkedDb.get(`${collection}${document_id}${name}`)) return;
 	checkedDb.set(`${collection}${document_id}${name}`, true);
-	let response = await crud.readDocument({ collection, document_id, name });
-	let string = crud.getObjectValueByPath(response.data, name);
+
+	let string = ''
+	if (info.newDocument)
+		string = info.newDocument
+	else {
+		let response = await crud.readDocument({ collection, document: {_id: document_id, name}});
+		string = crud.getObjectValueByPath(response.document[0], name);
+	}
 	if (string && flag != false) {
 		info.value = string;
 		info.start = 0;
@@ -138,6 +150,8 @@ function insertChange(info, flag) {
 	
 	let name = docs.get(docName).get(typeName);
 	let changeLog = name.get('changeLog');
+	if (!changeLog)
+		return
 
 	let lastChange = changeLog[changeLog.length - 1];
 	if (lastChange && change.datetime && lastChange.datetime){
@@ -212,7 +226,7 @@ function persistChange(info) {
 	crud.updateDocument({
 		collection: 'crdt-transactions',
 		document_id: info.document_id,
-		data: {
+		document: {
 			_id: info.document_id,
 			docName,
 			[typeName]: changeLog
@@ -227,7 +241,7 @@ function persistChange(info) {
 }
 
 message.listen('crdt', function(response) {
-    let data = response.data
+	let data = response.data
 	if (docs.get(`${data.collection}${data.document_id}`)){
 		if (docs.get(`${data.collection}${data.document_id}`).get(data.name))
 		if (data.clientId !== clientId){
@@ -305,7 +319,6 @@ crdt.updateText({
 })
 */
 async function updateText(info, flag) {
-	let broadcast = true;
 	let doc = await getDoc(info);
 	if (doc) {
 		
@@ -315,8 +328,8 @@ async function updateText(info, flag) {
 			let wholestring = await getText(info);
 			crud.updateDocument({
 				collection: info.collection,
-				document_id: info.document_id,
-				data: {
+				document: {
+					_id: info.document_id,
 					[info.name]: wholestring
 				},
 				upsert: info.upsert,