@ocap/util 1.29.18 → 1.29.20

package/esm/index.d.mts

@@ -210,14 +210,22 @@ declare function toBase64(v: any, escape?: boolean): string;
  */
 declare function fromBase64(v: string): Buffer;
 /**
- * Convert did to address: remove `did:abt:` prefix
+ * Convert did to address: remove `did:{method}:` prefix.
+ * Strips only the first layer prefix (anchored regex).
  */
 declare function toAddress(did: string): string;
 /**
- * Convert address to did: prepend `did:abt:` prefix
+ * Convert address to did: prepend `did:{method}:` prefix.
+ * @param address - bare address or full DID
+ * @param method - DID method (default: 'abt')
  */
-declare function toDid(address: string): string;
+declare function toDid(address: string, method?: string): string;
 declare function isSameDid(a: string, b: string): boolean;
+/**
+ * Extract the method from a DID string.
+ * @returns The method string, or null if no prefix found
+ */
+declare function extractMethod(did: unknown): string | null;
 declare function formatTxType(type: string): Capitalize<string>;
 //#endregion
-export { BN, BytesType, EncodingType, KeyPairType, UUID, bytesToHex, formatTxType, fromBase58, fromBase64, fromTokenToUnit, fromUnitToToken, hexToBytes, hexToNumber, hexToUtf8, isBN, isBase58btc, isBigNumber, isHex, isHexPrefixed, isHexStrict, isSameDid, isUUID, isUint8Array, leftPad, numberToBN, numberToHex, numberToString, rightPad, scopeMatch, scopeMatchAny, stripHexPrefix, toAddress, toBN, toBase58, toBase64, toBuffer, toDid, toHex, toUint8Array, utf8ToHex };
+export { BN, BytesType, EncodingType, KeyPairType, UUID, bytesToHex, extractMethod, formatTxType, fromBase58, fromBase64, fromTokenToUnit, fromUnitToToken, hexToBytes, hexToNumber, hexToUtf8, isBN, isBase58btc, isBigNumber, isHex, isHexPrefixed, isHexStrict, isSameDid, isUUID, isUint8Array, leftPad, numberToBN, numberToHex, numberToString, rightPad, scopeMatch, scopeMatchAny, stripHexPrefix, toAddress, toBN, toBase58, toBase64, toBuffer, toDid, toHex, toUint8Array, utf8ToHex };

package/esm/index.mjs

@@ -15,7 +15,6 @@ import upperFirst from "lodash/upperFirst.js";
 import utf8 from "utf8";
 
 //#region src/index.ts
-const DID_PREFIX = "did:abt:";
 const zero = new BN(0);
 const negative1 = new BN(-1);
 const base58btc = {
@@ -406,24 +405,39 @@ function fromBase64(v) {
 	if (typeof v !== "string") throw new Error("fromBase64 requires input to be a string");
 	return Buffer.from(base64.unescape(v), "base64");
 }
+/** Pattern matching any did:{method}: prefix where method is [a-z0-9]+ */
+const DID_PREFIX_PATTERN = /^did:[a-z0-9]+:/;
 /**
-* Convert did to address: remove `did:abt:` prefix
+* Convert did to address: remove `did:{method}:` prefix.
+* Strips only the first layer prefix (anchored regex).
 */
 function toAddress(did) {
-	return did.replace(DID_PREFIX, "");
+	return did.replace(DID_PREFIX_PATTERN, "");
 }
 /**
-* Convert address to did: prepend `did:abt:` prefix
+* Convert address to did: prepend `did:{method}:` prefix.
+* @param address - bare address or full DID
+* @param method - DID method (default: 'abt')
 */
-function toDid(address) {
-	return `${DID_PREFIX}${toAddress(address)}`;
+function toDid(address, method = "abt") {
+	return `did:${method}:${toAddress(address)}`;
 }
 function isSameDid(a, b) {
 	return toAddress(a).toLowerCase() === toAddress(b).toLowerCase();
 }
+/**
+* Extract the method from a DID string.
+* @returns The method string, or null if no prefix found
+*/
+function extractMethod(did) {
+	if (typeof did !== "string" || !did) return null;
+	const match = did.match(/^did:([a-z0-9]+):/);
+	if (match) return match[1];
+	return null;
+}
 function formatTxType(type) {
 	return upperFirst(camelCase(type));
 }
 
 //#endregion
-export { BN, UUID, bytesToHex, formatTxType, fromBase58, fromBase64, fromTokenToUnit, fromUnitToToken, hexToBytes, hexToNumber, hexToUtf8, isBN, isBase58btc, isBigNumber, isHex, isHexPrefixed, isHexStrict, isSameDid, isUUID, isUint8Array, leftPad, numberToBN, numberToHex, numberToString, rightPad, scopeMatch, scopeMatchAny, stripHexPrefix, toAddress, toBN, toBase58, toBase64, toBuffer, toDid, toHex, toUint8Array, utf8ToHex };
+export { BN, UUID, bytesToHex, extractMethod, formatTxType, fromBase58, fromBase64, fromTokenToUnit, fromUnitToToken, hexToBytes, hexToNumber, hexToUtf8, isBN, isBase58btc, isBigNumber, isHex, isHexPrefixed, isHexStrict, isSameDid, isUUID, isUint8Array, leftPad, numberToBN, numberToHex, numberToString, rightPad, scopeMatch, scopeMatchAny, stripHexPrefix, toAddress, toBN, toBase58, toBase64, toBuffer, toDid, toHex, toUint8Array, utf8ToHex };

package/lib/index.cjs

@@ -29,7 +29,6 @@ let utf8 = require("utf8");
 utf8 = require_rolldown_runtime.__toESM(utf8);
 
 //#region src/index.ts
-const DID_PREFIX = "did:abt:";
 const zero = new require_bn.BN(0);
 const negative1 = new require_bn.BN(-1);
 const base58btc = {
@@ -420,21 +419,36 @@ function fromBase64(v) {
 	if (typeof v !== "string") throw new Error("fromBase64 requires input to be a string");
 	return Buffer.from(base64_url.default.unescape(v), "base64");
 }
+/** Pattern matching any did:{method}: prefix where method is [a-z0-9]+ */
+const DID_PREFIX_PATTERN = /^did:[a-z0-9]+:/;
 /**
-* Convert did to address: remove `did:abt:` prefix
+* Convert did to address: remove `did:{method}:` prefix.
+* Strips only the first layer prefix (anchored regex).
 */
 function toAddress(did) {
-	return did.replace(DID_PREFIX, "");
+	return did.replace(DID_PREFIX_PATTERN, "");
 }
 /**
-* Convert address to did: prepend `did:abt:` prefix
+* Convert address to did: prepend `did:{method}:` prefix.
+* @param address - bare address or full DID
+* @param method - DID method (default: 'abt')
 */
-function toDid(address) {
-	return `${DID_PREFIX}${toAddress(address)}`;
+function toDid(address, method = "abt") {
+	return `did:${method}:${toAddress(address)}`;
 }
 function isSameDid(a, b) {
 	return toAddress(a).toLowerCase() === toAddress(b).toLowerCase();
 }
+/**
+* Extract the method from a DID string.
+* @returns The method string, or null if no prefix found
+*/
+function extractMethod(did) {
+	if (typeof did !== "string" || !did) return null;
+	const match = did.match(/^did:([a-z0-9]+):/);
+	if (match) return match[1];
+	return null;
+}
 function formatTxType(type) {
 	return (0, lodash_upperFirst.default)((0, lodash_camelCase.default)(type));
 }
@@ -443,6 +457,7 @@ function formatTxType(type) {
 exports.BN = require_bn.BN;
 exports.UUID = UUID;
 exports.bytesToHex = bytesToHex;
+exports.extractMethod = extractMethod;
 exports.formatTxType = formatTxType;
 exports.fromBase58 = fromBase58;
 exports.fromBase64 = fromBase64;

package/lib/index.d.cts

@@ -210,14 +210,22 @@ declare function toBase64(v: any, escape?: boolean): string;
  */
 declare function fromBase64(v: string): Buffer;
 /**
- * Convert did to address: remove `did:abt:` prefix
+ * Convert did to address: remove `did:{method}:` prefix.
+ * Strips only the first layer prefix (anchored regex).
  */
 declare function toAddress(did: string): string;
 /**
- * Convert address to did: prepend `did:abt:` prefix
+ * Convert address to did: prepend `did:{method}:` prefix.
+ * @param address - bare address or full DID
+ * @param method - DID method (default: 'abt')
  */
-declare function toDid(address: string): string;
+declare function toDid(address: string, method?: string): string;
 declare function isSameDid(a: string, b: string): boolean;
+/**
+ * Extract the method from a DID string.
+ * @returns The method string, or null if no prefix found
+ */
+declare function extractMethod(did: unknown): string | null;
 declare function formatTxType(type: string): Capitalize<string>;
 //#endregion
-export { BN, BytesType, EncodingType, KeyPairType, UUID, bytesToHex, formatTxType, fromBase58, fromBase64, fromTokenToUnit, fromUnitToToken, hexToBytes, hexToNumber, hexToUtf8, isBN, isBase58btc, isBigNumber, isHex, isHexPrefixed, isHexStrict, isSameDid, isUUID, isUint8Array, leftPad, numberToBN, numberToHex, numberToString, rightPad, scopeMatch, scopeMatchAny, stripHexPrefix, toAddress, toBN, toBase58, toBase64, toBuffer, toDid, toHex, toUint8Array, utf8ToHex };
+export { BN, BytesType, EncodingType, KeyPairType, UUID, bytesToHex, extractMethod, formatTxType, fromBase58, fromBase64, fromTokenToUnit, fromUnitToToken, hexToBytes, hexToNumber, hexToUtf8, isBN, isBase58btc, isBigNumber, isHex, isHexPrefixed, isHexStrict, isSameDid, isUUID, isUint8Array, leftPad, numberToBN, numberToHex, numberToString, rightPad, scopeMatch, scopeMatchAny, stripHexPrefix, toAddress, toBN, toBase58, toBase64, toBuffer, toDid, toHex, toUint8Array, utf8ToHex };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/util",
-  "version": "1.29.18",
+  "version": "1.29.20",
   "type": "module",
   "description": "utils shared across multiple forge js libs, works in both node.js and browser",
   "keywords": [
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@ocap/types": "1.29.18",
+    "@ocap/types": "1.29.20",
     "@types/bn.js": "^5.2.0",
     "base64-url": "^2.3.3",
     "bn.js": "5.2.3",