rdflib 2.2.17 → 2.2.18-ce0e0a33

package/lib/jsonldparser.js

@@ -86,29 +86,44 @@ function jsonldParser(str, kb, base, callback) {
     base: baseString
   }).then(function (flattened) {
     return flattened.reduce(function (store, flatResource) {
-      var id = flatResource['@id'] ? kb.rdfFactory.namedNode(flatResource['@id']) : kb.rdfFactory.blankNode();
+      kb = processResource(kb, base, flatResource);
+      return kb;
+    }, kb);
+  }).then(callback).catch(callback);
+}
 
-      for (var _i = 0, _Object$keys = Object.keys(flatResource); _i < _Object$keys.length; _i++) {
-        var property = _Object$keys[_i];
+function processResource(kb, base, flatResource) {
+  var id = flatResource['@id'] ? kb.rdfFactory.namedNode(flatResource['@id']) : kb.rdfFactory.blankNode();
 
-        if (property === '@id') {
-          continue;
-        }
+  for (var _i = 0, _Object$keys = Object.keys(flatResource); _i < _Object$keys.length; _i++) {
+    var property = _Object$keys[_i];
 
-        var value = flatResource[property];
+    if (property === '@id') {
+      continue;
+    } else if (property == '@graph') {
+      // the JSON-LD flattened structure may contain nested graphs
+      // the id value for this object is the new base (named graph id) for all nested flat resources
+      var graphId = id; // this is an array of resources
 
-        if (Array.isArray(value)) {
-          for (var i = 0; i < value.length; i++) {
-            kb.addStatement(createStatement(kb, id, property, value[i], base));
-          }
-        } else {
-          kb.addStatement(createStatement(kb, id, property, value, base));
-        }
+      var nestedFlatResources = flatResource[property]; // recursively process all flat resources in the array, but with the graphId as base.
+
+      for (var i = 0; i < nestedFlatResources.length; i++) {
+        kb = processResource(kb, graphId, nestedFlatResources[i]);
       }
+    }
 
-      return kb;
-    }, kb);
-  }).then(callback).catch(callback);
+    var value = flatResource[property];
+
+    if (Array.isArray(value)) {
+      for (var _i2 = 0; _i2 < value.length; _i2++) {
+        kb.addStatement(createStatement(kb, id, property, value[_i2], base));
+      }
+    } else {
+      kb.addStatement(createStatement(kb, id, property, value, base));
+    }
+  }
+
+  return kb;
 }
 /**
  * Create statement quad depending on @type being a type node

package/lib/query.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.Query = void 0;
 exports.indexedFormulaQuery = indexedFormulaQuery;
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _store = _interopRequireDefault(require("./store"));
@@ -41,7 +43,7 @@ var _uri = require("./uri");
 /**
  * Query class, for tracking queries the user has in the UI.
  */
-var Query = function Query(name, id) {
+var Query = /*#__PURE__*/(0, _createClass2.default)(function Query(name, id) {
   (0, _classCallCheck2.default)(this, Query);
   this.pat = new _store.default(); // The pattern to search for
 
@@ -50,7 +52,7 @@ var Query = function Query(name, id) {
 
   this.name = name;
   this.id = id;
-};
+});
 /**
  * This function will match a pattern to the current Store
  *
@@ -67,7 +69,6 @@ var Query = function Query(name, id) {
  * @param onDone -  callback when query finished
  */
 
-
 exports.Query = Query;
 
 function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {

package/lib/rdfxmlparser.d.ts

@@ -40,11 +40,11 @@ export default class RDFParser {
     getAttributeNodeNS(node: any, uri: any, name: any): any;
     /**
      * Build our initial scope frame and parse the DOM into triples
-     * @param {DOMTree} document The DOM to parse
+     * @param {HTMLDocument} document The DOM to parse
      * @param {String} base The base URL to use
      * @param {Object} why The context to which this resource belongs
      */
-    parse(document: any, base: string, why: any): boolean;
+    parse(document: HTMLDocument, base: string, why: any): boolean;
     base: string | undefined;
     parseDOM(frame: any): void;
     /**

package/lib/rdfxmlparser.js

@@ -269,7 +269,7 @@ var RDFParser = /*#__PURE__*/function () {
     }
     /**
      * Build our initial scope frame and parse the DOM into triples
-     * @param {DOMTree} document The DOM to parse
+     * @param {HTMLDocument} document The DOM to parse
      * @param {String} base The base URL to use
      * @param {Object} why The context to which this resource belongs
      */

package/lib/serialize.d.ts

@@ -1,15 +1,14 @@
 import Formula from './formula';
 import { ContentType } from './types';
-import IndexedFormula from './store';
 import { BlankNode, NamedNode } from './tf-types';
 /**
  * Serialize to the appropriate format
  */
 export default function serialize(
 /** The graph or nodes that should be serialized */
-target: Formula | NamedNode | BlankNode, 
+target: Formula | NamedNode | BlankNode | null, 
 /** The store */
-kb?: IndexedFormula, base?: unknown, 
+kb: Formula, base?: unknown, 
 /**
  * The mime type.
  * Defaults to Turtle.
@@ -19,5 +18,9 @@ contentType?: string | ContentType, callback?: (err: Error | undefined | null, r
      * A string of letters, each of which set an options
      * e.g. `deinprstux`
      */
-    flags: string;
+    flags?: string;
+    /**
+     * A set of [prefix, uri] pairs that define namespace prefixes
+     */
+    namespaces?: Record<string, string>;
 }): string | undefined;

package/lib/serialize.js

@@ -32,7 +32,7 @@ kb, base,
  * Defaults to Turtle.
  */
 contentType, callback, options) {
-  base = base || target.value;
+  base = base || (target === null || target === void 0 ? void 0 : target.value);
   var opts = options || {};
   contentType = contentType || _types.TurtleContentType; // text/n3 if complex?
 
@@ -42,8 +42,17 @@ contentType, callback, options) {
     var sz = (0, _serializer.default)(kb);
     if (opts.flags) sz.setFlags(opts.flags);
     var newSts = kb.statementsMatching(undefined, undefined, undefined, target);
-    var n3String;
-    sz.suggestNamespaces(kb.namespaces);
+    var n3String; // If an IndexedFormula, use the namespaces from the given graph as suggestions
+
+    if ('namespaces' in kb) {
+      sz.suggestNamespaces(kb.namespaces);
+    } // use the provided options.namespaces are mandatory prefixes
+
+
+    if (opts.namespaces) {
+      sz.setNamespaces(opts.namespaces);
+    }
+
     sz.setBase(base);
 
     switch (contentType) {

package/lib/serializer.d.ts

@@ -25,6 +25,19 @@ export class Serializer {
     setFlags(flags: any): Serializer;
     toStr(x: any): any;
     fromStr(s: any): any;
+    /**
+     * Defines a set of [prefix, namespace] pairs to be uised by this Serializer instance.
+     * Overrides previous prefixes if any
+     * @param namespaces
+     * @return {Serializer}
+     */
+    setNamespaces(namespaces: any): Serializer;
+    /**
+     * Defines a namespace prefix, overriding any existing prefix for that URI
+     * @param prefix
+     * @param uri
+     */
+    setPrefix(prefix: any, uri: any): void;
     suggestPrefix(prefix: any, uri: any): void;
     suggestNamespaces(namespaces: any): Serializer;
     checkIntegrity(): void;

package/lib/serializer.js

@@ -122,6 +122,50 @@ var Serializer = /*#__PURE__*/function () {
 
       return this.store.fromNT(s);
     }
+    /**
+     * Defines a set of [prefix, namespace] pairs to be uised by this Serializer instance.
+     * Overrides previous prefixes if any
+     * @param namespaces
+     * @return {Serializer}
+     */
+
+  }, {
+    key: "setNamespaces",
+    value: function setNamespaces(namespaces) {
+      for (var px in namespaces) {
+        this.setPrefix(px, namespaces[px]);
+      }
+
+      return this;
+    }
+    /**
+     * Defines a namespace prefix, overriding any existing prefix for that URI
+     * @param prefix
+     * @param uri
+     */
+
+  }, {
+    key: "setPrefix",
+    value: function setPrefix(prefix, uri) {
+      if (prefix.slice(0, 7) === 'default') return; // Try to weed these out
+
+      if (prefix.slice(0, 2) === 'ns') return; //  From others inferior algos
+
+      if (!prefix || !uri) return; // empty strings not suitable
+      // remove any existing prefix targeting this uri
+      // for (let existingPrefix in this.namespaces) {
+      //   if (this.namespaces[existingPrefix] == uri)
+      //     delete this.namespaces[existingPrefix];
+      // }
+      // remove any existing mapping for this prefix
+
+      for (var existingNs in this.prefixes) {
+        if (this.prefixes[existingNs] == prefix) delete this.prefixes[existingNs];
+      }
+
+      this.prefixes[uri] = prefix;
+      this.namespaces[prefix] = uri;
+    }
     /* Accumulate Namespaces
     **
     ** These are only hints.  If two overlap, only one gets used
@@ -405,13 +449,13 @@ var Serializer = /*#__PURE__*/function () {
 
         for (var i = 0; i < tree.length; i++) {
           var branch = tree[i];
-          var s2 = typeof branch === 'string' ? branch : treeToLine(branch); // Note the space before the dot in case statement ends 123. which is in fact allowed but be conservative.
+          var s2 = typeof branch === 'string' ? branch : treeToLine(branch); // Note the space before the dot in case statement ends with 123 or colon. which is in fact allowed but be conservative.
 
           if (i !== 0) {
             var ch = str.slice(-1) || ' ';
 
             if (s2 === ',' || s2 === ';') {// no gap
-            } else if (s2 === '.' && !'0123456789.'.includes(ch)) {// no gap except after number
+            } else if (s2 === '.' && !'0123456789.:'.includes(ch)) {// no gap except after number and colon
               // no gap
             } else {
               str += ' '; // separate from previous token
@@ -454,7 +498,14 @@ var Serializer = /*#__PURE__*/function () {
           if (typeof branch === 'string') {
             if (branch.length === 1 && str.slice(-1) === '\n') {
               if (',.;'.indexOf(branch) >= 0) {
-                str = str.slice(0, -1) + branch + '\n'; //  slip punct'n on end
+                str = str.slice(0, -1); // be conservative and ensure a whitespace between some chars and a final dot, as in treeToLine above
+
+                if (branch == '.' && '0123456789.:'.includes(str.charAt(str.length - 1))) {
+                  str += ' ';
+                  lastLength += 1;
+                }
+
+                str += branch + '\n'; //  slip punct'n on end
 
                 lastLength += 1;
                 continue;

package/lib/store.d.ts

@@ -299,4 +299,5 @@ export default class IndexedFormula extends Formula {
      * @param term
      */
     uris(term: Quad_Subject): string[];
+    serialize(base: any, contentType: any, provenance: any, options?: any): string | undefined;
 }

package/lib/store.js

@@ -51,12 +51,18 @@ var _namedNode = _interopRequireDefault(require("./named-node"));
 
 var _index = require("./index");
 
+var _serialize2 = _interopRequireDefault(require("./serialize"));
+
 var _blankNode = _interopRequireDefault(require("./blank-node"));
 
 var _defaultGraph = _interopRequireDefault(require("./default-graph"));
 
 var _literal = _interopRequireDefault(require("./literal"));
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -1159,6 +1165,11 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
 
       if (prefix.slice(0, 2) === 'ns' || prefix.slice(0, 7) === 'default') {
         return;
+      } // remove any prefix that currently targets nsuri
+
+
+      for (var existingPrefix in this.namespaces) {
+        if (this.namespaces[existingPrefix] == nsuri) delete this.namespaces[existingPrefix];
       }
 
       this.namespaces[prefix] = nsuri;
@@ -1291,6 +1302,20 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
 
       return res;
     }
+  }, {
+    key: "serialize",
+    value: function serialize(base, contentType, provenance, options) {
+      var _options;
+
+      // override Formula.serialize to force the serializer namespace prefixes
+      // to those of this IndexedFormula
+      // if namespaces are explicitly passed in options, let them override the existing namespaces in this formula
+      var namespaces = (_options = options) !== null && _options !== void 0 && _options.namespaces ? _objectSpread(_objectSpread({}, this.namespaces), options.namespaces) : _objectSpread({}, this.namespaces);
+      options = _objectSpread(_objectSpread({}, options || {}), {}, {
+        namespaces: namespaces
+      });
+      return (0, _serialize2.default)(provenance, this, base, contentType, undefined, options);
+    }
   }], [{
     key: "defaultGraphURI",
     get: function get() {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.17",
-  "engines": {
-    "node": ">=6.0"
-  },
+  "version": "2.2.18-ce0e0a33",
   "private": false,
+  "browserslist": [
+    "> 0.5%"
+  ],
   "author": {
     "name": "Tim BL",
     "email": "timbl@w3.org"
@@ -44,49 +44,49 @@
   "homepage": "http://github.com/linkeddata/rdflib.js",
   "bugs": "http://github.com/linkeddata/rdflib.js/issues",
   "dependencies": {
-    "@babel/runtime": "^7.16.0",
-    "@xmldom/xmldom": "^0.8.0",
-    "async": "^3.2.2",
-    "cross-fetch": "^3.1.4",
+    "@babel/runtime": "^7.17.8",
+    "@xmldom/xmldom": "^0.8.1",
+    "async": "^3.2.3",
+    "cross-fetch": "^3.1.5",
     "jsonld": "^5.2.0",
-    "n3": "^1.12.2",
+    "n3": "^1.15.0",
     "solid-namespace": "^0.5.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/preset-typescript": "^7.16.0",
-    "@babel/register": "^7.16.0",
-    "@types/chai": "^4.2.22",
+    "@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",
     "@types/dirty-chai": "^2.0.2",
     "@types/express": "^4.17.13",
     "@types/jsonld": "^1.5.6",
-    "@types/mocha": "^9.0.0",
-    "@types/rdf-js": "^4.0.1",
-    "@types/sinon-chai": "^3.2.5",
-    "babel-loader": "^8.2.3",
-    "chai": "^4.3.4",
+    "@types/mocha": "^9.1.0",
+    "@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",
     "dirty-chai": "^2.0.1",
     "eslint": "^7.32.0",
-    "fs-grep": "^0.0.5",
-    "mocha": "^9.1.3",
-    "nock": "^13.1.4",
-    "node-fetch": "^2.6.6",
-    "node-mkdirp": "0.0.1",
-    "rimraf": "^3.0.2",
+    "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": "^12.0.1",
     "sinon-chai": "^3.7.0",
-    "source-map-loader": "^1.1.3",
-    "typedoc": "^0.22.10",
-    "typescript": "^4.4.4",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.4.0",
-    "wrapper-webpack-plugin": "^2.1.0"
+    "source-map-loader": "^3.0.1",
+    "ts-node": "^10.7.0",
+    "typedoc": "^0.22.13",
+    "typescript": "^4.6.2",
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.7.4"
   },
   "scripts": {
     "build": "babel src --extensions \".ts,.js\" -d lib",
@@ -96,7 +96,7 @@
     "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",
     "postversion": "git push --follow-tags",
-    "start": "webpack-dev-server --https --port 4800",
+    "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",
@@ -117,9 +117,9 @@
     "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: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",
-    "test:unit:dev": "mocha --watch --growl --require ./tests/babel-register.js tests/unit/**-test.js",
+    "test:unit": "mocha --growl --loader=ts-node/esm --require  ./tests/babel-register.js tests/unit/**-test.*",
+    "test:unit:egp": "mocha --loader=ts-node/esm --require ./tests/babel-register.js tests/unit/fetcher-egp-test.js",
+    "test:unit:dev": "mocha --watch --growl --loader=ts-node/esm --require ./tests/babel-register.js tests/unit/**-test.js",
     "watch": "babel src --extensions \".ts,.js\" --env-name esm -d esm --watch & babel src --extensions \".ts,.js\" -d lib --watch"
   },
   "files": [

package/src/formula.ts

@@ -5,7 +5,7 @@ import log from './log'
 import RDFlibNamedNode from './named-node'
 import Namespace from './namespace'
 import Node from './node-internal'
-import Serializer from './serialize'
+import serialize from './serialize'
 import Statement from './statement'
 import {
   Bindings,
@@ -721,33 +721,11 @@ export default class Formula extends Node {
    * @param base - The base string
    * @param contentType - The content type of the syntax to use
    * @param provenance - The provenance URI
+   * @param options  - options to pass to the serializer, as defined in serialize method
    */
-  serialize (base, contentType, provenance) {
-    let documentString
-    let sts
-    let sz
-    sz = Serializer(this)
-    sz.suggestNamespaces(this.ns)
-    sz.setBase(base)
-    if (provenance) {
-      sts = this.statementsMatching(void 0, void 0, void 0, provenance)
-    } else {
-      sts = this.statements
-    }
-    switch (
-    contentType != null ? contentType : 'text/n3') {
-      case 'application/rdf+xml':
-        documentString = sz.statementsToXML(sts)
-        break
-      case 'text/n3':
-      case 'text/turtle':
-        documentString = sz.statementsToN3(sts)
-        break
-      default:
-        throw new Error('serialize: Content-type ' + contentType +
-          ' not supported.')
-    }
-    return documentString
+  serialize (base, contentType, provenance, options?) {
+    // delegate the graph serialization to the implementation in ./serialize
+    return serialize(provenance, this, base, contentType, undefined, options);
   }
 
   /**

package/src/index.ts

@@ -120,6 +120,9 @@ export {
 export { termValue } from './utils/termValue'
 
 export class ConnectedStore extends Store {
+
+  fetcher: Fetcher;
+
   constructor (features) {
     super(features)
     this.fetcher = new Fetcher(this, {})
@@ -127,6 +130,9 @@ export class ConnectedStore extends Store {
 }
 
 export class  LiveStore extends ConnectedStore {
+
+  updater: UpdateManager;
+  
   constructor (features) {
     super(features)
     this.updater = new UpdateManager(this)

package/src/jsonldparser.js

@@ -73,23 +73,8 @@ export default function jsonldParser (str, kb, base, callback) {
   return jsonld
     .flatten(JSON.parse(str), null, { base: baseString })
     .then((flattened) => flattened.reduce((store, flatResource) => {
-      const id = flatResource['@id']
-        ? kb.rdfFactory.namedNode(flatResource['@id'])
-        : kb.rdfFactory.blankNode()
-
-      for (const property of Object.keys(flatResource)) {
-        if (property === '@id') {
-          continue
-        }
-        const value = flatResource[property]
-        if (Array.isArray(value)) {
-          for (let i = 0; i < value.length; i++) {
-            kb.addStatement(createStatement(kb, id, property, value[i], base))
-          }
-        } else {
-          kb.addStatement(createStatement(kb, id, property, value, base))
-        }
-      }
+
+      kb = processResource(kb, base, flatResource)
 
       return kb
     }, kb))
@@ -97,6 +82,41 @@ export default function jsonldParser (str, kb, base, callback) {
     .catch(callback)
 }
 
+
+function processResource(kb, base, flatResource) {
+  const id = flatResource['@id']
+    ? kb.rdfFactory.namedNode(flatResource['@id'])
+    : kb.rdfFactory.blankNode()
+
+  for (const property of Object.keys(flatResource)) {
+    if (property === '@id') {
+      continue
+    } else if (property == '@graph') {
+      // the JSON-LD flattened structure may contain nested graphs
+      // the id value for this object is the new base (named graph id) for all nested flat resources
+      const graphId = id
+      // this is an array of resources
+      const nestedFlatResources = flatResource[property]
+
+      // recursively process all flat resources in the array, but with the graphId as base.
+      for (let i = 0; i < nestedFlatResources.length; i++ ) {
+        kb = processResource(kb, graphId, nestedFlatResources[i])
+      }
+    }
+
+    const value = flatResource[property]
+    if (Array.isArray(value)) {
+      for (let i = 0; i < value.length; i++) {
+        kb.addStatement(createStatement(kb, id, property, value[i], base))
+      }
+    } else {
+      kb.addStatement(createStatement(kb, id, property, value, base))
+    }
+  }
+
+  return kb
+}
+
 /**
  * Create statement quad depending on @type being a type node
  * @param kb
@@ -107,6 +127,7 @@ export default function jsonldParser (str, kb, base, callback) {
  */
 function createStatement(kb, id, property, value, base) {
   let predicate, object
+
   if (property === "@type") {
     predicate = kb.rdfFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
     object = kb.rdfFactory.namedNode(value)

package/src/rdfxmlparser.js

@@ -198,7 +198,7 @@ export default class RDFParser {
 
   /**
    * Build our initial scope frame and parse the DOM into triples
-   * @param {DOMTree} document The DOM to parse
+   * @param {HTMLDocument} document The DOM to parse
    * @param {String} base The base URL to use
    * @param {Object} why The context to which this resource belongs
    */