rdflib 2.2.21 → 2.2.22-0de51c50

package/lib/rdfxmlparser.js

@@ -1,26 +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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var uriUtil = _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; }
-
 /**
  *  RDF/XML PARSER
  *
@@ -72,7 +63,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * associated documentation will at all times remain with copyright
  * holders.
  */
-
 /**
  * @class RDFParser resource object tied to an RDFStore
  *
@@ -86,24 +76,17 @@ var RDFParser = /*#__PURE__*/function () {
    */
   function RDFParser(store) {
     (0, _classCallCheck2.default)(this, RDFParser);
-
     /** Our triple store reference @private */
-    this.store = store;
-    /** Our identified blank nodes @private */
-
-    this.bnodes = {};
-    /** A context for context-aware stores @private */
-
-    this.why = null;
-    /** Reification flag */
 
+    this.store = store; /** Our identified blank nodes @private */
+    this.bnodes = {}; /** A context for context-aware stores @private */
+    this.why = null; /** Reification flag */
     this.reify = false;
   }
+
   /** Standard namespaces that we know how to handle @final
    *  @member RDFParser
    */
-
-
   (0, _createClass2.default)(RDFParser, [{
     key: "frameFactory",
     value:
@@ -114,6 +97,7 @@ var RDFParser = /*#__PURE__*/function () {
      *
      * @private
      */
+
     function frameFactory(parser, parent, element) {
       return {
         'NODE': 1,
@@ -131,29 +115,23 @@ var RDFParser = /*#__PURE__*/function () {
         'rdfid': null,
         'datatype': null,
         'collection': false,
-
         /** Terminate the frame and notify the store that we're done */
         'terminateFrame': function terminateFrame() {
           if (this.collection) {
             this.node.close();
           }
         },
-
-        /** Add a symbol of a certain type to the this frame */
-        'addSymbol': function addSymbol(type, uri) {
+        /** Add a symbol of a certain type to the this frame */'addSymbol': function addSymbol(type, uri) {
           uri = uriUtil.join(uri, this.base);
           this.node = this.store.sym(uri);
           this.nodeType = type;
         },
-
-        /** Load any constructed triples into the store */
-        'loadTriple': function loadTriple() {
+        /** Load any constructed triples into the store */'loadTriple': function loadTriple() {
           if (this.parent.parent.collection) {
             this.parent.parent.node.append(this.node);
           } else {
             this.store.add(this.parent.parent.node, this.parent.node, this.node, this.parser.why);
           }
-
           if (this.parent.rdfid != null) {
             // reify
             var triple = this.store.sym(uriUtil.join('#' + this.parent.rdfid, this.base));
@@ -163,39 +141,27 @@ var RDFParser = /*#__PURE__*/function () {
             this.store.add(triple, this.store.sym(RDFParser.ns.RDF + 'object'), this.node, this.parser.why);
           }
         },
-
-        /** Check if it's OK to load a triple */
-        'isTripleToLoad': function isTripleToLoad() {
+        /** Check if it's OK to load a triple */'isTripleToLoad': function isTripleToLoad() {
           return this.parent != null && this.parent.parent != null && this.nodeType === this.NODE && this.parent.nodeType === this.ARC && this.parent.parent.nodeType === this.NODE;
         },
-
-        /** Add a symbolic node to this frame */
-        'addNode': function addNode(uri) {
+        /** Add a symbolic node to this frame */'addNode': function addNode(uri) {
           this.addSymbol(this.NODE, uri);
-
           if (this.isTripleToLoad()) {
             this.loadTriple();
           }
         },
-
-        /** Add a collection node to this frame */
-        'addCollection': function addCollection() {
+        /** Add a collection node to this frame */'addCollection': function addCollection() {
           this.nodeType = this.NODE;
           this.node = this.store.collection();
           this.collection = true;
-
           if (this.isTripleToLoad()) {
             this.loadTriple();
           }
         },
-
-        /** Add a collection arc to this frame */
-        'addCollectionArc': function addCollectionArc() {
+        /** Add a collection arc to this frame */'addCollectionArc': function addCollectionArc() {
           this.nodeType = this.ARC;
         },
-
-        /** Add a bnode to this frame */
-        'addBNode': function addBNode(id) {
+        /** Add a bnode to this frame */'addBNode': function addBNode(id) {
           if (id != null) {
             if (this.parser.bnodes[id] != null) {
               this.node = this.parser.bnodes[id];
@@ -205,58 +171,46 @@ var RDFParser = /*#__PURE__*/function () {
           } else {
             this.node = this.store.bnode();
           }
-
           this.nodeType = this.NODE;
-
           if (this.isTripleToLoad()) {
             this.loadTriple();
           }
         },
-
-        /** Add an arc or property to this frame */
-        'addArc': function addArc(uri) {
+        /** Add an arc or property to this frame */'addArc': function addArc(uri) {
           if (uri === RDFParser.ns.RDF + 'li') {
             uri = RDFParser.ns.RDF + '_' + this.parent.listIndex;
             this.parent.listIndex++;
           }
-
           this.addSymbol(this.ARC, uri);
         },
-
-        /** Add a literal to this frame */
-        'addLiteral': function addLiteral(value) {
+        /** Add a literal to this frame */'addLiteral': function addLiteral(value) {
           if (this.parent.datatype && this.parent.datatype !== RDFParser.ns.RDF + 'langString') {
             this.node = this.store.literal(value, this.store.sym(this.parent.datatype));
           } else {
             this.node = this.store.literal(value, this.lang);
           }
-
           this.nodeType = this.NODE;
-
           if (this.isTripleToLoad()) {
             this.loadTriple();
           }
         }
       };
-    } // from the OpenLayers source .. needed to get around IE problems.
+    }
 
+    // from the OpenLayers source .. needed to get around IE problems.
   }, {
     key: "getAttributeNodeNS",
     value: function getAttributeNodeNS(node, uri, name) {
       var attributeNode = null;
-
       if (node.getAttributeNodeNS) {
         attributeNode = node.getAttributeNodeNS(uri, name);
       } else {
         var attributes = node.attributes;
         var potentialNode, fullName;
-
         for (var i = 0; i < attributes.length; ++i) {
           potentialNode = attributes[i];
-
           if (potentialNode.namespaceURI === uri) {
             fullName = potentialNode.prefix ? potentialNode.prefix + ':' + name : name;
-
             if (fullName === potentialNode.nodeName) {
               attributeNode = potentialNode;
               break;
@@ -264,25 +218,21 @@ var RDFParser = /*#__PURE__*/function () {
           }
         }
       }
-
       return attributeNode;
     }
+
     /**
      * Build our initial scope frame and parse the DOM into triples
      * @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
      */
-
   }, {
     key: "parse",
     value: function parse(document, base, why) {
       var children = document.childNodes; // clean up for the next run
-
       this.cleanParser(); // figure out the root element
-
       var root;
-
       if (document.nodeType === RDFParser.nodeType.DOCUMENT) {
         for (var c = 0; c < children.length; c++) {
           if (children[c].nodeType === RDFParser.nodeType.ELEMENT) {
@@ -293,16 +243,15 @@ var RDFParser = /*#__PURE__*/function () {
       } else if (document.nodeType === RDFParser.nodeType.ELEMENT) {
         root = document;
       } else {
-        throw new Error("RDFParser: can't find root in " + base + '. Halting. '); // return false
+        throw new Error("RDFParser: can't find root in " + base + '. Halting. ');
+        // return false
       }
 
       this.why = why; // our topmost frame
-
       var f = this.frameFactory(this);
       this.base = base;
       f.base = base;
       f.lang = null; // was '' but can't have langs like that 2015 (!)
-
       this.parseDOM(this.buildFrame(f, root));
       return true;
     }
@@ -311,33 +260,25 @@ var RDFParser = /*#__PURE__*/function () {
     value: function parseDOM(frame) {
       // a DOM utility function used in parsing
       var rdfid;
-
       var elementURI = function (el) {
         var result = '';
-
         if (el.namespaceURI == null) {
           throw new Error('RDF/XML syntax error: No namespace for ' + el.localName + ' in ' + this.base);
         }
-
         if (el.namespaceURI) {
           result = result + el.namespaceURI;
         }
-
         if (el.localName) {
           result = result + el.localName;
         } else if (el.nodeName) {
           if (el.nodeName.indexOf(':') >= 0) result = result + el.nodeName.split(':')[1];else result = result + el.nodeName;
         }
-
         return result;
       }.bind(this);
-
       var dig = true; // if we'll dig down in the tree on the next iter
-
       while (frame.parent) {
         var dom = frame.element;
         var attrs = dom.attributes;
-
         if (dom.nodeType === RDFParser.nodeType.TEXT || dom.nodeType === RDFParser.nodeType.CDATA_SECTION) {
           // we have a literal
           if (frame.parent.nodeType === frame.NODE) {
@@ -345,7 +286,6 @@ var RDFParser = /*#__PURE__*/function () {
             frame.addArc(RDFParser.ns.RDF + 'value');
             frame = this.buildFrame(frame);
           }
-
           frame.addLiteral(dom.nodeValue);
         } else if (elementURI(dom) !== RDFParser.ns.RDF + 'RDF') {
           // not root
@@ -355,22 +295,18 @@ var RDFParser = /*#__PURE__*/function () {
             frame = this.buildFrame(frame, frame.element);
             frame.parent.element = null;
           }
-
           if (!frame.parent || !frame.parent.nodeType || frame.parent.nodeType === frame.ARC) {
             // we need a node
             var about = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'about');
             rdfid = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'ID');
-
             if (about && rdfid) {
               throw new Error('RDFParser: ' + dom.nodeName + ' has both rdf:id and rdf:about.' + ' Halting. Only one of these' + ' properties may be specified on a' + ' node.');
             }
-
             if (!about && rdfid) {
               frame.addNode('#' + rdfid.nodeValue);
               dom.removeAttributeNode(rdfid);
             } else if (about == null && rdfid == null) {
               var bnid = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'nodeID');
-
               if (bnid) {
                 frame.addBNode(bnid.nodeValue);
                 dom.removeAttributeNode(bnid);
@@ -380,57 +316,46 @@ var RDFParser = /*#__PURE__*/function () {
             } else {
               frame.addNode(about.nodeValue);
               dom.removeAttributeNode(about);
-            } // Typed nodes
-
-
+            }
+            // Typed nodes
             var rdftype = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'type');
-
             if (RDFParser.ns.RDF + 'Description' !== elementURI(dom)) {
               rdftype = {
                 'nodeValue': elementURI(dom)
               };
             }
-
             if (rdftype != null) {
               this.store.add(frame.node, this.store.sym(RDFParser.ns.RDF + 'type'), this.store.sym(uriUtil.join(rdftype.nodeValue, frame.base)), this.why);
-
               if (rdftype.nodeName) {
                 dom.removeAttributeNode(rdftype);
               }
-            } // Property Attributes
-
-
+            }
+            // Property Attributes
             for (var x = attrs.length - 1; x >= 0; x--) {
               this.store.add(frame.node, this.store.sym(elementURI(attrs[x])), this.store.literal(attrs[x].nodeValue, frame.lang), this.why);
             }
           } else {
             // we should add an arc (or implicit bnode+arc)
             frame.addArc(elementURI(dom)); // save the arc's rdf:ID if it has one
-
             if (this.reify) {
               rdfid = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'ID');
-
               if (rdfid) {
                 frame.rdfid = rdfid.nodeValue;
                 dom.removeAttributeNode(rdfid);
               }
             }
-
             var parsetype = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'parseType');
             var datatype = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'datatype');
-
             if (datatype) {
               frame.datatype = datatype.nodeValue;
               dom.removeAttributeNode(datatype);
             }
-
             if (parsetype) {
               var nv = parsetype.nodeValue;
-
               if (nv === 'Literal') {
                 frame.datatype = RDFParser.ns.RDF + 'XMLLiteral';
-                frame = this.buildFrame(frame); // Don't include the literal node, only its children
-
+                frame = this.buildFrame(frame);
+                // Don't include the literal node, only its children
                 frame.addLiteral(dom.childNodes);
                 dig = false;
               } else if (nv === 'Resource') {
@@ -442,15 +367,12 @@ var RDFParser = /*#__PURE__*/function () {
                 frame.parent.element = null;
                 frame.addCollection();
               }
-
               dom.removeAttributeNode(parsetype);
             }
-
             if (attrs.length !== 0) {
               var resource = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'resource');
               var bnid2 = this.getAttributeNodeNS(dom, RDFParser.ns.RDF, 'nodeID');
               frame = this.buildFrame(frame);
-
               if (resource) {
                 frame.addNode(resource.nodeValue);
                 dom.removeAttributeNode(resource);
@@ -462,11 +384,9 @@ var RDFParser = /*#__PURE__*/function () {
                   frame.addBNode();
                 }
               }
-
               for (var x1 = attrs.length - 1; x1 >= 0; x1--) {
                 var f = this.buildFrame(frame);
                 f.addArc(elementURI(attrs[x1]));
-
                 if (elementURI(attrs[x1]) === RDFParser.ns.RDF + 'type') {
                   this.buildFrame(f).addNode(attrs[x1].nodeValue);
                 } else {
@@ -479,28 +399,19 @@ var RDFParser = /*#__PURE__*/function () {
           }
         } // rdf:RDF
         // dig dug
-
-
         dom = frame.element;
-
         while (frame.parent) {
           var pframe = frame;
-
           while (dom == null) {
             frame = frame.parent;
             dom = frame.element;
           }
-
           var candidate = dom.childNodes && dom.childNodes[frame.lastChild];
-
           if (!candidate || !dig) {
             frame.terminateFrame();
-
             if (!(frame = frame.parent)) {
               break;
             } // done
-
-
             dom = frame.element;
             dig = true;
           } else if (candidate.nodeType !== RDFParser.nodeType.ELEMENT && candidate.nodeType !== RDFParser.nodeType.TEXT && candidate.nodeType !== RDFParser.nodeType.CDATA_SECTION || (candidate.nodeType === RDFParser.nodeType.TEXT || candidate.nodeType === RDFParser.nodeType.CDATA_SECTION) && dom.childNodes.length !== 1) {
@@ -513,74 +424,62 @@ var RDFParser = /*#__PURE__*/function () {
           }
         }
       } // while
-
     }
+
     /**
      * Cleans out state from a previous parse run
      * @private
      */
-
   }, {
     key: "cleanParser",
     value: function cleanParser() {
       this.bnodes = {};
       this.why = null;
     }
+
     /**
      * Builds scope frame
      * @private
      */
-
   }, {
     key: "buildFrame",
     value: function buildFrame(parent, element) {
       var frame = this.frameFactory(this, parent, element);
-
       if (parent) {
         frame.base = parent.base;
         frame.lang = parent.lang;
       }
-
       if (!element || element.nodeType === RDFParser.nodeType.TEXT || element.nodeType === RDFParser.nodeType.CDATA_SECTION) {
         return frame;
       }
-
       var attrs = element.attributes;
       var base = element.getAttributeNode('xml:base');
-
       if (base != null) {
         frame.base = base.nodeValue;
         element.removeAttribute('xml:base');
       }
-
       var lang = element.getAttributeNode('xml:lang');
-
       if (lang != null) {
         frame.lang = lang.nodeValue;
         element.removeAttribute('xml:lang');
-      } // remove all extraneous xml and xmlns attributes
-
-
+      }
+      // remove all extraneous xml and xmlns attributes
       for (var x = attrs.length - 1; x >= 0; x--) {
         if (attrs[x].nodeName.substr(0, 3) === 'xml') {
           if (attrs[x].name.slice(0, 6) === 'xmlns:') {
             var uri = attrs[x].nodeValue; // alert('base for namespac attr:'+this.base)
-
             if (this.base) uri = uriUtil.join(uri, this.base);
             this.store.setPrefixForURI(attrs[x].name.slice(6), uri);
-          } //		alert('rdfparser: xml atribute: '+attrs[x].name) //@@
-
-
+          }
+          //		alert('rdfparser: xml atribute: '+attrs[x].name) //@@
           element.removeAttributeNode(attrs[x]);
         }
       }
-
       return frame;
     }
   }]);
   return RDFParser;
 }();
-
 exports.default = RDFParser;
 (0, _defineProperty2.default)(RDFParser, "ns", {
   'RDF': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',

package/lib/serialize.d.ts

@@ -23,4 +23,4 @@ contentType?: string | ContentType, callback?: (err: Error | undefined | null, r
      * A set of [prefix, uri] pairs that define namespace prefixes
      */
     namespaces?: Record<string, string>;
-}): string | undefined;
+}): string | undefined | Promise<string>;

package/lib/serialize.js

@@ -1,31 +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 = serialize;
-
-var convert = _interopRequireWildcard(require("./convert"));
-
 var _serializer = _interopRequireDefault(require("./serializer"));
-
 var _types = require("./types");
-
-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; }
-
 /**
  * Serialize to the appropriate format
  */
-function serialize(
-/** The graph or nodes that should be serialized */
-target,
-/** The store */
+function serialize( /** The graph or nodes that should be serialized */
+target, /** The store */
 kb, base,
 /**
  * The mime type.
@@ -35,69 +21,49 @@ contentType, callback, options) {
   base = base || (target === null || target === void 0 ? void 0 : target.value);
   var opts = options || {};
   contentType = contentType || _types.TurtleContentType; // text/n3 if complex?
-
   var documentString = undefined;
-
   try {
     var sz = (0, _serializer.default)(kb);
     if (opts.flags) sz.setFlags(opts.flags);
     var newSts = kb.statementsMatching(undefined, undefined, undefined, target);
-    var n3String; // If an IndexedFormula, use the namespaces from the given graph as suggestions
 
+    // 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
-
+    }
 
+    // use the provided options.namespaces are mandatory prefixes
     if (opts.namespaces) {
       sz.setNamespaces(opts.namespaces);
     }
-
     sz.setBase(base);
-
     switch (contentType) {
       case _types.RDFXMLContentType:
         documentString = sz.statementsToXML(newSts);
         return executeCallback(null, documentString);
-
       case _types.N3ContentType:
       case _types.N3LegacyContentType:
         documentString = sz.statementsToN3(newSts);
         return executeCallback(null, documentString);
-
       case _types.TurtleContentType:
       case _types.TurtleLegacyContentType:
         sz.setFlags('si'); // Suppress = for sameAs and => for implies
-
         documentString = sz.statementsToN3(newSts);
         return executeCallback(null, documentString);
-
       case _types.NTriplesContentType:
         sz.setFlags('deinprstux'); // Suppress nice parts of N3 to make ntriples
-
         documentString = sz.statementsToNTriples(newSts);
         return executeCallback(null, documentString);
-
       case _types.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 _types.NQuadsContentType:
       case _types.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.');
     }
@@ -106,7 +72,6 @@ contentType, callback, options) {
       // @ts-ignore
       return callback(err, undefined);
     }
-
     throw err; // Don't hide problems from caller in sync mode
   }
 

package/lib/serializer.d.ts

@@ -63,5 +63,6 @@ export class Serializer {
     symbolToN3(x: any): any;
     writeStore(write: any): void;
     statementsToXML(sts: any): string;
+    statementsToJsonld(sts: any): string;
 }
 import NamedNode from "./named-node";