@cocreate/crdt 1.9.11 → 1.11.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.11.0](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.10.1...v1.11.0) (2022-06-11)
+
+
+### Features
+
+* undo and redo text ([3d0c74e](https://github.com/CoCreate-app/CoCreate-crdt/commit/3d0c74ef80b2cf1e9cfa6557007ac40a5ddc4949))
+
+## [1.10.1](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.10.0...v1.10.1) (2022-05-23)
+
+
+### Bug Fixes
+
+* bump all dependencies ([88fcdae](https://github.com/CoCreate-app/CoCreate-crdt/commit/88fcdae04ed2331258123e65d9ddc412bdeeff78))
+
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.9.11...v1.10.0) (2022-05-14)
+
+
+### Features
+
+* function readDocumentList has been renamed to readDocuments ([6b7c24c](https://github.com/CoCreate-app/CoCreate-crdt/commit/6b7c24c360d4e74a82a68b9db0d9e5423b1142a1))
+
 ## [1.9.11](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.9.10...v1.9.11) (2022-05-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crdt",
-  "version": "1.9.11",
+  "version": "1.11.0",
   "description": "CoCreate crdt",
   "author": "CoCreate LLC",
   "license": "SEE LICENSE",
@@ -43,9 +43,8 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.3.33",
-    "@cocreate/crud-client": "^1.4.47",
-    "@cocreate/message-client": "^1.1.64",
-    "@cocreate/utils": "^1.6.4"
+    "@cocreate/crud-client": "^1.6.2",
+    "@cocreate/message-client": "^1.1.69",
+    "@cocreate/utils": "^1.7.1"
   }
 }

package/src/index.js

@@ -2,7 +2,6 @@
 import crud from '@cocreate/crud-client';
 import message from '@cocreate/message-client';
 import uuid from '@cocreate/uuid';
-import action from '@cocreate/actions';
 
 const docs = new Map();
 const clientId = config.clientId || window.CoCreateSockets.clientId || uuid.generate(12);
@@ -38,9 +37,15 @@ async function getDoc(info) {
 		}
 		if (!type.has('changeLog')) {
 			let changeLog = [];
-
+			
+			let undoLog = new Map()
+			type.set('undoLog', undoLog)
+			
+			let redoLog = new Map()
+			type.set('redoLog', redoLog)
+			
 			if (info.read != 'false') {
-				let response = await crud.readDocumentList({		      
+				let response = await crud.readDocuments({		      
 					collection: "crdt-transactions",
 					operator: {
 						filters: [{
@@ -78,7 +83,10 @@ async function generateText(info, flag) {
 		let string = '';
 		let changeLog = name.get('changeLog');
 		for (let change of changeLog) {
-			string = string.customSplice(change.start, change.length, change.value);
+			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'){
 			string = await checkDb(info, flag);
@@ -105,7 +113,7 @@ async function checkDb(info, flag) {
 	return string || '';
 }
 
-function insertChange(info, broadcast, flag) {
+function insertChange(info, flag) {
 	let docName = generateDocName(info);
 	let typeName = info.name;
 	let type = 'insert';
@@ -151,8 +159,15 @@ function insertChange(info, broadcast, flag) {
 			}
 		}
 	}
-	changeLog.push(change);
+	if (!change || change == null ) {
+		console.log('null change')
+		return
+	}
 	let string = name.get('text') || '';
+	if (change.length > 0)
+		change.removedValue = string.substr(change.start, change.length);
+	
+	changeLog.push(change);
 	name.set('text', string.customSplice(change.start, change.length, change.value));
 	string = {string: name.get('text')};
 	
@@ -170,14 +185,6 @@ function insertChange(info, broadcast, flag) {
 		persistChange(info);
 }
 
-function undoChange(){
-	
-}
-
-function redoChange(){
-	
-}
-
 function broadcastChange(info){
 	message.send({
 		room: "",
@@ -298,7 +305,7 @@ async function updateText(info, flag) {
 	let doc = await getDoc(info);
 	if (doc) {
 		
-		insertChange(info, broadcast, flag);
+		insertChange(info, flag);
 		
 		if (info.crud != 'false' && info.save != 'false') {
 			let wholestring = await getText(info);
@@ -319,6 +326,76 @@ async function updateText(info, flag) {
 	}
 }
 
+function createChange(info, change){
+	if (change.value && change.length == 0) {
+		change.length = change.value.length
+		change.removedValue = change.value
+		change.value = '';
+		change.type = 'delete';
+	} else {
+		change.value = change.removedValue
+		change.length = 0;
+		change.type = 'insert';
+	}
+	info = {...info, ...change};
+	delete info.clientId
+	delete info.datetime
+	delete change.clientId
+	delete change.datetime
+	return {info, change}
+}
+
+function undoText(info){
+	let docName = generateDocName(info);
+	let typeName = info.name;
+
+	let name = docs.get(docName).get(typeName);
+	let changeLog = name.get('changeLog');
+	let undoLog = name.get('undoLog')
+
+	for (let index = changeLog.length - 1; index >= 0; index--) {
+		let change =  Object.assign({}, changeLog[index]);
+		if (change && change.clientId == clientId){
+			let log = undoLog.get(index)
+			if (!log) {
+				if (log != 'undo') {
+					undoLog.set(index, 'undo')
+					change.index = changeLog.length += 1;
+					let updated = createChange(info, change);
+					undoLog.set(updated.change.index, updated.change)
+					updateText(updated.info)
+					return
+				}
+			}
+		}
+	}
+}
+
+function redoText(info){
+	let docName = generateDocName(info);
+	let typeName = info.name;
+
+	let name = docs.get(docName).get(typeName);
+	let redoLog = name.get('redoLog')
+	let undoLog = Array.from(name.get('undoLog').values());
+
+	for (let index = undoLog.length - 1; index >= 0; index--) {
+		let change = Object.assign({}, undoLog[index]);
+		if (change && change != 'undo') {
+			let log = redoLog.get(change.index)
+
+			if (!log) {
+				if (log != 'redo') {
+					let updated = createChange(info, change);
+					redoLog.set(updated.change.index, updated.change)
+					updateText(updated.info)
+					return
+				}
+			}
+		}
+	}
+}
+
 
 
 // function deleteDoc(docName) {
@@ -338,20 +415,4 @@ function generateDocName(info) {
 	// return btoa(JSON.stringify(docName));
 }
 
-action.init({
-	name: "undo",
-	endEvent: "undo",
-	callback: (btn, data) => {
-		undoChange(btn);
-	}
-});
-
-action.init({
-	name: "redo",
-	endEvent: "redo",
-	callback: (btn, data) => {
-		redoChange(btn);
-	}
-});
-
-export default { init, getText, updateText, replaceText };
+export default { init, getText, updateText, replaceText, undoText, redoText };