@inkandswitch/patchwork 0.7.3 → 0.7.4

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @inkandswitch/patchwork
 
+## 0.7.4
+
+### Patch Changes
+
+- 7339066: The dev importmap now names each builtin's pre-bundled dep URL
+  (`/node_modules/.vite/deps/…?v=…`) instead of `/@id/<dep>`. Both URLs resolve to
+  the same file, but a module fetched under two URLs is evaluated twice — the site
+  imported solid through the pre-bundled URL and tool code imported it through the
+  importmap, so tools ran against a second solid with its own owner stack and
+  logged "computations created outside a `createRoot`" for every effect they
+  created. Builtins that aren't pre-bundled still fall back to `/@id/<dep>`.
+- ebca53b: Move the automerge-repo subduction fork to 2.6.0-subduction.48, `@automerge/automerge-repo-keyhive` to 0.5.0-alpha.7, and `@keyhive/keyhive` to 0.1.0-alpha.8. These three are bumped together because the keyhive package pins its automerge-repo version exactly.
+
+  keyhive 0.5 renames the two hive flavours. The network-adapter hive is now `LegacyAutomergeRepoKeyhive`, built by `initializeLegacyAutomergeRepoKeyhive`; the subduction hive keeps the name `AutomergeRepoKeyhive` and is built by `initializeAutomergeRepoKeyhive`. Both extend `AutomergeRepoKeyhiveBase`, which is what Patchwork's `hive` fields are typed as, so a tool that only reads membership works against either.
+
+  `createKeyhiveNetworkAdapter` takes an options object instead of positional arguments, and `onlyShareWithHardcodedServerPeerId` is now `onlyShareWithSyncServer`.
+
+- Updated dependencies [ebca53b]
+- Updated dependencies [882eacd]
+  - @inkandswitch/patchwork-bootloader@0.6.3
+  - @inkandswitch/patchwork-elements@6.0.2
+  - @inkandswitch/patchwork-filesystem@0.2.8
+  - @inkandswitch/patchwork-plugins@1.2.3
+  - @inkandswitch/patchwork-providers@0.5.2
+
 ## 0.7.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -18,7 +18,7 @@
  * and the automerge-worker handoff and nothing else.
  */
 import { Repo } from "@automerge/vanillajs/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import type { Patchwork, PatchworkOptions } from "./types.js";
 declare global {
     interface Window {

package/dist/index.js

@@ -94,7 +94,11 @@ async function doSetup(options) {
             // Mirror the boot wiring: a keyhive repo talks to the worker through a
             // keyhive adapter wrapped around the message channel.
             const registered = bootHive
-                ? bootHive.createKeyhiveNetworkAdapter(fresh, false, false, 2000)
+                ? bootHive.createKeyhiveNetworkAdapter(fresh, {
+                    onlyShareWithSyncServer: false,
+                    periodicallyRequestSync: false,
+                    syncRequestInterval: 2000,
+                })
                 : fresh;
             repo.networkSubsystem.addNetworkAdapter(registered);
             removeAdapterFor(repo, workerAdapter, registered);

package/dist/repo.d.ts

@@ -1,11 +1,11 @@
 import { MessageChannelNetworkAdapter, Repo } from "@automerge/vanillajs/slim";
-import { type AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import { type AutomergeRepoKeyhiveBase } from "@automerge/automerge-repo-keyhive";
 import setupServiceWorker from "@inkandswitch/patchwork-bootloader";
 import type { SignerIdentity } from "./types.js";
 export declare function initWasm(): Promise<void>;
 export declare function createRepo(workerAdapter: MessageChannelNetworkAdapter): Promise<{
     repo: Repo;
-    hive?: AutomergeRepoKeyhive;
+    hive?: AutomergeRepoKeyhiveBase;
     signerIdentity?: SignerIdentity;
 }>;
 /**

package/dist/repo.js

@@ -1,6 +1,6 @@
 import { initializeWasm, Repo, } from "@automerge/vanillajs/slim";
 import { IndexedDBWorkerStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb/IndexedDBWorkerStorageAdapter";
-import { initKeyhiveWasm, initializeAutomergeRepoKeyhiveWithRepo, } from "@automerge/automerge-repo-keyhive";
+import { initKeyhiveWasm, initializeLegacyAutomergeRepoKeyhive, } from "@automerge/automerge-repo-keyhive";
 // eslint-disable-next-line
 // @ts-ignore — initSync is a wasm-bindgen runtime helper not in the .d.ts
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
@@ -32,14 +32,14 @@ export async function createRepo(workerAdapter) {
     if (syncServer.keyhive) {
         log("setting up keyhive");
         initKeyhiveWasm();
-        const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
+        const { hive, repo } = await initializeLegacyAutomergeRepoKeyhive({
             createRepo: (repoConfig) => new Repo(repoConfig),
             storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
             peerIdSuffix: storagePrefix + Math.random().toString(36).slice(2),
             networkAdapter: workerAdapter,
             automaticArchiveIngestion: true,
             cachingMode: "periodic",
-            onlyShareWithHardcodedServerPeerId: false,
+            onlyShareWithSyncServer: false,
             // ARK selects the relay via `syncServer`, defaulting to "subduction".
             syncServer: syncServer.keyhive,
             repo: {

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { AutomergeUrl, DocHandle, Repo } from "@automerge/vanillajs/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import type { ModuleWatcher, HasPatchworkMetadata } from "@inkandswitch/patchwork-filesystem";
 import type { AccountCreator, AccountDoc } from "@inkandswitch/patchwork-plugins";
 import type { ServiceWorkerRepoChannelListener, SyncStateDocMessage } from "@inkandswitch/patchwork-bootloader/types";

package/dist/vite/importmap-plugin.js

@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+import { relative } from "node:path";
 /**
  * bootloader owns resolving/emitting its own dependencies (it's the one that
  * actually has automerge/keyhive/codemirror/solid/the other patchwork-*
@@ -87,11 +88,22 @@ export function importmap(options) {
         },
         transformIndexHtml: {
             order: "pre",
-            handler(html, context) {
+            async handler(html, context) {
                 const activeImportmap = structuredClone(importmap);
                 if (context.server) {
+                    // The importmap has to name the same URL the site's own imports get
+                    // rewritten to, which is the pre-bundled dep. `/@id/<dep>` resolves
+                    // to the same file but is a second URL, and a module fetched under
+                    // two URLs is evaluated twice — two solids, two automerges.
+                    const optimizer = context.server.environments.client.depsOptimizer;
+                    await optimizer?.init();
+                    const root = context.server.config.root;
                     for (const id of Object.keys(builtins)) {
-                        activeImportmap.imports[id] = `/@id/${devDependencyId(id)}`;
+                        const dependency = devDependencyId(id);
+                        const optimized = optimizer?.metadata.optimized[dependency];
+                        activeImportmap.imports[id] = optimized
+                            ? `/${relative(root, optimized.file)}?v=${optimized.browserHash}`
+                            : `/@id/${dependency}`;
                     }
                 }
                 return {

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/inkandswitch/patchwork-system.git",
     "directory": "core/patchwork"
   },
-  "version": "0.7.3",
+  "version": "0.7.4",
   "author": "Ink & Switch",
   "type": "module",
   "license": "MIT",
@@ -73,21 +73,21 @@
   },
   "dependencies": {
     "@automerge/automerge": "3.3.2",
-    "@automerge/automerge-repo": "2.6.0-subduction.47",
-    "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
-    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.47",
+    "@automerge/automerge-repo": "2.6.0-subduction.48",
+    "@automerge/automerge-repo-keyhive": "0.5.0-alpha.7",
+    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.48",
     "@automerge/automerge-subduction": "0.16.1",
-    "@automerge/vanillajs": "2.6.0-subduction.47",
+    "@automerge/vanillajs": "2.6.0-subduction.48",
     "@types/debug": "^4.1.13",
     "debug": "^4.4.3",
     "esbuild": "^0.23.1",
     "sharp": "^0.35.3",
     "vite-plugin-wasm": "^3.6.0",
-    "@inkandswitch/patchwork-bootloader": "^0.6.2",
-    "@inkandswitch/patchwork-elements": "^6.0.1",
-    "@inkandswitch/patchwork-filesystem": "^0.2.6",
-    "@inkandswitch/patchwork-plugins": "^1.2.1",
-    "@inkandswitch/patchwork-providers": "^0.5.0"
+    "@inkandswitch/patchwork-bootloader": "^0.6.3",
+    "@inkandswitch/patchwork-elements": "^6.0.2",
+    "@inkandswitch/patchwork-filesystem": "^0.2.8",
+    "@inkandswitch/patchwork-plugins": "^1.2.3",
+    "@inkandswitch/patchwork-providers": "^0.5.2"
   },
   "devDependencies": {
     "rollup": "^4.61.1",

package/src/index.ts

@@ -25,7 +25,7 @@ import {
 } from "@automerge/vanillajs/slim";
 import * as Automerge from "@automerge/automerge/slim";
 import * as AutomergeRepo from "@automerge/automerge-repo/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 
 import { ModuleWatcher } from "@inkandswitch/patchwork-filesystem";
 import { importAutomergePackageViaWorker } from "@inkandswitch/patchwork-bootloader/module-loader";
@@ -97,9 +97,7 @@ export function setup(options: PatchworkOptions = {}): Promise<Patchwork> {
     timer = setTimeout(
       () =>
         reject(
-          new Error(
-            `patchwork.setup: boot did not finish within ${timeout}ms`
-          )
+          new Error(`patchwork.setup: boot did not finish within ${timeout}ms`)
         ),
       timeout
     );
@@ -161,7 +159,11 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
       // Mirror the boot wiring: a keyhive repo talks to the worker through a
       // keyhive adapter wrapped around the message channel.
       const registered = bootHive
-        ? bootHive.createKeyhiveNetworkAdapter(fresh, false, false, 2000)
+        ? bootHive.createKeyhiveNetworkAdapter(fresh, {
+            onlyShareWithSyncServer: false,
+            periodicallyRequestSync: false,
+            syncRequestInterval: 2000,
+          })
         : fresh;
       repo.networkSubsystem.addNetworkAdapter(registered as any);
       removeAdapterFor(repo, workerAdapter, registered);
@@ -264,9 +266,8 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
     },
 
     async create<D>(type: string, init?: (doc: D) => void) {
-      const datatype = await getRegistry<DatatypeDescription>(
-        "patchwork:datatype"
-      ).load(type);
+      const datatype =
+        await getRegistry<DatatypeDescription>("patchwork:datatype").load(type);
       if (!datatype) {
         throw new Error(
           `patchwork.create: no datatype registered for "${type}"`

package/src/repo.ts

@@ -8,8 +8,8 @@ import { IndexedDBWorkerStorageAdapter } from "@automerge/automerge-repo-storage
 import * as AutomergeRepo from "@automerge/automerge-repo/slim";
 import {
   initKeyhiveWasm,
-  initializeAutomergeRepoKeyhiveWithRepo,
-  type AutomergeRepoKeyhive,
+  initializeLegacyAutomergeRepoKeyhive,
+  type AutomergeRepoKeyhiveBase,
   type SyncServerSelection,
 } from "@automerge/automerge-repo-keyhive";
 // eslint-disable-next-line
@@ -57,20 +57,20 @@ export async function createRepo(
   workerAdapter: MessageChannelNetworkAdapter
 ): Promise<{
   repo: Repo;
-  hive?: AutomergeRepoKeyhive;
+  hive?: AutomergeRepoKeyhiveBase;
   signerIdentity?: SignerIdentity;
 }> {
   if (syncServer.keyhive) {
     log("setting up keyhive");
     initKeyhiveWasm();
-    const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
+    const { hive, repo } = await initializeLegacyAutomergeRepoKeyhive({
       createRepo: (repoConfig) => new Repo(repoConfig),
       storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
       peerIdSuffix: storagePrefix + Math.random().toString(36).slice(2),
       networkAdapter: workerAdapter,
       automaticArchiveIngestion: true,
       cachingMode: "periodic",
-      onlyShareWithHardcodedServerPeerId: false,
+      onlyShareWithSyncServer: false,
       // ARK selects the relay via `syncServer`, defaulting to "subduction".
       syncServer: syncServer.keyhive,
       repo: {

package/src/types.ts

@@ -1,5 +1,5 @@
 import type { AutomergeUrl, DocHandle, Repo } from "@automerge/vanillajs/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import type {
   ModuleWatcher,
   HasPatchworkMetadata,

package/src/vite/importmap-plugin.ts

@@ -4,6 +4,7 @@ import type {
   PatchworkVitePluginOptions,
 } from "./patchwork-plugin.js";
 import { fileURLToPath } from "node:url";
+import { relative } from "node:path";
 
 /**
  * bootloader owns resolving/emitting its own dependencies (it's the one that
@@ -115,11 +116,22 @@ export function importmap(options?: PatchworkVitePluginOptions): Plugin {
     },
     transformIndexHtml: {
       order: "pre",
-      handler(html, context) {
+      async handler(html, context) {
         const activeImportmap = structuredClone(importmap);
         if (context.server) {
+          // The importmap has to name the same URL the site's own imports get
+          // rewritten to, which is the pre-bundled dep. `/@id/<dep>` resolves
+          // to the same file but is a second URL, and a module fetched under
+          // two URLs is evaluated twice — two solids, two automerges.
+          const optimizer = context.server.environments.client.depsOptimizer;
+          await optimizer?.init();
+          const root = context.server.config.root;
           for (const id of Object.keys(builtins)) {
-            activeImportmap.imports[id] = `/@id/${devDependencyId(id)}`;
+            const dependency = devDependencyId(id);
+            const optimized = optimizer?.metadata.optimized[dependency];
+            activeImportmap.imports[id] = optimized
+              ? `/${relative(root, optimized.file)}?v=${optimized.browserHash}`
+              : `/@id/${dependency}`;
           }
         }
         return {