@atproto/repo 0.9.0 → 0.10.0-next.0

package/dist/util.js

@@ -1,61 +1,23 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureV3Commit = exports.cidForRecord = exports.cborToLexRecord = exports.cborToLex = exports.verifyCommitSig = exports.signCommit = exports.metaEqual = exports.formatDataKey = exports.parseDataKey = exports.ensureCreates = exports.diffToWriteDescripts = void 0;
-exports.concatBytesAsync = concatBytesAsync;
-exports.concatBytes = concatBytes;
-const common_web_1 = require("@atproto/common-web");
-const crypto = __importStar(require("@atproto/crypto"));
-const cbor = __importStar(require("@atproto/lex-cbor"));
-const lex_data_1 = require("@atproto/lex-data");
-const types_1 = require("./types");
-const diffToWriteDescripts = (diff) => {
+import { TID } from '@atproto/common-web';
+import * as crypto from '@atproto/crypto';
+import * as cbor from '@atproto/lex-cbor';
+import { isPlainObject } from '@atproto/lex-data';
+import { WriteOpAction, } from './types.js';
+export const diffToWriteDescripts = (diff) => {
     return Promise.all([
         ...diff.addList().map(async (add) => {
-            const { collection, rkey } = (0, exports.parseDataKey)(add.key);
+            const { collection, rkey } = parseDataKey(add.key);
             return {
-                action: types_1.WriteOpAction.Create,
+                action: WriteOpAction.Create,
                 collection,
                 rkey,
                 cid: add.cid,
             };
         }),
         ...diff.updateList().map(async (upd) => {
-            const { collection, rkey } = (0, exports.parseDataKey)(upd.key);
+            const { collection, rkey } = parseDataKey(upd.key);
             return {
-                action: types_1.WriteOpAction.Update,
+                action: WriteOpAction.Update,
                 collection,
                 rkey,
                 cid: upd.cid,
@@ -63,9 +25,9 @@ const diffToWriteDescripts = (diff) => {
             };
         }),
         ...diff.deleteList().map((del) => {
-            const { collection, rkey } = (0, exports.parseDataKey)(del.key);
+            const { collection, rkey } = parseDataKey(del.key);
             return {
-                action: types_1.WriteOpAction.Delete,
+                action: WriteOpAction.Delete,
                 collection,
                 rkey,
                 cid: del.cid,
@@ -73,11 +35,10 @@ const diffToWriteDescripts = (diff) => {
         }),
     ]);
 };
-exports.diffToWriteDescripts = diffToWriteDescripts;
-const ensureCreates = (descripts) => {
+export const ensureCreates = (descripts) => {
     const creates = [];
     for (const descript of descripts) {
-        if (descript.action !== types_1.WriteOpAction.Create) {
+        if (descript.action !== WriteOpAction.Create) {
             throw new Error(`Unexpected action: ${descript.action}`);
         }
         else {
@@ -86,23 +47,19 @@ const ensureCreates = (descripts) => {
     }
     return creates;
 };
-exports.ensureCreates = ensureCreates;
-const parseDataKey = (key) => {
+export const parseDataKey = (key) => {
     const { length, 0: collection, 1: rkey } = key.split('/');
     if (length !== 2)
         throw new Error(`Invalid record key: ${key}`);
     return { collection, rkey };
 };
-exports.parseDataKey = parseDataKey;
-const formatDataKey = (collection, rkey) => {
+export const formatDataKey = (collection, rkey) => {
     return collection + '/' + rkey;
 };
-exports.formatDataKey = formatDataKey;
-const metaEqual = (a, b) => {
+export const metaEqual = (a, b) => {
     return a.did === b.did && a.version === b.version;
 };
-exports.metaEqual = metaEqual;
-const signCommit = async (unsigned, keypair) => {
+export const signCommit = async (unsigned, keypair) => {
     const encoded = cbor.encode(unsigned);
     const sig = await keypair.sign(encoded);
     return {
@@ -110,24 +67,21 @@ const signCommit = async (unsigned, keypair) => {
         sig,
     };
 };
-exports.signCommit = signCommit;
-const verifyCommitSig = async (commit, didKey) => {
+export const verifyCommitSig = async (commit, didKey) => {
     const { sig, ...rest } = commit;
     const encoded = cbor.encode(rest);
     return crypto.verifySignature(didKey, encoded, sig);
 };
-exports.verifyCommitSig = verifyCommitSig;
-exports.cborToLex = cbor.decode;
-const cborToLexRecord = (val) => {
-    const parsed = (0, exports.cborToLex)(val);
-    if (!(0, lex_data_1.isPlainObject)(parsed)) {
+export const cborToLex = cbor.decode;
+export const cborToLexRecord = (val) => {
+    const parsed = cborToLex(val);
+    if (!isPlainObject(parsed)) {
         throw new Error('lexicon records be a json object');
     }
     return parsed;
 };
-exports.cborToLexRecord = cborToLexRecord;
-exports.cidForRecord = cbor.cidForLex;
-const ensureV3Commit = (commit) => {
+export const cidForRecord = cbor.cidForLex;
+export const ensureV3Commit = (commit) => {
     if (commit.version === 3) {
         return commit;
     }
@@ -135,12 +89,11 @@ const ensureV3Commit = (commit) => {
         return {
             ...commit,
             version: 3,
-            rev: commit.rev ?? common_web_1.TID.nextStr(),
+            rev: commit.rev ?? TID.nextStr(),
         };
     }
 };
-exports.ensureV3Commit = ensureV3Commit;
-async function concatBytesAsync(iterable) {
+export async function concatBytesAsync(iterable) {
     const chunks = [];
     for await (const chunk of iterable)
         chunks.push(chunk);
@@ -149,7 +102,7 @@ async function concatBytesAsync(iterable) {
 /**
  * This is the same as {@link Buffer.concat}, without the `totalLength` argument.
  */
-function concatBytes(chunks) {
+export function concatBytes(chunks) {
     let totalLength = 0;
     for (const chunk of chunks)
         totalLength += chunk.byteLength;

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { TID } from '@atproto/common-web'\nimport * as crypto from '@atproto/crypto'\nimport { Keypair } from '@atproto/crypto'\nimport * as cbor from '@atproto/lex-cbor'\nimport { Cid, LexMap, LexValue, isPlainObject } from '@atproto/lex-data'\nimport { DataDiff } from './data-diff'\nimport {\n  Commit,\n  LegacyV2Commit,\n  RecordCreateDescript,\n  RecordDeleteDescript,\n  RecordPath,\n  RecordUpdateDescript,\n  RecordWriteDescript,\n  UnsignedCommit,\n  WriteOpAction,\n} from './types'\n\nexport const diffToWriteDescripts = (\n  diff: DataDiff,\n): Promise<RecordWriteDescript[]> => {\n  return Promise.all([\n    ...diff.addList().map(async (add) => {\n      const { collection, rkey } = parseDataKey(add.key)\n      return {\n        action: WriteOpAction.Create,\n        collection,\n        rkey,\n        cid: add.cid,\n      } as RecordCreateDescript\n    }),\n    ...diff.updateList().map(async (upd) => {\n      const { collection, rkey } = parseDataKey(upd.key)\n      return {\n        action: WriteOpAction.Update,\n        collection,\n        rkey,\n        cid: upd.cid,\n        prev: upd.prev,\n      } as RecordUpdateDescript\n    }),\n    ...diff.deleteList().map((del) => {\n      const { collection, rkey } = parseDataKey(del.key)\n      return {\n        action: WriteOpAction.Delete,\n        collection,\n        rkey,\n        cid: del.cid,\n      } as RecordDeleteDescript\n    }),\n  ])\n}\n\nexport const ensureCreates = (\n  descripts: RecordWriteDescript[],\n): RecordCreateDescript[] => {\n  const creates: RecordCreateDescript[] = []\n  for (const descript of descripts) {\n    if (descript.action !== WriteOpAction.Create) {\n      throw new Error(`Unexpected action: ${descript.action}`)\n    } else {\n      creates.push(descript)\n    }\n  }\n  return creates\n}\n\nexport const parseDataKey = (key: string): RecordPath => {\n  const { length, 0: collection, 1: rkey } = key.split('/')\n  if (length !== 2) throw new Error(`Invalid record key: ${key}`)\n  return { collection, rkey }\n}\n\nexport const formatDataKey = (collection: string, rkey: string): string => {\n  return collection + '/' + rkey\n}\n\nexport const metaEqual = (a: Commit, b: Commit): boolean => {\n  return a.did === b.did && a.version === b.version\n}\n\nexport const signCommit = async (\n  unsigned: UnsignedCommit,\n  keypair: Keypair,\n): Promise<Commit> => {\n  const encoded = cbor.encode(unsigned)\n  const sig = await keypair.sign(encoded)\n  return {\n    ...unsigned,\n    sig,\n  }\n}\n\nexport const verifyCommitSig = async (\n  commit: Commit,\n  didKey: string,\n): Promise<boolean> => {\n  const { sig, ...rest } = commit\n  const encoded = cbor.encode(rest)\n  return crypto.verifySignature(didKey, encoded, sig)\n}\n\nexport const cborToLex: (val: Uint8Array) => LexValue = cbor.decode\n\nexport const cborToLexRecord = (val: Uint8Array): LexMap => {\n  const parsed = cborToLex(val)\n  if (!isPlainObject(parsed)) {\n    throw new Error('lexicon records be a json object')\n  }\n  return parsed\n}\n\nexport const cidForRecord: (val: LexValue) => Promise<Cid> = cbor.cidForLex\n\nexport const ensureV3Commit = (commit: LegacyV2Commit | Commit): Commit => {\n  if (commit.version === 3) {\n    return commit\n  } else {\n    return {\n      ...commit,\n      version: 3,\n      rev: commit.rev ?? TID.nextStr(),\n    }\n  }\n}\n\nexport async function concatBytesAsync(iterable: AsyncIterable<Uint8Array>) {\n  const chunks: Uint8Array[] = []\n  for await (const chunk of iterable) chunks.push(chunk)\n  return concatBytes(chunks)\n}\n\n/**\n * This is the same as {@link Buffer.concat}, without the `totalLength` argument.\n */\nexport function concatBytes(chunks: readonly Uint8Array[]): Uint8Array {\n  let totalLength = 0\n  for (const chunk of chunks) totalLength += chunk.byteLength\n  const result = new Uint8Array(totalLength)\n  let offset = 0\n  for (const chunk of chunks) {\n    result.set(chunk, offset)\n    offset += chunk.byteLength\n  }\n  return result\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { TID } from '@atproto/common-web'\nimport * as crypto from '@atproto/crypto'\nimport { Keypair } from '@atproto/crypto'\nimport * as cbor from '@atproto/lex-cbor'\nimport { Cid, LexMap, LexValue, isPlainObject } from '@atproto/lex-data'\nimport { DataDiff } from './data-diff.js'\nimport {\n  Commit,\n  LegacyV2Commit,\n  RecordCreateDescript,\n  RecordDeleteDescript,\n  RecordPath,\n  RecordUpdateDescript,\n  RecordWriteDescript,\n  UnsignedCommit,\n  WriteOpAction,\n} from './types.js'\n\nexport const diffToWriteDescripts = (\n  diff: DataDiff,\n): Promise<RecordWriteDescript[]> => {\n  return Promise.all([\n    ...diff.addList().map(async (add) => {\n      const { collection, rkey } = parseDataKey(add.key)\n      return {\n        action: WriteOpAction.Create,\n        collection,\n        rkey,\n        cid: add.cid,\n      } as RecordCreateDescript\n    }),\n    ...diff.updateList().map(async (upd) => {\n      const { collection, rkey } = parseDataKey(upd.key)\n      return {\n        action: WriteOpAction.Update,\n        collection,\n        rkey,\n        cid: upd.cid,\n        prev: upd.prev,\n      } as RecordUpdateDescript\n    }),\n    ...diff.deleteList().map((del) => {\n      const { collection, rkey } = parseDataKey(del.key)\n      return {\n        action: WriteOpAction.Delete,\n        collection,\n        rkey,\n        cid: del.cid,\n      } as RecordDeleteDescript\n    }),\n  ])\n}\n\nexport const ensureCreates = (\n  descripts: RecordWriteDescript[],\n): RecordCreateDescript[] => {\n  const creates: RecordCreateDescript[] = []\n  for (const descript of descripts) {\n    if (descript.action !== WriteOpAction.Create) {\n      throw new Error(`Unexpected action: ${descript.action}`)\n    } else {\n      creates.push(descript)\n    }\n  }\n  return creates\n}\n\nexport const parseDataKey = (key: string): RecordPath => {\n  const { length, 0: collection, 1: rkey } = key.split('/')\n  if (length !== 2) throw new Error(`Invalid record key: ${key}`)\n  return { collection, rkey }\n}\n\nexport const formatDataKey = (collection: string, rkey: string): string => {\n  return collection + '/' + rkey\n}\n\nexport const metaEqual = (a: Commit, b: Commit): boolean => {\n  return a.did === b.did && a.version === b.version\n}\n\nexport const signCommit = async (\n  unsigned: UnsignedCommit,\n  keypair: Keypair,\n): Promise<Commit> => {\n  const encoded = cbor.encode(unsigned)\n  const sig = await keypair.sign(encoded)\n  return {\n    ...unsigned,\n    sig,\n  }\n}\n\nexport const verifyCommitSig = async (\n  commit: Commit,\n  didKey: string,\n): Promise<boolean> => {\n  const { sig, ...rest } = commit\n  const encoded = cbor.encode(rest)\n  return crypto.verifySignature(didKey, encoded, sig)\n}\n\nexport const cborToLex: (val: Uint8Array) => LexValue = cbor.decode\n\nexport const cborToLexRecord = (val: Uint8Array): LexMap => {\n  const parsed = cborToLex(val)\n  if (!isPlainObject(parsed)) {\n    throw new Error('lexicon records be a json object')\n  }\n  return parsed\n}\n\nexport const cidForRecord: (val: LexValue) => Promise<Cid> = cbor.cidForLex\n\nexport const ensureV3Commit = (commit: LegacyV2Commit | Commit): Commit => {\n  if (commit.version === 3) {\n    return commit\n  } else {\n    return {\n      ...commit,\n      version: 3,\n      rev: commit.rev ?? TID.nextStr(),\n    }\n  }\n}\n\nexport async function concatBytesAsync(iterable: AsyncIterable<Uint8Array>) {\n  const chunks: Uint8Array[] = []\n  for await (const chunk of iterable) chunks.push(chunk)\n  return concatBytes(chunks)\n}\n\n/**\n * This is the same as {@link Buffer.concat}, without the `totalLength` argument.\n */\nexport function concatBytes(chunks: readonly Uint8Array[]): Uint8Array {\n  let totalLength = 0\n  for (const chunk of chunks) totalLength += chunk.byteLength\n  const result = new Uint8Array(totalLength)\n  let offset = 0\n  for (const chunk of chunks) {\n    result.set(chunk, offset)\n    offset += chunk.byteLength\n  }\n  return result\n}\n"]}

package/jest.config.cjs

@@ -0,0 +1,17 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  displayName: 'Repo',
+  transform: {
+    '^.+\\.(t|j)s$': [
+      '@swc/jest',
+      { jsc: { transform: {} }, module: { type: 'es6' } },
+    ],
+  },
+  extensionsToTreatAsEsm: ['.ts'],
+  transformIgnorePatterns: [],
+  setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: {
+    '^varint$': '<rootDir>/../../jest.varint-shim.cjs',
+    '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'],
+  },
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/repo",
-  "version": "0.9.0",
+  "version": "0.10.0-next.0",
   "license": "MIT",
   "description": "atproto repo and MST implementation",
   "keywords": [
@@ -8,7 +8,7 @@
     "mst"
   ],
   "engines": {
-    "node": ">=18.7.0"
+    "node": ">=22"
   },
   "homepage": "https://atproto.com",
   "repository": {
@@ -16,25 +16,30 @@
     "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/repo"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "dependencies": {
     "varint": "^6.0.0",
     "zod": "^3.23.8",
-    "@atproto/common": "^0.5.15",
-    "@atproto/common-web": "^0.4.19",
-    "@atproto/crypto": "^0.4.5",
-    "@atproto/lex-cbor": "^0.0.15",
-    "@atproto/lex-data": "^0.0.14",
-    "@atproto/syntax": "^0.5.2"
+    "@atproto/lex-cbor": "^0.1.0-next.0",
+    "@atproto/lex-data": "^0.1.0-next.0",
+    "@atproto/crypto": "^0.5.0-next.0",
+    "@atproto/common": "^0.6.0-next.0",
+    "@atproto/syntax": "^0.6.0-next.0",
+    "@atproto/common-web": "^0.5.0-next.0"
   },
   "devDependencies": {
-    "jest": "^28.1.2",
-    "typescript": "^5.6.3"
+    "jest": "^30.0.0",
+    "typescript": "^6.0.3"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
   },
   "scripts": {
-    "test": "jest",
-    "test:profile": "node --inspect ../../node_modules/.bin/jest",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
+    "test:profile": "node --experimental-vm-modules --inspect ../../node_modules/.bin/jest",
     "build": "tsc --build tsconfig.build.json"
   }
 }

package/src/car.ts

@@ -1,10 +1,11 @@
 import { setImmediate } from 'node:timers/promises'
-import * as varint from 'varint'
+// eslint-disable-next-line import/default, import/no-named-as-default-member
+import varint from 'varint'
 import * as cbor from '@atproto/lex-cbor'
 import { Cid, decodeCid, isCidForBytes } from '@atproto/lex-data'
-import { BlockMap } from './block-map'
-import { CarBlock, schema } from './types'
-import { concatBytesAsync } from './util'
+import { BlockMap } from './block-map.js'
+import { CarBlock, schema } from './types.js'
+import { concatBytesAsync } from './util.js'
 
 export async function* writeCarStream(
   root: Cid | null,

package/src/data-diff.ts

@@ -1,7 +1,7 @@
 import { Cid } from '@atproto/lex-data'
-import { BlockMap } from './block-map'
-import { CidSet } from './cid-set'
-import { MST, NodeEntry, mstDiff } from './mst'
+import { BlockMap } from './block-map.js'
+import { CidSet } from './cid-set.js'
+import { MST, NodeEntry, mstDiff } from './mst/index.js'
 
 export class DataDiff {
   adds: Record<string, DataAdd> = {}

package/src/index.ts

@@ -1,11 +1,11 @@
-export * from './block-map'
-export * from './cid-set'
-export * from './repo'
-export * from './mst'
-export * from './parse'
-export * from './storage'
-export * from './sync'
-export * from './types'
-export * from './data-diff'
-export * from './car'
-export * from './util'
+export * from './block-map.js'
+export * from './cid-set.js'
+export * from './repo.js'
+export * from './mst/index.js'
+export * from './parse.js'
+export * from './storage/index.js'
+export * from './sync/index.js'
+export * from './types.js'
+export * from './data-diff.js'
+export * from './car.js'
+export * from './util.js'

package/src/mst/diff.ts

@@ -1,6 +1,6 @@
-import { DataDiff } from '../data-diff'
-import { MST } from './mst'
-import { MstWalker } from './walker'
+import { DataDiff } from '../data-diff.js'
+import { MST } from './mst.js'
+import { MstWalker } from './walker.js'
 
 export const nullDiff = async (tree: MST): Promise<DataDiff> => {
   const diff = new DataDiff()

package/src/mst/index.ts

@@ -1,4 +1,4 @@
-export * from './mst'
-export * from './diff'
-export * from './walker'
-export * as mstUtil from './util'
+export * from './mst.js'
+export * from './diff.js'
+export * from './walker.js'
+export * as mstUtil from './util.js'

package/src/mst/mst.ts

@@ -1,13 +1,13 @@
 import { z } from 'zod'
 import { cidForLex, encode } from '@atproto/lex-cbor'
 import { Cid, cidForCbor } from '@atproto/lex-data'
-import { BlockMap } from '../block-map'
-import { CidSet } from '../cid-set'
-import { MissingBlockError, MissingBlocksError } from '../error'
-import * as parse from '../parse'
-import { ReadableBlockstore } from '../storage'
-import { CarBlock, schema } from '../types'
-import * as util from './util'
+import { BlockMap } from '../block-map.js'
+import { CidSet } from '../cid-set.js'
+import { MissingBlockError, MissingBlocksError } from '../error.js'
+import * as parse from '../parse.js'
+import { ReadableBlockstore } from '../storage/index.js'
+import { CarBlock, schema } from '../types.js'
+import * as util from './util.js'
 
 /**
  * This is an implementation of a Merkle Search Tree (MST)

package/src/mst/util.ts

@@ -1,8 +1,8 @@
 import { sha256 } from '@atproto/crypto'
 import { cidForLex } from '@atproto/lex-cbor'
 import { Cid } from '@atproto/lex-data'
-import { ReadableBlockstore } from '../storage'
-import { Leaf, MST, MstOpts, NodeData, NodeEntry } from './mst'
+import { ReadableBlockstore } from '../storage/index.js'
+import { Leaf, MST, MstOpts, NodeData, NodeEntry } from './mst.js'
 
 function toAscii(bytes: Uint8Array): string {
   let string = ''
@@ -12,7 +12,7 @@ function toAscii(bytes: Uint8Array): string {
   return string
 }
 
-function fromAscii(str: string): Uint8Array {
+function fromAscii(str: string): Uint8Array<ArrayBuffer> {
   const bytes = new Uint8Array(str.length)
   for (let i = 0; i < str.length; i++) {
     bytes[i] = str.charCodeAt(i)

package/src/mst/walker.ts

@@ -1,4 +1,4 @@
-import { MST, NodeEntry } from './mst'
+import { MST, NodeEntry } from './mst.js'
 
 type WalkerStatusDone = {
   done: true

package/src/parse.ts

@@ -1,9 +1,9 @@
 import { check } from '@atproto/common-web'
 import { decode } from '@atproto/lex-cbor'
 import { Cid, LexMap } from '@atproto/lex-data'
-import { BlockMap } from './block-map'
-import { MissingBlockError, UnexpectedObjectError } from './error'
-import { cborToLexRecord } from './util'
+import { BlockMap } from './block-map.js'
+import { MissingBlockError, UnexpectedObjectError } from './error.js'
+import { cborToLexRecord } from './util.js'
 
 export const getAndParseRecord = async (
   blocks: BlockMap,

package/src/readable-repo.ts

@@ -1,11 +1,11 @@
 import { Cid, LexMap } from '@atproto/lex-data'
-import { MissingBlocksError } from './error'
-import log from './logger'
-import { MST } from './mst'
-import * as parse from './parse'
-import { ReadableBlockstore } from './storage'
-import { Commit, RepoContents, def } from './types'
-import * as util from './util'
+import { MissingBlocksError } from './error.js'
+import log from './logger.js'
+import { MST } from './mst/index.js'
+import * as parse from './parse.js'
+import { ReadableBlockstore } from './storage/index.js'
+import { Commit, RepoContents, def } from './types.js'
+import * as util from './util.js'
 
 type Params = {
   storage: ReadableBlockstore

package/src/repo.ts

@@ -2,13 +2,13 @@ import { TID } from '@atproto/common-web'
 import * as crypto from '@atproto/crypto'
 import { encode } from '@atproto/lex-cbor'
 import { Cid, cidForCbor } from '@atproto/lex-data'
-import { BlockMap } from './block-map'
-import { CidSet } from './cid-set'
-import { DataDiff } from './data-diff'
-import log from './logger'
-import { MST } from './mst'
-import { ReadableRepo } from './readable-repo'
-import { RepoStorage } from './storage'
+import { BlockMap } from './block-map.js'
+import { CidSet } from './cid-set.js'
+import { DataDiff } from './data-diff.js'
+import log from './logger.js'
+import { MST } from './mst/index.js'
+import { ReadableRepo } from './readable-repo.js'
+import { RepoStorage } from './storage/index.js'
 import {
   Commit,
   CommitData,
@@ -16,8 +16,8 @@ import {
   RecordWriteOp,
   WriteOpAction,
   def,
-} from './types'
-import * as util from './util'
+} from './types.js'
+import * as util from './util.js'
 
 type Params = {
   storage: RepoStorage

package/src/storage/index.ts

@@ -1,4 +1,4 @@
-export * from './readable-blockstore'
-export * from './memory-blockstore'
-export * from './sync-storage'
-export * from './types'
+export * from './readable-blockstore.js'
+export * from './memory-blockstore.js'
+export * from './sync-storage.js'
+export * from './types.js'

package/src/storage/memory-blockstore.ts

@@ -1,8 +1,8 @@
 import { Cid } from '@atproto/lex-data'
-import { BlockMap } from '../block-map'
-import { CommitData } from '../types'
-import { ReadableBlockstore } from './readable-blockstore'
-import { RepoStorage } from './types'
+import { BlockMap } from '../block-map.js'
+import { CommitData } from '../types.js'
+import { ReadableBlockstore } from './readable-blockstore.js'
+import { RepoStorage } from './types.js'
 
 export class MemoryBlockstore
   extends ReadableBlockstore

package/src/storage/readable-blockstore.ts

@@ -1,9 +1,9 @@
 import { check } from '@atproto/common-web'
 import { Cid, LexMap } from '@atproto/lex-data'
-import { BlockMap } from '../block-map'
-import { MissingBlockError } from '../error'
-import { parseObjByDef } from '../parse'
-import { cborToLexRecord } from '../util'
+import { BlockMap } from '../block-map.js'
+import { MissingBlockError } from '../error.js'
+import { parseObjByDef } from '../parse.js'
+import { cborToLexRecord } from '../util.js'
 
 export abstract class ReadableBlockstore {
   abstract getBytes(cid: Cid): Promise<Uint8Array | null>

package/src/storage/sync-storage.ts

@@ -1,6 +1,6 @@
 import { Cid } from '@atproto/lex-data'
-import { BlockMap } from '../block-map'
-import { ReadableBlockstore } from './readable-blockstore'
+import { BlockMap } from '../block-map.js'
+import { ReadableBlockstore } from './readable-blockstore.js'
 
 export class SyncStorage extends ReadableBlockstore {
   constructor(

package/src/storage/types.ts

@@ -1,8 +1,8 @@
 import type { Readable } from 'node:stream'
 import { check } from '@atproto/common-web'
 import { Cid, LexMap } from '@atproto/lex-data'
-import { BlockMap } from '../block-map'
-import { CommitData } from '../types'
+import { BlockMap } from '../block-map.js'
+import { CommitData } from '../types.js'
 
 export interface RepoStorage {
   // Writable

package/src/sync/consumer.ts

@@ -1,18 +1,22 @@
 import { Cid } from '@atproto/lex-data'
-import { BlockMap } from '../block-map'
-import { readCarWithRoot } from '../car'
-import { DataDiff } from '../data-diff'
-import { MST } from '../mst'
-import { ReadableRepo } from '../readable-repo'
-import { MemoryBlockstore, ReadableBlockstore, SyncStorage } from '../storage'
+import { BlockMap } from '../block-map.js'
+import { readCarWithRoot } from '../car.js'
+import { DataDiff } from '../data-diff.js'
+import { MST } from '../mst/index.js'
+import { ReadableRepo } from '../readable-repo.js'
+import {
+  MemoryBlockstore,
+  ReadableBlockstore,
+  SyncStorage,
+} from '../storage/index.js'
 import {
   RecordCidClaim,
   RecordClaim,
   VerifiedDiff,
   VerifiedRepo,
   def,
-} from '../types'
-import * as util from '../util'
+} from '../types.js'
+import * as util from '../util.js'
 
 export const verifyRepoCar = async (
   carBytes: Uint8Array,

package/src/sync/index.ts

@@ -1,2 +1,2 @@
-export * from './consumer'
-export * from './provider'
+export * from './consumer.js'
+export * from './provider.js'

package/src/sync/provider.ts

@@ -1,11 +1,11 @@
 import { Cid } from '@atproto/lex-data'
-import { writeCarStream } from '../car'
-import { CidSet } from '../cid-set'
-import { MissingBlocksError } from '../error'
-import { MST } from '../mst'
-import { ReadableBlockstore, RepoStorage } from '../storage'
-import { CarBlock, RecordPath, def } from '../types'
-import * as util from '../util'
+import { writeCarStream } from '../car.js'
+import { CidSet } from '../cid-set.js'
+import { MissingBlocksError } from '../error.js'
+import { MST } from '../mst/index.js'
+import { ReadableBlockstore, RepoStorage } from '../storage/index.js'
+import { CarBlock, RecordPath, def } from '../types.js'
+import * as util from '../util.js'
 
 // Full Repo
 // -------------