fix after rebasing from parent branch

Author: Sotatek-Patrick-Vu

src/keri/app/clienting.ts

@@ -18,7 +18,7 @@ import { Notifications } from './notifying.ts';
 const DEFAULT_BOOT_URL = 'http://localhost:3903';
 
 // Export type outside the class
-export type AgentResourceResult = components["schemas"]["AgentResourceResult"];
+export type AgentResourceResult = components['schemas']['AgentResourceResult'];
 
 class State {
     agent: any | null;

src/keri/app/coring.ts

@@ -267,7 +267,11 @@ export class KeyStates {
      * @param {any} [anchor] Optional anchor
      * @returns {Promise<Operation<any>>} A promise to the long-running operation
      */
-    async query(pre: string, sn?: string, anchor?: any): Promise<Operation<any>> {
+    async query(
+        pre: string,
+        sn?: string,
+        anchor?: any
+    ): Promise<Operation<any>> {
         const path = `/queries`;
         const data: any = {
             pre: pre,

src/keri/core/keeping.ts

@@ -181,57 +181,82 @@ export class IdentifierManagerFactory {
         let kargs: any;
 
         if (Algos.salty in aid) {
-            return new SaltyIdentifierManager(
-                this.salter,
-                aid.salty.pidx,
-                aid.salty.kidx,
-                aid.salty.tier,
-                aid.salty.transferable,
-                aid.salty.stem,
-                undefined,
-                undefined,
-                aid.salty.icodes,
-                undefined,
-                undefined,
-                aid.salty.ncodes,
-                aid.salty.dcode,
-                undefined,
-                aid.salty.sxlt
-            );
+            algo = Algos.salty;
+            kargs = aid.salty;
         } else if (Algos.randy in aid) {
-            return new RandyIdentifierManager(
-                this.salter,
-                undefined,
-                undefined,
-                undefined,
-                new Prefixer({ qb64: aid['prefix'] }).transferable,
-                undefined,
-                undefined,
-                [],
-                undefined,
-                aid.randy.prxs,
-                aid.randy.nxts
-            );
+            algo = Algos.randy;
+            kargs = aid.randy;
         } else if (Algos.group in aid) {
-            return new GroupIdentifierManager(
-                this,
-                aid.group.mhab,
-                undefined,
-                undefined,
-                aid.group.keys,
-                aid.group.ndigs
-            );
+            algo = Algos.group;
+            kargs = aid.group;
         } else if (Algos.extern in aid) {
-            const typ = aid.extern.extern_type;
-            if (typ in this.modules) {
-                const mod = new this.modules[typ](aid.extern.pidx, aid.extern);
-                return mod;
-            } else {
-                throw new Error(`unsupported external module type ${typ}`);
-            }
+            algo = Algos.extern;
+            kargs = aid.extern;
         } else {
             throw new Error('No algo specified');
         }
+
+        if (!kargs) {
+            throw new Error('No kargs found in HabState');
+        }
+        switch (algo) {
+            case Algos.salty:
+                kargs = kargs as SaltyKeyState;
+                return new SaltyIdentifierManager(
+                    this.salter,
+                    kargs.pidx,
+                    kargs.kidx,
+                    kargs.tier,
+                    kargs.transferable,
+                    kargs.stem,
+                    undefined,
+                    undefined,
+                    kargs.icodes,
+                    undefined,
+                    undefined,
+                    kargs.ncodes,
+                    kargs.dcode,
+                    undefined,
+                    kargs.sxlt
+                );
+            case Algos.randy:
+                kargs = kargs as RandyKeyState;
+                return new RandyIdentifierManager(
+                    this.salter,
+                    undefined,
+                    undefined,
+                    undefined,
+                    new Prefixer({ qb64: aid['prefix'] }).transferable,
+                    undefined,
+                    undefined,
+                    [],
+                    undefined,
+                    kargs.prxs,
+                    kargs.nxts
+                );
+            case Algos.group:
+                kargs = kargs as GroupKeyState;
+                return new GroupIdentifierManager(
+                    this,
+                    kargs.mhab,
+                    undefined,
+                    undefined,
+                    kargs.keys,
+                    kargs.ndigs
+                );
+            case Algos.extern: {
+                kargs = kargs as ExternState;
+                const typ = kargs.extern_type;
+                if (typ in this.modules) {
+                    const mod = new this.modules[typ](kargs.pidx, kargs);
+                    return mod;
+                } else {
+                    throw new Error(`unsupported external module type ${typ}`);
+                }
+            }
+            default:
+                throw new Error('Algo not allowed yet');
+        }
     }
 }
 

src/keri/core/keyState.ts

@@ -45,4 +45,3 @@ export type HabState =
     | RandyHabState
     | GroupHabState
     | ExternHabState;
-

src/keri/core/salter.ts

@@ -4,9 +4,6 @@ import { Matter, MtrDex } from './matter.ts';
 import { EmptyMaterialError } from './kering.ts';
 import libsodium from 'libsodium-wrappers-sumo';
 import { Tier } from '../../types/keria-api-schema.ts';
-
-export { Tier } from '../../types/keria-api-schema.ts';
-
 export { Tier } from '../../types/keria-api-schema.ts';
 
 interface SalterArgs {