rdflib 2.4.0 → 2.4.1

package/esm/fetcher.js

@@ -674,16 +674,42 @@ export default class Fetcher {
     // if metadata flaged clear cache and removeDocument
     const meta = this.appNode;
     const kb = this.store;
-    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), meta).map(st => st.subject);
+    // The recorded URI is stored as a string literal, not as a node (see
+    // saveRequestMetadata and linkeddata/rdflib.js#427): matching it with
+    // kb.sym() never found the request, so a flagged document was answered from
+    // the cache instead of being refetched (#870).
+    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.rdfFactory.literal(docuri), meta).map(st => st.subject);
+    let answered = false;
+    let usableAnswer = false;
     for (const request of requests) {
       const response = kb.any(request, this.ns.link('response'), null, meta);
-      if (response != undefined) {
-        // ts
-        const quad = kb.statementsMatching(response, this.ns.link('outOfDate'), true, meta);
-        kb.remove(quad);
-        options.force = true;
-        options.clearPreviousData = true;
+      // any() returns null (never undefined) when nothing matches: keep the
+      // loose check so a request that has no recorded answer yet is not
+      // counted as answered.
+      if (response == null) {
+        continue;
       }
+      answered = true;
+      // Every recorded answer that is flagged out-of-date is unusable: the
+      // answer of a previous identity/authorization (flagAuthorizationMetadata).
+      // Read the mark with anyJS, as update-manager.editable does: it is stored
+      // as an xsd:boolean literal and the object position has to stay a
+      // wildcard - any() returns null when all four positions are given, even
+      // when the statement exists.
+      const outOfDate = kb.anyJS(response, this.ns.link('outOfDate'), null, meta);
+      if (!outOfDate) {
+        usableAnswer = true;
+        break;
+      }
+    }
+    if (answered && !usableAnswer) {
+      // Refetch instead of answering from the cache, and keep the marks: an
+      // answer of the previous authorization stays excluded, so it cannot win
+      // over the fresh one — and if the refetch fails the state stays
+      // "unknown" instead of becoming definitive again. Once a fresh answer is
+      // recorded the loop above finds it and later loads are cache hits again.
+      options.force = true;
+      options.clearPreviousData = true;
     }
     const initialisedOptions = this.initFetchOptions(docuri, options);
     return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions);

package/esm/index.js

@@ -5,7 +5,6 @@ import Empty from './empty';
 import Fetcher from './fetcher';
 import Formula from './formula';
 import Store from './store';
-import jsonParser from './jsonparser';
 import Literal from './literal';
 import log from './log';
 import N3Parser from './n3parser';
@@ -56,7 +55,7 @@ const term = Node.fromValue;
 // it exports the _current_ value of nextId, which is always 0
 const NextId = BlankNode.nextId;
 export * from './utils/terms';
-export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula,
+export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula,
 // Alias
 
 NextId, fromNT, fetcher, graph, lit, st, namedNode as sym,

package/esm/parse.js

@@ -7,7 +7,7 @@ import { parseRDFaDOM } from './rdfaparser';
 import RDFParser from './rdfxmlparser';
 import sparqlUpdateParser from './patch-parser';
 import * as Util from './utils-js';
-import { TurtleContentType, N3ContentType, RDFXMLContentType, XHTMLContentType, HTMLContentType, SPARQLUpdateContentType, SPARQLUpdateSingleMatchContentType, JSONLDContentType, NQuadsContentType, NQuadsAltContentType } from './types';
+import { TurtleContentType, N3ContentType, NTriplesContentType, RDFXMLContentType, XHTMLContentType, HTMLContentType, SPARQLUpdateContentType, SPARQLUpdateSingleMatchContentType, JSONLDContentType, NQuadsContentType, NQuadsAltContentType } from './types';
 /**
  * Parse a string and put the result into the graph kb.
  * Normal method is sync.
@@ -23,7 +23,7 @@ export default function parse(str, kb, base, contentType = 'text/turtle', callba
   contentType = contentType || TurtleContentType;
   contentType = contentType.split(';')[0];
   try {
-    if (contentType === N3ContentType || contentType === TurtleContentType) {
+    if (contentType === N3ContentType || contentType === TurtleContentType || contentType === NTriplesContentType) {
       var p = N3Parser(kb, kb, base, base, null, null, '', null);
       p.loadBuf(str);
       executeCallback();
@@ -74,7 +74,8 @@ export default function parse(str, kb, base, contentType = 'text/turtle', callba
     'application/sparql-update-single-match': true,
     'application/ld+json': true,
     'application/nquads': true,
-    'application/n-quads': true
+    'application/n-quads': true,
+    'application/n-triples': true
   };
   function executeCallback() {
     if (callback) {

package/esm/serializer.js

@@ -295,7 +295,7 @@ export class Serializer {
         return self.atomicTermToN3(x);
       }
       var list = x.elements;
-      var rest = kb.sym(rdfns + 'nill');
+      var rest = kb.sym(rdfns + 'nil');
       for (var i = list.length - 1; i >= 0; i--) {
         var bnode = factory.blankNode();
         str += termToNT(bnode) + ' ' + termToNT(kb.sym(rdfns + 'first')) + ' ' + termToNT(list[i]) + '.\n';
@@ -656,7 +656,7 @@ export class Serializer {
       if (canSplit) {
         if (this.defaultNamespace && this.defaultNamespace === namesp && this.flags.indexOf('d') < 0) {
           // d -> suppress default
-          if (this.flags.indexOf('k') >= 0 && this.keyords.indexOf(localid) < 0) {
+          if (this.flags.indexOf('k') >= 0 && this.keywords.indexOf(localid) < 0) {
             return localid;
           }
           return ':' + localid;

package/lib/fetcher.js

@@ -683,16 +683,42 @@ class Fetcher {
     // if metadata flaged clear cache and removeDocument
     const meta = this.appNode;
     const kb = this.store;
-    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), meta).map(st => st.subject);
+    // The recorded URI is stored as a string literal, not as a node (see
+    // saveRequestMetadata and linkeddata/rdflib.js#427): matching it with
+    // kb.sym() never found the request, so a flagged document was answered from
+    // the cache instead of being refetched (#870).
+    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.rdfFactory.literal(docuri), meta).map(st => st.subject);
+    let answered = false;
+    let usableAnswer = false;
     for (const request of requests) {
       const response = kb.any(request, this.ns.link('response'), null, meta);
-      if (response != undefined) {
-        // ts
-        const quad = kb.statementsMatching(response, this.ns.link('outOfDate'), true, meta);
-        kb.remove(quad);
-        options.force = true;
-        options.clearPreviousData = true;
+      // any() returns null (never undefined) when nothing matches: keep the
+      // loose check so a request that has no recorded answer yet is not
+      // counted as answered.
+      if (response == null) {
+        continue;
       }
+      answered = true;
+      // Every recorded answer that is flagged out-of-date is unusable: the
+      // answer of a previous identity/authorization (flagAuthorizationMetadata).
+      // Read the mark with anyJS, as update-manager.editable does: it is stored
+      // as an xsd:boolean literal and the object position has to stay a
+      // wildcard - any() returns null when all four positions are given, even
+      // when the statement exists.
+      const outOfDate = kb.anyJS(response, this.ns.link('outOfDate'), null, meta);
+      if (!outOfDate) {
+        usableAnswer = true;
+        break;
+      }
+    }
+    if (answered && !usableAnswer) {
+      // Refetch instead of answering from the cache, and keep the marks: an
+      // answer of the previous authorization stays excluded, so it cannot win
+      // over the fresh one — and if the refetch fails the state stays
+      // "unknown" instead of becoming definitive again. Once a fresh answer is
+      // recorded the loop above finds it and later loads are cache hits again.
+      options.force = true;
+      options.clearPreviousData = true;
     }
     const initialisedOptions = this.initFetchOptions(docuri, options);
     return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions);

package/lib/index.d.ts

@@ -4,7 +4,6 @@ import Empty from './empty';
 import Fetcher from './fetcher';
 import Formula from './formula';
 import Store from './store';
-import jsonParser from './jsonparser';
 import Literal from './literal';
 import log from './log';
 import N3Parser from './n3parser';
@@ -34,7 +33,7 @@ declare const term: <T extends import("./types").FromValueReturns>(value: import
 declare const NextId: number;
 export * from './utils/terms';
 export type { AutoInitOptions, ExtendedResponse, FetchError } from './fetcher';
-export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula, // Alias
+export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula, // Alias
 NextId, fromNT, fetcher, graph, lit, st, namedNode as sym, blankNode, defaultGraph, literal, namedNode, quad, triple, variable, };
 export { termValue } from './utils/termValue';
 export declare class ConnectedStore extends Store {

package/lib/index.js

@@ -29,7 +29,6 @@ var _exportNames = {
   Formula: true,
   Store: true,
   IndexedFormula: true,
-  jsonParser: true,
   Literal: true,
   log: true,
   N3Parser: true,
@@ -197,14 +196,7 @@ Object.defineProperty(exports, "Variable", {
     return _variable.default;
   }
 });
-exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.blankNode = void 0;
-Object.defineProperty(exports, "jsonParser", {
-  enumerable: true,
-  get: function () {
-    return _jsonparser.default;
-  }
-});
-exports.literal = exports.lit = void 0;
+exports.literal = exports.lit = exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.blankNode = void 0;
 Object.defineProperty(exports, "log", {
   enumerable: true,
   get: function () {
@@ -252,7 +244,6 @@ var _empty = _interopRequireDefault(require("./empty"));
 var _fetcher = _interopRequireDefault(require("./fetcher"));
 var _formula = _interopRequireDefault(require("./formula"));
 var _store = _interopRequireDefault(require("./store"));
-var _jsonparser = _interopRequireDefault(require("./jsonparser"));
 var _literal = _interopRequireDefault(require("./literal"));
 var _log = _interopRequireDefault(require("./log"));
 var _n3parser = _interopRequireDefault(require("./n3parser"));

package/lib/parse.js

@@ -33,7 +33,7 @@ function parse(str, kb, base, contentType = 'text/turtle', callback) {
   contentType = contentType || _types.TurtleContentType;
   contentType = contentType.split(';')[0];
   try {
-    if (contentType === _types.N3ContentType || contentType === _types.TurtleContentType) {
+    if (contentType === _types.N3ContentType || contentType === _types.TurtleContentType || contentType === _types.NTriplesContentType) {
       var p = (0, _n3parser.default)(kb, kb, base, base, null, null, '', null);
       p.loadBuf(str);
       executeCallback();
@@ -84,7 +84,8 @@ function parse(str, kb, base, contentType = 'text/turtle', callback) {
     'application/sparql-update-single-match': true,
     'application/ld+json': true,
     'application/nquads': true,
-    'application/n-quads': true
+    'application/n-quads': true,
+    'application/n-triples': true
   };
   function executeCallback() {
     if (callback) {

package/lib/serialize.d.ts

@@ -6,7 +6,7 @@ import { BlankNode, NamedNode } from './tf-types';
  */
 export default function serialize(
 /** The graph or nodes that should be serialized */
-target: Formula | NamedNode | BlankNode | null, 
+target: Formula | NamedNode | BlankNode | null | undefined, 
 /** The store */
 kb: Formula, base?: unknown, 
 /**

package/lib/serializer.js

@@ -305,7 +305,7 @@ class Serializer {
         return self.atomicTermToN3(x);
       }
       var list = x.elements;
-      var rest = kb.sym(rdfns + 'nill');
+      var rest = kb.sym(rdfns + 'nil');
       for (var i = list.length - 1; i >= 0; i--) {
         var bnode = factory.blankNode();
         str += termToNT(bnode) + ' ' + termToNT(kb.sym(rdfns + 'first')) + ' ' + termToNT(list[i]) + '.\n';
@@ -666,7 +666,7 @@ class Serializer {
       if (canSplit) {
         if (this.defaultNamespace && this.defaultNamespace === namesp && this.flags.indexOf('d') < 0) {
           // d -> suppress default
-          if (this.flags.indexOf('k') >= 0 && this.keyords.indexOf(localid) < 0) {
+          if (this.flags.indexOf('k') >= 0 && this.keywords.indexOf(localid) < 0) {
             return localid;
           }
           return ':' + localid;

package/lib/types.d.ts

@@ -36,7 +36,7 @@ export declare const XHTMLContentType: "application/xhtml+xml";
 /**
  * A valid mime type header
  */
-export type ContentType = typeof RDFXMLContentType | typeof HTMLContentType | typeof JSONLDContentType | typeof N3ContentType | typeof N3LegacyContentType | typeof NQuadsAltContentType | typeof NQuadsContentType | typeof SPARQLUpdateContentType | typeof SPARQLUpdateSingleMatchContentType | typeof TurtleContentType | typeof TurtleLegacyContentType | typeof XHTMLContentType;
+export type ContentType = typeof RDFXMLContentType | typeof HTMLContentType | typeof JSONLDContentType | typeof N3ContentType | typeof N3LegacyContentType | typeof NQuadsAltContentType | typeof NQuadsContentType | typeof NTriplesContentType | typeof SPARQLUpdateContentType | typeof SPARQLUpdateSingleMatchContentType | typeof TurtleContentType | typeof TurtleLegacyContentType | typeof XHTMLContentType;
 /** A type for values that serves as inputs */
 export type ValueType = Term | Node | Date | string | number | boolean | undefined | null | Collection;
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -51,8 +51,6 @@
     "cross-fetch": "^4.1.0",
     "jsonld": "^9.0.0",
     "n3": "^2.0.3",
-    "package-lock.json": "^1.0.0",
-    "package.json": "^2.0.1",
     "solid-namespace": "^0.5.4"
   },
   "devDependencies": {
@@ -101,6 +99,7 @@
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
     "lint": "eslint src tests",
     "lint:fix": "eslint src tests --fix",
+    "prepare": "npm run build",
     "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
     "postversion": "case \"$npm_package_version\" in *-*) git push ;; *) git push --follow-tags ;; esac",
     "start": "webpack serve --port 4800",

package/src/fetcher.ts

@@ -979,15 +979,42 @@ export default class Fetcher implements CallbackifyInterface {
     // if metadata flaged clear cache and removeDocument
     const meta = this.appNode
     const kb = this.store
-    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), meta).map(st => st.subject)
+    // The recorded URI is stored as a string literal, not as a node (see
+    // saveRequestMetadata and linkeddata/rdflib.js#427): matching it with
+    // kb.sym() never found the request, so a flagged document was answered from
+    // the cache instead of being refetched (#870).
+    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.rdfFactory.literal(docuri), meta).map(st => st.subject)
+    let answered = false
+    let usableAnswer = false
     for (const request of requests) {
       const response = kb.any(request, this.ns.link('response'), null, meta) as Quad_Subject
-      if (response != undefined) { // ts
-        const quad = kb.statementsMatching(response, this.ns.link('outOfDate'), true as any, meta)
-        kb.remove(quad)
-        options.force = true
-        options.clearPreviousData = true
+      // any() returns null (never undefined) when nothing matches: keep the
+      // loose check so a request that has no recorded answer yet is not
+      // counted as answered.
+      if (response == null) {
+        continue
       }
+      answered = true
+      // Every recorded answer that is flagged out-of-date is unusable: the
+      // answer of a previous identity/authorization (flagAuthorizationMetadata).
+      // Read the mark with anyJS, as update-manager.editable does: it is stored
+      // as an xsd:boolean literal and the object position has to stay a
+      // wildcard - any() returns null when all four positions are given, even
+      // when the statement exists.
+      const outOfDate = kb.anyJS(response, this.ns.link('outOfDate'), null, meta)
+      if (!outOfDate) {
+        usableAnswer = true
+        break
+      }
+    }
+    if (answered && !usableAnswer) {
+      // Refetch instead of answering from the cache, and keep the marks: an
+      // answer of the previous authorization stays excluded, so it cannot win
+      // over the fresh one — and if the refetch fails the state stays
+      // "unknown" instead of becoming definitive again. Once a fresh answer is
+      // recorded the loop above finds it and later loads are cache hits again.
+      options.force = true
+      options.clearPreviousData = true
     }
 
     const initialisedOptions = this.initFetchOptions(docuri, options)

package/src/index.ts

@@ -6,7 +6,6 @@ import Empty from './empty'
 import Fetcher from './fetcher'
 import Formula from './formula'
 import Store from './store'
-import jsonParser from './jsonparser'
 import Literal from './literal'
 import log from './log'
 import N3Parser from './n3parser'
@@ -70,7 +69,6 @@ export {
   Fetcher,
   Formula,
   Store,
-  jsonParser,
   Literal,
   log,
   N3Parser,

package/src/parse.ts

@@ -8,7 +8,7 @@ import RDFParser from './rdfxmlparser'
 import sparqlUpdateParser from './patch-parser'
 import * as Util from './utils-js'
 import Formula from './formula'
-import { ContentType, TurtleContentType, N3ContentType, RDFXMLContentType, XHTMLContentType, HTMLContentType, SPARQLUpdateContentType, SPARQLUpdateSingleMatchContentType, JSONLDContentType, NQuadsContentType, NQuadsAltContentType } from './types'
+import { ContentType, TurtleContentType, N3ContentType, NTriplesContentType, RDFXMLContentType, XHTMLContentType, HTMLContentType, SPARQLUpdateContentType, SPARQLUpdateSingleMatchContentType, JSONLDContentType, NQuadsContentType, NQuadsAltContentType } from './types'
 import { Quad } from './tf-types'
 import type { Document as XmldomDocument } from '@xmldom/xmldom'
 
@@ -35,7 +35,7 @@ export default function parse (
   contentType = contentType || TurtleContentType
   contentType = contentType.split(';')[0] as ContentType
   try {
-    if (contentType === N3ContentType || contentType === TurtleContentType) {
+    if (contentType === N3ContentType || contentType === TurtleContentType || contentType === NTriplesContentType) {
       var p = N3Parser(kb, kb, base, base, null, null, '', null)
       p.loadBuf(str)
       executeCallback()
@@ -83,7 +83,8 @@ export default function parse (
     'application/sparql-update-single-match': true,
     'application/ld+json': true,
     'application/nquads' : true,
-    'application/n-quads' : true
+    'application/n-quads' : true,
+    'application/n-triples' : true
   }
 
   function executeCallback () {

package/src/serialize.ts

@@ -20,7 +20,7 @@ import { BlankNode, NamedNode } from './tf-types'
  */
 export default function serialize (
   /** The graph or nodes that should be serialized */
-  target: Formula | NamedNode | BlankNode | null,
+  target: Formula | NamedNode | BlankNode | null | undefined,
   /** The store */
   kb: Formula,
   base?: unknown,

package/src/serializer.js

@@ -306,7 +306,7 @@ export class Serializer {
         return self.atomicTermToN3(x)
       }
       var list = x.elements
-      var rest = kb.sym(rdfns + 'nill')
+      var rest = kb.sym(rdfns + 'nil')
       for (var i = list.length - 1; i >= 0; i--) {
         var bnode = factory.blankNode()
         str += termToNT(bnode) + ' ' + termToNT(kb.sym(rdfns + 'first')) + ' ' + termToNT(list[i]) + '.\n'
@@ -679,7 +679,7 @@ export class Serializer {
         if (this.defaultNamespace && this.defaultNamespace === namesp &&
             this.flags.indexOf('d') < 0) { // d -> suppress default
           if (this.flags.indexOf('k') >= 0 &&
-            this.keyords.indexOf(localid) < 0) {
+            this.keywords.indexOf(localid) < 0) {
             return localid
           }
           return ':' + localid

package/src/types.ts

@@ -55,6 +55,7 @@ export type ContentType = typeof RDFXMLContentType
   | typeof N3LegacyContentType
   | typeof NQuadsAltContentType
   | typeof NQuadsContentType
+  | typeof NTriplesContentType
   | typeof SPARQLUpdateContentType
   | typeof SPARQLUpdateSingleMatchContentType
   | typeof TurtleContentType

package/esm/jsonparser.js

@@ -1,53 +0,0 @@
-export default (function () {
-  return {
-    parseJSON: function (data, source, store) {
-      var subject, predicate, object;
-      var bnodes = {};
-      var why = store.sym(source);
-      for (var x in data) {
-        if (x.indexOf('_:') === 0) {
-          if (bnodes[x]) {
-            subject = bnodes[x];
-          } else {
-            subject = store.bnode(x);
-            bnodes[x] = subject;
-          }
-        } else {
-          subject = store.sym(x);
-        }
-        var preds = data[x];
-        for (var y in preds) {
-          var objects = preds[y];
-          predicate = store.sym(y);
-          for (var z in objects) {
-            var obj = objects[z];
-            if (obj.type === 'uri') {
-              object = store.sym(obj.value);
-              store.add(subject, predicate, object, why);
-            } else if (obj.type === 'BlankNode') {
-              if (bnodes[obj.value]) {
-                object = bnodes[obj.value];
-              } else {
-                object = store.bnode(obj.value);
-                bnodes[obj.value] = object;
-              }
-              store.add(subject, predicate, object, why);
-            } else if (obj.type === 'Literal') {
-              // var datatype
-              if (obj.datatype) {
-                object = store.literal(obj.value, undefined, store.sym(obj.datatype));
-              } else if (obj.lang) {
-                object = store.literal(obj.value, obj.lang);
-              } else {
-                object = store.literal(obj.value);
-              }
-              store.add(subject, predicate, object, why);
-            } else {
-              throw new Error('error: unexpected termtype: ' + z.type);
-            }
-          }
-        }
-      }
-    }
-  };
-})();

package/lib/jsonparser.d.ts

@@ -1,4 +0,0 @@
-declare namespace _default {
-    function parseJSON(data: any, source: any, store: any): void;
-}
-export default _default;

package/lib/jsonparser.js

@@ -1,59 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = exports.default = function () {
-  return {
-    parseJSON: function (data, source, store) {
-      var subject, predicate, object;
-      var bnodes = {};
-      var why = store.sym(source);
-      for (var x in data) {
-        if (x.indexOf('_:') === 0) {
-          if (bnodes[x]) {
-            subject = bnodes[x];
-          } else {
-            subject = store.bnode(x);
-            bnodes[x] = subject;
-          }
-        } else {
-          subject = store.sym(x);
-        }
-        var preds = data[x];
-        for (var y in preds) {
-          var objects = preds[y];
-          predicate = store.sym(y);
-          for (var z in objects) {
-            var obj = objects[z];
-            if (obj.type === 'uri') {
-              object = store.sym(obj.value);
-              store.add(subject, predicate, object, why);
-            } else if (obj.type === 'BlankNode') {
-              if (bnodes[obj.value]) {
-                object = bnodes[obj.value];
-              } else {
-                object = store.bnode(obj.value);
-                bnodes[obj.value] = object;
-              }
-              store.add(subject, predicate, object, why);
-            } else if (obj.type === 'Literal') {
-              // var datatype
-              if (obj.datatype) {
-                object = store.literal(obj.value, undefined, store.sym(obj.datatype));
-              } else if (obj.lang) {
-                object = store.literal(obj.value, obj.lang);
-              } else {
-                object = store.literal(obj.value);
-              }
-              store.add(subject, predicate, object, why);
-            } else {
-              throw new Error('error: unexpected termtype: ' + z.type);
-            }
-          }
-        }
-      }
-    }
-  };
-}();

package/src/jsonparser.js

@@ -1,53 +0,0 @@
-export default (function () {
-  return {
-    parseJSON: function (data, source, store) {
-      var subject, predicate, object
-      var bnodes = {}
-      var why = store.sym(source)
-      for (var x in data) {
-        if (x.indexOf('_:') === 0) {
-          if (bnodes[x]) {
-            subject = bnodes[x]
-          } else {
-            subject = store.bnode(x)
-            bnodes[x] = subject
-          }
-        } else {
-          subject = store.sym(x)
-        }
-        var preds = data[x]
-        for (var y in preds) {
-          var objects = preds[y]
-          predicate = store.sym(y)
-          for (var z in objects) {
-            var obj = objects[z]
-            if (obj.type === 'uri') {
-              object = store.sym(obj.value)
-              store.add(subject, predicate, object, why)
-            } else if (obj.type === 'BlankNode') {
-              if (bnodes[obj.value]) {
-                object = bnodes[obj.value]
-              } else {
-                object = store.bnode(obj.value)
-                bnodes[obj.value] = object
-              }
-              store.add(subject, predicate, object, why)
-            } else if (obj.type === 'Literal') {
-              // var datatype
-              if (obj.datatype) {
-                object = store.literal(obj.value, undefined, store.sym(obj.datatype))
-              } else if (obj.lang) {
-                object = store.literal(obj.value, obj.lang)
-              } else {
-                object = store.literal(obj.value)
-              }
-              store.add(subject, predicate, object, why)
-            } else {
-              throw new Error('error: unexpected termtype: ' + z.type)
-            }
-          }
-        }
-      }
-    }
-  }
-})()