@atcute/car 1.1.1 → 2.0.0

package/dist/atproto-repo.d.ts

@@ -1,14 +1,12 @@
-import * as CBOR from '@atcute/cbor';
+import * as CID from '@atcute/cid';
 export declare class RepoEntry {
     readonly collection: string;
     readonly rkey: string;
-    readonly cid: CBOR.CIDLink;
+    readonly cid: CID.CidLink;
     private blockmap;
-    constructor(collection: string, rkey: string, cid: CBOR.CIDLink, blockmap: BlockMap);
+    constructor(collection: string, rkey: string, cid: CID.CidLink, blockmap: BlockMap);
     get record(): unknown;
 }
 export declare function iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry>;
-/** @deprecated Use `iterateAtpRepo` instead */
-export declare const iterateAtpCar: typeof iterateAtpRepo;
 type BlockMap = Map<string, Uint8Array>;
 export {};

package/dist/atproto-repo.js

@@ -23,7 +23,7 @@ export function* iterateAtpRepo(buf) {
     // Collect all archive entries into a mapping of CID string -> actual bytes
     const blockmap = new Map();
     for (const entry of iterate()) {
-        blockmap.set(CID.format(entry.cid), entry.bytes);
+        blockmap.set(CID.toString(entry.cid), entry.bytes);
     }
     // Read the head, then walk through the MST tree from there.
     const commit = readObject(blockmap, roots[0]);
@@ -32,8 +32,6 @@ export function* iterateAtpRepo(buf) {
         yield new RepoEntry(collection, rkey, cid, blockmap);
     }
 }
-/** @deprecated Use `iterateAtpRepo` instead */
-export const iterateAtpCar = iterateAtpRepo;
 function readObject(map, link) {
     const cid = link.$link;
     const bytes = map.get(cid);

package/dist/atproto-repo.js.map

@@ -1 +1 @@
-{"version":3,"file":"atproto-repo.js","sourceRoot":"","sources":["../lib/atproto-repo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atproto-repo.js","sourceRoot":"","sources":["../lib/atproto-repo.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { iterateAtpCar, iterateAtpRepo, type RepoEntry } from './atproto-repo.js';
-export { fromUint8Array, readCar } from './reader.js';
+export { iterateAtpRepo, type RepoEntry } from './atproto-repo.js';
+export { readCar } from './reader.js';

package/dist/index.js

@@ -1,3 +1,3 @@
-export { iterateAtpCar, iterateAtpRepo } from './atproto-repo.js';
-export { fromUint8Array, readCar } from './reader.js';
+export { iterateAtpRepo } from './atproto-repo.js';
+export { readCar } from './reader.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAkB,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}

package/dist/reader.d.ts

@@ -1,15 +1,7 @@
 export declare const readCar: (buffer: Uint8Array) => {
-    roots: import("@atcute/cbor").CIDLink[];
+    roots: import("@atcute/cid").CidLink[];
     iterate(): Generator<{
-        cid: import("@atcute/cid").CID;
-        bytes: Uint8Array;
-    }>;
-};
-/** @deprecated Use `readCar` instead */
-export declare const fromUint8Array: (buffer: Uint8Array) => {
-    roots: import("@atcute/cbor").CIDLink[];
-    iterate(): Generator<{
-        cid: import("@atcute/cid").CID;
+        cid: import("@atcute/cid").Cid;
         bytes: Uint8Array;
     }>;
 };

package/dist/reader.js

@@ -4,6 +4,4 @@ export const readCar = (buffer) => {
     const reader = createUint8Reader(buffer);
     return createCarReader(reader);
 };
-/** @deprecated Use `readCar` instead */
-export const fromUint8Array = readCar;
 //# sourceMappingURL=reader.js.map

package/dist/reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"reader.js","sourceRoot":"","sources":["../lib/reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAAkB,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,wCAAwC;AACxC,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC"}
+{"version":3,"file":"reader.js","sourceRoot":"","sources":["../lib/reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAAkB,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC"}

package/dist/utilities/sync-car-reader.d.ts

@@ -2,9 +2,9 @@ import * as CBOR from '@atcute/cbor';
 import * as CID from '@atcute/cid';
 import type { SyncByteReader } from './byte-reader.js';
 export declare const createCarReader: (reader: SyncByteReader) => {
-    roots: CBOR.CIDLink[];
+    roots: CBOR.CidLink[];
     iterate(): Generator<{
-        cid: CID.CID;
+        cid: CID.Cid;
         bytes: Uint8Array;
     }>;
 };

package/dist/utilities/sync-car-reader.js

@@ -1,12 +1,12 @@
 import * as CBOR from '@atcute/cbor';
-import * as varint from '@atcute/varint';
 import * as CID from '@atcute/cid';
+import * as varint from '@atcute/varint';
 const isCarV1Header = (value) => {
     if (value === null || typeof value !== 'object') {
         return false;
     }
     const { version, roots } = value;
-    return version === 1 && Array.isArray(roots) && roots.every((root) => root instanceof CBOR.CIDLinkWrapper);
+    return version === 1 && Array.isArray(roots) && roots.every((root) => root instanceof CBOR.CidLinkWrapper);
 };
 const readVarint = (reader, size) => {
     const buf = reader.upto(size);
@@ -29,32 +29,31 @@ const readHeader = (reader) => {
     }
     return header;
 };
-const readMultihashDigest = (reader) => {
-    const first = reader.upto(8);
-    const [code, codeOffset] = varint.decode(first);
-    const [size, sizeOffset] = varint.decode(first.subarray(codeOffset));
-    const offset = codeOffset + sizeOffset;
-    const bytes = reader.exactly(offset + size, true);
-    const digest = bytes.subarray(offset);
-    return {
-        code: code,
-        size: size,
-        digest: digest,
-        bytes: bytes,
-    };
-};
 const readCid = (reader) => {
-    const version = readVarint(reader, 8);
-    if (version !== 1) {
-        throw new Error(`expected a cidv1`);
+    const head = reader.upto(3 + 4);
+    const version = head[0];
+    const codec = head[1];
+    const digestCodec = head[2];
+    if (version !== CID.CID_VERSION) {
+        throw new RangeError(`incorrect cid version (got v${version})`);
+    }
+    if (codec !== CID.CODEC_DCBOR && codec !== CID.CODEC_RAW) {
+        throw new RangeError(`incorrect cid codec (got 0x${codec.toString(16)})`);
+    }
+    if (digestCodec !== CID.HASH_SHA256) {
+        throw new RangeError(`incorrect cid hash type (got 0x${digestCodec.toString(16)})`);
     }
-    const codec = readVarint(reader, 8);
-    const digest = readMultihashDigest(reader);
+    const [digestSize, digestLebSize] = varint.decode(head, 3);
+    const bytes = reader.exactly(3 + digestLebSize + digestSize, true);
+    const digest = bytes.subarray(3 + digestLebSize);
     const cid = {
         version: version,
-        code: codec,
-        digest: digest,
-        bytes: CID.encode(version, codec, digest.bytes),
+        codec: codec,
+        digest: {
+            codec: digestCodec,
+            contents: digest,
+        },
+        bytes: bytes,
     };
     return cid;
 };

package/dist/utilities/sync-car-reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-car-reader.js","sourceRoot":"","sources":["../../lib/utilities/sync-car-reader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AASnC,MAAM,aAAa,GAAG,CAAC,KAAc,EAAwB,EAAE;IAC9D,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAoB,CAAC;IAChD,OAAO,OAAO,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,IAAI,CAAC,cAAc,CAAC,CAAC;AAC5G,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,MAAsB,EAAE,IAAY,EAAU,EAAE;IACnE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,UAAU,CAAC,wBAAwB,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,MAAsB,EAAe,EAAE;IAC1D,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACrC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,UAAU,CAAC,8BAA8B,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACtC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,MAAsB,EAAc,EAAE;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7B,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEtC,OAAO;QACN,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACZ,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,MAAsB,EAAW,EAAE;IACnD,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACtC,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,GAAG,GAAY;QACpB,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;KAC/C,CAAC;IAEF,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAuC,EAAE;IACvF,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC;IAEzB,IAAI,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACjC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,IAAI,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC;IAE3B,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC;IAEpD,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE;IACzD,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAErC,OAAO;QACN,KAAK;QACL,CAAC,OAAO;YACP,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;gBACnD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAE9C,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;YACtB,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"sync-car-reader.js","sourceRoot":"","sources":["../../lib/utilities/sync-car-reader.ts"],"names":[],"mappings":"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"}

package/lib/atproto-repo.ts

@@ -9,7 +9,7 @@ export class RepoEntry {
 	constructor(
 		public readonly collection: string,
 		public readonly rkey: string,
-		public readonly cid: CBOR.CIDLink,
+		public readonly cid: CID.CidLink,
 		private blockmap: BlockMap,
 	) {}
 
@@ -25,7 +25,7 @@ export function* iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry> {
 	// Collect all archive entries into a mapping of CID string -> actual bytes
 	const blockmap: BlockMap = new Map();
 	for (const entry of iterate()) {
-		blockmap.set(CID.format(entry.cid), entry.bytes);
+		blockmap.set(CID.toString(entry.cid), entry.bytes);
 	}
 
 	// Read the head, then walk through the MST tree from there.
@@ -37,10 +37,7 @@ export function* iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry> {
 	}
 }
 
-/** @deprecated Use `iterateAtpRepo` instead */
-export const iterateAtpCar = iterateAtpRepo;
-
-function readObject(map: BlockMap, link: CBOR.CIDLink): unknown {
+function readObject(map: BlockMap, link: CID.CidLink): unknown {
 	const cid = link.$link;
 
 	const bytes = map.get(cid);
@@ -51,7 +48,7 @@ function readObject(map: BlockMap, link: CBOR.CIDLink): unknown {
 	return data;
 }
 
-function* walkEntries(map: BlockMap, pointer: CBOR.CIDLink): Generator<NodeEntry> {
+function* walkEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry> {
 	const data = readObject(map, pointer) as MstNode;
 	const entries = data.e;
 
@@ -88,9 +85,9 @@ type BlockMap = Map<string, Uint8Array>;
 interface Commit {
 	version: 3;
 	did: string;
-	data: CBOR.CIDLink;
+	data: CID.CidLink;
 	rev: string;
-	prev: CBOR.CIDLink | null;
+	prev: CID.CidLink | null;
 	sig: CBOR.Bytes;
 }
 
@@ -100,19 +97,19 @@ interface TreeEntry {
 	/** remainder of key for this TreeEntry, after "prefixlen" have been removed */
 	k: CBOR.Bytes;
 	/** link to a sub-tree Node at a lower level which has keys sorting after this TreeEntry's key (to the "right"), but before the next TreeEntry's key in this Node (if any) */
-	v: CBOR.CIDLink;
+	v: CID.CidLink;
 	/** next subtree (to the right of leaf) */
-	t: CBOR.CIDLink | null;
+	t: CID.CidLink | null;
 }
 
 interface MstNode {
 	/** link to sub-tree Node on a lower level and with all keys sorting before keys at this node */
-	l: CBOR.CIDLink | null;
+	l: CID.CidLink | null;
 	/** ordered list of TreeEntry objects */
 	e: TreeEntry[];
 }
 
 interface NodeEntry {
 	key: string;
-	cid: CBOR.CIDLink;
+	cid: CID.CidLink;
 }

package/lib/index.ts

@@ -1,2 +1,2 @@
-export { iterateAtpCar, iterateAtpRepo, type RepoEntry } from './atproto-repo.js';
-export { fromUint8Array, readCar } from './reader.js';
+export { iterateAtpRepo, type RepoEntry } from './atproto-repo.js';
+export { readCar } from './reader.js';

package/lib/reader.ts

@@ -5,6 +5,3 @@ export const readCar = (buffer: Uint8Array) => {
 	const reader = createUint8Reader(buffer);
 	return createCarReader(reader);
 };
-
-/** @deprecated Use `readCar` instead */
-export const fromUint8Array = readCar;

package/lib/utilities/sync-car-reader.ts

@@ -1,12 +1,12 @@
 import * as CBOR from '@atcute/cbor';
-import * as varint from '@atcute/varint';
 import * as CID from '@atcute/cid';
+import * as varint from '@atcute/varint';
 
 import type { SyncByteReader } from './byte-reader.js';
 
 interface CarV1Header {
 	version: 1;
-	roots: CBOR.CIDLink[];
+	roots: CID.CidLink[];
 }
 
 const isCarV1Header = (value: unknown): value is CarV1Header => {
@@ -15,7 +15,7 @@ const isCarV1Header = (value: unknown): value is CarV1Header => {
 	}
 
 	const { version, roots } = value as CarV1Header;
-	return version === 1 && Array.isArray(roots) && roots.every((root) => root instanceof CBOR.CIDLinkWrapper);
+	return version === 1 && Array.isArray(roots) && roots.every((root) => root instanceof CBOR.CidLinkWrapper);
 };
 
 const readVarint = (reader: SyncByteReader, size: number): number => {
@@ -45,45 +45,44 @@ const readHeader = (reader: SyncByteReader): CarV1Header => {
 	return header;
 };
 
-const readMultihashDigest = (reader: SyncByteReader): CID.Digest => {
-	const first = reader.upto(8);
-
-	const [code, codeOffset] = varint.decode(first);
-	const [size, sizeOffset] = varint.decode(first.subarray(codeOffset));
+const readCid = (reader: SyncByteReader): CID.Cid => {
+	const head = reader.upto(3 + 4);
 
-	const offset = codeOffset + sizeOffset;
+	const version = head[0];
+	const codec = head[1];
+	const digestCodec = head[2];
 
-	const bytes = reader.exactly(offset + size, true);
-	const digest = bytes.subarray(offset);
+	if (version !== CID.CID_VERSION) {
+		throw new RangeError(`incorrect cid version (got v${version})`);
+	}
 
-	return {
-		code: code,
-		size: size,
-		digest: digest,
-		bytes: bytes,
-	};
-};
+	if (codec !== CID.CODEC_DCBOR && codec !== CID.CODEC_RAW) {
+		throw new RangeError(`incorrect cid codec (got 0x${codec.toString(16)})`);
+	}
 
-const readCid = (reader: SyncByteReader): CID.CID => {
-	const version = readVarint(reader, 8);
-	if (version !== 1) {
-		throw new Error(`expected a cidv1`);
+	if (digestCodec !== CID.HASH_SHA256) {
+		throw new RangeError(`incorrect cid hash type (got 0x${digestCodec.toString(16)})`);
 	}
 
-	const codec = readVarint(reader, 8);
-	const digest = readMultihashDigest(reader);
+	const [digestSize, digestLebSize] = varint.decode(head, 3);
 
-	const cid: CID.CID = {
+	const bytes = reader.exactly(3 + digestLebSize + digestSize, true);
+	const digest = bytes.subarray(3 + digestLebSize);
+
+	const cid: CID.Cid = {
 		version: version,
-		code: codec,
-		digest: digest,
-		bytes: CID.encode(version, codec, digest.bytes),
+		codec: codec,
+		digest: {
+			codec: digestCodec,
+			contents: digest,
+		},
+		bytes: bytes,
 	};
 
 	return cid;
 };
 
-const readBlockHeader = (reader: SyncByteReader): { cid: CID.CID; blockSize: number } => {
+const readBlockHeader = (reader: SyncByteReader): { cid: CID.Cid; blockSize: number } => {
 	const start = reader.pos;
 
 	let size = readVarint(reader, 8);
@@ -104,7 +103,7 @@ export const createCarReader = (reader: SyncByteReader) => {
 
 	return {
 		roots,
-		*iterate(): Generator<{ cid: CID.CID; bytes: Uint8Array }> {
+		*iterate(): Generator<{ cid: CID.Cid; bytes: Uint8Array }> {
 			while (reader.upto(8).length > 0) {
 				const { cid, blockSize } = readBlockHeader(reader);
 				const bytes = reader.exactly(blockSize, true);

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@atcute/car",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "read AT Protocol's CAR (content-addressable archive) repositories",
   "license": "MIT",
   "repository": {
@@ -22,9 +22,9 @@
     "@types/bun": "^1.1.12"
   },
   "dependencies": {
-    "@atcute/cbor": "^1.0.6",
+    "@atcute/cid": "^2.0.0",
     "@atcute/varint": "^1.0.1",
-    "@atcute/cid": "^1.0.2"
+    "@atcute/cbor": "^2.0.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",