chore: update type

Author: Vu Van Duc

src/keri/app/aiding.ts

@@ -1,5 +1,5 @@
 import { b, Ilks, Serials, Vrsn_1_0 } from '../core/core.ts';
-import { incept, interact, reply, ReplyData, rotate } from '../core/eventing.ts';
+import { incept, interact, reply, EndRoleAddAttributes, rotate } from '../core/eventing.ts';
 import { parseRangeHeaders } from '../core/httping.ts';
 import { IdentifierManagerFactory } from '../core/keeping.ts';
 import { HabState } from '../core/keyState.ts';
@@ -472,7 +472,7 @@ export class Identifier {
         eid?: string,
         stamp?: string
     ): Serder {
-        const data: ReplyData = {
+        const data: EndRoleAddAttributes = {
             cid: pre,
             role: role,
         };

src/keri/app/clienting.ts

@@ -172,14 +172,14 @@ export class SignifyClient {
     async fetch(
         path: string,
         method: string,
-        data: Record<string, unknown> | null | undefined,
+        data: unknown | null | undefined,
         extraHeaders?: Headers
     ): Promise<Response> {
         const headers = new Headers();
         let signed_headers = new Headers();
         const final_headers = new Headers();
 
-        headers.set('Signify-Resource', this.controller.pre!);
+        headers.set('Signify-Resource', this.controller.pre);
         headers.set(
             HEADER_SIG_TIME,
             new Date().toISOString().replace('Z', '000+00:00')

src/keri/app/controller.ts

@@ -1,18 +1,18 @@
-import { SaltyCreator } from '../core/manager.ts';
-import { Salter, Tier } from '../core/salter.ts';
-import { MtrDex } from '../core/matter.ts';
+import { Cipher } from '../core/cipher.ts';
+import { b, Ilks, Serials, Vrsn_1_0 } from '../core/core.ts';
+import { Decrypter } from '../core/decrypter.ts';
 import { Diger } from '../core/diger.ts';
-import { incept, rotate, interact } from '../core/eventing.ts';
-import { Serder, SerderSAD } from '../core/serder.ts';
-import { Tholder } from '../core/tholder.ts';
-import { Ilks, b, Serials, Vrsn_1_0 } from '../core/core.ts';
-import { Verfer } from '../core/verfer.ts';
 import { Encrypter } from '../core/encrypter.ts';
-import { Decrypter } from '../core/decrypter.ts';
-import { Cipher } from '../core/cipher.ts';
-import { Seqner } from '../core/seqner.ts';
+import { incept, InceptEventSAD, interact, InteractEventSAD, rotate } from '../core/eventing.ts';
+import { SaltyCreator } from '../core/manager.ts';
+import { MtrDex } from '../core/matter.ts';
 import { CesrNumber } from '../core/number.ts';
+import { Salter, Tier } from '../core/salter.ts';
+import { Seqner } from '../core/seqner.ts';
+import { Serder } from '../core/serder.ts';
 import { Signer } from '../core/signer.ts';
+import { Tholder } from '../core/tholder.ts';
+import { Verfer } from '../core/verfer.ts';
 
 /**
  * Agent is a custodial entity that can be used in conjuntion with a local Client to establish the
@@ -129,7 +129,7 @@ export class Controller {
     /**
      * Either the current establishment event, inception or rotation, or the interaction event used for delegation approval.
      */
-    public serder: Serder;
+    public serder: Serder<InteractEventSAD | InceptEventSAD>;
     /**
      * Current public keys formatted in fully-qualified Base64.
      * @private
@@ -232,7 +232,7 @@ export class Controller {
         const sn =
             new CesrNumber({}, undefined, String(this.serder.sad['s'])).num + 1;
         this.serder = interact({
-            pre: this.serder.pre!,
+            pre: this.serder.pre,
             dig: this.serder.sad['d']!,
             sn: sn,
             data: [anchor],
@@ -242,7 +242,7 @@ export class Controller {
         return [this.signer.sign(this.serder.raw, 0).qb64];
     }
 
-    get pre(): string | undefined {
+    get pre(): string {
         return this.serder.pre;
     }
 
@@ -270,7 +270,7 @@ export class Controller {
             return new Serder({
                 sad: state.controller['ee'],
                 d: '',
-            } as SerderSAD);
+            });
         }
     }
 

src/keri/app/credentialing.ts

@@ -497,7 +497,7 @@ export class Credentials {
 
         return {
             rev: new Serder(rev),
-            anc: new Serder(ixn || {}),
+            anc: new Serder(ixn),
             op,
         };
     }

src/keri/app/delegating.ts

@@ -20,7 +20,7 @@ export class Delegations {
      */
     async approve(
         name: string,
-        data?: { i: string; s: string; d: string }
+        data: { i: string; s: string; d: string }
     ): Promise<EventResult> {
         const { serder, sigs, jsondata } = await this.client
             .identifiers()

src/keri/app/habery.ts

@@ -3,7 +3,7 @@ import { incept } from '../core/eventing.ts';
 import { Algos, Manager } from '../core/manager.ts';
 import { MtrDex } from '../core/matter.ts';
 import { Salter } from '../core/salter.ts';
-import { Serder } from '../core/serder.ts';
+import { Serder, SerderSAD } from '../core/serder.ts';
 import { Verfer } from '../core/verfer.ts';
 
 export class TraitCodex {
@@ -39,16 +39,16 @@ export interface MakeHabArgs {
     data?: any;
 }
 
-export class Hab {
+export class Hab<T extends SerderSAD = SerderSAD> {
     public name: string;
-    public serder: Serder;
+    public serder: Serder<T>;
 
-    constructor(name: string, icp: Serder) {
+    constructor(name: string, icp: Serder<T>) {
         this.name = name;
         this.serder = icp;
     }
 
-    get pre(): string | undefined {
+    get pre(): T['i'] {
         return this.serder.sad['i'];
     }
 }

src/keri/core/authing.ts

@@ -42,7 +42,9 @@ export class Authenticater {
         inputs.forEach((input) => {
             const items = new Array<string>();
             input.fields!.forEach((field) => {
-                if (typeof field !== 'string') return;
+                if (typeof field !== 'string') {
+                    throw new Error("Invalid siginput field type");
+                }
 
                 if (field.startsWith('@')) {
                     if (field == '@method') {

src/keri/core/eventing.ts

@@ -1,3 +1,4 @@
+import { components } from '../../types/keria-api-schema.ts';
 import { Cigar } from './cigar.ts';
 import {
     b,
@@ -42,9 +43,9 @@ export interface RotateArgs {
     intive?: boolean;
 }
 
-export interface ReplyData {
-    cid?: string;
-    role?: string;
+export interface EndRoleAddAttributes extends Record<string, unknown> {
+    cid: string;
+    role: string;
     eid?: string;
 }
 
@@ -55,9 +56,9 @@ export interface RotateEventSAD extends BaseSAD, Record<string, unknown> {
     i: string;
     s: string;
     p?: string;
-    kt: number | string | string[] | string[][];
+    kt: string | string[] | string[][];
     k: string[];
-    nt: number | string | string[] | string[][];
+    nt: string | string[] | string[][];
     n: string[];
     bt: number | string;
     br?: string[];
@@ -81,11 +82,8 @@ export interface InceptEventSAD extends BaseSAD, Record<string, unknown> {
     a: Record<string, unknown>[];
 }
 
-export interface InteractEventData {
-    i: string;
-    s: string;
-    d: string;
-}
+export type InteractEventData = components['schemas']['Seal'];
+
 export interface InteractEventSAD extends BaseSAD {
     i: string;
     t: string;
@@ -96,17 +94,13 @@ export interface InteractEventSAD extends BaseSAD {
 export interface ReplyEventSAD extends BaseSAD {
     t: string;
     dt: string;
-    r: string;
-    a: ReplyData;
-}
-
-export interface SealData {
-    i: string;
-    s: string;
-    d: string;
+    r: '/end/role/add';
+    a: EndRoleAddAttributes;
 }
 
-export type Seal = [string, SealData];
+export type Seal<
+    T extends components['schemas']['Seal'] = components['schemas']['Seal'],
+> = ['SealEvent', T];
 
 export function rotate({
     pre = undefined,
@@ -624,15 +618,15 @@ export function interact(args: InteractArgs): Serder<InteractEventSAD> {
 }
 
 export function reply(
-    route: string = '',
-    data: ReplyData | undefined,
+    route: '/end/role/add',
+    data: EndRoleAddAttributes | undefined,
     stamp: string | undefined,
     version: Version | undefined,
     kind: Serials = Serials.JSON
 ) {
     const vs = versify(Protocols.KERI, version, kind, 0);
     if (data == undefined) {
-        data = {};
+        data = {} as EndRoleAddAttributes;
     }
     const _sad: ReplyEventSAD = {
         v: vs,

src/keri/core/prefixer.ts

@@ -8,7 +8,10 @@ import { Verfer } from './verfer.ts';
 
 const Dummy: string = '#';
 
-export interface PrefixerSAD extends BaseSAD {
+export interface PrefixerSAD extends Omit<BaseSAD, "d"> {
+    d?: string;
+    t?: string;
+    v: string;
     k?: string[];
     n?: string | string[];
     b?: string[];
@@ -157,7 +160,7 @@ export class Prefixer<T extends PrefixerSAD = PrefixerSAD> extends Matter {
 
         sad['i'] = ''.padStart(Matter.Sizes.get(MtrDex.Blake3_256)!.fs!, Dummy);
         sad['d'] = sad['i'];
-        const [raw] = sizeify(sad);
+        const [raw] = sizeify(sad as BaseSAD);
         const dig = blake3.create({ dkLen: 32 }).update(raw).digest();
         return [dig, MtrDex.Blake3_256];
     }

src/keri/core/saider.ts

@@ -11,7 +11,7 @@ export enum Ids {
 }
 
 export interface BaseSAD extends Record<string, unknown> {
-    d?: string;
+    d: string;
     v?: string;
     t?: string;
 }