@rdfc/sparql-ingest-processor-ts 2.1.3 → 2.1.5

package/lib/SPARQLIngest.js

@@ -159,7 +159,7 @@ export class SPARQLIngest extends Processor {
                 if (this.config.graphStoreUrl) {
                     try {
                         const t0 = Date.now();
-                        await doSPARQLRequest(query, this.config, this.doSPARQLRequestLogger);
+                        await doSPARQLRequest(query, this.config, this.logger);
                         const reqTime = Date.now() - t0;
                         if (this.config.measurePerformance) {
                             this.requestsPerformance.push(reqTime);
@@ -185,7 +185,7 @@ export class SPARQLIngest extends Processor {
                         }
                     }
                     else {
-                        await this.sparqlWriter.string(query.join("\n"));
+                        await this.sparqlWriter.string(query.join(";\n"));
                     }
                 }
             }
@@ -193,7 +193,7 @@ export class SPARQLIngest extends Processor {
                 if (this.config.operationMode === OperationMode.REPLICATION) {
                     try {
                         const t0 = Date.now();
-                        await doSPARQLRequest(this.memberBatch, this.config, this.doSPARQLRequestLogger);
+                        await doSPARQLRequest(this.memberBatch, this.config, this.logger);
                         const reqTime = Date.now() - t0;
                         if (this.config.measurePerformance) {
                             this.requestsPerformance.push(reqTime);
@@ -222,7 +222,7 @@ export class SPARQLIngest extends Processor {
         if (this.config.operationMode === OperationMode.REPLICATION && this.memberBatch.length > 0) {
             try {
                 const t0 = Date.now();
-                await doSPARQLRequest(this.memberBatch, this.config, this.doSPARQLRequestLogger);
+                await doSPARQLRequest(this.memberBatch, this.config, this.logger);
                 const reqTime = Date.now() - t0;
                 if (this.config.measurePerformance) {
                     this.requestsPerformance.push(reqTime);
@@ -292,16 +292,16 @@ export class SPARQLIngest extends Processor {
             }
         }
         if (createStore.size > 0) {
-            transactionQueryBuilder.push(CREATE(createStore, config.forVirtuoso).join("\n"));
+            transactionQueryBuilder.push(...CREATE(createStore, config.forVirtuoso));
         }
         if (updateStore.size > 0) {
-            transactionQueryBuilder.push(UPDATE(updateStore, config.forVirtuoso).join("\n"));
+            transactionQueryBuilder.push(...UPDATE(updateStore, config.forVirtuoso));
         }
         if (deleteStore.size > 0) {
             deleteMembers.forEach(dm => {
-                transactionQueryBuilder.push(DELETE(deleteStore, dm, config.memberShape).join("\n"));
+                transactionQueryBuilder.push(...DELETE(deleteStore, dm, config.memberShape));
             });
         }
-        return transactionQueryBuilder.join("\n");
+        return transactionQueryBuilder.join(";\n");
     }
 }

package/lib/SPARQLQueries.js

@@ -1,8 +1,8 @@
-import { RDF, SHACL } from "@treecg/types";
+import { SHACL } from "@treecg/types";
 import { Writer as N3Writer, Parser } from "n3";
 import { RdfStore } from "rdf-stores";
 import { DataFactory } from "rdf-data-factory";
-import { getObjects, getSubjects, splitStoreOnSize, splitStorePerNamedGraph } from "./Utils.js";
+import { getObjects, splitStoreOnSize, splitStorePerNamedGraph } from "./Utils.js";
 const df = new DataFactory();
 export const CREATE = (store, forVirtuoso) => {
     const queries = [];
@@ -17,7 +17,7 @@ export const CREATE = (store, forVirtuoso) => {
                 return df.quad(q.subject, q.predicate, q.object, df.defaultGraph());
             }))}
                     ${graph.equals(df.defaultGraph()) ? "" : `}`}
-                };
+                }
             `);
         });
     }
@@ -36,7 +36,7 @@ export const UPDATE = (store, forVirtuoso) => {
             }
             WHERE { 
                 ${formattedQuery[0]} 
-            };
+            }
         `];
         subStores.forEach((s, i) => {
             deleteInsertQuery.push(`
@@ -46,7 +46,7 @@ export const UPDATE = (store, forVirtuoso) => {
                 return df.quad(q.subject, q.predicate, q.object, df.defaultGraph());
             }))}
                     ${graph.equals(df.defaultGraph()) ? "" : `}`}
-                };
+                }
             `);
         });
         queries.push(...deleteInsertQuery);
@@ -66,7 +66,7 @@ export const DELETE = (store, memberIRI, memberShape) => {
                 ${deleteBuilder}
             } WHERE {
                 ${whereBuilder}
-            };
+            }
         `);
     }
     return queries;
@@ -123,36 +123,3 @@ function formatQuery(memberStore, memberIRI, memberShape, indexStart = 0) {
         return [queryBuilder.join("\n"), deleteQueryBuilder.join("\n")];
     }
 }
-function extractMainTargetClass(store) {
-    const nodeShapes = getSubjects(store, RDF.terms.type, SHACL.terms.NodeShape, null);
-    let mainNodeShape = null;
-    if (nodeShapes && nodeShapes.length > 0) {
-        for (const ns of nodeShapes) {
-            const isNotReferenced = getSubjects(store, null, ns, null).length === 0;
-            if (isNotReferenced) {
-                if (!mainNodeShape) {
-                    mainNodeShape = ns;
-                }
-                else {
-                    throw new Error("There are multiple main node shapes in a given shape."
-                        + " Unrelated shapes must be given as separate member shapes");
-                }
-            }
-        }
-        if (mainNodeShape) {
-            const tcq = getObjects(store, mainNodeShape, SHACL.terms.targetClass, null)[0];
-            if (tcq) {
-                return tcq;
-            }
-            else {
-                throw new Error("No target class found in main SHACL Node Shapes");
-            }
-        }
-        else {
-            throw new Error("No main SHACL Node Shapes found in given member shape");
-        }
-    }
-    else {
-        throw new Error("No SHACL Node Shapes found in given member shape");
-    }
-}

package/lib/Utils.d.ts

@@ -1,7 +1,7 @@
 import { RdfStore } from "rdf-stores";
+import { Logger } from "winston";
 import type { Term, Quad_Subject, Quad_Object, Quad, Quad_Graph } from "@rdfjs/types";
 import type { IngestConfig } from "./SPARQLIngest.js";
-import { Logger } from "winston";
 export declare function getSubjects(store: RdfStore, predicate: Term | null, object: Term | null, graph?: Term | null): Quad_Subject[];
 export declare function getObjects(store: RdfStore, subject: Term | null, predicate: Term | null, graph?: Term | null): Quad_Object[];
 export declare function splitStorePerNamedGraph(store: RdfStore): {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rdfc/sparql-ingest-processor-ts",
-    "version": "2.1.3",
+    "version": "2.1.5",
     "description": "SPARQL Update function to be within RDF-Connect pipelines",
     "author": "Julián Rojas",
     "contributors": [
@@ -40,8 +40,8 @@
         "@rdfjs/types": "^2.0.1",
         "@types/n3": "^1.26.1",
         "@types/node": "^25.2.2",
-        "@typescript-eslint/eslint-plugin": "^8.54.0",
-        "@typescript-eslint/parser": "^8.54.0",
+        "@typescript-eslint/eslint-plugin": "^8.55.0",
+        "@typescript-eslint/parser": "^8.55.0",
         "@vitest/coverage-v8": "^4.0.18",
         "eslint": "^9.39.2",
         "eslint-config-prettier": "^10.1.8",