Merge pull request #1050 from streamich/feat/json-hash-diff-packages

Improve hash, diff packages and refactor iterators

Author: streamich

packages/click-json/src/ClickableJsonCrdt/nodes/JsonCrdtStrNode/StrEdit.tsx

@@ -1,15 +1,15 @@
 import * as React from 'react';
 import {theme} from 'nano-theme';
-import {bind} from 'collaborative-input';
+import {bind} from '@jsonjoy.com/collaborative-input';
 import {FlexibleInput} from 'flexible-input';
 import {useT} from 'use-t';
-import type {NodeRef} from '../../NodeRef';
 import * as css from '../../../css';
 import {selectOnFocus} from '../../../utils/selectOnFocus';
 import {inputStyle} from '../../../ClickableJson/utils';
 import {CancelAction} from '../../../buttons/Action/CancelAction';
 import {SubmitAction} from '../../../buttons/Action/SubmitAction';
 import {useJsonCrdt} from '../../context';
+import type {NodeRef} from '../../NodeRef';
 import type {StrNode} from 'json-joy/lib/json-crdt';
 
 export interface StrEditProps {

packages/collaborative-input/docs/text.md

@@ -10,13 +10,13 @@ JSON CRDT data structures. It allows multiple users to edit the `<input>` and
 Installation:
 
 ```
-npm install json-joy collaborative-input
+npm install json-joy @jsonjoy.com/collaborative-input
 ```
 
 Usage:
 
 ```ts
-import {bind} from 'collaborative-input';
+import {bind} from '@jsonjoy.com/collaborative-input';
 
 const str = model.api.str(['path', 'to', 'string']);
 const input = document.getElementById('input');
@@ -25,8 +25,3 @@ const unbind = bind(str, input);
 // When done, unbind the binding.
 unbind();
 ```
-
-
-## Preview
-
-See [demo](https://streamich.github.io/collaborative-input).

packages/collaborative-react/package.json

@@ -32,7 +32,8 @@
     "crdt"
   ],
   "dependencies": {
-    "json-joy": "workspace:*"
+    "json-joy": "workspace:*",
+    "thingies": "^2.6.0"
   },
   "peerDependencies": {
     "react": "^19",

packages/collaborative-react/src/hooks.ts

@@ -1,7 +1,7 @@
 import {useState, useMemo, useCallback, useSyncExternalStore, useEffect} from 'react';
 import {useCtxModelStrict, useCtxNodeStrict} from './context';
 import type {FanOutUnsubscribe} from 'thingies/lib/fanout';
-import type {SyncStore} from 'json-joy/lib/util/events/sync-store';
+import type {SyncStore} from 'thingies/lib/sync';
 import type {Model, JsonNodeView, ArrApi, ObjApi, StrApi} from 'json-joy/lib/json-crdt';
 import type {ChangeEvent} from 'json-joy/lib/json-crdt/model/api/events';
 import type {ApiPath} from 'json-joy/lib/json-crdt/model/api/types';

packages/collaborative-slate/package.json

@@ -82,6 +82,7 @@
   "dependencies": {
     "@jsonjoy.com/collaborative-peritext": "workspace:*",
     "@jsonjoy.com/collaborative-presence": "workspace:*",
+    "@jsonjoy.com/diff": "workspace:*",
     "@jsonjoy.com/json-equal": "workspace:*",
     "@jsonjoy.com/ui": "workspace:*",
     "code-colors": "^2.4.0",

packages/collaborative-slate/src/sync/applyPatch.ts

@@ -5,7 +5,7 @@
  */
 
 import {Transforms, Editor} from 'slate';
-import * as str from 'json-joy/lib/util/diff/str';
+import * as str from '@jsonjoy.com/diff/lib/str';
 import {deepEqual} from '@jsonjoy.com/json-equal';
 import type {SlateDescendantNode, SlateDocument, SlateElementNode, SlateTextNode} from '../types';
 

packages/collaborative-slate/tsconfig.build.json

@@ -29,6 +29,9 @@
     {
       "path": "../collaborative-presence/tsconfig.build.json"
     },
+    {
+      "path": "../diff/tsconfig.build.json"
+    },
     {
       "path": "../json-equal/tsconfig.build.json"
     },

packages/collaborative-slate/tsconfig.json

@@ -30,6 +30,9 @@
     {
       "path": "../collaborative-presence"
     },
+    {
+      "path": "../diff"
+    },
     {
       "path": "../json-equal"
     },

packages/collaborative-str/package.json

@@ -35,6 +35,7 @@
     "crdt"
   ],
   "dependencies": {
+    "@jsonjoy.com/diff": "workspace:*",
     "json-joy": "workspace:*"
   },
   "peerDependencies": {

packages/collaborative-str/src/StrBinding.ts

@@ -1,7 +1,7 @@
 import {invokeFirstOnly} from './util';
 import {Selection} from './Selection';
 import {applyChange} from './util';
-import {diff, diffEdit} from 'json-joy/lib/util/diff/str';
+import {diff, diffEdit} from '@jsonjoy.com/diff/lib/str';
 import type {CollaborativeStr, EditorFacade, SimpleChange} from './types';
 
 const enum PATCH_OP_TYPE {