CHANGELOG.md

@@ -1,15 +1,3 @@
-# [0.2.0-develop.42](https://git.lumeweb.com/LumeWeb/libweb/compare/v0.2.0-develop.41...v0.2.0-develop.42) (2023-09-04)
-
-
-### Bug Fixes
-
-* update encodeCid overloads and return types ([7dc8067](https://git.lumeweb.com/LumeWeb/libweb/commit/7dc8067e958bb62efe856cdb234ac0010b6d2896))
-
-
-### Features
-
-* add encodeRegistryCid, encodeRegistryValue, decodeRegistryValue, decodeRegistryCid ([7ce52cb](https://git.lumeweb.com/LumeWeb/libweb/commit/7ce52cbff7e622a9046e6a36d4e664d211043e1e))
-
 # [0.2.0-develop.41](https://git.lumeweb.com/LumeWeb/libweb/compare/v0.2.0-develop.40...v0.2.0-develop.41) (2023-09-03)
 
 # [0.2.0-develop.40](https://git.lumeweb.com/LumeWeb/libweb/compare/v0.2.0-develop.39...v0.2.0-develop.40) (2023-09-03)

npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
     "name": "@lumeweb/libweb",
-    "version": "0.2.0-develop.42",
+    "version": "0.2.0-develop.41",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@lumeweb/libweb",
-            "version": "0.2.0-develop.42",
+            "version": "0.2.0-develop.41",
             "dependencies": {
                 "@lumeweb/community-portals": "^0.1.0-develop.6",
                 "@lumeweb/libportal": "0.2.0-develop.23",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lumeweb/libweb",
-    "version": "0.2.0-develop.42",
+    "version": "0.2.0-develop.41",
     "main": "lib/index.js",
     "type": "module",
     "repository": {

src/cid.ts

@@ -1,42 +1,27 @@
 import { ErrTuple } from "#types.js";
-import type { CID } from "@lumeweb/libportal";
 import {
   decodeCid as decodeCidPortal,
   encodeCid as encodeCidPortal,
 } from "@lumeweb/libportal";
 import { addContextToErr } from "#err.js";
-import { CID_HASH_TYPES, CID_TYPES, REGISTRY_TYPES } from "@lumeweb/libs5";
-import { concatBytes } from "@noble/hashes/utils";
+import type { CID } from "@lumeweb/libportal";
 
-export function encodeCid(
-  hash: Uint8Array,
-  size: bigint,
-  type?: number,
-  hashType?: number,
-  raw?: boolean,
-): ErrTuple<string | Uint8Array>;
-export function encodeCid(
-  hash: string,
-  size: bigint,
-  type?: number,
-  hashType?: number,
-  raw?: boolean,
-): ErrTuple<string | Uint8Array>;
+export function encodeCid(hash: Uint8Array, size: bigint): ErrTuple<string>;
+export function encodeCid(hash: string, size: bigint): ErrTuple<string>;
 export function encodeCid(
   hash: any,
   size: bigint,
   type?: number,
   hashType?: number,
-  raw: boolean = false,
-): ErrTuple<string | Uint8Array> {
+): ErrTuple<CID> {
   try {
-    return [encodeCidPortal(hash, size, type, hashType, raw), null];
+    return [encodeCidPortal(hash, size, type, hashType), null];
   } catch (e) {
-    return ["", addContextToErr(e as Error, "failed to encode cid")];
+    return [null, addContextToErr(e as Error, "failed to encode cid")];
   }
 }
 
-export function decodeCid(cid: string | Uint8Array): ErrTuple<CID> {
+export function decodeCid(cid: string): ErrTuple<CID> {
   try {
     return [decodeCidPortal(cid), null];
   } catch (e) {
@@ -53,83 +38,4 @@ export function verifyCid(cid: string): boolean {
   }
 }
 
-export function encodeRegistryCid(
-  hash: Uint8Array,
-  size?: bigint,
-  type?: number,
-  hashType?: number,
-  raw?: boolean,
-): ErrTuple<string | Uint8Array>;
-export function encodeRegistryCid(
-  hash: string,
-  size?: bigint,
-  type?: number,
-  hashType?: number,
-  raw?: boolean,
-): ErrTuple<string | Uint8Array>;
-export function encodeRegistryCid(
-  hash: any,
-  size = BigInt(0),
-  type = CID_TYPES.RESOLVER,
-  hashType = CID_HASH_TYPES.ED25519,
-  raw: boolean = false,
-): ErrTuple<string | Uint8Array> {
-  return encodeCid(hash, size, type, hashType, raw);
-}
-
-export function encodeRegistryValue(
-  cid: CID | string,
-  type: number = REGISTRY_TYPES.CID,
-  hashType = CID_HASH_TYPES.BLAKE3,
-): ErrTuple<Uint8Array> {
-  if (typeof cid === "string") {
-    let err;
-    [cid, err] = decodeCid(cid);
-
-    if (err) {
-      return [new Uint8Array(), err];
-    }
-  }
-
-  const [ret, err] = encodeCid(
-    cid.hash,
-    cid.size,
-    CID_TYPES.RESOLVER,
-    CID_HASH_TYPES.BLAKE3,
-    true,
-  );
-
-  if (err) {
-    return [new Uint8Array(), err];
-  }
-
-  return [
-    concatBytes(Uint8Array.from([REGISTRY_TYPES.CID]), ret as Uint8Array),
-    null,
-  ];
-}
-
-export function decodeRegistryValue(hash: Uint8Array): ErrTuple<CID> {
-  if (!Object.values(REGISTRY_TYPES).includes(hash[0])) {
-    return [null, "invalid registry type"];
-  }
-
-  hash = hash.slice(1);
-
-  return decodeCid(hash);
-}
-
-export function decodeRegistryCid(cid: string | Uint8Array): ErrTuple<CID> {
-  const [ret, err] = decodeCid(cid);
-  if (err) {
-    return [null, err];
-  }
-
-  if (ret.type !== CID_TYPES.RESOLVER) {
-    return [null, "not a valid registry cid"];
-  }
-
-  return [cid, null];
-}
-
 export type { CID } from "@lumeweb/libportal";