Bump deps

package.json

@@ -31,9 +31,9 @@
     "@graphql-tools/schema": "^10.0.23",
     "@ndla/licenses": "^9.0.3",
     "cheerio": "^1.1.0",
-    "compression": "^1.7.4",
-    "dataloader": "^1.4.0",
-    "dotenv": "^6.2.0",
+    "compression": "^1.8.0",
+    "dataloader": "^2.2.3",
+    "dotenv": "^16.5.0",
     "express": "^4.21.2",
     "express-prom-bundle": "^7.0.0",
     "graphql": "^16.11.0",
@@ -42,15 +42,15 @@
     "he": "^1.2.0",
     "lodash": "^4.17.21",
     "lru-cache": "^7.0.0",
-    "marked": "^9.1.0",
-    "node-fetch": "2.6.7",
-    "open-graph-scraper": "^6.8.3",
+    "marked": "^15.0.12",
+    "node-fetch": "2.7.0",
+    "open-graph-scraper": "^6.10.0",
     "openapi-fetch": "^0.13.5",
     "prismjs": "^1.30.0",
     "prom-client": "^15.1.3",
     "punycode": "^2.3.1",
-    "query-string": "^6.2.0",
-    "sanitize-html": "^2.13.1",
+    "query-string": "^9.2.1",
+    "sanitize-html": "^2.17.0",
     "source-map-support": "^0.5.21",
     "winston": "^3.13.0"
   },
@@ -64,29 +64,29 @@
     "@ndla/types-backend": "^1.0.55",
     "@ndla/types-embed": "^5.0.16-alpha.0",
     "@ndla/types-taxonomy": "^1.0.34",
-    "@types/compression": "^1.7.2",
-    "@types/cors": "^2.8.4",
-    "@types/dotenv": "^6.1.0",
+    "@types/compression": "^1.8.1",
+    "@types/cors": "^2.8.19",
+    "@types/dotenv": "^8.2.3",
     "@types/express": "^4.17.21",
-    "@types/graphql": "^14.2.3",
-    "@types/he": "^1.1.1",
-    "@types/lodash": "^4.14.118",
+    "@types/graphql": "^14.5.0",
+    "@types/he": "^1.2.3",
+    "@types/lodash": "^4.17.18",
     "@types/node": "^22.15.0",
-    "@types/node-fetch": "^2.1.2",
+    "@types/node-fetch": "^2.6.12",
     "@types/open-graph-scraper": "^4.8.5",
-    "@types/prismjs": "^1.26.0",
+    "@types/prismjs": "^1.26.5",
     "@types/punycode": "^2.1.4",
-    "@types/query-string": "^6.1.1",
-    "@types/sanitize-html": "^2.11.0",
+    "@types/query-string": "^6.3.0",
+    "@types/sanitize-html": "^2.16.0",
     "@types/source-map-support": "^0",
     "@vercel/ncc": "^0.34.0",
     "concurrently": "^9.1.0",
     "eslint": "^9.16.0",
     "eslint-config-ndla": "^6.0.0-alpha.0",
-    "prettier": "^3.1.0",
-    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.17.0",
-    "vitest": "^3.2.3"
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.34.1",
+    "vitest": "^3.2.4"
   },
   "packageManager": "[email protected]"
 }

src/api/articleApi.ts

@@ -163,7 +163,10 @@ export async function fetchArticlesPage(
     .then(resolveJsonOATS);
 }
 
-export async function fetchArticles(articleIds: string[], context: Context): Promise<(IArticleV2DTO | undefined)[]> {
+export async function fetchArticles(
+  articleIds: readonly string[],
+  context: Context,
+): Promise<(IArticleV2DTO | undefined)[]> {
   const pageSize = 100;
   const ids = articleIds.map((id) => parseInt(id)).filter((id) => isNaN(id) === false);
   const numberOfPages = Math.ceil(ids.length / pageSize);

src/api/folderApi.ts

@@ -6,7 +6,6 @@
  *
  */
 
-import qs from "query-string";
 import {
   IMyNDLAUserDTO,
   IFolderDTO,
@@ -41,15 +40,6 @@ import { createAuthClient, resolveJsonOATS, resolveOATS } from "../utils/openapi
 
 const client = createAuthClient<openapi.paths>({ disableCache: true });
 
-interface QueryParamsType {
-  [key: string]: any;
-}
-
-export const queryString = (params: QueryParamsType) => {
-  const stringified = qs.stringify(params);
-  return stringified.length ? `?${stringified}` : "";
-};
-
 export async function fetchFolders(
   { includeResources, includeSubfolders }: GQLQueryFoldersArgs,
   _context: Context,

src/api/folderResourceMetaApi.ts

@@ -71,7 +71,10 @@ const fetchAndTransformResourceMeta = async (
     ]);
     return ids
       .map((id) => {
-        const node = nodes.flatMap((x) => x).find((n) => !!n && n.contentUri === `urn:${nodeType}:${id}`);
+        const node = nodes
+          .filter((n): n is Node[] => !!n)
+          .flatMap((x) => x)
+          .find((n) => !!n && n.contentUri === `urn:${nodeType}:${id}`);
         const element = elements.find((e) => e?.id === Number(id));
         return element
           ? {

src/api/learningpathApi.ts

@@ -25,14 +25,15 @@ const client = createAuthClient<openapi.paths>();
 const cachelessClient = createAuthClient<openapi.paths>({ disableCache: true });
 
 export async function fetchLearningpaths(
-  learningpathIds: number[],
+  learningpathIds: readonly number[],
   context: Context,
 ): Promise<Array<ILearningPathV2DTO | undefined>> {
+  const ids = learningpathIds.filter((id) => isNaN(id) === false);
   const json = await client
     .GET("/learningpath-api/v2/learningpaths/ids", {
       params: {
         query: {
-          ids: learningpathIds,
+          ids: ids,
           language: context.language,
           fallback: true,
         },

src/api/taxonomyApi.ts

@@ -56,7 +56,10 @@ export async function fetchNode(
   return await resolveJson(response);
 }
 
-export async function searchNodes(params: { contentUris: string[] }, context: Context): Promise<SearchResult<Node>> {
+export async function searchNodes(
+  params: { contentUris: readonly string[] },
+  context: Context,
+): Promise<SearchResult<Node>> {
   const { contentUris } = params;
   const query = qs.stringify({
     language: context.language,

src/resolvers/frontpageResolvers.ts

@@ -42,7 +42,7 @@ export const resolvers = {
       return context.loaders.articlesLoader.load(`${menu.articleId}`);
     },
     async hideLevel(menu: IFrontPageDTO | IMenuDTO): Promise<boolean> {
-      return "hideLevel" in menu ? menu.hideLevel ?? false : false;
+      return "hideLevel" in menu ? (menu.hideLevel ?? false) : false;
     },
   },
 

src/resolvers/subjectResolvers.ts

@@ -100,25 +100,28 @@ export const resolvers = {
   },
   SubjectPage: {
     async connectedTo(subjectpage: ISubjectPageDTO, _: any, context: ContextWithLoaders): Promise<GQLSubjectLink[]> {
-      return await context.loaders.nodeLoader.loadMany(
+      const connectedTo = await context.loaders.nodeLoader.loadMany(
         subjectpage.connectedTo.map((id) => {
           return { id };
         }),
       );
+      return connectedTo.filter((sub): sub is Node => !!sub);
     },
     async buildsOn(subjectpage: ISubjectPageDTO, _: any, context: ContextWithLoaders): Promise<GQLSubjectLink[]> {
-      return await context.loaders.nodeLoader.loadMany(
+      const buildsOn = await context.loaders.nodeLoader.loadMany(
         subjectpage.buildsOn.map((id) => {
           return { id };
         }),
       );
+      return buildsOn.filter((sub): sub is Node => !!sub);
     },
     async leadsTo(subjectpage: ISubjectPageDTO, _: any, context: ContextWithLoaders): Promise<GQLSubjectLink[]> {
-      return await context.loaders.nodeLoader.loadMany(
+      const leadsTo = await context.loaders.nodeLoader.loadMany(
         subjectpage.leadsTo.map((id) => {
           return { id };
         }),
       );
+      return leadsTo.filter((sub): sub is Node => !!sub);
     },
   },
   SubjectPageVisualElement: {

src/utils/articleHelpers.ts

@@ -36,12 +36,12 @@ export async function filterMissingArticles<T extends GQLTaxonomyEntity | NodeCh
 
   const entitiesWithContentUri = visibleEntities.filter((taxonomyEntity) => !!taxonomyEntity.contentUri);
 
-  const learningpathResources = entitiesWithContentUri.filter(
-    (taxonomyEntity) => taxonomyEntity.contentUri?.includes("urn:learningpath"),
+  const learningpathResources = entitiesWithContentUri.filter((taxonomyEntity) =>
+    taxonomyEntity.contentUri?.includes("urn:learningpath"),
   );
 
-  const articleResources = entitiesWithContentUri.filter(
-    (taxonomyEntity) => taxonomyEntity.contentUri?.includes("urn:article"),
+  const articleResources = entitiesWithContentUri.filter((taxonomyEntity) =>
+    taxonomyEntity.contentUri?.includes("urn:article"),
   );
 
   const articles = await context.loaders.articlesLoader.loadMany(