fix typescript

Author: SharonStrats

src/social/triage.ts

@@ -1,7 +1,13 @@
 import { DataBrowserContext } from 'pane-registry'
-import { LiveStore, NamedNode } from 'rdflib'
+import { IndexedFormula, NamedNode } from 'rdflib'
 import { ns } from 'solid-ui'
 
+type FriendshipStore = IndexedFormula & {
+  fetcher?: {
+    load?: (target: NamedNode | string) => Promise<unknown>
+  }
+}
+
 export interface FriendshipTriage {
   acquaintances: NamedNode[]
   confirmed: NamedNode[]
@@ -23,7 +29,7 @@ function uniqueNamedNodes (nodes: NamedNode[]): NamedNode[] {
   return unique
 }
 
-export function triageFriends (store: LiveStore, subject: NamedNode): FriendshipTriage {
+export function triageFriends (store: FriendshipStore, subject: NamedNode): FriendshipTriage {
   const outgoingFriends = uniqueNamedNodes(store.each(subject, ns.foaf('knows')) as NamedNode[])
   const incomingFriends = uniqueNamedNodes(
     store.each(undefined, ns.foaf('knows'), subject) as NamedNode[]
@@ -60,10 +66,8 @@ export async function loadFriendshipTriage (
   context: DataBrowserContext,
   subject: NamedNode
 ): Promise<FriendshipTriage> {
-  const store = context.session.store
-  const fetcher = (store as LiveStore & {
-    fetcher?: { load?: (target: NamedNode | string) => Promise<unknown> }
-  }).fetcher
+  const store = context.session.store as FriendshipStore
+  const fetcher = store.fetcher
 
   if (!fetcher || typeof fetcher.load !== 'function') {
     return triageFriends(store, subject)

test/unit/social/triage.test.ts

@@ -58,10 +58,13 @@ describe('loadFriendshipTriage', () => {
     store.add(alice, ns.foaf('knows'), bob, alice.doc())
 
     ;(store as typeof store & {
-      fetcher?: { load: jest.Mock<Promise<void>, [$rdf.NamedNode | string]> }
+      fetcher?: {
+        load: (...args: any[]) => Promise<void>
+      }
     }).fetcher = {
-      load: jest.fn(async (target: $rdf.NamedNode | string) => {
-        const value = typeof target === 'string' ? target : target.value
+      load: jest.fn(async (target: $rdf.NamedNode | string | Array<$rdf.NamedNode | string>) => {
+        const resolvedTarget = Array.isArray(target) ? target[0] : target
+        const value = typeof resolvedTarget === 'string' ? resolvedTarget : resolvedTarget.value
         loadedTargets.push(value)
         if (value === bob.doc().value) {
           store.add(bob, ns.foaf('knows'), alice, bob.doc())

typings/declarations.d.ts

@@ -4,6 +4,22 @@ declare module '*.svg' {
   export default content
 }
 
+declare module 'solid-ui/components/actions/button'
+
+interface SolidUIButtonElement extends HTMLElement {
+  type: string
+  variant: string
+  size: string
+  label: string
+  disabled: boolean
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'solid-ui-button': SolidUIButtonElement
+  }
+}
+
 declare module '*.svg?raw' {
   const content: string
   export default content