Merge pull request #84 from SolidOS/updateDep

timea-solid · web-flow · commit b33811e5d304 · 2025-08-19T16:59:23.000+02:00
updated dependencies &amp; fix vulnerabilities
diff --git a/.babelrc b/.babelrc
@@ -4,8 +4,8 @@
     "@babel/preset-typescript"
   ],
   "plugins": [
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-transform-class-properties",
+    "@babel/plugin-transform-optional-chaining",
     "@babel/plugin-transform-async-to-generator",
     "@babel/plugin-transform-runtime"
   ]
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,29 @@
+const {
+    defineConfig,
+} = require("eslint/config");
+
+const tsParser = require("@typescript-eslint/parser");
+const typescriptEslint = require("@typescript-eslint/eslint-plugin");
+const js = require("@eslint/js");
+
+const {
+    FlatCompat,
+} = require("@eslint/eslintrc");
+
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+module.exports = defineConfig([{
+    languageOptions: {
+        parser: tsParser,
+    },
+
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+    },
+
+    extends: compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
+}]);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,26 +25,26 @@
   },
   "homepage": "https://github.com/solidos/solid-logic#readme",
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "~7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "~7.21.0",
-    "@babel/plugin-transform-async-to-generator": "~7.25.9",
-    "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "~7.26.7",
-    "@babel/preset-typescript": "~7.26.0",
-    "@types/jest": "^29.5.14",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.57.1",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "@babel/plugin-transform-class-properties": "^7.27.1",
+    "@babel/plugin-transform-optional-chaining": "^7.27.1",
+    "@babel/plugin-transform-async-to-generator": "^7.27.1",
+    "@babel/plugin-transform-runtime": "^7.28.0",
+    "@babel/preset-env": "^7.28.0",
+    "@babel/preset-typescript": "^7.27.1",
+    "@types/jest": "^30.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.34.0",
+    "@typescript-eslint/parser": "^8.34.0",
+    "eslint": "^9.28.0",
+    "jest": "^30.0.2",
+    "jest-environment-jsdom": "^30.0.2",
     "jest-environment-node-debug": "^2.0.0",
     "jest-fetch-mock": "^3.0.3",
     "typescript": "^5.7.3"
   },
   "dependencies": {
     "@inrupt/solid-client-authn-browser": "1.17",
     "lint-staged": "^15.4.3",
-    "rdflib": "^2.2.36",
+    "rdflib": "^2.2.37",
     "solid-namespace": "^0.5.4"
   }
 }
diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts
@@ -87,7 +87,8 @@ export function createAclLogic(store): AclLogic {
 
         return fetcher.load(docURI).then(result => {
             if (!result.ok) {
-            throw new Error('fetchACLRel: While loading:' + (result as any).error)
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                throw new Error('fetchACLRel: While loading:' + (result as any).error)
             }
 
             const aclDoc = store.any(
diff --git a/src/authn/authUtil.ts b/src/authn/authUtil.ts
@@ -7,7 +7,9 @@ import * as debug from '../util/debug'
  * see: https://github.com/facebook/jest/issues/936#issuecomment-545080082 for more
  * @return {any} - an appContext object
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const appContext = ():any => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let { SolidAppContext }: any = window
     SolidAppContext ||= {}
     SolidAppContext.viewingNoAuthPage = false
@@ -40,6 +42,7 @@ export const appContext = ():any => {
  * @returns {NamedNode|null}
  */
 export function offlineTestID (): NamedNode | null {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any 
     const { $SolidTestEnvironment }: any = window
     if (
       typeof $SolidTestEnvironment !== 'undefined' &&
diff --git a/src/chat/chatLogic.ts b/src/chat/chatLogic.ts
@@ -96,6 +96,7 @@ export function createChatLogic(store, profileLogic): ChatLogic {
             await store.fetcher.load(
                 new NamedNode(chatContainer.value + "index.ttl#this")
             );
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
             exists = false;
         }
diff --git a/src/inbox/inboxLogic.ts b/src/inbox/inboxLogic.ts
@@ -1,7 +1,8 @@
-import { NamedNode, sym } from "rdflib";
+import { NamedNode } from "rdflib";
 import { InboxLogic } from "../types";
 import { getArchiveUrl } from "../util/utils";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function createInboxLogic(store, profileLogic, utilityLogic, containerLogic, aclLogic): InboxLogic {
 
     async function createInboxFor(peerWebId: string, nick: string) {
diff --git a/src/logic/solidLogic.ts b/src/logic/solidLogic.ts
@@ -17,6 +17,7 @@ import * as debug from "../util/debug";
 ** into a `ConnectedStore` or a `LiveStore`.  A Fetcher object is
 ** available at store.fetcher, and `fetch` function at `store.fetcher._fetch`,
 */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function createSolidLogic(specialFetch: { fetch: (url: any, requestInit: any) => any }, session: Session): SolidLogic {
 
     debug.log("SolidLogic: Unique instance created.  There should only be one of these.")
diff --git a/src/profile/profileLogic.ts b/src/profile/profileLogic.ts
@@ -17,6 +17,7 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
     async function silencedLoadPreferences(user: NamedNode): Promise <NamedNode | undefined> {
         try {
             return await loadPreferences(user)
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (err) {
             return undefined
         }
diff --git a/src/typeIndex/typeIndexLogic.ts b/src/typeIndex/typeIndexLogic.ts
@@ -23,6 +23,7 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
         let publicTypeIndex
         try {
             publicTypeIndex = await utilityLogic.followOrCreateLink(user, ns.solid('publicTypeIndex') as NamedNode, suggestion, profile)
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (err) {
             const message = `User ${user} has no pointer in profile to publicTypeIndex file.`
             debug.warn(message)
@@ -32,6 +33,7 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
         let preferencesFile
         try {
             preferencesFile = await profileLogic.silencedLoadPreferences(user)
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (err) {
             preferencesFile = null
         }
@@ -45,7 +47,8 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
             try {
                 privateTypeIndex = store.any(user, ns.solid('privateTypeIndex'), undefined, profile) ||
                     await utilityLogic.followOrCreateLink(user, ns.solid('privateTypeIndex') as NamedNode, suggestedPrivateTypeIndex, preferencesFile);
-            } catch (err) {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                } catch (err) {
                 const message = `User ${user} has no pointer in preference file to privateTypeIndex file.`
                 debug.warn(message)
             }
@@ -68,6 +71,7 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
         let preferencesFile
         try {
             preferencesFile = await profileLogic.silencedLoadPreferences(user)
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (err) {
             const message = `User ${user} has no pointer in profile to preferences file.`
             debug.warn(message)
@@ -78,6 +82,7 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
             )
             let result = []
             for (const org of communities) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 result = result.concat(await loadTypeIndexesFor(org as NamedNode) as any)
             }
             return result
@@ -93,6 +98,7 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
         const scopes = await loadAllTypeIndexes(user)
         let scopedApps = []
         for (const scope of scopes) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const scopedApps0 = await getScopedAppsFromIndex(scope, klass) as any
             scopedApps = scopedApps.concat(scopedApps0)
         }
diff --git a/src/types.ts b/src/types.ts
@@ -72,7 +72,7 @@ export interface ProfileLogic {
 }
 
 export interface AclLogic {
-    findAclDocUrl: (url: NamedNode) => Promise<any>,
+    findAclDocUrl: (url: NamedNode) => Promise<string | undefined>,
     setACLUserPublic: (docURI: string, me: NamedNode,
         options: {
             defaultForNew?: boolean,
@@ -103,6 +103,7 @@ export interface TypeIndexLogic {
     suggestPublicTypeIndex: (me: NamedNode) => NamedNode,
     suggestPrivateTypeIndex: (preferencesFile: NamedNode) => NamedNode,
     registerInTypeIndex: (instance: NamedNode, index: NamedNode, theClass: NamedNode) => Promise<NamedNode | null>,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     deleteTypeIndexRegistration: (item: any) => Promise<void>
     getScopedAppsFromIndex: (scope: TypeIndexScope, theClass: NamedNode | null) => Promise<ScopedApp[]>
 }
diff --git a/src/util/utilityLogic.ts b/src/util/utilityLogic.ts
@@ -16,9 +16,9 @@ export function createUtilityLogic(store, aclLogic, containerLogic) {
           );
         }
         const nodeToStringHere = containerNode.value;
-        return store.fetcher._fetch(nodeToStringHere, { method: "DELETE" });
+        return store.fetcher._fetch(nodeToStringHere, { method: "DELETE" })
       } catch (e) {
-        // debug.log(`Please manually remove ${url} from your system under test.`, e);
+        debug.log(`Please manually remove ${containerNode.value} from your system.`, e);
       }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ export function createAclLogic(store): AclLogic {`
`87`	`87`
`88`	`88`	`return fetcher.load(docURI).then(result => {`
`89`	`89`	`if (!result.ok) {`
`90`		`- throw new Error('fetchACLRel: While loading:' + (result as any).error)`
	`90`	`+ // eslint-disable-next-line @typescript-eslint/no-explicit-any`
	`91`	`+ throw new Error('fetchACLRel: While loading:' + (result as any).error)`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`const aclDoc = store.any(`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ export function createChatLogic(store, profileLogic): ChatLogic {`
`96`	`96`	`await store.fetcher.load(`
`97`	`97`	`new NamedNode(chatContainer.value + "index.ttl#this")`
`98`	`98`	`);`
	`99`	`+ // eslint-disable-next-line @typescript-eslint/no-unused-vars`
`99`	`100`	`} catch (e) {`
`100`	`101`	`exists = false;`
`101`	`102`	`}`