From 5f2a152e7c0d6ab8db5dcc50d09665b55e5f2905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Dierick?= <michael.dierick@redpencil.io>
Date: Fri, 13 Jan 2023 10:33:16 +0100
Subject: [PATCH] use recommended rdfjs types See
 https://www.npmjs.com/package/rdf-js

---
 app.ts            |  7 +++----
 package-lock.json |  2 +-
 package.json      |  2 +-
 sparql-queries.ts |  5 ++---
 utils.ts          | 10 ++++------
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app.ts b/app.ts
index c09370a..786de89 100644
--- a/app.ts
+++ b/app.ts
@@ -5,9 +5,8 @@ import {
   getLatestTimestamp
 } from "./sparql-queries";
 
-import { NamedNode } from "@rdfjs/types";
 import { DataFactory } from "n3";
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import Consumer, { Member } from "ldes-consumer";
 import { TreeProperties, convertBlankNodes, extractBaseResourceUri, extractVersionTimestamp, extractEndpointHeadersFromEnv } from "./utils";
 import { CronJob } from "cron";
@@ -21,9 +20,9 @@ import {
 } from "./config";
 const { quad, variable } = DataFactory;
 
-const latestVersionMap : Map<NamedNode, Date> = new Map();
+const latestVersionMap : Map<RDF.NamedNode, Date> = new Map();
 
-async function latestVersionTimestamp (resource: NamedNode, treeProperties: TreeProperties): Promise<Date | null> {
+async function latestVersionTimestamp (resource: RDF.NamedNode, treeProperties: TreeProperties): Promise<Date | null> {
   if (latestVersionMap.has(resource)) {
     return latestVersionMap.get(resource)!;
   } else {
diff --git a/package-lock.json b/package-lock.json
index 9c7e011..2fd654e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,10 +15,10 @@
         "express-http-context": "^1.2.4",
         "ldes-consumer": "^0.3.5",
         "n3": "^1.16.1",
-        "rdf-js": "^4.0.2",
         "rdf-parse": "^2.0.0"
       },
       "devDependencies": {
+        "@rdfjs/types": "^1.1.0",
         "@types/cron": "^2.0.0",
         "@typescript-eslint/eslint-plugin": "^5.31.0",
         "@typescript-eslint/parser": "^5.31.0",
diff --git a/package.json b/package.json
index bf9bcaf..98bce88 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
     "express-http-context": "^1.2.4",
     "ldes-consumer": "^0.3.5",
     "n3": "^1.16.1",
-    "rdf-js": "^4.0.2",
     "rdf-parse": "^2.0.0"
   },
   "name": "ldes-consumer-service",
@@ -25,6 +24,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@rdfjs/types": "^1.1.0",
     "@types/cron": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.31.0",
     "@typescript-eslint/parser": "^5.31.0",
diff --git a/sparql-queries.ts b/sparql-queries.ts
index af3b903..e2f830d 100644
--- a/sparql-queries.ts
+++ b/sparql-queries.ts
@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import { TreeProperties, extractEndpointHeadersFromEnv, toString } from "./utils";
 import { querySudo, updateSudo, ConnectionOptions } from "@lblod/mu-auth-sudo";
 import { DataFactory } from "n3";
@@ -11,7 +11,6 @@ import {
   SPARQL_ENDPOINT_HEADER_PREFIX
 } from "./config";
 import { State } from "@treecg/actor-init-ldes-client";
-import { NamedNode } from "rdf-js";
 const { quad, namedNode, variable, literal } = DataFactory;
 
 const stream = namedNode(LDES_STREAM);
@@ -109,7 +108,7 @@ export async function executeDeleteQuery (quads: RDF.Quad[]) {
   }
 }
 
-export async function getLatestTimestamp (baseResource: NamedNode, treeProperties: TreeProperties) {
+export async function getLatestTimestamp (baseResource: RDF.NamedNode, treeProperties: TreeProperties) {
   const quads = [
     quad(variable("version"), treeProperties.versionOfPath, baseResource),
     quad(variable("version"), treeProperties.timestampPath, variable("timestamp"))
diff --git a/utils.ts b/utils.ts
index d5ec669..baf86ad 100644
--- a/utils.ts
+++ b/utils.ts
@@ -1,19 +1,17 @@
-import { Term } from "rdf-js";
 import { Member } from "ldes-consumer";
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import { DataFactory } from "n3";
 import { BLANK, XSD } from "./namespaces";
 import { v4 as uuidv4 } from "uuid";
 import { sparqlEscapeString, sparqlEscapeUri } from "mu";
-import { NamedNode } from "@rdfjs/types";
 const { literal } = DataFactory;
 
 export interface TreeProperties {
-  versionOfPath: NamedNode,
-  timestampPath: NamedNode
+  versionOfPath: RDF.NamedNode,
+  timestampPath: RDF.NamedNode
 }
 
-export function toString (term: Term): string {
+export function toString (term: RDF.Term): string {
   switch (term.termType) {
     case "NamedNode":
       return sparqlEscapeUri(term.value);