Merge branch 'master' into blixt/master

Author: streamich

.github/workflows/gh-pages.yml

@@ -11,17 +11,18 @@ jobs:
       contents: write
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
     steps:
       - uses: actions/checkout@v4
+      - run: corepack enable
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn install --frozen-lockfile
       - run: yarn typedoc
-      - run: yarn coverage
+      - run: yarn test:coverage
       - run: yarn build:pages
       - name: Publish to gh-pages
         uses: peaceiris/actions-gh-pages@v4

.github/workflows/pr.yml

@@ -13,45 +13,45 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.x, 22.x, 24.x]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - run: corepack enable
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn install --frozen-lockfile
-      - run: yarn test:ci --ci
+      - run: yarn test
   lint-and-co:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.x, 22.x, 24.x]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - run: corepack enable
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn install --frozen-lockfile
-      - run: yarn build:all
-      - run: yarn lint
       - run: yarn format
-      - run: yarn test:cli:pointer
-      - run: yarn test:cli:patch
-      - run: yarn test:cli:pack
-      - run: yarn demo:json-patch
+      - run: yarn lint
+      - run: yarn typecheck
+      - run: yarn build
   typedoc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.x, 22.x, 24.x]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - run: corepack enable
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

.github/workflows/release.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

.yarnrc.yml

@@ -1,13 +1,11 @@
 {
-	"$schema": "https://biomejs.dev/schemas/1.9.3/schema.json",
-	"organizeImports": {
-		"enabled": true
-	},
+	"$schema": "https://biomejs.dev/schemas/2.2.6/schema.json",
 	"formatter": {
 		"indentStyle": "space",
 		"lineWidth": 120
 	},
 	"javascript": {
+		"jsxRuntime": "reactClassic",
 		"formatter": {
 			"quoteStyle": "single",
 			"trailingCommas": "all",
@@ -25,25 +23,36 @@
 				"noInferrableTypes": "off",
 				"noUselessElse": "off",
 				"noParameterAssign": "off",
-				"noCommaOperator": "off",
 				"useSingleVarDeclarator": "off",
+				"noUnusedTemplateLiteral": "off",
 				"useLiteralEnumMembers": "off"
 			},
 			"suspicious": {
 				"noExplicitAny": "off",
 				"useIsArray": "off",
 				"noAssignInExpressions": "off",
+				"useIterableCallbackReturn": "off",
+				"useAdjacentOverloadSignatures": "off",
 				"noConfusingLabels": "off",
 				"noConfusingVoidType": "off",
-				"noConstEnum": "off"
+				"noConstEnum": "off",
+				"noSelfCompare": "off"
 			},
 			"complexity": {
 				"noStaticOnlyClass": "off",
 				"useOptionalChain": "off",
+				"noCommaOperator": "off",
 				"noUselessLabel": "off"
 			},
+			"security": {
+				"noGlobalEval": "off"
+			},
 			"a11y": {
-				"noSvgWithoutTitle": "off"
+				"noSvgWithoutTitle": "off",
+				"noStaticElementInteractions": "off"
+			},
+			"correctness": {
+				"noUnusedFunctionParameters": "off"
 			},
 			"performance": {
 				"noDelete": "off"

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
-  "name": "json-joy",
-  "version": "17.43.0",
+  "name": "json-joy-monorepo",
+  "version": "17.56.0",
   "description": "Collection of libraries for building collaborative editing apps.",
   "author": {
     "name": "streamich",
@@ -13,67 +13,27 @@
     "type": "github",
     "url": "https://github.com/sponsors/streamich"
   },
-  "engines": {
-    "node": ">=10.0"
-  },
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "typings": "lib/index.d.ts",
-  "bin": {
-    "jj": "./bin/jj.js",
-    "json-pack": "./bin/json-pack.js",
-    "json-pack-test": "./bin/json-pack-test.js",
-    "json-unpack": "./bin/json-unpack.js",
-    "json-pointer": "./bin/json-pointer.js",
-    "json-pointer-test": "./bin/json-pointer-test.js",
-    "json-patch": "./bin/json-patch.js",
-    "json-patch-test": "./bin/json-patch-test.js"
-  },
-  "files": [
-    "LICENSE",
-    "bin/",
-    "lib/",
-    "esm/"
-  ],
   "scripts": {
-    "format": "biome format ./src",
-    "format:fix": "biome format --write ./src",
-    "lint": "biome lint ./src",
-    "lint:fix": "biome lint --write ./src",
-    "clean": "npx [email protected] lib es6 es2019 es2020 esm typedocs coverage gh-pages yarn-error.log src/**/__bench__/node_modules src/**/__bench__/yarn-error.log",
-    "build:es2020": "tsc --project tsconfig.build.json --module commonjs --target es2020 --outDir lib",
-    "build:esm": "tsc --project tsconfig.build.json --module ESNext --target ESNEXT --outDir esm",
-    "build:all": "npx [email protected] \"yarn build:es2020\" \"yarn build:esm\"",
-    "build": "yarn build:es2020",
-    "jest": "jest",
-    "test": "jest --maxWorkers 7",
-    "test:all": "yarn lint && yarn test && yarn build:all && yarn test:cli:pointer && yarn test:cli:patch && yarn test:cli:pack && yarn demo:json-patch",
-    "test:ci": "yarn jest --maxWorkers 3 --no-cache",
-    "test:cli": "yarn test:cli:pointer && yarn test:cli:patch && yarn test:cli:pack",
-    "test:cli:pointer": "./bin/json-pointer-test.js ./bin/json-pointer.js",
-    "test:cli:patch": "./bin/json-patch-test.js ./bin/json-patch.js",
-    "test:cli:pack": "./bin/json-pack-test.js ./bin/json-pack.js",
-    "demo:json-patch": "npx ts-node src/json-patch/__demos__/json-patch.ts",
-    "demo:ui:peritext": "webpack serve --config ./src/json-crdt-peritext-ui/__demos__/webpack.config.js",
-    "bench:json-crdt:traces:crdt-libs": "cd src/json-crdt/__bench__ && yarn && yarn bench:traces:crdt-libs",
-    "bench:json-crdt:traces:non-crdt-libs": "cd src/json-crdt/__bench__ && yarn && yarn bench:traces:non-crdt-libs",
-    "bench:json-crdt:concurrent-traces": "cd src/json-crdt/__bench__ && yarn && yarn bench:concurrent-traces",
-    "bench:json-crdt:codecs:encoding": "cd src/json-crdt/__bench__ && yarn && yarn bench:codecs:encoding",
-    "bench:json-crdt:codecs:decoding": "cd src/json-crdt/__bench__ && yarn && yarn bench:codecs:decoding",
-    "bench:json-crdt:codecs:encoding:json": "cd src/json-crdt/__bench__ && yarn && yarn bench:codecs:encoding:json",
-    "bench:json-crdt:codecs:encoding:libs": "cd src/json-crdt/__bench__ && yarn && yarn bench:codecs:encoding:libs",
-    "bench:json-crdt:codecs:sizes": "cd src/json-crdt/__bench__ && yarn && yarn bench:codecs:sizes",
-    "bench:json-ot:ot-string:apply": "cd src/json-ot/__bench__ && yarn && yarn bench:ot-string:apply",
-    "bench:json-ot:ot-string:compose-and-transform": "yarn build && cd src/json-ot/__bench__ && yarn && yarn bench:ot-string:compose-and-transform",
-    "coverage": "yarn test --collectCoverage",
-    "typedoc": "npx [email protected] --tsconfig tsconfig.build.json",
-    "build:pages": "npx [email protected] gh-pages && mkdir -p gh-pages && cp -r typedocs/* gh-pages && cp -r coverage gh-pages/coverage",
+    "clean": "rimraf lib coverage typedocs gh-pages && yarn workspaces foreach -Apt run clean",
+    "build": "yarn workspaces foreach -Apt run build",
+    "test": "node -r ts-node/register ./node_modules/.bin/jest --maxWorkers 7",
+    "test:coverage": "node -r ts-node/register ./node_modules/.bin/jest --maxWorkers 7 --collectCoverage",
+    "format": "biome format ./packages/*/src",
+    "format:fix": "biome format --write ./packages/*/src",
+    "lint": "biome lint ./packages/*/src",
+    "lint:fix": "biome lint --write ./packages/*/src",
+    "typecheck": "yarn workspaces foreach -Apt run typecheck",
+    "typedoc": "npx [email protected] --tsconfig tsconfig.typedoc.json",
+    "build:pages": "rimraf gh-pages && mkdir -p gh-pages && cp -r typedocs/* gh-pages && cp -r coverage gh-pages/coverage",
     "deploy:pages": "gh-pages -d gh-pages",
-    "publish-coverage-and-typedocs": "yarn typedoc && yarn coverage && yarn build:pages && yarn deploy:pages",
-    "jj": "npx ts-node src/json-cli/jj.ts",
+    "publish-coverage-and-typedocs": "yarn typedoc && yarn test:coverage && yarn build:pages && yarn deploy:pages",
     "upgrade:check": "npx [email protected]",
     "upgrade:interactive": "npx [email protected] --interactive"
   },
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
   "peerDependencies": {
     "rxjs": "7",
     "tslib": "2"
@@ -83,26 +43,13 @@
       "optional": true
     }
   },
-  "dependencies": {
-    "@jsonjoy.com/base64": "^1.1.2",
-    "@jsonjoy.com/json-expression": "^1.0.0",
-    "@jsonjoy.com/json-pack": "^1.1.0",
-    "@jsonjoy.com/json-pointer": "^1.0.0",
-    "@jsonjoy.com/json-type": "^1.0.0",
-    "@jsonjoy.com/util": "^1.6.0",
-    "arg": "^5.0.2",
-    "hyperdyperid": "^1.2.0",
-    "nano-css": "^5.6.2",
-    "sonic-forest": "^1.2.0",
-    "thingies": "^2.1.1",
-    "tree-dump": "^1.0.2",
-    "very-small-parser": "^1.12.0"
-  },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
+    "@biomejs/biome": "^2.2.6",
+    "@monaco-editor/react": "^4.7.0",
     "@radix-ui/react-icons": "^1.3.1",
     "@types/benchmark": "^2.1.5",
     "@types/jest": "^29.5.12",
+    "@types/node": "^24.8.1",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
     "benchmark": "^2.1.4",
@@ -111,44 +58,36 @@
     "collaborative-input": "^1.6.1",
     "collaborative-ui": "^1.6.0",
     "config-galore": "^1.0.0",
-    "editing-traces": "https://github.com/streamich/editing-traces#6494020428530a6e382378b98d1d7e31334e2d7b",
+    "editing-traces": "https://github.com/streamich/editing-traces#145f79871a7bf54162f55d84eb6b8381db7b65b8",
     "fast-diff": "^1.3.0",
     "fast-json-patch": "^3.1.1",
     "html-webpack-plugin": "^5.6.0",
     "jest": "^29.7.0",
     "json-crdt-traces": "https://github.com/streamich/json-crdt-traces#ec825401dc05cbb74b9e0b3c4d6527399f54d54d",
     "json-logic-js": "^2.0.2",
+    "monaco-editor": "^0.54.0",
     "nano-theme": "^1.4.3",
     "nice-ui": "^1.30.0",
     "quill-delta": "^5.1.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "rimraf": "^6.0.1",
     "rxjs": "^7.8.2",
-    "ts-jest": "^29.1.2",
-    "ts-loader": "^9.5.1",
+    "ts-jest": "^29.4.0",
+    "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
-    "tslint": "^6.1.3",
-    "tslint-config-common": "^1.6.2",
-    "typescript": "^5.4.5",
+    "tslib": "^2.8.1",
+    "typescript": "^5.8.3",
     "use-t": "^1.6.3",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.1.0",
     "yjs": "^13.6.18"
   },
   "jest": {
-    "moduleFileExtensions": [
-      "ts",
-      "js"
-    ],
-    "transform": {
-      "^.+\\.ts$": "ts-jest"
-    },
-    "transformIgnorePatterns": [
-      ".*/node_modules/.*"
-    ],
-    "testRegex": ".*/(__tests__|__jest__|demo)/.*\\.(test|spec)\\.ts$"
+    "projects": [
+      "packages/*/package.json"
+    ]
   },
   "config": {
     "commitizen": {
@@ -176,25 +115,6 @@
       }
     }
   },
-  "release": {
-    "branches": [
-      "master",
-      {
-        "name": "next",
-        "prerelease": true
-      }
-    ],
-    "prepare": [
-      "@semantic-release/changelog",
-      "@semantic-release/npm",
-      "@semantic-release/git"
-    ],
-    "verifyConditions": [
-      "@semantic-release/changelog",
-      "@semantic-release/npm",
-      "@semantic-release/git"
-    ]
-  },
   "keywords": [
     "collaborative",
     "multiplayer",
@@ -236,5 +156,6 @@
     "json-type",
     "json-type-value",
     "json-walk"
-  ]
+  ],
+  "packageManager": "[email protected]"
 }