@peerbit/document 13.1.19 → 13.1.20

package/dist/src/borsh.d.ts

@@ -1,2 +1,15 @@
+import { type CustomField, type SimpleField } from "@dao-xyz/borsh";
+/**
+ * Register a Borsh field backed by an accessor and explicitly preserve that
+ * accessor when Documents wraps an indexed value with its local context.
+ *
+ * The accessor must not inherit from another Borsh-decorated class, must be
+ * defined directly on `clazz.prototype`, have both a getter and setter, and be
+ * safe when invoked with the generated wrapper as `this`. In particular, it
+ * cannot depend on private fields, constructor-only state, or state stored in a
+ * WeakMap keyed by instances of `clazz`. The setter is invoked while Borsh
+ * deserializes persisted index rows.
+ */
+export declare const registerIndexFieldAccessor: (clazz: Function, key: string, properties: SimpleField | CustomField<any>) => void;
 export declare const copySerialization: (sourceClazz: any, targetClazz: any) => void;
 //# sourceMappingURL=borsh.d.ts.map

package/dist/src/borsh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"borsh.d.ts","sourceRoot":"","sources":["../../src/borsh.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,GAAI,aAAa,GAAG,EAAE,aAAa,GAAG,SAgBnE,CAAC"}
+{"version":3,"file":"borsh.d.ts","sourceRoot":"","sources":["../../src/borsh.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,WAAW,EAGhB,MAAM,gBAAgB,CAAC;AAQxB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,0BAA0B,GACtC,OAAO,QAAQ,EACf,KAAK,MAAM,EACX,YAAY,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,KACxC,IAqCF,CAAC;AA8CF,eAAO,MAAM,iBAAiB,GAAI,aAAa,GAAG,EAAE,aAAa,GAAG,SAsCnE,CAAC"}

package/dist/src/borsh.js

@@ -1,16 +1,93 @@
-import { getSchema } from "@dao-xyz/borsh";
+import { field, getSchema, } from "@dao-xyz/borsh";
+const serializedFieldAccessors = new WeakMap();
+const copiedSerializations = new WeakMap();
+/**
+ * Register a Borsh field backed by an accessor and explicitly preserve that
+ * accessor when Documents wraps an indexed value with its local context.
+ *
+ * The accessor must not inherit from another Borsh-decorated class, must be
+ * defined directly on `clazz.prototype`, have both a getter and setter, and be
+ * safe when invoked with the generated wrapper as `this`. In particular, it
+ * cannot depend on private fields, constructor-only state, or state stored in a
+ * WeakMap keyed by instances of `clazz`. The setter is invoked while Borsh
+ * deserializes persisted index rows.
+ */
+export const registerIndexFieldAccessor = (clazz, key, properties) => {
+    if (typeof key !== "string") {
+        throw new Error("Index field accessor keys must be strings");
+    }
+    const prototype = clazz.prototype;
+    const descriptor = Object.getOwnPropertyDescriptor(prototype, key);
+    if (!descriptor?.get || !descriptor.set) {
+        throw new Error(`Index field accessor '${key}' must define both a getter and setter`);
+    }
+    const registered = serializedFieldAccessors.get(prototype);
+    if (registered?.has(key)) {
+        return;
+    }
+    let parent = Object.getPrototypeOf(clazz);
+    while (parent && parent !== Function.prototype) {
+        if (getSchema(parent)) {
+            throw new Error("Index field accessors cannot inherit from a Borsh-decorated class");
+        }
+        parent = Object.getPrototypeOf(parent);
+    }
+    if (getSchema(clazz)?.fields.some((existing) => existing.key === key)) {
+        throw new Error(`Index field accessor '${key}' is already registered as a Borsh field`);
+    }
+    field(properties)(prototype, key);
+    serializedFieldAccessors.set(prototype, new Map([...(registered ?? []), [key, descriptor]]));
+};
+const getSerializedFieldAccessor = (sourceClazz, targetClazz, targetSchema, key) => {
+    const sourcePrototype = sourceClazz.prototype;
+    const registeredDescriptor = serializedFieldAccessors
+        .get(sourcePrototype)
+        ?.get(key);
+    if (!registeredDescriptor) {
+        return undefined;
+    }
+    if (targetSchema.fields.some((field) => field.key === key)) {
+        throw new Error(`Cannot preserve index field accessor '${key}': the wrapper schema already contains that field`);
+    }
+    if (Object.getOwnPropertyDescriptor(targetClazz.prototype, key)) {
+        throw new Error(`Cannot preserve index field accessor '${key}': the wrapper prototype already defines it`);
+    }
+    const descriptor = Object.getOwnPropertyDescriptor(sourcePrototype, key);
+    if (!descriptor?.get || !descriptor.set) {
+        throw new Error(`Registered index field accessor '${key}' must define both a getter and setter`);
+    }
+    if (descriptor.get !== registeredDescriptor.get ||
+        descriptor.set !== registeredDescriptor.set ||
+        descriptor.enumerable !== registeredDescriptor.enumerable ||
+        descriptor.configurable !== registeredDescriptor.configurable) {
+        throw new Error(`Registered index field accessor '${key}' changed after registration`);
+    }
+    return descriptor;
+};
 export const copySerialization = (sourceClazz, targetClazz) => {
-    const copiedFromAlready = targetClazz["__copiedFrom"] || [];
-    if (copiedFromAlready?.includes(sourceClazz)) {
+    const copiedFromAlready = copiedSerializations.get(targetClazz);
+    if (copiedFromAlready?.has(sourceClazz)) {
         return;
     }
-    copiedFromAlready.push(sourceClazz);
-    targetClazz["__copiedFrom"] = copiedFromAlready;
     const targetSchema = getSchema(targetClazz);
     const sourceSchema = getSchema(sourceClazz);
+    const accessors = [];
+    for (const sourceField of sourceSchema.fields) {
+        const descriptor = getSerializedFieldAccessor(sourceClazz, targetClazz, targetSchema, sourceField.key);
+        if (descriptor) {
+            accessors.push([sourceField.key, descriptor]);
+        }
+    }
+    if (accessors.length > 0 && !Object.isExtensible(targetClazz.prototype)) {
+        throw new Error("Cannot preserve index field accessors: the wrapper prototype is not extensible");
+    }
+    for (const [key, descriptor] of accessors) {
+        Object.defineProperty(targetClazz.prototype, key, descriptor);
+    }
     targetSchema.fields = [...sourceSchema.fields, ...targetSchema.fields];
     targetSchema.variant = sourceSchema.variant;
     targetSchema.getDependencies =
         sourceSchema.getDependencies.bind(sourceSchema);
+    copiedSerializations.set(targetClazz, new Set([...(copiedFromAlready ?? []), sourceClazz]));
 };
 //# sourceMappingURL=borsh.js.map

package/dist/src/borsh.js.map

@@ -1 +1 @@
-{"version":3,"file":"borsh.js","sourceRoot":"","sources":["../../src/borsh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAAgB,EAAE,WAAgB,EAAE,EAAE;IACvE,MAAM,iBAAiB,GAAU,WAAW,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IACnE,IAAI,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9C,OAAO;IACR,CAAC;IAED,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACpC,WAAW,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC;IAEhD,MAAM,YAAY,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAE5C,YAAY,CAAC,MAAM,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvE,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAC5C,YAAY,CAAC,eAAe;QAC3B,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC,CAAC"}
+{"version":3,"file":"borsh.js","sourceRoot":"","sources":["../../src/borsh.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -6,6 +6,7 @@ export { coerceWithContext, coerceWithIndexed } from "./search.js";
 export * from "./operation.js";
 export { policy } from "./policy.js";
 export { transform } from "./transform.js";
+export { registerIndexFieldAccessor } from "./borsh.js";
 export { MAX_BATCH_SIZE as MAX_DOCUMENT_SIZE } from "./constants.js";
 export { ClosedError } from "@peerbit/program";
 export { type CustomDocumentDomain, createDocumentDomain, createDocumentDomainFromProperty, } from "./domain.js";

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,YAAY,EACX,OAAO,EACP,SAAS,EACT,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,oBAAoB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACnE,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACN,KAAK,oBAAoB,EACzB,oBAAoB,EACpB,gCAAgC,GAChC,MAAM,aAAa,CAAC;AACrB,cAAc,aAAa,CAAC;AAC5B,YAAY,EACX,aAAa,EACb,yBAAyB,EACzB,kBAAkB,EAClB,kBAAkB,EAClB,2BAA2B,GAC3B,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,YAAY,EACX,OAAO,EACP,SAAS,EACT,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,oBAAoB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACnE,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACN,KAAK,oBAAoB,EACzB,oBAAoB,EACpB,gCAAgC,GAChC,MAAM,aAAa,CAAC;AACrB,cAAc,aAAa,CAAC;AAC5B,YAAY,EACX,aAAa,EACb,yBAAyB,EACzB,kBAAkB,EAClB,kBAAkB,EAClB,2BAA2B,GAC3B,MAAM,WAAW,CAAC"}

package/dist/src/index.js

@@ -5,6 +5,7 @@ export { coerceWithContext, coerceWithIndexed } from "./search.js";
 export * from "./operation.js";
 export { policy } from "./policy.js";
 export { transform } from "./transform.js";
+export { registerIndexFieldAccessor } from "./borsh.js";
 export { MAX_BATCH_SIZE as MAX_DOCUMENT_SIZE } from "./constants.js";
 export { ClosedError } from "@peerbit/program";
 export { createDocumentDomain, createDocumentDomainFromProperty, } from "./domain.js";

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,cAAc,CAAC;AA+B7B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACnE,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAEN,oBAAoB,EACpB,gCAAgC,GAChC,MAAM,aAAa,CAAC;AACrB,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,cAAc,CAAC;AA+B7B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACnE,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAEN,oBAAoB,EACpB,gCAAgC,GAChC,MAAM,aAAa,CAAC;AACrB,cAAc,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/document",
-  "version": "13.1.19",
+  "version": "13.1.20",
   "description": "Document store implementation",
   "type": "module",
   "sideEffects": false,
@@ -59,21 +59,21 @@
     "@multiformats/multiaddr": "^13.0.1",
     "p-defer": "^4.0.0",
     "uint8arrays": "^5.1.0",
-    "@peerbit/crypto": "3.1.4",
-    "@peerbit/document-interface": "3.2.54",
     "@peerbit/cache": "3.1.1",
-    "@peerbit/indexer-interface": "3.0.8",
+    "@peerbit/crypto": "3.1.4",
     "@peerbit/indexer-cache": "0.2.11",
+    "@peerbit/indexer-interface": "3.0.8",
+    "@peerbit/document-interface": "3.2.54",
     "@peerbit/indexer-simple": "1.2.12",
     "@peerbit/indexer-sqlite3": "3.0.11",
     "@peerbit/log": "6.2.11",
     "@peerbit/logger": "2.0.1",
-    "@peerbit/program": "6.0.42",
     "@peerbit/pubsub": "5.3.7",
     "@peerbit/rpc": "6.1.10",
+    "@peerbit/program": "6.0.42",
     "@peerbit/shared-log": "13.2.18",
-    "@peerbit/stream-interface": "6.0.14",
-    "@peerbit/time": "3.0.1"
+    "@peerbit/time": "3.0.1",
+    "@peerbit/stream-interface": "6.0.14"
   },
   "optionalDependencies": {
     "@peerbit/document-rust": "0.1.1"
@@ -86,8 +86,8 @@
     "uuid": "^11.1.1",
     "@peerbit/log-rust": "1.1.2",
     "@peerbit/native-backbone": "0.2.4",
-    "@peerbit/test-utils": "3.1.14",
-    "peerbit": "5.3.14"
+    "peerbit": "5.3.14",
+    "@peerbit/test-utils": "3.1.14"
   },
   "repository": {
     "type": "git",

package/src/borsh.ts

@@ -1,19 +1,150 @@
-import { getSchema } from "@dao-xyz/borsh";
+import {
+	type CustomField,
+	type SimpleField,
+	field,
+	getSchema,
+} from "@dao-xyz/borsh";
 
-export const copySerialization = (sourceClazz: any, targetClazz: any) => {
-	const copiedFromAlready: any[] = targetClazz["__copiedFrom"] || [];
-	if (copiedFromAlready?.includes(sourceClazz)) {
+const serializedFieldAccessors = new WeakMap<
+	object,
+	ReadonlyMap<string, PropertyDescriptor>
+>();
+const copiedSerializations = new WeakMap<Function, ReadonlySet<Function>>();
+
+/**
+ * Register a Borsh field backed by an accessor and explicitly preserve that
+ * accessor when Documents wraps an indexed value with its local context.
+ *
+ * The accessor must not inherit from another Borsh-decorated class, must be
+ * defined directly on `clazz.prototype`, have both a getter and setter, and be
+ * safe when invoked with the generated wrapper as `this`. In particular, it
+ * cannot depend on private fields, constructor-only state, or state stored in a
+ * WeakMap keyed by instances of `clazz`. The setter is invoked while Borsh
+ * deserializes persisted index rows.
+ */
+export const registerIndexFieldAccessor = (
+	clazz: Function,
+	key: string,
+	properties: SimpleField | CustomField<any>,
+): void => {
+	if (typeof key !== "string") {
+		throw new Error("Index field accessor keys must be strings");
+	}
+
+	const prototype = clazz.prototype;
+	const descriptor = Object.getOwnPropertyDescriptor(prototype, key);
+	if (!descriptor?.get || !descriptor.set) {
+		throw new Error(
+			`Index field accessor '${key}' must define both a getter and setter`,
+		);
+	}
+
+	const registered = serializedFieldAccessors.get(prototype);
+	if (registered?.has(key)) {
 		return;
 	}
+	let parent = Object.getPrototypeOf(clazz);
+	while (parent && parent !== Function.prototype) {
+		if (getSchema(parent)) {
+			throw new Error(
+				"Index field accessors cannot inherit from a Borsh-decorated class",
+			);
+		}
+		parent = Object.getPrototypeOf(parent);
+	}
+	if (getSchema(clazz)?.fields.some((existing) => existing.key === key)) {
+		throw new Error(
+			`Index field accessor '${key}' is already registered as a Borsh field`,
+		);
+	}
+
+	(field(properties) as unknown as PropertyDecorator)(prototype, key);
+	serializedFieldAccessors.set(
+		prototype,
+		new Map([...(registered ?? []), [key, descriptor]]),
+	);
+};
+
+const getSerializedFieldAccessor = (
+	sourceClazz: any,
+	targetClazz: any,
+	targetSchema: ReturnType<typeof getSchema>,
+	key: string,
+): PropertyDescriptor | undefined => {
+	const sourcePrototype = sourceClazz.prototype;
+	const registeredDescriptor = serializedFieldAccessors
+		.get(sourcePrototype)
+		?.get(key);
+	if (!registeredDescriptor) {
+		return undefined;
+	}
+
+	if (targetSchema.fields.some((field) => field.key === key)) {
+		throw new Error(
+			`Cannot preserve index field accessor '${key}': the wrapper schema already contains that field`,
+		);
+	}
+	if (Object.getOwnPropertyDescriptor(targetClazz.prototype, key)) {
+		throw new Error(
+			`Cannot preserve index field accessor '${key}': the wrapper prototype already defines it`,
+		);
+	}
 
-	copiedFromAlready.push(sourceClazz);
-	targetClazz["__copiedFrom"] = copiedFromAlready;
+	const descriptor = Object.getOwnPropertyDescriptor(sourcePrototype, key);
+	if (!descriptor?.get || !descriptor.set) {
+		throw new Error(
+			`Registered index field accessor '${key}' must define both a getter and setter`,
+		);
+	}
+	if (
+		descriptor.get !== registeredDescriptor.get ||
+		descriptor.set !== registeredDescriptor.set ||
+		descriptor.enumerable !== registeredDescriptor.enumerable ||
+		descriptor.configurable !== registeredDescriptor.configurable
+	) {
+		throw new Error(
+			`Registered index field accessor '${key}' changed after registration`,
+		);
+	}
+	return descriptor;
+};
+
+export const copySerialization = (sourceClazz: any, targetClazz: any) => {
+	const copiedFromAlready = copiedSerializations.get(targetClazz);
+	if (copiedFromAlready?.has(sourceClazz)) {
+		return;
+	}
 
 	const targetSchema = getSchema(targetClazz);
 	const sourceSchema = getSchema(sourceClazz);
+	const accessors: Array<[string, PropertyDescriptor]> = [];
+	for (const sourceField of sourceSchema.fields) {
+		const descriptor = getSerializedFieldAccessor(
+			sourceClazz,
+			targetClazz,
+			targetSchema,
+			sourceField.key,
+		);
+		if (descriptor) {
+			accessors.push([sourceField.key, descriptor]);
+		}
+	}
+	if (accessors.length > 0 && !Object.isExtensible(targetClazz.prototype)) {
+		throw new Error(
+			"Cannot preserve index field accessors: the wrapper prototype is not extensible",
+		);
+	}
+
+	for (const [key, descriptor] of accessors) {
+		Object.defineProperty(targetClazz.prototype, key, descriptor);
+	}
 
 	targetSchema.fields = [...sourceSchema.fields, ...targetSchema.fields];
 	targetSchema.variant = sourceSchema.variant;
 	targetSchema.getDependencies =
 		sourceSchema.getDependencies.bind(sourceSchema);
+	copiedSerializations.set(
+		targetClazz,
+		new Set([...(copiedFromAlready ?? []), sourceClazz]),
+	);
 };

package/src/index.ts

@@ -35,6 +35,7 @@ export { coerceWithContext, coerceWithIndexed } from "./search.js";
 export * from "./operation.js";
 export { policy } from "./policy.js";
 export { transform } from "./transform.js";
+export { registerIndexFieldAccessor } from "./borsh.js";
 export { MAX_BATCH_SIZE as MAX_DOCUMENT_SIZE } from "./constants.js";
 export { ClosedError } from "@peerbit/program";
 export {