@cocreate/crdt 1.3.14 → 1.3.18

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.3.18](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.3.17...v1.3.18) (2021-09-28)
+
+
+### Bug Fixes
+
+* update dependencies ([cbccd8a](https://github.com/CoCreate-app/CoCreate-crdt/commit/cbccd8a65de0d6aaa477ee99fb3a4097e5b6056b))
+
+## [1.3.17](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.3.16...v1.3.17) (2021-09-28)
+
+
+### Bug Fixes
+
+* crud true or false, defaults to true ([c2c01a2](https://github.com/CoCreate-app/CoCreate-crdt/commit/c2c01a2e958dd6740fbc4ac500f5eebed84b35ca))
+
+## [1.3.16](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.3.15...v1.3.16) (2021-09-27)
+
+
+### Bug Fixes
+
+* sendPostion ([ef57991](https://github.com/CoCreate-app/CoCreate-crdt/commit/ef5799155665454eaf27efc3387310cae66a572b))
+
+## [1.3.15](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.3.14...v1.3.15) (2021-09-16)
+
+
+### Bug Fixes
+
+* update dependencies ([ea01942](https://github.com/CoCreate-app/CoCreate-crdt/commit/ea01942819ff1b565f4bd893550fdff29aaddf7c))
+
 ## [1.3.14](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.3.13...v1.3.14) (2021-09-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crdt",
-  "version": "1.3.14",
+  "version": "1.3.18",
   "description": "CoCreate crdt",
   "author": "CoCreate LLC",
   "license": "SEE LICENSE",
@@ -15,9 +15,9 @@
     "hosting": "node ./node_modules/@cocreate/hosting/src/index.js"
   },
   "dependencies": {
-    "@cocreate/crud-client": "^1.2.22",
-    "@cocreate/cursors": "^1.4.9",
-    "@cocreate/utils": "^1.1.16",
+    "@cocreate/crud-client": "^1.2.25",
+    "@cocreate/cursors": "^1.5.2",
+    "@cocreate/utils": "^1.1.19",
     "y-indexeddb": "^9.0.6",
     "y-websocket": "^1.3.16",
     "yjs": "^13.5.11"

package/src/index.js

@@ -1,3 +1,5 @@
+/*globals config, atob, btoa, CustomEvent*/
+
 import * as Y from 'yjs';
 import { WebsocketProvider } from 'y-websocket';
 // import { IndexeddbPersistence } from 'y-indexeddb';
@@ -24,7 +26,7 @@ class CoCreateCRDTClass {
 	*/
 	init(info) {
 		try {
-			this.createDoc(info)
+			this.createDoc(info);
 		} catch(e) {
 			console.log('Invalid param', e);
 		}
@@ -46,7 +48,7 @@ class CoCreateCRDTClass {
 		
 		const crdtDoc = this.doc;
 		const url_socket = this.__getSocketUrl();
-		const shardType = crdtDoc.getText(typeName);
+		const sharedType = crdtDoc.getText(typeName);
 
 		var socketProvider = new WebsocketProvider(url_socket, docName, crdtDoc);
 		
@@ -59,7 +61,7 @@ class CoCreateCRDTClass {
 		
 		this._awarenessListener = event => {
 		 const f = clientId => {
-			  this.updateSelection(crdtDoc, typeName, shardType, this._cursors, clientId, awareness);
+			  this.updateSelection(crdtDoc, typeName, sharedType, this._cursors, clientId, awareness);
 		  };
 		  event.added.forEach(f);
 		  event.removed.forEach(f);
@@ -107,10 +109,10 @@ class CoCreateCRDTClass {
 	
 	_registerUpdateEvent(docName, typeName) {
 		const crdtDoc = docName.doc;
-		const shardType = crdtDoc.getText(typeName);
+		const sharedType = crdtDoc.getText(typeName);
 		let self = this;
 		
-		shardType.observe((event) => {
+		sharedType.observe((event) => {
 			self._crdtUpdateEvent(event, typeName);
 		});
 	}
@@ -225,12 +227,12 @@ class CoCreateCRDTClass {
 	}
 	
 	generateDocName(info) {
-		let docName = {org: config.organization_Id, collection: info.collection, document_id: info.document_id}
+		let docName = {org: config.organization_Id, collection: info.collection, document_id: info.document_id};
 		return btoa(JSON.stringify(docName));        
 	}
 	
 	generateTypeName(info) {
-		let nameId = {org: config.organization_Id, collection: info.collection, document_id: info.document_id, name: info.name}
+		let nameId = {org: config.organization_Id, collection: info.collection, document_id: info.document_id, name: info.name};
 		return btoa(JSON.stringify(nameId));        
 	}
 
@@ -249,31 +251,31 @@ class CoCreateCRDTClass {
 		let docName = this.generateDocName(info);
 		let typeName = this.generateTypeName(info);
 		if (!this.docs[docName]){
-			this.init(info)
-		};
+			this.init(info);
+		}
 		if (info.updateCrud != false) info.updateCrud = true;
 		
 		if (docName) {
 			let oldData = this.docs[docName].doc.getText(typeName).toString();
 			let textValue = info['value'].toString();
 			if (oldData && oldData.length > 0) {
-				this.deleteText({collection: info['collection'], document_id: info['document_id'], name: info['name'], position: 0, length: Math.max(oldData.length, textValue.length), crud: info['crud']});
+				this.deleteText({collection: info.collection, document_id: info.document_id, name: info.name, position: 0, length: Math.max(oldData.length, textValue.length), crud: info['crud']});
 			}
-			this.insertText({ collection: info.collection, document_id: info.document_id, name: info.name, position: 0, value: textValue });
+			this.insertText({ collection: info.collection, document_id: info.document_id, name: info.name, position: 0, value: textValue, crud: info.crud });
 		}
-		if (info.crud != false) {
+		if (info.crud != 'false') {
 			crud.updateDocument({
 				collection: info.collection,
 				document_id: info.document_id,
 				data: {[info.name]: info.value},
-				element: info.element,
-				metadata:info.metadata,
+				upsert: info.upsert,
+				// element: info.element,
 				namespace: info.namespace,
 				room: info.room,
 				broadcast: info.broadcast,
-				upsert: info.upsert,
-				broadcast_sender: info.broadcast_sender
-			})
+				broadcast_sender: info.broadcast_sender,
+				metadata:info.metadata
+			});
 		}
 	}
 	
@@ -289,22 +291,26 @@ class CoCreateCRDTClass {
 	*/
 	insertText(info) {
 		try {
-			let docName = this.generateDocName(info)
-			let typeName = this.generateTypeName(info)
-			let meta = {test: 'hello'}
+			let docName = this.generateDocName(info);
+			let typeName = this.generateTypeName(info);
 			if (docName) {
 				this.docs[docName].doc.getText(typeName).insert(info['position'], info['value'], info['attributes']);
-				let wholestring = this.docs[docName].doc.getText(typeName).toString();
 				
-				if (info.crud != false) {
+				if (info.crud != 'false') {
+					let wholestring = this.docs[docName].doc.getText(typeName).toString();
 					crud.updateDocument({
 						collection: info.collection,
 						document_id: info.document_id,
 						data: {
 							[info.name]: wholestring
 						},
-						metadata: 'yjs-change'
-					})
+						upsert: info.upsert,
+						namespace: info.namespace,
+						room: info.room,
+						broadcast: info.broadcast,
+						broadcast_sender: info.broadcast_sender,
+						metadata: 'crdt-change'
+					});
 				}
 			}
 		}
@@ -324,21 +330,26 @@ class CoCreateCRDTClass {
 	*/
 	deleteText(info) {
 		try{
-			let docName = this.generateDocName(info)
-			let typeName = this.generateTypeName(info)
+			let docName = this.generateDocName(info);
+			let typeName = this.generateTypeName(info);
 			if (docName) {
 				this.docs[docName].doc.getText(typeName).delete(info['position'], info['length']);
-				let wholestring = this.docs[docName].doc.getText(typeName).toString();
 				
-				if (info.crud != false) {
+				if (info.crud != 'false') {
+					let wholestring = this.docs[docName].doc.getText(typeName).toString();
 					crud.updateDocument({
 						collection: info.collection,
 						document_id: info.document_id,
 						data: {
 							[info.name]: wholestring
 						},
-						metadata: 'yjs-change'
-					})
+						upsert: info.upsert,
+						namespace: info.namespace,
+						room: info.room,
+						broadcast: info.broadcast,
+						broadcast_sender: info.broadcast_sender,
+						metadata: 'crdt-change'
+					});
 				}
 			}
 		}
@@ -357,9 +368,12 @@ class CoCreateCRDTClass {
 	*/
 	getText(info) {
 		try{
-			let docName = this.generateDocName(info)
-			let typeName = this.generateTypeName(info)
+			let docName = this.generateDocName(info);
+			let typeName = this.generateTypeName(info);
 			if (docName) {
+				if (!this.docs[docName]){
+					this.init(info);
+				}				
 				return this.docs[docName].doc.getText(typeName).toString();
 			} 
 			else return "--";
@@ -370,27 +384,6 @@ class CoCreateCRDTClass {
 		}
 	}
 	
-	/*
-	crdt.getText({
-		collection: 'module_activities',
-		document_id: '5e4802ce3ed96d38e71fc7e5',
-		name: 'name'
-	})
-	*/
-	getText(info) {
-		try{
-			let docName = this.generateDocName(info)
-			let typeName = this.generateTypeName(info)
-			if (docName) {
-				return this.docs[docName].doc.getText(typeName).toString();
-			} 
-			else return "--";
-		}
-		catch (e) {
-			console.error(e); 
-			return "";
-		}
-	}
 
 	/*
 	crdt.getDoc({
@@ -401,9 +394,12 @@ class CoCreateCRDTClass {
 	*/
 	getDoc(info) {
 		try{
-			let docName = this.generateDocName(info)
-			let typeName = this.generateTypeName(info)
+			let docName = this.generateDocName(info);
+			let typeName = this.generateTypeName(info);
 			if (docName) {
+				if (!this.docs[docName]){
+					this.init(info);
+				}
 				return this.docs[docName].doc.getText(typeName);
 			} 
 			else return false;
@@ -422,7 +418,7 @@ class CoCreateCRDTClass {
 	if(typeof miFuncion === 'function')
 		this.changeListenAwereness(callback);
 	else
-		console.error('Callback should be a function')
+		console.error('Callback should be a function');
 	}
 }