rdflib 2.2.21 → 2.2.22-04669b23

package/lib/variable.js

@@ -1,44 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _classOrder = _interopRequireDefault(require("./class-order"));
-
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _types = require("./types");
-
 var Uri = _interopRequireWildcard(require("./uri"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
 * Variables are placeholders used in patterns to be matched.
 * In cwm they are symbols which are the formula's list of quantified variables.
@@ -46,11 +19,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 * a common special base URI for variables. Their names are uris,
 * but the ? notation has an implicit base uri of 'varid:'
 */
-var Variable = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(Variable, _Node);
-
-  var _super = _createSuper(Variable);
-
+class Variable extends _nodeInternal.default {
   /** The base string for a variable's name */
 
   /** The unique identifier of this variable */
@@ -59,58 +28,38 @@ var Variable = /*#__PURE__*/function (_Node) {
    * Initializes this variable
    * @param name The variable's name
    */
-  function Variable() {
-    var _this;
-
-    var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-    (0, _classCallCheck2.default)(this, Variable);
-    _this = _super.call(this, name);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.VariableTermType);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "base", 'varid:');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "classOrder", _classOrder.default.Variable);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVar", 1);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "uri", void 0);
-    _this.base = 'varid:';
-    _this.uri = Uri.join(name, _this.base);
-    return _this;
+  constructor() {
+    let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    super(name);
+    (0, _defineProperty2.default)(this, "termType", _types.VariableTermType);
+    (0, _defineProperty2.default)(this, "base", 'varid:');
+    (0, _defineProperty2.default)(this, "classOrder", _classOrder.default.Variable);
+    (0, _defineProperty2.default)(this, "isVar", 1);
+    (0, _defineProperty2.default)(this, "uri", void 0);
+    this.base = 'varid:';
+    this.uri = Uri.join(name, this.base);
   }
-
-  (0, _createClass2.default)(Variable, [{
-    key: "equals",
-    value: function equals(other) {
-      if (!other) {
-        return false;
-      }
-
-      return this.termType === other.termType && this.value === other.value;
-    }
-  }, {
-    key: "hashString",
-    value: function hashString() {
-      return this.toString();
-    }
-  }, {
-    key: "substitute",
-    value: function substitute(bindings) {
-      var ref;
-      return (ref = bindings[this.toNT()]) != null ? ref : this;
+  equals(other) {
+    if (!other) {
+      return false;
     }
-  }, {
-    key: "toString",
-    value: function toString() {
-      return Variable.toString(this);
-    }
-  }], [{
-    key: "toString",
-    value: function toString(variable) {
-      if (variable.uri.slice(0, variable.base.length) === variable.base) {
-        return "?".concat(variable.uri.slice(variable.base.length));
-      }
-
-      return "?".concat(variable.uri);
+    return this.termType === other.termType && this.value === other.value;
+  }
+  hashString() {
+    return this.toString();
+  }
+  substitute(bindings) {
+    var ref;
+    return (ref = bindings[this.toNT()]) != null ? ref : this;
+  }
+  toString() {
+    return Variable.toString(this);
+  }
+  static toString(variable) {
+    if (variable.uri.slice(0, variable.base.length) === variable.base) {
+      return `?${variable.uri.slice(variable.base.length)}`;
     }
-  }]);
-  return Variable;
-}(_nodeInternal.default);
-
+    return `?${variable.uri}`;
+  }
+}
 exports.default = Variable;

package/lib/xsd-internal.js

@@ -1,14 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _namedNode = _interopRequireDefault(require("./named-node"));
-
 var _default = {
   boolean: new _namedNode.default('http://www.w3.org/2001/XMLSchema#boolean'),
   dateTime: new _namedNode.default('http://www.w3.org/2001/XMLSchema#dateTime'),

package/lib/xsd.js

@@ -1,17 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createXSD = createXSD;
 exports.default = void 0;
-
 var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
-
 function createXSD() {
-  var localFactory = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _canonicalDataFactory.default;
+  let localFactory = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _canonicalDataFactory.default;
   return {
     boolean: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#boolean"),
     dateTime: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#dateTime"),
@@ -22,7 +19,6 @@ function createXSD() {
     string: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#string")
   };
 }
-
-var defaultXSD = createXSD(_canonicalDataFactory.default);
+const defaultXSD = createXSD(_canonicalDataFactory.default);
 var _default = defaultXSD;
 exports.default = _default;

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.21",
+  "version": "2.2.22-04669b23",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -44,62 +44,63 @@
   "homepage": "http://github.com/linkeddata/rdflib.js",
   "bugs": "http://github.com/linkeddata/rdflib.js/issues",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@xmldom/xmldom": "^0.8.1",
-    "async": "^3.2.3",
+    "@babel/runtime": "^7.20.1",
+    "@frogcat/ttl2jsonld": "^0.0.9",
+    "@xmldom/xmldom": "^0.8.6",
     "cross-fetch": "^3.1.5",
-    "jsonld": "^5.2.0",
-    "n3": "^1.16.0",
+    "jsonld": "^8.1.0",
+    "n3": "^1.16.3",
     "solid-namespace": "^0.5.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.8",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/preset-typescript": "^7.16.7",
-    "@babel/register": "^7.17.7",
-    "@types/chai": "^4.3.0",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.20.2",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/register": "^7.18.9",
+    "@types/chai": "^4.3.4",
     "@types/dirty-chai": "^2.0.2",
-    "@types/express": "^4.17.13",
-    "@types/jsonld": "^1.5.6",
-    "@types/rdf-js": "^4.0.2",
-    "@types/sinon-chai": "^3.2.8",
-    "babel-loader": "^8.2.4",
-    "chai": "^4.3.6",
-    "diff": "^5.0.0",
+    "@types/express": "^4.17.14",
+    "@types/jsonld": "^1.5.8",
+    "@types/sinon-chai": "^3.2.9",
+    "babel-loader": "^9.1.0",
+    "chai": "^4.3.7",
+    "diff": "^5.1.0",
     "dirty-chai": "^2.0.1",
-    "eslint": "^8.12.0",
+    "eslint": "^8.28.0",
     "fs-grep": "0.0.5",
-    "locate-path": "^7.1.0",
-    "mocha": "^9.2.2",
-    "nock": "^13.2.4",
-    "node-fetch": "^2.6.7",
-    "node-polyfill-webpack-plugin": "^1.1.4",
-    "sinon": "^13.0.1",
+    "locate-path": "^7.1.1",
+    "mocha": "^10.1.0",
+    "nock": "^13.2.9",
+    "node-fetch": "^3.3.0",
+    "node-polyfill-webpack-plugin": "^2.0.1",
+    "rdf-js": "^4.0.2",
+    "sinon": "^14.0.2",
     "sinon-chai": "^3.7.0",
-    "source-map-loader": "^3.0.1",
-    "ts-node": "^10.7.0",
-    "typedoc": "^0.22.13",
-    "typescript": "^4.6.3",
-    "webpack": "^5.70.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.7.4"
+    "source-map-loader": "^4.0.1",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.21",
+    "typescript": "^4.9.3",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.0",
+    "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/fetcher.ts

@@ -979,7 +979,7 @@ export default class Fetcher implements CallbackifyInterface {
     return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions) as any
   }
 
-  pendingFetchPromise (
+  async pendingFetchPromise (
     uri: string,
     originalUri: string,
     options: AutoInitOptions
@@ -987,7 +987,7 @@ export default class Fetcher implements CallbackifyInterface {
     let pendingPromise
 
     // Check to see if some request is already dealing with this uri
-    if (!options.force && this.fetchQueue[originalUri]) {
+    if (!options.force && await this.fetchQueue[originalUri]) {
       pendingPromise = this.fetchQueue[originalUri]
     } else {
       pendingPromise = Promise

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/n3parser.js

@@ -6,6 +6,7 @@
 **/
 import * as Uri from './uri'
 import { ArrayIndexOf } from './utils'
+import { convertFirstRestNil } from './lists'
 
 function hexify (str) { // also used in parser
   return encodeURI(str);
@@ -148,6 +149,7 @@ var diag_progress = function(str) { /*$rdf.log.debug(str);*/ }
 
 
 var RDF_type_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
+var RDF_nil_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";
 var DAML_sameAs_URI = "http://www.w3.org/2002/07/owl#sameAs";
 
 /*
@@ -247,6 +249,7 @@ export class SinkParser {
         this.source = store.sym(thisDoc);
         this.lines = 0;
         this.statementCount = 0;
+        this.hasNil = false;
         this.startOfLine = 0;
         this.previousLine = 0;
         this._genPrefix = genPrefix;
@@ -509,14 +512,20 @@ export class SinkParser {
     };
     startDoc() {
     };
-    endDoc() {
-        /*
-        Signal end of document and stop parsing. returns formula*/
 
+    /* Signal end of document and stop parsing. returns formula */
+    endDoc() {
+        if (this.hasNil && this._store.rdfFactory.supports["COLLECTIONS"]) {
+          convertFirstRestNil(this._store, this.source)
+        }
         return this._formula;
     };
     makeStatement(quad) {
         quad[0].add(quad[2], quad[1], quad[3], this.source);
+        if ((quad[2].uri && quad[2].uri === RDF_nil_URI)
+        || (quad[3].uri && quad[3].uri === RDF_nil_URI)) {
+          this.hasNil = true
+        }
         this.statementCount += 1;
     };
     statement(str, i) {
@@ -1571,4 +1580,3 @@ function stripCR(str) {
 
 function dummyWrite(x) {
 }
-

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

@@ -752,7 +752,7 @@ export default class UpdateManager {
         // console.log(message)
         throw new Error(message)
       }
-      var control = this.patchControlFor(doc)
+      var control = this.patchControlFor(doc as NamedNode)
       var startTime = Date.now()
 
       var props = ['subject', 'predicate', 'object', 'why']
@@ -781,7 +781,7 @@ export default class UpdateManager {
           throw new Error('Update: Loaded ' + doc + "but stil can't figure out what editing protcol it supports.")
         }
         // console.log(`Update: have not loaded ${doc} before: loading now...`);
-        (this.store.fetcher.load(doc) as Promise<Response>).then(response => {
+        (this.store.fetcher.load(doc as NamedNode) as Promise<Response>).then(response => {
           this.update(deletions, insertions, callback, true, options)
         }, err => {
             if (err.response.status === 404) { // nonexistent files are fine
@@ -793,8 +793,13 @@ export default class UpdateManager {
         return
       } else if ((protocol as string).indexOf('SPARQL') >= 0) {
         var bnodes: BlankNode[] = []
-        if (ds.length) bnodes = this.statementArrayBnodes(ds)
-        if (is.length) bnodes = bnodes.concat(this.statementArrayBnodes(is))
+        // change ReadOnly type to Mutable type
+        type Mutable<Type> = {
+          -readonly [Key in keyof Type]: Type[Key];
+        }
+        
+        if (ds.length) bnodes = this.statementArrayBnodes(ds as Mutable<typeof ds>)
+        if (is.length) bnodes = bnodes.concat(this.statementArrayBnodes(is as Mutable<typeof is>))
         var context = this.bnodeContext(bnodes, doc)
         var whereClause = this.contextWhere(context)
         var query = ''
@@ -846,7 +851,7 @@ export default class UpdateManager {
             */
           if (success) {
             try {
-              kb.remove(ds)
+              kb.remove(ds as Mutable<typeof ds>)
             } catch (e) {
               success = false
               body = 'Remote Ok BUT error deleting ' + ds.length + ' from store!!! ' + e
@@ -867,11 +872,11 @@ export default class UpdateManager {
           }
         }, options)
       } else if ((protocol as string).indexOf('DAV') >= 0) {
-        this.updateDav(doc, ds, is, callback, options)
+        this.updateDav(doc as NamedNode, ds, is, callback, options)
       } else {
         if ((protocol as string).indexOf('LOCALFILE') >= 0) {
           try {
-            this.updateLocalFile(doc, ds, is, callback, options)
+            this.updateLocalFile(doc as NamedNode, ds, is, callback, options)
           } catch (e) {
             callback(doc.value, false,
               'Exception trying to write back file <' + doc.value + '>\n'