@ocap/statedb 1.29.4 → 1.29.5

package/README.md

@@ -3,7 +3,6 @@
 Defines the abstract interface of OCAP StateDB, must be implemented with an actual statedb, please checkout following packages:
 
 - `@ocap/statedb-memory`
-- `@ocap/statedb-fs`
 - `@ocap/statedb-dolt`
 
 ## Usage

package/esm/index.d.mts

@@ -1,3 +1,4 @@
 import StateDB from "./db.mjs";
 import StateDBTable from "./table.mjs";
-export { StateDB, StateDBTable };
+import { followMigrationChain, wouldCreateMigrationCycle } from "./migration-utils.mjs";
+export { StateDB, StateDBTable, followMigrationChain, wouldCreateMigrationCycle };

package/esm/index.mjs

@@ -1,4 +1,5 @@
 import db_default from "./db.mjs";
 import table_default from "./table.mjs";
+import { followMigrationChain, wouldCreateMigrationCycle } from "./migration-utils.mjs";
 
-export { db_default as StateDB, table_default as StateDBTable };
+export { db_default as StateDB, table_default as StateDBTable, followMigrationChain, wouldCreateMigrationCycle };

package/esm/migration-utils.d.mts

@@ -0,0 +1,28 @@
+//#region src/migration-utils.d.ts
+/**
+ * Migration utility functions for StateDB
+ * Shared logic for circular migration detection
+ */
+type AccountWithMigration = {
+  migratedTo?: string[];
+};
+/**
+ * Check if adding migration targets would create a cycle
+ * @param sourceAddress - The address that will have migratedTo set
+ * @param targets - The migration targets to check
+ * @param getAccount - Function to get account by address (without following migration)
+ * @param normalizeAddress - Function to normalize address format
+ * @returns true if a cycle would be created
+ */
+declare function wouldCreateMigrationCycle<T extends AccountWithMigration>(sourceAddress: string, targets: string[], getAccount: (address: string) => Promise<T | null>, normalizeAddress: (addr: string) => string): Promise<boolean>;
+/**
+ * Follow migration chain with cycle detection
+ * @param startAddress - Starting address to look up
+ * @param getAccount - Function to get account by address
+ * @param normalizeAddress - Function to normalize address format
+ * @param visited - Set of already visited addresses (for cycle detection)
+ * @returns The final account after following migration chain, or null if cycle/missing
+ */
+declare function followMigrationChain<T extends AccountWithMigration>(startAddress: string, getAccount: (address: string) => Promise<T | null>, normalizeAddress: (addr: string) => string, visited?: Set<string>): Promise<T | null>;
+//#endregion
+export { followMigrationChain, wouldCreateMigrationCycle };

package/esm/migration-utils.mjs

@@ -0,0 +1,45 @@
+//#region src/migration-utils.ts
+/**
+* Check if adding migration targets would create a cycle
+* @param sourceAddress - The address that will have migratedTo set
+* @param targets - The migration targets to check
+* @param getAccount - Function to get account by address (without following migration)
+* @param normalizeAddress - Function to normalize address format
+* @returns true if a cycle would be created
+*/
+async function wouldCreateMigrationCycle(sourceAddress, targets, getAccount, normalizeAddress) {
+	const normalizedSource = normalizeAddress(sourceAddress);
+	const visited = new Set([normalizedSource]);
+	const checkTarget = async (target) => {
+		const normalizedTarget = normalizeAddress(target);
+		if (normalizedTarget === normalizedSource) return true;
+		if (visited.has(normalizedTarget)) return false;
+		visited.add(normalizedTarget);
+		const targetAccount = await getAccount(normalizedTarget);
+		if (targetAccount?.migratedTo?.length) {
+			for (const nextTarget of targetAccount.migratedTo) if (await checkTarget(nextTarget)) return true;
+		}
+		return false;
+	};
+	for (const target of targets) if (await checkTarget(target)) return true;
+	return false;
+}
+/**
+* Follow migration chain with cycle detection
+* @param startAddress - Starting address to look up
+* @param getAccount - Function to get account by address
+* @param normalizeAddress - Function to normalize address format
+* @param visited - Set of already visited addresses (for cycle detection)
+* @returns The final account after following migration chain, or null if cycle/missing
+*/
+async function followMigrationChain(startAddress, getAccount, normalizeAddress, visited = /* @__PURE__ */ new Set()) {
+	const normalizedAddress = normalizeAddress(startAddress);
+	if (visited.has(normalizedAddress)) return null;
+	visited.add(normalizedAddress);
+	const account = await getAccount(normalizedAddress);
+	if (account?.migratedTo?.length) return followMigrationChain(account.migratedTo[0], getAccount, normalizeAddress, visited);
+	return account;
+}
+
+//#endregion
+export { followMigrationChain, wouldCreateMigrationCycle };

package/esm/table.mjs

@@ -28,7 +28,7 @@ var StateDBTable = class extends Ready {
 			"reset"
 		].forEach((x) => {
 			Object.defineProperty(this, x, { value: async (...args) => {
-				if (typeof args[0] === "string" && isValid(args[0])) args[0] = toAddress(args[0]);
+				if (typeof args[0] === "string" && (isValid(args[0]) || args[0].startsWith("did:abt:"))) args[0] = toAddress(args[0]);
 				hooks.execPreSync(x, args);
 				const result = await this[`_${x}`](...args);
 				hooks.execPostSync(x, result);

package/lib/index.cjs

@@ -1,5 +1,8 @@
 const require_db = require('./db.cjs');
 const require_table = require('./table.cjs');
+const require_migration_utils = require('./migration-utils.cjs');
 
 exports.StateDB = require_db.default;
-exports.StateDBTable = require_table.default;
+exports.StateDBTable = require_table.default;
+exports.followMigrationChain = require_migration_utils.followMigrationChain;
+exports.wouldCreateMigrationCycle = require_migration_utils.wouldCreateMigrationCycle;

package/lib/index.d.cts

@@ -1,3 +1,4 @@
 import StateDB from "./db.cjs";
 import StateDBTable from "./table.cjs";
-export { StateDB, StateDBTable };
+import { followMigrationChain, wouldCreateMigrationCycle } from "./migration-utils.cjs";
+export { StateDB, StateDBTable, followMigrationChain, wouldCreateMigrationCycle };

package/lib/migration-utils.cjs

@@ -0,0 +1,47 @@
+
+//#region src/migration-utils.ts
+/**
+* Check if adding migration targets would create a cycle
+* @param sourceAddress - The address that will have migratedTo set
+* @param targets - The migration targets to check
+* @param getAccount - Function to get account by address (without following migration)
+* @param normalizeAddress - Function to normalize address format
+* @returns true if a cycle would be created
+*/
+async function wouldCreateMigrationCycle(sourceAddress, targets, getAccount, normalizeAddress) {
+	const normalizedSource = normalizeAddress(sourceAddress);
+	const visited = new Set([normalizedSource]);
+	const checkTarget = async (target) => {
+		const normalizedTarget = normalizeAddress(target);
+		if (normalizedTarget === normalizedSource) return true;
+		if (visited.has(normalizedTarget)) return false;
+		visited.add(normalizedTarget);
+		const targetAccount = await getAccount(normalizedTarget);
+		if (targetAccount?.migratedTo?.length) {
+			for (const nextTarget of targetAccount.migratedTo) if (await checkTarget(nextTarget)) return true;
+		}
+		return false;
+	};
+	for (const target of targets) if (await checkTarget(target)) return true;
+	return false;
+}
+/**
+* Follow migration chain with cycle detection
+* @param startAddress - Starting address to look up
+* @param getAccount - Function to get account by address
+* @param normalizeAddress - Function to normalize address format
+* @param visited - Set of already visited addresses (for cycle detection)
+* @returns The final account after following migration chain, or null if cycle/missing
+*/
+async function followMigrationChain(startAddress, getAccount, normalizeAddress, visited = /* @__PURE__ */ new Set()) {
+	const normalizedAddress = normalizeAddress(startAddress);
+	if (visited.has(normalizedAddress)) return null;
+	visited.add(normalizedAddress);
+	const account = await getAccount(normalizedAddress);
+	if (account?.migratedTo?.length) return followMigrationChain(account.migratedTo[0], getAccount, normalizeAddress, visited);
+	return account;
+}
+
+//#endregion
+exports.followMigrationChain = followMigrationChain;
+exports.wouldCreateMigrationCycle = wouldCreateMigrationCycle;

package/lib/migration-utils.d.cts

@@ -0,0 +1,28 @@
+//#region src/migration-utils.d.ts
+/**
+ * Migration utility functions for StateDB
+ * Shared logic for circular migration detection
+ */
+type AccountWithMigration = {
+  migratedTo?: string[];
+};
+/**
+ * Check if adding migration targets would create a cycle
+ * @param sourceAddress - The address that will have migratedTo set
+ * @param targets - The migration targets to check
+ * @param getAccount - Function to get account by address (without following migration)
+ * @param normalizeAddress - Function to normalize address format
+ * @returns true if a cycle would be created
+ */
+declare function wouldCreateMigrationCycle<T extends AccountWithMigration>(sourceAddress: string, targets: string[], getAccount: (address: string) => Promise<T | null>, normalizeAddress: (addr: string) => string): Promise<boolean>;
+/**
+ * Follow migration chain with cycle detection
+ * @param startAddress - Starting address to look up
+ * @param getAccount - Function to get account by address
+ * @param normalizeAddress - Function to normalize address format
+ * @param visited - Set of already visited addresses (for cycle detection)
+ * @returns The final account after following migration chain, or null if cycle/missing
+ */
+declare function followMigrationChain<T extends AccountWithMigration>(startAddress: string, getAccount: (address: string) => Promise<T | null>, normalizeAddress: (addr: string) => string, visited?: Set<string>): Promise<T | null>;
+//#endregion
+export { followMigrationChain, wouldCreateMigrationCycle };

package/lib/table.cjs

@@ -34,7 +34,7 @@ var StateDBTable = class extends _ocap_util_lib_ready.Ready {
 			"reset"
 		].forEach((x) => {
 			Object.defineProperty(this, x, { value: async (...args) => {
-				if (typeof args[0] === "string" && (0, _arcblock_did.isValid)(args[0])) args[0] = (0, _ocap_util.toAddress)(args[0]);
+				if (typeof args[0] === "string" && ((0, _arcblock_did.isValid)(args[0]) || args[0].startsWith("did:abt:"))) args[0] = (0, _ocap_util.toAddress)(args[0]);
 				hooks.execPreSync(x, args);
 				const result = await this[`_${x}`](...args);
 				hooks.execPostSync(x, result);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.29.4",
+  "version": "1.29.5",
   "description": "Defines the basic interface for OCAP StateDB",
   "type": "module",
   "main": "./lib/index.cjs",
@@ -43,10 +43,10 @@
   "license": "MIT",
   "devDependencies": {},
   "dependencies": {
-    "@arcblock/did": "1.29.4",
-    "@ocap/state": "1.29.4",
-    "@ocap/types": "1.29.4",
-    "@ocap/util": "1.29.4",
+    "@arcblock/did": "1.29.5",
+    "@ocap/state": "1.29.5",
+    "@ocap/types": "1.29.5",
+    "@ocap/util": "1.29.5",
     "kareem": "^2.4.1",
     "lodash": "^4.17.23"
   }