rdflib 2.2.22-2f49e8ef → 2.2.22-53d65d90

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.22-2f49e8ef",
+  "version": "2.2.22-53d65d90",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -45,8 +45,8 @@
   "bugs": "http://github.com/linkeddata/rdflib.js/issues",
   "dependencies": {
     "@babel/runtime": "^7.20.1",
+    "@frogcat/ttl2jsonld": "^0.0.9",
     "@xmldom/xmldom": "^0.8.6",
-    "async": "^3.2.4",
     "cross-fetch": "^3.1.5",
     "jsonld": "^8.1.0",
     "n3": "^1.16.3",
@@ -81,25 +81,26 @@
     "sinon-chai": "^3.7.0",
     "source-map-loader": "^4.0.1",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.21",
+    "typedoc": "^0.23.24",
     "typescript": "^4.9.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0",
-    "webpack-dev-server": "4.11"
+    "webpack-dev-server": "^4.11.1"
   },
   "scripts": {
     "build": "babel src --extensions \".ts,.js\" -d lib",
     "build:esm": "babel src --extensions \".ts,.js\" --env-name esm -d esm",
     "build:browser": "webpack --progress",
     "build:types": "tsc --emitDeclarationOnly -d --moduleResolution node --declarationDir lib",
+    "build:all": "npm run build && npm run build:types && npm run build:browser && npm run build:esm",
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
-    "ignore:prepublishOnly": "npm ci && npm run build && npm run build:types && npm run build:browser && npm run build:esm",
+    "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
     "postversion": "git push --follow-tags",
     "start": "webpack serve --port 4800",
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",
     "test:clean": "rimraf tests/serialize/,*",
     "test:serialize": "npm run build && npm run test:serialize:all && npm run test:clean",
-    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15",
+    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14  && npm run test:serialize:15",
     "test:serialize:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && fs-grep http://www.w3.org/2001/XMLSchema#integer ,t1.xml",
     "test:serialize:2": "cd ./tests/serialize && node ./data.js -in=t2.ttl -format=application/rdf+xml  -out=,t2.xml && node diff ,t2.xml t2-ref.xml",
     "test:serialize:3": "cd ./tests/serialize && node ./data.js -in=t3.ttl -format=application/rdf+xml  -out=,t3.xml && node diff ,t3.xml t3-ref.xml",
@@ -107,14 +108,14 @@
     "test:serialize:5": "cd ./tests/serialize && node ./data.js -in=t5.n3 -format=text/turtle -out=,t5.ttl && node diff ,t5.ttl t5-ref.ttl",
     "test:serialize:6": "cd ./tests/serialize && node ./data.js -in=t5.n3 -format=text/n3 -out=,t6.n3 && node diff ,t6.n3 t6-ref.n3",
     "test:serialize:7": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/n-triples -out=,t7.nt && node diff ,t7.nt t7-ref.nt",
-    "test:serialize:8": "cd ./tests/serialize && node ./data.js -in=t5.n3  -format=application/n-quads -dump=,t8.nq && node diff ,t8.nq t8-ref.nq",
-    "test:serialize:9": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/ld+json -out=,t9.json && node diff ,t9.json t9-ref.json",
+    "test:serialize:8": "cd ./tests/serialize && node ./data.js -in=t5.n3  -format=application/n-quads -out=,t8.nq && node diff ,t8.nq t8-ref.nq",
     "test:serialize:10": "cd ./tests/serialize && node ./data.js -in=details.ttl -format=text/turtle -out=,t10.ttl && node diff ,t10.ttl t10-ref.ttl",
     "test:serialize:11": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/rdf+xml  -out=,structures.xml && node diff ,structures.xml t11-ref.xml",
     "test:serialize:12": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=text/turtle -out=,structures.ttl && node diff ,structures.ttl t12-ref.ttl",
     "test:serialize:13": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/n-triples -out=,structures.nt && node ./data.js -format=application/n-triples -in=,structures.nt -format=text/turtle -out=,structures.nt.ttl && node diff ,structures.nt.ttl t13-ref.ttl",
     "test:serialize:14": "cd ./tests/serialize && node ./data.js -in=t14.html -format=text/turtle -out=,t14.ttl && node diff ,t14.ttl t14-ref.ttl",
     "test:serialize:15": "cd ./tests/serialize && node ./data.js -in=t15.html -format=text/turtle -out=,t15.ttl && node diff ,t15.ttl t15-ref.ttl",
+    "test:serialize:16": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/ld+json -out=,t1.jsonld && node diff ,t1.jsonld t16-ref.jsonld",
     "test:types": "tsc --noEmit --target es2019 --moduleResolution node tests/types/*.ts",
     "test:unit": "mocha --growl --require  ./tests/babel-register.js tests/unit/**-test.*",
     "test:unit:egp": "mocha --require ./tests/babel-register.js tests/unit/fetcher-egp-test.js",

package/src/index.ts

@@ -2,7 +2,6 @@ import { IRDFlibDataFactory } from './types'
 
 import BlankNode from './blank-node'
 import Collection from './collection'
-import * as convert from './convert'
 import Empty from './empty'
 import Fetcher from './fetcher'
 import Formula from './formula'
@@ -66,7 +65,6 @@ export type { AutoInitOptions, ExtendedResponse, FetchError } from './fetcher'
 export {
   BlankNode,
   Collection,
-  convert,
   DataFactory,
   Empty,
   Fetcher,

package/src/jsonldparser.js

@@ -22,7 +22,7 @@ export function jsonldObjectToTerm (kb, obj) {
   }
 
   if (Object.prototype.hasOwnProperty.call(obj, '@id')) {
-    return kb.rdfFactory.namedNode(obj['@id'])
+    return nodeType(kb, obj)
   }
 
   if (Object.prototype.hasOwnProperty.call(obj, '@language')) {
@@ -44,7 +44,7 @@ export function jsonldObjectToTerm (kb, obj) {
  * Adds the statements in a json-ld list object to {kb}.
  */
 function listToStatements (kb, obj) {
-  const listId = obj['@id'] ? kb.rdfFactory.namedNode(obj['@id']) : kb.rdfFactory.blankNode()
+  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode()
 
   const items = obj['@list'].map((listItem => jsonldObjectToTerm(kb, listItem)))
   const statements = arrayToStatements(kb.rdfFactory, listId, items)
@@ -82,10 +82,19 @@ export default function jsonldParser (str, kb, base, callback) {
     .catch(callback)
 }
 
+function nodeType (kb, obj) {
+  if (obj['@id'].startsWith('_:')) {
+    // This object is a Blank Node. Pass the id without the `_:` prefix
+    return kb.rdfFactory.blankNode(obj['@id'].substring(2));
+  } else {
+    // This object is a Named Node
+    return kb.rdfFactory.namedNode(obj['@id']);
+  }
+}
 
 function processResource(kb, base, flatResource) {
   const id = flatResource['@id']
-    ? kb.rdfFactory.namedNode(flatResource['@id'])
+    ? nodeType(kb, flatResource)
     : kb.rdfFactory.blankNode()
 
   for (const property of Object.keys(flatResource)) {
@@ -136,4 +145,4 @@ function createStatement(kb, id, property, value, base) {
     object = jsonldObjectToTerm(kb, value)
   }
   return kb.rdfFactory.quad(id, predicate, object, kb.rdfFactory.namedNode(base))
-}
+}

package/src/serialize.ts

@@ -1,4 +1,3 @@
-import * as convert from './convert'
 import Formula from './formula'
 import Serializer from './serializer'
 import {
@@ -42,7 +41,7 @@ export default function serialize (
      */
     namespaces?: Record<string, string>
   }
-): string | undefined {
+): string | undefined | Promise<string> {
   base = base || target?.value
   const opts = options || {}
   contentType = contentType || TurtleContentType // text/n3 if complex?
@@ -51,7 +50,6 @@ export default function serialize (
     var sz = Serializer(kb)
     if ((opts as any).flags) sz.setFlags((opts as any).flags)
     var newSts = kb!.statementsMatching(undefined, undefined, undefined, target as NamedNode)
-    var n3String: string
 
     // If an IndexedFormula, use the namespaces from the given graph as suggestions
     if ('namespaces' in kb) {
@@ -82,19 +80,14 @@ export default function serialize (
         documentString = sz.statementsToNTriples(newSts)
         return executeCallback(null, documentString)
       case JSONLDContentType:
-        sz.setFlags('deinprstux') // Use adapters to connect to incmpatible parser
-        n3String = sz.statementsToNTriples(newSts)
-        // n3String = sz.statementsToN3(newSts)
-        convert.convertToJson(n3String, callback)
-        break
+        sz.setFlags('si') // use turtle parameters
+        documentString = sz.statementsToJsonld(newSts) // convert via turtle
+        return executeCallback(null, documentString)
       case NQuadsContentType:
       case NQuadsAltContentType: // @@@ just outpout the quads? Does not work for collections
         sz.setFlags('deinprstux q') // Suppress nice parts of N3 to make ntriples
         documentString = sz.statementsToNTriples(newSts) // q in flag means actually quads
         return executeCallback(null, documentString)
-        // n3String = sz.statementsToN3(newSts)
-        // documentString = convert.convertToNQuads(n3String, callback)
-        // break
       default:
         throw new Error('Serialize: Content-type ' + contentType + ' not supported for data write.')
     }

package/src/serializer.js

@@ -12,6 +12,8 @@ import * as Util from './utils-js'
 import CanonicalDataFactory from './factories/canonical-data-factory'
 import { createXSD } from './xsd'
 import solidNs from 'solid-namespace'
+// import * as jsonld from 'jsonld'
+import * as ttl2jsonld from '@frogcat/ttl2jsonld'
 
 
 export default function createSerializer(store) {
@@ -1011,6 +1013,28 @@ export class Serializer {
     var tree2 = [str, tree, '</rdf:RDF>'] // @@ namespace declrations
     return XMLtreeToString(tree2, -1)
   } // End @@ body
+
+  statementsToJsonld (sts) {
+    // ttl2jsonld creates context keys for all ttl prefix
+    // context keys must be full IRI
+    function findId (itemObj) {
+      if (itemObj['@id']) {
+        const item = itemObj['@id'].split(':')
+        if (keys[item[0]]) itemObj['@id'] = jsonldObj['@context'][item[0]] + item[1]
+      }
+      const itemValues = Object.values(itemObj)
+      for (const i in itemValues) {
+        if (typeof itemValues[i] !== 'string') { // @list contains array
+          findId(itemValues[i])
+        }
+      }
+    }
+    const turtleDoc = this.statementsToN3(sts)
+    const jsonldObj = ttl2jsonld.parse(turtleDoc)
+
+    return JSON.stringify(jsonldObj, null, 2)
+  }
+
 }
 
 // String escaping utilities

package/src/update-manager.ts

@@ -213,7 +213,7 @@ export default class UpdateManager {
    * Returns a list of all bnodes occurring in a list of statements
    * @private
    */
-  statementArrayBnodes (sts: Quad[]) {
+  statementArrayBnodes (sts: ReadonlyArray<Quad>) {
     var bnodes: BlankNode[] = []
     for (let i = 0; i < sts.length; i++) {
       bnodes = bnodes.concat(this.statementBnodes(sts[i]))
@@ -752,7 +752,13 @@ export default class UpdateManager {
         // console.log(message)
         throw new Error(message)
       }
-      var control = this.patchControlFor(doc as NamedNode)
+      if (doc.termType !== 'NamedNode') {
+        let message = 'Error patching: document not a NamedNode:' + ds[0] + ', ' + is[0]
+        // console.log(message)
+        throw new Error(message)
+      }
+      var control = this.patchControlFor(doc)
+
       var startTime = Date.now()
 
       var props = ['subject', 'predicate', 'object', 'why']

package/esm/convert.js

@@ -1,60 +0,0 @@
-import asyncLib from 'async'; // @@ Goal: remove this dependency
-import jsonld from 'jsonld';
-import { Parser, Writer } from 'n3'; // @@ Goal: remove this dependency
-
-export function convertToJson(n3String, jsonCallback) {
-  var jsonString;
-  var n3Parser = new Parser();
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  });
-  asyncLib.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, quad, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    try {
-      jsonld.fromRDF(result, {
-        format: 'application/nquads'
-      }).then(result => {
-        callback(null, result);
-      });
-    } catch (err) {
-      callback(err);
-    }
-  }, function (json, callback) {
-    jsonString = JSON.stringify(json);
-    jsonCallback(null, jsonString);
-  }], function (err, result) {
-    jsonCallback(err, jsonString);
-  });
-}
-export function convertToNQuads(n3String, nquadCallback) {
-  var nquadString;
-  var n3Parser = new Parser();
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  });
-  asyncLib.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, triple, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    nquadString = result;
-    nquadCallback(null, nquadString);
-  }], function (err, result) {
-    nquadCallback(err, nquadString);
-  });
-}

package/lib/convert.d.ts

@@ -1,2 +0,0 @@
-export function convertToJson(n3String: any, jsonCallback: any): void;
-export function convertToNQuads(n3String: any, nquadCallback: any): void;

package/lib/convert.js

@@ -1,71 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.convertToJson = convertToJson;
-exports.convertToNQuads = convertToNQuads;
-var _async = _interopRequireDefault(require("async"));
-var _jsonld = _interopRequireDefault(require("jsonld"));
-var _n = require("n3");
-// @@ Goal: remove this dependency
-
-// @@ Goal: remove this dependency
-
-function convertToJson(n3String, jsonCallback) {
-  var jsonString;
-  var n3Parser = new _n.Parser();
-  var n3Writer = new _n.Writer({
-    format: 'N-Quads'
-  });
-  _async.default.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, quad, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    try {
-      _jsonld.default.fromRDF(result, {
-        format: 'application/nquads'
-      }).then(result => {
-        callback(null, result);
-      });
-    } catch (err) {
-      callback(err);
-    }
-  }, function (json, callback) {
-    jsonString = JSON.stringify(json);
-    jsonCallback(null, jsonString);
-  }], function (err, result) {
-    jsonCallback(err, jsonString);
-  });
-}
-function convertToNQuads(n3String, nquadCallback) {
-  var nquadString;
-  var n3Parser = new _n.Parser();
-  var n3Writer = new _n.Writer({
-    format: 'N-Quads'
-  });
-  _async.default.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, triple, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    nquadString = result;
-    nquadCallback(null, nquadString);
-  }], function (err, result) {
-    nquadCallback(err, nquadString);
-  });
-}

package/src/convert.js

@@ -1,70 +0,0 @@
-import asyncLib from 'async' // @@ Goal: remove this dependency
-import jsonld from 'jsonld'
-import { Parser, Writer } from 'n3'  // @@ Goal: remove this dependency
-
-export function convertToJson (n3String, jsonCallback) {
-  var jsonString
-  var n3Parser = new Parser()
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  })
-  asyncLib.waterfall([
-    function (callback) {
-      n3Parser.parse(n3String, function (error, quad, prefixes) {
-        if (error) {
-          callback(error);
-        } else if (quad !== null) {
-          n3Writer.addQuad(quad);
-        } else {
-          n3Writer.end(callback);
-        }
-      });
-    },
-    function (result, callback) {
-      try {
-        jsonld.fromRDF(result, {
-          format: 'application/nquads'
-        }).then((result) => {
-          callback(null, result)
-        })
-      } catch (err) {
-        callback(err)
-      }
-    },
-    function (json, callback) {
-      jsonString = JSON.stringify(json)
-      jsonCallback(null, jsonString)
-    }
-  ], function (err, result) {
-    jsonCallback(err, jsonString)
-  }
-  )
-}
-
-export function convertToNQuads (n3String, nquadCallback) {
-  var nquadString
-  var n3Parser = new Parser()
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  })
-  asyncLib.waterfall([
-    function (callback) {
-      n3Parser.parse(n3String, function (error, triple, prefixes) {
-        if (error) {
-          callback(error);
-        } else if (quad !== null) {
-          n3Writer.addQuad(quad);
-        } else {
-          n3Writer.end(callback);
-        }
-      });
-    },
-    function (result, callback) {
-      nquadString = result
-      nquadCallback(null, nquadString)
-    }
-  ], function (err, result) {
-    nquadCallback(err, nquadString)
-  }
-  )
-}