v0.7.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Device (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version of slate [e.g. 0.58.0]
- - Version of slate-collaborative
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

CHANGELOG.md

@@ -2,32 +2,9 @@
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v0.7.2](https://github.com/cudr/slate-collaborative/compare/v0.7.1...v0.7.2)
+#### [v0.7.0](https://github.com/cudr/slate-collaborative/compare/v0.7.0...v0.7.0)
 
-> 18 January 2021
+> 27 October 2020
-
-- fix dependency update [`#50`](https://github.com/cudr/slate-collaborative/pull/50)
-- Fix split_node missing properties bug. [`#45`](https://github.com/cudr/slate-collaborative/pull/45)
-- Always call external onChange. [`#43`](https://github.com/cudr/slate-collaborative/pull/43)
-- Fix setNodes undefined value since automerge does not handle undefined value correctly. [`#49`](https://github.com/cudr/slate-collaborative/pull/49)
-- Fix destory [`#48`](https://github.com/cudr/slate-collaborative/pull/48)
-- Fix cursor delete [`#44`](https://github.com/cudr/slate-collaborative/pull/44)
-- build(deps): bump react from 16.14.0 to 17.0.1 [`#40`](https://github.com/cudr/slate-collaborative/pull/40)
-- build(deps-dev): bump husky from 3.1.0 to 4.3.6 [`#46`](https://github.com/cudr/slate-collaborative/pull/46)
-- build(deps): bump @types/node from 12.7.5 to 14.14.6 [`#42`](https://github.com/cudr/slate-collaborative/pull/42)
-- build(deps-dev): bump ts-jest from 25.5.1 to 26.4.4 [`#41`](https://github.com/cudr/slate-collaborative/pull/41)
-- build(deps): bump react-dom from 16.14.0 to 17.0.1 [`#39`](https://github.com/cudr/slate-collaborative/pull/39)
-- build(deps-dev): bump @commitlint/cli from 9.1.2 to 11.0.0 [`#38`](https://github.com/cudr/slate-collaborative/pull/38)
-- build(deps): bump slate-react from 0.58.3 to 0.59.0 [`#37`](https://github.com/cudr/slate-collaborative/pull/37)
-- build(deps): bump slate from 0.58.3 to 0.59.0 [`#36`](https://github.com/cudr/slate-collaborative/pull/36)
-- build(deps): bump faker from 4.1.0 to 5.1.0 [`#35`](https://github.com/cudr/slate-collaborative/pull/35)
-- build(deps): bump nodemon from 1.19.4 to 2.0.6 [`#34`](https://github.com/cudr/slate-collaborative/pull/34)
-- Update issue templates [`cc4449e`](https://github.com/cudr/slate-collaborative/commit/cc4449e6dd35fbf36675a5ac5a7bac61222dad06)
-- feat: nodemon run example [`71ab42d`](https://github.com/cudr/slate-collaborative/commit/71ab42d5bec04b89819f51a85659a93587f1af67)
-
-#### [v0.7.1](https://github.com/cudr/slate-collaborative/compare/v0.7.0...v0.7.1)
-
-> 28 October 2020
 
 - defensive code for when the document sometimes isn't there on server restarts. [`#26`](https://github.com/cudr/slate-collaborative/pull/26)
 - fix: socket io namespace message broadcast [`ab3c36a`](https://github.com/cudr/slate-collaborative/commit/ab3c36ab7dd7f24059c5d0864735c5892df98028)

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.7.1",
-  "version": "0.7.2",
+  "version": "0.7.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -1,12 +1,11 @@
 {
   "private": true,
-  "version": "0.7.1",
   "description": "Slate collaborative plugin & microservice",
   "scripts": {
     "bootstrap": "lerna bootstrap",
-    "changelog": "auto-changelog -p ./packages/bridge/package.json --template changelog-template.hbs && git add CHANGELOG.md",
+    "version": "auto-changelog -p ./packages/bridge/package.json --template changelog-template.hbs && git add CHANGELOG.md",
     "clean": "rimraf ./packages/**/lib/ && rimraf ./packages/**/tsconfig.tsbuildinfo && lerna clean --yes",
-    "release": "yarn prebuild && yarn build && lerna version && lerna publish from-package && yarn changelog",
+    "release": "yarn prebuild && yarn build && lerna version && lerna publish from-package",
     "deploy:site": "git subtree push --prefix packages/example heroku master",
     "dev": "lerna run --stream build:js && concurrently \"yarn watch\" \"lerna run dev --stream\"",
     "build": "lerna run build:module --stream",
@@ -38,11 +37,11 @@
     ]
   },
   "devDependencies": {
-    "@commitlint/cli": "^11.0.0",
+    "@commitlint/cli": "^9.0.1",
     "@commitlint/config-conventional": "^9.0.1",
     "auto-changelog": "^2.1.0",
     "concurrently": "^4.1.2",
-    "husky": "^4.3.6",
+    "husky": "^3.0.5",
     "lerna": "^3.20.2",
     "lint-staged": "^9.2.5",
     "prettier": "^1.18.2",

packages/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slate-collaborative/backend",
-  "version": "0.7.2",
+  "version": "0.7.1",
   "files": [
     "lib"
   ],
@@ -26,12 +26,12 @@
   "dependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.9.0",
     "@babel/runtime": "^7.6.3",
-    "@slate-collaborative/bridge": "^0.7.2",
+    "@slate-collaborative/bridge": "^0.7.0",
     "@types/lodash": "^4.14.150",
     "@types/socket.io": "^2.1.4",
     "automerge": "0.14.0",
     "lodash": "^4.17.15",
-    "slate": "0.59.0",
+    "slate": "0.58.3",
     "socket.io": "^2.3.0",
     "typescript": "^3.8.3"
   },

packages/backend/src/SocketIOConnection.ts

@@ -38,7 +38,7 @@ export default class SocketIOCollaboration {
    */
 
   constructor(options: SocketIOCollaborationOptions) {
-    this.io = io(options.entry as Server, options.connectOpts)
+    this.io = io(options.entry, options.connectOpts)
 
     this.backend = new AutomergeBackend()
 

packages/bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slate-collaborative/bridge",
-  "version": "0.7.2",
+  "version": "0.7.0",
   "files": [
     "lib"
   ],
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "automerge": "0.14.0",
-    "slate": "0.59.0",
+    "slate": "0.58.3",
     "typescript": "^3.8.3"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "@babel/preset-typescript": "^7.6.0",
     "@types/jest": "^24.9.0",
     "jest": "^24.9.0",
-    "ts-jest": "^26.4.4"
+    "ts-jest": "^25.4.0"
   },
   "directories": {
     "lib": "lib"

packages/bridge/src/apply/node/setNode.ts

@@ -9,12 +9,7 @@ const setNode = (doc: SyncValue, op: SetNodeOperation): SyncValue => {
   const { newProperties } = op
 
   for (let key in newProperties) {
-    const value = newProperties[key]
+    node[key] = newProperties[key]
-    if (value !== undefined) {
-      node[key] = value
-    } else {
-      delete node[key]
-    }
   }
 
   return doc

packages/bridge/src/apply/node/splitNode.ts

@@ -8,10 +8,7 @@ const splitNode = (doc: SyncValue, op: SplitNodeOperation): SyncValue => {
   const [parent, index]: [any, number] = getParent(doc, op.path)
 
   const target = getChildren(parent)[index]
-  const inject = {
+  const inject = cloneNode(target)
-    ...cloneNode(target),
-    ...op.properties
-  }
 
   if (target.text) {
     target.text.length > op.position &&

packages/bridge/src/convert/remove.ts

@@ -5,70 +5,52 @@ import { toSlatePath, toJS } from '../utils'
 import { getTarget } from '../path'
 
 const removeTextOp = (op: Automerge.Diff) => (map: any, doc: Element) => {
+  const { index, path, obj } = op
+
+  const slatePath = toSlatePath(path).slice(0, path?.length)
+
+  let node
+
   try {
-    const { index, path, obj } = op
+    node = getTarget(doc, slatePath) || map[obj]
-
-    const slatePath = toSlatePath(path).slice(0, path?.length)
-
-    let node = map[obj]
-
-    try {
-      node = getTarget(doc, slatePath)
-    } catch (e) {
-      console.error(e, slatePath, op, map, toJS(doc))
-    }
-
-    if (typeof index !== 'number') return
-
-    const text = node?.text?.[index] || '*'
-
-    if (node) {
-      node.text = node?.text ? (node.text.slice(0, index) + node.text.slice(index + 1)) : ''
-    }
-
-    return {
-      type: 'remove_text',
-      path: slatePath,
-      offset: index,
-      text,
-      marks: []
-    }
   } catch (e) {
-    console.error(e, op, map, toJS(doc))
+    console.error(e, op, doc)
+  }
+
+  if (typeof index !== 'number') return
+
+  const text = node?.text[index] || '*'
+
+  if (node) {
+    node.text = node.text?.slice(0, index) + node.text?.slice(index + 1)
+  }
+
+  return {
+    type: 'remove_text',
+    path: slatePath,
+    offset: index,
+    text,
+    marks: []
   }
 }
 
-const removeNodeOp = (op: Automerge.Diff) => (
+const removeNodeOp = ({ index, obj, path }: Automerge.Diff) => (
   map: any,
   doc: Element
 ) => {
-  try {
+  const slatePath = toSlatePath(path)
-    const { index, obj, path } = op
 
-    const slatePath = toSlatePath(path)
+  const parent = getTarget(doc, slatePath)
+  const target = parent?.children[index as number] || { children: [] }
 
-    const parent = getTarget(doc, slatePath)
+  if (!map.hasOwnProperty(obj)) {
-    const target = parent?.children?.[index as number] || parent?.[index as number] || { children: [] }
+    map[obj] = target
+  }
 
-    if (!target) {
+  return {
-      throw new TypeError('Target is not found!')
+    type: 'remove_node',
-    }
+    path: slatePath.length ? slatePath.concat(index) : [index],
-
+    node: target
-    if (!map.hasOwnProperty(obj)) {
-      map[obj] = target
-    }
-
-    if (!Number.isInteger(index)) {
-      throw new TypeError('Index is not a number')
-    }
-
-    return {
-      type: 'remove_node',
-      path: slatePath.length ? slatePath.concat(index) : [index],
-      node: target
-    }
-  } catch (e) {
-    console.error(e, op, map, toJS(doc))
   }
 }
 
@@ -79,8 +61,7 @@ const opRemove = (op: Automerge.Diff, [map, ops]: any) => {
     if (
       map.hasOwnProperty(obj) &&
       typeof map[obj] !== 'string' &&
-      type !== 'text' &&
+      type !== 'text'
-      map?.obj?.length
     ) {
       map[obj].splice(index, 1)
 
@@ -91,7 +72,7 @@ const opRemove = (op: Automerge.Diff, [map, ops]: any) => {
 
     const key = path[path.length - 1]
 
-    if (key === 'cursors' || op.key === 'cursors') return [map, ops]
+    if (key === 'cursors') return [map, ops]
 
     const fn = key === 'text' ? removeTextOp : removeNodeOp
 

packages/bridge/src/convert/set.ts

@@ -10,10 +10,10 @@ const setDataOp = (
     type: 'set_node',
     path: toSlatePath(path),
     properties: {
-      [key]: toJS(Automerge.getObjectById(doc, obj)?.[key])
+      [key]: Automerge.getObjectById(doc, obj)?.[key]
     },
     newProperties: {
-      [key]: map?.[value] || value
+      [key]: value
     }
   }
 }
@@ -22,7 +22,7 @@ const opSet = (op: Automerge.Diff, [map, ops]: any, doc: any) => {
   const { link, value, path, obj, key } = op
 
   try {
-    if (path && path.length && path[0] !== 'cursors') {
+    if (path && path[0] !== 'cursors') {
       ops.push(setDataOp(op, doc))
     } else if (map[obj]) {
       map[obj][key as any] = link ? map[value] : value

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slate-collaborative/client",
-  "version": "0.7.2",
+  "version": "0.7.0",
   "files": [
     "lib"
   ],
@@ -26,9 +26,9 @@
   "dependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.9.0",
     "@babel/preset-react": "^7.0.0",
-    "@slate-collaborative/bridge": "^0.7.2",
+    "@slate-collaborative/bridge": "^0.7.0",
     "automerge": "0.14.0",
-    "slate": "0.59.0",
+    "slate": "0.58.3",
     "slate-history": "0.58.3",
     "socket.io-client": "^2.3.0",
     "typescript": "^3.8.3"

packages/client/src/automerge-editor.ts

@@ -130,9 +130,7 @@ export const AutomergeEditor = {
         Editor.withoutNormalizing(e, () => {
           if (HistoryEditor.isHistoryEditor(e) && !preserveExternalHistory) {
             HistoryEditor.withoutSaving(e, () => {
-              slateOps.forEach((o: Operation) => {
+              slateOps.forEach((o: Operation) => e.apply(o))
-                e.apply(o)
-              })
             })
           } else {
             slateOps.forEach((o: Operation) => e.apply(o))
@@ -151,12 +149,8 @@ export const AutomergeEditor = {
   garbageCursor: (e: AutomergeEditor, docId: string) => {
     const doc = e.docSet.getDoc(docId)
 
-    if (!doc) {
-      return
-    }
-
     const changed = Automerge.change<SyncDoc>(doc, (d: any) => {
-      delete d.cursors
+      delete d.cusors
     })
 
     e.onCursor && e.onCursor(null)

packages/client/src/withAutomerge.ts

@@ -74,9 +74,9 @@ const withAutomerge = <T extends Editor>(
 
     if (!e.isRemote) {
       AutomergeEditor.applySlateOps(e, docId, operations, cursorData)
-    }
 
-    onChange()
+      onChange()
+    }
   }
 
   /**

packages/client/src/withSocketIO.ts

@@ -122,8 +122,6 @@ const withSocketIO = <T extends AutomergeEditor>(
    */
 
   e.destroy = () => {
-    e.socket.removeListener('disconnect')
-
     e.socket.close()
 
     e.closeConnection()

packages/example/package.json

@@ -1,28 +1,36 @@
 {
   "name": "@slate-collaborative/example",
-  "version": "0.7.2",
+  "version": "0.7.1",
   "private": true,
   "dependencies": {
     "@emotion/core": "^10.0.17",
     "@emotion/styled": "^10.0.17",
-    "@slate-collaborative/backend": "^0.7.2",
+    "@slate-collaborative/backend": "^0.7.1",
-    "@slate-collaborative/client": "^0.7.2",
+    "@slate-collaborative/client": "^0.7.0",
+    "@types/faker": "^4.1.5",
+    "@types/is-url": "^1.2.28",
+    "@types/jest": "24.0.18",
+    "@types/node": "12.7.5",
+    "@types/randomcolor": "^0.5.4",
+    "@types/react-dom": "^16.9.6",
     "concurrently": "^4.1.2",
     "cross-env": "^6.0.3",
     "express": "^4.17.1",
+    "faker": "^4.1.0",
     "is-url": "^1.2.4",
     "lodash": "^4.17.15",
-    "nodemon": "^2.0.6",
+    "nodemon": "^1.19.2",
     "randomcolor": "^0.5.4",
-    "react": "^17.0.1",
+    "react": "^16.9.0",
-    "react-dom": "^17.0.1",
+    "react-dom": "^16.9.0",
     "react-scripts": "3.1.2",
-    "slate": "0.59.0",
+    "slate": "0.58.3",
     "slate-history": "0.58.3",
-    "slate-react": "0.59.0"
+    "slate-react": "0.58.3",
+    "typescript": "^3.8.3"
   },
   "scripts": {
-    "start": "nodemon server.js",
+    "start": "node server.js",
     "start:cra": "react-scripts start",
     "prebuild": "cp -f ./tsconfig.production.json ./tsconfig.json",
     "build": "cross-env NODE_ENV=production && react-scripts build",
@@ -46,15 +54,5 @@
   },
   "engines": {
     "node": "12.x"
-  },
-  "devDependencies": {
-    "@types/faker": "^4.1.5",
-    "@types/is-url": "^1.2.28",
-    "@types/jest": "24.0.18",
-    "@types/node": "14.14.6",
-    "@types/randomcolor": "^0.5.4",
-    "@types/react-dom": "^16.9.6",
-    "faker": "^5.1.0",
-    "typescript": "^3.8.3"
   }
 }