Fixing some type errors

Author: megoth

src/dashboard/dashboardPane.source.ts

@@ -43,7 +43,8 @@ function buildPage (
 }
 
 function buildDashboard (container: HTMLElement, context: DataBrowserContext) {
-  const outliner = context.getOutliner(context.dom)
+  // @@ TODO get a proper type
+  const outliner: any = context.getOutliner(context.dom)
   outliner
     .getDashboard()
     .then((dashboard: HTMLElement) => container.appendChild(dashboard))

src/internal/internalPane.source.ts

@@ -113,7 +113,7 @@ const pane: PaneDefinition = {
             // @@ TODO Remove casing of store.fetcher
             var promise = isFolder
               ? deleteRecursive(store, subject)
-              : (store.fetcher as any).webOperation('DELETE', subject.uri)
+              : (store as any).fetcher.webOperation('DELETE', subject.uri) // @@ TODO remove casting
             promise
               .then(() => {
                 var str = 'Deleted: ' + subject
@@ -140,7 +140,8 @@ const pane: PaneDefinition = {
       refreshCell.appendChild(refreshButton)
       refreshButton.addEventListener('click', () => {
         // @@ TODO Remove casting of store.fetcher
-        ;(store.fetcher as any).refresh(subject, function (
+        ;(store as any).fetcher.refresh(subject, function (
+          // @@ TODO Remove casting
           ok: boolean,
           errm: string
         ) {
@@ -164,7 +165,7 @@ const pane: PaneDefinition = {
           subject,
           sym('http://www.w3.org/2007/ont/link#uri'),
           subject.uri,
-          store.fetcher.appNode
+          (store as any).fetcher.appNode // @@ TODO Remove casting
         )
       )
       if (subject.uri.indexOf('#') >= 0) {
@@ -174,15 +175,15 @@ const pane: PaneDefinition = {
             subject,
             sym('http://www.w3.org/2007/ont/link#documentURI'),
             subject.uri.split('#')[0],
-            store.fetcher.appNode
+            (store as any).fetcher.appNode // @@ TODO Remove casting
           )
         )
         plist.push(
           st(
             subject,
             sym('http://www.w3.org/2007/ont/link#document'),
             sym(subject.uri.split('#')[0]),
-            store.fetcher.appNode
+            (store as any).fetcher.appNode // @@ TODO Remove casting
           )
         )
       } else {
@@ -199,12 +200,13 @@ const pane: PaneDefinition = {
             subject,
             sym('http://www.w3.org/ns/rww#editable'),
             (literal as any)(ed),
-            store.fetcher.appNode
+            (store as any).fetcher.appNode // @@ TODO remove casting
           )
         )
       }
     }
-    var outliner = context.getOutliner(dom)
+    // @@ TODO get a proper type
+    const outliner: any = context.getOutliner(dom)
     outliner.appendPropertyTRs(div, plist, false, filter)
     plist = store.statementsMatching(undefined, undefined, subject)
     outliner.appendPropertyTRs(div, plist, true, filter)

src/pad/padPane.source.ts

@@ -2,7 +2,16 @@ import { authn, icons, ns, pad, widgets } from 'solid-ui'
 // @ts-ignore
 // @@ TODO: serialize is not part rdflib type definitions
 // Might be fixed in https://github.com/linkeddata/rdflib.js/issues/341
-import { graph, log, NamedNode, Namespace, sym, serialize } from 'rdflib'
+import {
+  graph,
+  log,
+  NamedNode,
+  Namespace,
+  sym,
+  serialize,
+  UpdateManager,
+  Fetcher
+} from 'rdflib'
 import { PaneDefinition } from 'pane-registry'
 /*   pad Pane
  **
@@ -29,7 +38,7 @@ const paneDef: PaneDefinition = {
 
   mintNew: function (context, newPaneOptions: any) {
     const store = context.session.store
-    var updater = store.updater
+    const updater = store.updater as UpdateManager
     if (newPaneOptions.me && !newPaneOptions.me.uri) {
       throw new Error('notepad mintNew:  Invalid userid')
     }
@@ -272,7 +281,7 @@ const paneDef: PaneDefinition = {
 
       var toBeCopied = [{ local: 'index.html', contentType: 'text/html' }]
 
-      let newInstance = store.sym(newPadDoc.uri + '#thisPad')
+      const newInstance = store.sym(newPadDoc.uri + '#thisPad')
 
       // log.debug("\n Ready to put " + kb.statementsMatching(undefined, undefined, undefined, there)); //@@
 
@@ -287,21 +296,19 @@ const paneDef: PaneDefinition = {
             console.log('Copying ' + base + item.local + ' to ' + newURI)
 
             var setThatACL = function () {
-                setACL(newURI, false, function (ok: boolean, message: string) {
-                  if (!ok) {
-                    complainIfBad(
-                      ok,
-                      'FAILED to set ACL ' + newURI + ' : ' + message
-                    )
-                    console.log('FAILED to set ACL ' + newURI + ' : ' + message)
-                  } else {
-                    agenda.shift()!() // beware too much nesting
-                  }
-                })
-              }
-
-              // @@ TODO Remove casting of fetcher
-            ;(store.fetcher as any)
+              setACL(newURI, false, function (ok: boolean, message: string) {
+                if (!ok) {
+                  complainIfBad(
+                    ok,
+                    'FAILED to set ACL ' + newURI + ' : ' + message
+                  )
+                  console.log('FAILED to set ACL ' + newURI + ' : ' + message)
+                } else {
+                  agenda.shift()!() // beware too much nesting
+                }
+              })
+            }
+            ;(store as any).fetcher // @@ TODO Remove casting
               .webCopy(
                 base + item.local,
                 newBase + item.local,
@@ -489,8 +496,9 @@ const paneDef: PaneDefinition = {
     //  Body of Pane
     var appPathSegment = 'app-pad.timbl.com' // how to allocate this string and connect to
 
-    var fetcher = store.fetcher
-    var updater = store.updater
+    // @@ TODO Remove castings
+    const fetcher = (store as any).fetcher as Fetcher
+    const updater = (store as any).updater as UpdateManager
     var me: any
 
     var PAD = Namespace('http://www.w3.org/ns/pim/pad#')

src/profile/profilePane.source.ts

@@ -61,11 +61,16 @@ const thisPane: PaneDefinition = {
     ) {
       if (!subject) throw new Error('subject missing')
       const profile = subject.doc()
-      let otherProfiles = store.each(subject, ns.rdfs('seeAlso'), null, profile)
+      const otherProfiles = store.each(
+        subject,
+        ns.rdfs('seeAlso'),
+        null,
+        profile
+      )
       if (otherProfiles.length > 0) {
         try {
-          // @@ TODO Remove casting of store.fetcher.load
-          await (store.fetcher.load as any)(otherProfiles)
+          // @@ TODO Remove casting of store and store.fetcher.load
+          await ((store as any).fetcher.load as any)(otherProfiles)
         } catch (err) {
           container.appendChild(widgets.errorMessageBlock(err))
         }

src/versionInfo.ts

@@ -1,6 +1,6 @@
 export default {
-  buildTime: '2019-11-21T14:13:06Z',
-  commit: '8601dd767b2705e7ece30b299ab5aea0a10dc81e',
+  buildTime: '2019-11-24T12:58:17Z',
+  commit: '30ba1daec3519100d272620ed385a542111b4644',
   npmInfo: {
     'solid-panes': '2.0.4',
     npm: '6.10.0',