@inditextech/weave-sdk 0.39.3 → 0.40.1

package/dist/sdk.cjs

@@ -15551,10 +15551,10 @@ var WeaveStore = class {
 			if (weaveStateValues) {
 				this.undoManager = new yjs.UndoManager([weaveStateValues], {
 					captureTimeout: 250,
-					trackedOrigins: new Set([this.config.getUser().name]),
+					trackedOrigins: new Set([this.config.getUser().id]),
 					...this.config?.undoManagerOptions
 				});
-				this.undoManager.addTrackedOrigin(this.config.getUser().name);
+				this.undoManager.addTrackedOrigin(this.config.getUser().id);
 				this.undoManager.on("stack-item-added", () => {
 					const change = {
 						canUndo: this.undoManager.canUndo(),
@@ -15577,6 +15577,7 @@ var WeaveStore = class {
 		}
 		(0, __syncedstore_core.observeDeep)(this.getState(), () => {
 			const newState = JSON.parse(JSON.stringify(this.getState()));
+			this.logger.info({ newState }, "State changed");
 			this.instance.emitEvent("onStateChange", newState);
 			const nodesSelectionPlugin = this.instance.getPlugin("nodesSelection");
 			if (this.isRoomLoaded && nodesSelectionPlugin && nodesSelectionPlugin.getSelectedNodes().length === 1) {
@@ -18418,156 +18419,159 @@ var WeaveStateManager = class {
 		return this.findNodeById(state, nodeKey);
 	}
 	addNode(node, parentId = "mainLayer", index = void 0) {
-		const userName = this.instance.getStore().getUser().name;
-		this.instance.getStore().getDocument().transact(() => {
-			const state = this.instance.getStore().getState();
-			if ((0, import_lodash.isEmpty)(state.weave)) {
-				const msg = `State is empty, cannot add the node`;
-				this.logger.warn({
-					node,
-					parentId
-				}, msg);
-				return;
-			}
-			const { node: nodeState } = this.findNodeById(state.weave, node.key);
-			if (nodeState) {
-				const msg = `Node with key [${node.key}] already exists, cannot add it`;
-				this.logger.warn({
-					node,
-					parentId
-				}, msg);
-				return;
-			}
-			const { node: parent } = this.findNodeById(state.weave, parentId);
-			if (!parent) {
-				const msg = `Parent container with key [${node.key}] doesn't exists, cannot add it`;
-				this.logger.warn({
-					node,
-					parentId
-				}, msg);
-				return;
-			}
-			if (!parent.props.children || typeof parent.props.children === "undefined") parent.props.children = [];
-			if (index) {
-				let parentChildren = JSON.parse(JSON.stringify([...parent.props.children]));
-				parentChildren.splice(index, 0, node);
-				parentChildren = parentChildren.map((actNode, index$1) => {
-					return {
-						...actNode,
-						props: {
-							...actNode.props,
-							zIndex: index$1
-						}
-					};
-				});
-				parent.props.children = parentChildren;
-			} else {
-				const childrenAmount = parent.props.children.length;
-				const finalNode = {
-					...node,
+		const state = this.instance.getStore().getState();
+		this.logger.info({ state: JSON.parse(JSON.stringify(state)) }, "State before addNode");
+		if ((0, import_lodash.isEmpty)(state.weave)) {
+			const msg = `State is empty, cannot add the node`;
+			this.logger.warn({
+				node,
+				parentId
+			}, msg);
+			return;
+		}
+		const { node: nodeState } = this.findNodeById(state.weave, node.key);
+		if (nodeState) {
+			const msg = `Node with key [${node.key}] already exists, cannot add it`;
+			this.logger.warn({
+				node,
+				parentId
+			}, msg);
+			return;
+		}
+		const { node: parent } = this.findNodeById(state.weave, parentId);
+		if (!parent) {
+			const msg = `Parent container with key [${node.key}] doesn't exists, cannot add it`;
+			this.logger.warn({
+				node,
+				parentId
+			}, msg);
+			return;
+		}
+		this.logger.info({ parent: JSON.parse(JSON.stringify(parent)) }, "addNode: parent before init");
+		let parentChildren = [];
+		if (parent.props.children) parentChildren = JSON.parse(JSON.stringify(parent.props.children));
+		this.logger.info({ parent: JSON.parse(JSON.stringify(parent)) }, "addNode: parent before add");
+		if (index && parentChildren) {
+			parentChildren.splice(index, 0, node);
+			parentChildren = parentChildren.map((actNode, index$1) => {
+				return {
+					...actNode,
 					props: {
-						...node.props,
-						zIndex: childrenAmount
+						...actNode.props,
+						zIndex: index$1
 					}
 				};
-				parent.props.children.push(finalNode);
-			}
-			this.instance.emitEvent("onNodeAdded", node);
-		}, userName);
+			});
+		}
+		if (!index && parent.props.children) {
+			const childrenAmount = parent.props.children.length;
+			let finalNode = JSON.parse(JSON.stringify(node));
+			finalNode = {
+				...finalNode,
+				props: {
+					...finalNode.props,
+					zIndex: childrenAmount
+				}
+			};
+			this.logger.info({ node: JSON.parse(JSON.stringify(finalNode)) }, "addNode: node to add");
+			parentChildren.push(finalNode);
+		}
+		parent.props.children = parentChildren;
+		this.logger.info({ parent: JSON.parse(JSON.stringify(parent)) }, "addNode: parent after add");
+		this.instance.emitEvent("onNodeAdded", node);
 	}
 	updateNode(node) {
-		const userName = this.instance.getStore().getUser().name;
-		this.instance.getStore().getDocument().transact(() => {
-			const state = this.instance.getStore().getState();
-			if ((0, import_lodash.isEmpty)(state.weave)) {
-				const msg = `State is empty, cannot update the node`;
-				this.logger.warn({ node }, msg);
-				return;
-			}
-			const { node: nodeState } = this.findNodeById(state.weave, node.key);
-			if (!nodeState) {
-				const msg = `Node with key [${node.key}] doesn't exists, cannot update it`;
-				this.logger.warn({ node }, msg);
-				return;
-			}
-			const nodeNew = JSON.parse(JSON.stringify({
-				...nodeState.props,
-				...node.props
-			}));
-			nodeState.props = { ...nodeNew };
-			this.instance.emitEvent("onNodeUpdated", node);
-		}, userName);
+		const state = this.instance.getStore().getState();
+		this.logger.info({ state: JSON.parse(JSON.stringify(state)) }, "State before updateNode");
+		if ((0, import_lodash.isEmpty)(state.weave)) {
+			const msg = `State is empty, cannot update the node`;
+			this.logger.warn({ node }, msg);
+			return;
+		}
+		const { node: nodeState } = this.findNodeById(state.weave, node.key);
+		if (!nodeState) {
+			const msg = `Node with key [${node.key}] doesn't exists, cannot update it`;
+			this.logger.warn({ node }, msg);
+			return;
+		}
+		this.logger.info({ node: JSON.parse(JSON.stringify(nodeState)) }, "updateNode: before update");
+		const nodeNew = JSON.parse(JSON.stringify({
+			...nodeState.props,
+			...node.props
+		}));
+		nodeState.props = { ...nodeNew };
+		this.logger.info({ node: JSON.parse(JSON.stringify(nodeState)) }, "updateNode: after update");
+		this.instance.emitEvent("onNodeUpdated", node);
 	}
 	removeNode(node) {
-		const userName = this.instance.getStore().getUser().name;
-		this.instance.getStore().getDocument().transact(() => {
-			const state = this.instance.getStore().getState();
-			if ((0, import_lodash.isEmpty)(state.weave)) {
-				const msg = `State is empty, cannot update the node`;
-				this.logger.warn({ node }, msg);
-				return;
-			}
-			const { node: nodeState, parent: parentState } = this.findNodeById(state.weave, node.key);
-			if (!nodeState) {
-				const msg = `Node with key [${node.key}] doesn't exists, cannot remove it`;
-				this.logger.warn({ node }, msg);
-				return;
-			}
-			if (parentState) {
-				const newChildren = JSON.parse(JSON.stringify(parentState.props.children));
-				const filteredChildren = newChildren.filter((actNode) => actNode.key !== node.key);
-				parentState.props.children = filteredChildren;
-			}
-			this.instance.emitEvent("onNodeRemoved", node);
-		}, userName);
+		const state = this.instance.getStore().getState();
+		this.logger.info({ stage: JSON.parse(JSON.stringify(state)) }, "State before removeNode");
+		if ((0, import_lodash.isEmpty)(state.weave)) {
+			const msg = `State is empty, cannot update the node`;
+			this.logger.warn({ node }, msg);
+			return;
+		}
+		const { node: nodeState, parent: parentState } = this.findNodeById(state.weave, node.key);
+		if (!nodeState) {
+			const msg = `Node with key [${node.key}] doesn't exists, cannot remove it`;
+			this.logger.warn({ node }, msg);
+			return;
+		}
+		this.logger.info({ key: node.key }, "removeNode: node to remove");
+		this.logger.info({ parent: JSON.parse(JSON.stringify(parentState)) }, "removeNode: parent before remove");
+		if (parentState && parentState.props.children) {
+			const newChildren = JSON.parse(JSON.stringify(parentState.props.children));
+			const filteredChildren = newChildren.filter((actNode) => actNode.key !== node.key);
+			parentState.props.children = filteredChildren;
+			this.logger.info({ parent: JSON.parse(JSON.stringify(parentState)) }, "removeNode: parent after remove");
+		}
+		this.instance.emitEvent("onNodeRemoved", node);
 	}
 	removeNodes(nodes) {
 		for (const node of nodes) this.removeNode(node);
 	}
 	moveNode(node, position) {
-		const userName = this.instance.getStore().getUser().name;
-		this.instance.getStore().getDocument().transact(() => {
-			const state = this.instance.getStore().getState();
-			if ((0, import_lodash.isEmpty)(state.weave)) {
-				const msg = `State is empty, cannot update the node`;
-				this.logger.warn({ node }, msg);
-				return;
-			}
-			const { node: nodeState, parent: nodeParent } = this.findNodeById(state.weave, node.key);
-			if (!nodeState) {
-				const msg = `Node with key [${node.key}] doesn't exists, cannot update it`;
-				this.logger.warn({ node }, msg);
-				return;
-			}
-			if (nodeParent) {
-				let nodeParentNewChildren = JSON.parse(JSON.stringify([...nodeParent.props.children ?? []]));
-				const nodeNew = JSON.parse(JSON.stringify({ ...node }));
-				const childrenAmount = nodeParentNewChildren.length;
-				const nodeIndex = nodeParentNewChildren.findIndex((n) => n.key === nodeNew.key);
-				nodeParentNewChildren.splice(nodeIndex, 1);
-				if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.UP) nodeParentNewChildren.splice(nodeIndex + 1, 0, nodeNew);
-				if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.DOWN) nodeParentNewChildren.splice(nodeIndex - 1, 0, nodeNew);
-				if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.FRONT) nodeParentNewChildren.splice(childrenAmount - 1, 0, nodeNew);
-				if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.BACK) nodeParentNewChildren.splice(0, 0, nodeNew);
-				nodeParentNewChildren = nodeParentNewChildren.map((actNode, index) => {
-					return {
-						...actNode,
-						props: {
-							...actNode.props,
-							zIndex: index
-						}
-					};
-				});
-				if (!nodeParent.props.children) nodeParent.props.children = [];
-				nodeParent.props.children = nodeParentNewChildren;
-			}
-		}, userName);
+		const state = this.instance.getStore().getState();
+		if ((0, import_lodash.isEmpty)(state.weave)) {
+			const msg = `State is empty, cannot update the node`;
+			this.logger.warn({ node }, msg);
+			return;
+		}
+		const { node: nodeState, parent: nodeParent } = this.findNodeById(state.weave, node.key);
+		if (!nodeState) {
+			const msg = `Node with key [${node.key}] doesn't exists, cannot update it`;
+			this.logger.warn({ node }, msg);
+			return;
+		}
+		if (nodeParent && nodeParent.props.children) {
+			let nodeParentNewChildren = JSON.parse(JSON.stringify([...nodeParent.props.children ?? []]));
+			const nodeNew = JSON.parse(JSON.stringify({ ...node }));
+			const childrenAmount = nodeParentNewChildren.length;
+			const nodeIndex = nodeParentNewChildren.findIndex((n) => n.key === nodeNew.key);
+			nodeParentNewChildren.splice(nodeIndex, 1);
+			if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.UP) nodeParentNewChildren.splice(nodeIndex + 1, 0, nodeNew);
+			if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.DOWN) nodeParentNewChildren.splice(nodeIndex - 1, 0, nodeNew);
+			if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.FRONT) nodeParentNewChildren.splice(childrenAmount - 1, 0, nodeNew);
+			if (position === __inditextech_weave_types.WEAVE_NODE_POSITION.BACK) nodeParentNewChildren.splice(0, 0, nodeNew);
+			nodeParentNewChildren = nodeParentNewChildren.map((actNode, index) => {
+				return {
+					...actNode,
+					props: {
+						...actNode.props,
+						zIndex: index
+					}
+				};
+			});
+			if (!nodeParent.props.children) nodeParent.props.children = [];
+			nodeParent.props.children = nodeParentNewChildren;
+		}
 	}
 	getElementsTree() {
 		const state = this.instance.getStore().getState().weave;
 		const jsonState = JSON.parse(JSON.stringify(state, null, 2));
 		const mainLayer = jsonState.props?.children.find((node) => node.key === "mainLayer");
 		if (!mainLayer) return [];
+		if (!mainLayer.props?.children) return [];
 		return mainLayer.props.children;
 	}
 };
@@ -18645,7 +18649,7 @@ var WeaveRegisterManager = class {
 
 //#endregion
 //#region package.json
-var version = "0.39.3";
+var version = "0.40.1";
 
 //#endregion
 //#region src/managers/setup.ts
@@ -26546,7 +26550,7 @@ var WeaveConnectedUsersPlugin = class extends WeavePlugin {
 		const store = this.instance.getStore();
 		const userInfo = this.config.getUser();
 		store.setAwarenessInfo(WEAVE_CONNECTED_USER_INFO_KEY, userInfo);
-		this.instance.emitEvent("onConnectedUsersChange", { [userInfo.name]: userInfo });
+		this.instance.emitEvent("onConnectedUsersChange", { [userInfo.id]: userInfo });
 		this.instance.addEventListener("onConnectionStatusChange", (status) => {
 			if (status === "connected") {
 				const userInfo$1 = this.config.getUser();
@@ -26564,7 +26568,7 @@ var WeaveConnectedUsersPlugin = class extends WeavePlugin {
 				if (!change[WEAVE_CONNECTED_USER_INFO_KEY]) continue;
 				if (change[WEAVE_CONNECTED_USER_INFO_KEY]) {
 					const userInformation = change[WEAVE_CONNECTED_USER_INFO_KEY];
-					newConnectedUsers[userInformation.name] = userInformation;
+					newConnectedUsers[userInformation.id] = userInformation;
 				}
 			}
 			if (!(0, import_lodash.isEqual)(this.connectedUsers, newConnectedUsers)) this.instance.emitEvent("onConnectedUsersChange", newConnectedUsers);
@@ -26617,7 +26621,7 @@ var WeaveUsersSelectionPlugin = class extends WeavePlugin {
 			const allActiveUsers = [];
 			for (const change of changes) {
 				if (!change[WEAVE_USER_SELECTION_KEY]) continue;
-				if (change[WEAVE_USER_SELECTION_KEY] && selfUser.name !== change[WEAVE_USER_SELECTION_KEY].user) {
+				if (change[WEAVE_USER_SELECTION_KEY] && selfUser.id !== change[WEAVE_USER_SELECTION_KEY].user) {
 					const userSelection = change[WEAVE_USER_SELECTION_KEY];
 					allActiveUsers.push(userSelection.user);
 					this.usersSelection[userSelection.user] = userSelection;
@@ -26640,7 +26644,7 @@ var WeaveUsersSelectionPlugin = class extends WeavePlugin {
 		const userInfo = this.config.getUser();
 		const store = this.instance.getStore();
 		store.setAwarenessInfo(WEAVE_USER_SELECTION_KEY, {
-			user: userInfo.name,
+			user: userInfo.id,
 			nodes: tr.nodes().map((node) => node.getAttrs().id)
 		});
 	}
@@ -26791,7 +26795,7 @@ var WeaveUsersPointersPlugin = class extends WeavePlugin {
 			const allActiveUsers = [];
 			for (const change of changes) {
 				if (!change[WEAVE_USER_POINTER_KEY]) continue;
-				if (change[WEAVE_USER_POINTER_KEY] && selfUser.name !== change[WEAVE_USER_POINTER_KEY].user) {
+				if (change[WEAVE_USER_POINTER_KEY] && selfUser.id !== change[WEAVE_USER_POINTER_KEY].user) {
 					const userPointer = change[WEAVE_USER_POINTER_KEY];
 					allActiveUsers.push(userPointer.user);
 					this.usersPointers[userPointer.user] = userPointer;
@@ -26806,7 +26810,8 @@ var WeaveUsersPointersPlugin = class extends WeavePlugin {
 			const userInfo = this.config.getUser();
 			const mousePos = stage.getRelativePointerPosition();
 			if (mousePos) store.setAwarenessInfo(WEAVE_USER_POINTER_KEY, {
-				user: userInfo.name,
+				user: userInfo.id,
+				name: userInfo.name,
 				x: mousePos.x,
 				y: mousePos.y
 			});
@@ -26815,7 +26820,8 @@ var WeaveUsersPointersPlugin = class extends WeavePlugin {
 			const userInfo = this.config.getUser();
 			const mousePos = stage.getRelativePointerPosition();
 			if (mousePos) store.setAwarenessInfo(WEAVE_USER_POINTER_KEY, {
-				user: userInfo.name,
+				user: userInfo.id,
+				name: userInfo.name,
 				x: mousePos.x,
 				y: mousePos.y
 			});
@@ -26859,7 +26865,7 @@ var WeaveUsersPointersPlugin = class extends WeavePlugin {
 				id: `pointer_${userPointer.user}_userPointName`,
 				x: separation,
 				y: -circleRadius * 2 + backgroundPaddingY,
-				text: userPointer.user.trim(),
+				text: userPointer.name.trim(),
 				fontSize,
 				fontFamily,
 				lineHeight: .9,

package/dist/sdk.d.cts

@@ -53,6 +53,7 @@ type WeaveStoreOptions = {
 interface WeaveStoreBase {
   connect(): void;
   disconnect(): void;
+  handleAwarenessChange(emit: boolean): void;
   setAwarenessInfo(field: string, value: unknown): void;
 }
 
@@ -131,9 +132,10 @@ type WeaveExportNodesOptions = {
   quality?: number;
 };
 type WeaveUser = {
-  [key: string]: any;
+  id: string;
   name: string;
   email: string;
+  [key: string]: any;
 };
 type WeaveFont = {
   id: string;
@@ -223,6 +225,7 @@ declare abstract class WeaveStore implements WeaveStoreBase {
   handleConnectionStatusChange(status: WeaveStoreConnectionStatus): void;
   abstract connect(): void;
   abstract disconnect(): void;
+  abstract handleAwarenessChange(emit: boolean): void;
   abstract setAwarenessInfo(field: string, value: unknown): void;
 }
 
@@ -2349,6 +2352,7 @@ type WeaveUsersPointersPluginParams = {
 };
 type WeaveUserPointer = {
   user: string;
+  name: string;
   x: number;
   y: number;
 };