rdflib 2.2.10 → 2.2.12-5f141ca2

package/src/rdfxmlparser.js

@@ -57,23 +57,31 @@
 */
 import * as uriUtil from './uri'
 
-/*
- * @constructor
- * @param {RDFStore} store An RDFStore object
- */
 
-export default function RDFParser(store) {
-  var RDFParser = {}
+export default class RDFParser {
+
+  /*
+   * @constructor
+   * @param {RDFStore} store An RDFStore object
+   */
+  constructor(store) {
+    /** 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.reify = false
+  }
 
   /** Standard namespaces that we know how to handle @final
    *  @member RDFParser
    */
-  RDFParser.ns = {'RDF': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'RDFS': 'http://www.w3.org/2000/01/rdf-schema#'}
+  static ns = {'RDF': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'RDFS': 'http://www.w3.org/2000/01/rdf-schema#'}
 
   /** DOM Level 2 node type magic numbers @final
    *  @member RDFParser
    */
-  RDFParser.nodeType = {'ELEMENT': 1, 'ATTRIBUTE': 2, 'TEXT': 3,
+  static nodeType = {'ELEMENT': 1, 'ATTRIBUTE': 2, 'TEXT': 3,
     'CDATA_SECTION': 4, 'ENTITY_REFERENCE': 5,
     'ENTITY': 6, 'PROCESSING_INSTRUCTION': 7,
     'COMMENT': 8, 'DOCUMENT': 9, 'DOCUMENT_TYPE': 10,
@@ -87,7 +95,7 @@ export default function RDFParser(store) {
    * @private
    */
 
-  this.frameFactory = function (parser, parent, element) {
+  frameFactory(parser, parent, element) {
     return {'NODE': 1, 'ARC': 2, 'parent': parent, 'parser': parser, 'store': parser.store, 'element': element,
       'lastChild': 0, 'base': null, 'lang': null, 'node': null, 'nodeType': null, 'listIndex': 1, 'rdfid': null, 'datatype': null, 'collection': false, /** Terminate the frame and notify the store that we're done */
       'terminateFrame': function () {
@@ -167,7 +175,7 @@ export default function RDFParser(store) {
   }
 
   // from the OpenLayers source .. needed to get around IE problems.
-  this.getAttributeNodeNS = function (node, uri, name) {
+  getAttributeNodeNS(node, uri, name) {
     var attributeNode = null
     if (node.getAttributeNodeNS) {
       attributeNode = node.getAttributeNodeNS(uri, name)
@@ -188,13 +196,6 @@ export default function RDFParser(store) {
     return attributeNode
   }
 
-  /** 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.reify = false
-
   /**
    * Build our initial scope frame and parse the DOM into triples
    * @param {DOMTree} document The DOM to parse
@@ -202,7 +203,7 @@ export default function RDFParser(store) {
    * @param {Object} why The context to which this resource belongs
    */
 
-  this.parse = function (document, base, why) {
+  parse(document, base, why) {
     var children = document.childNodes // clean up for the next run
     this.cleanParser() // figure out the root element
     var root
@@ -228,7 +229,7 @@ export default function RDFParser(store) {
     return true
   }
 
-  this.parseDOM = function (frame) {
+  parseDOM(frame) {
     // a DOM utility function used in parsing
     var rdfid
     var elementURI = function (el) {
@@ -408,7 +409,7 @@ export default function RDFParser(store) {
    * Cleans out state from a previous parse run
    * @private
    */
-  this.cleanParser = function () {
+  cleanParser() {
     this.bnodes = {}
     this.why = null
   }
@@ -417,7 +418,7 @@ export default function RDFParser(store) {
    * Builds scope frame
    * @private
    */
-  this.buildFrame = function (parent, element) {
+  buildFrame(parent, element) {
     var frame = this.frameFactory(this, parent, element)
     if (parent) {
       frame.base = parent.base

package/src/serialize.ts

@@ -30,7 +30,7 @@ export default function serialize (
    * Defaults to Turtle.
    */
   contentType?: string | ContentType,
-  callback?: (err: Error | undefined | null, result?: string | null) => any,
+  callback?: (err: Error | undefined | null, result?: string) => any,
   options?: {
     /**
      * A string of letters, each of which set an options
@@ -42,7 +42,7 @@ export default function serialize (
   base = base || target.value
   const opts = options || {}
   contentType = contentType || TurtleContentType // text/n3 if complex?
-  var documentString: string | null = null
+  var documentString: string | undefined = undefined
   try {
     var sz = Serializer(kb)
     if ((opts as any).flags) sz.setFlags((opts as any).flags)
@@ -92,7 +92,7 @@ export default function serialize (
     throw err // Don't hide problems from caller in sync mode
   }
 
-  function executeCallback (err: Error | null | undefined, result: string | null | undefined): string | undefined {
+  function executeCallback (err: Error | null | undefined, result: string | undefined): string | undefined {
     if (callback) {
       callback(err, result)
       return

package/src/serializer.js

@@ -13,8 +13,13 @@ import CanonicalDataFactory from './factories/canonical-data-factory'
 import { createXSD } from './xsd'
 import solidNs from 'solid-namespace'
 
-export default (function () {
-  var __Serializer = function (store) {
+
+export default function createSerializer(store) {
+  return new Serializer(store);
+};
+
+export class Serializer {
+  constructor(store) {
     this.flags = ''
     this.base = null
 
@@ -41,11 +46,17 @@ export default (function () {
     this.xsd = createXSD(this.rdfFactory)
   }
 
-  __Serializer.prototype.setBase = function (base) { this.base = base; return this }
+  setBase(base) {
+    this.base = base;
+    return this
+  }
 
-  __Serializer.prototype.setFlags = function (flags) { this.flags = flags || ''; return this }
+  setFlags(flags) {
+    this.flags = flags || '';
+    return this
+  }
 
-  __Serializer.prototype.toStr = function (x) {
+  toStr(x) {
     var s = x.toNT()
     if (x.termType === 'Graph') {
       this.formulas[s] = x // remember as reverse does not work
@@ -53,7 +64,7 @@ export default (function () {
     return s
   }
 
-  __Serializer.prototype.fromStr = function (s) {
+  fromStr(s) {
     if (s[0] === '{') {
       var x = this.formulas[s]
       if (!x) console.log('No formula object for ' + s)
@@ -61,12 +72,13 @@ export default (function () {
     }
     return this.store.fromNT(s)
   }
+
   /* Accumulate Namespaces
   **
   ** These are only hints.  If two overlap, only one gets used
   ** There is therefore no guarantee in general.
   */
-  __Serializer.prototype.suggestPrefix = function (prefix, uri) {
+  suggestPrefix(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
@@ -76,34 +88,34 @@ export default (function () {
   }
 
   // Takes a namespace -> prefix map
-  __Serializer.prototype.suggestNamespaces = function (namespaces) {
+  suggestNamespaces(namespaces) {
     for (var px in namespaces) {
       this.suggestPrefix(px, namespaces[px])
     }
     return this
   }
 
-  __Serializer.prototype.checkIntegrity = function () {
+  checkIntegrity() {
     var p, ns
     for (p in this.namespaces) {
       if (this.prefixes[this.namespaces[p]] !== p) {
         throw new Error('Serializer integity error 1: ' + p + ', ' +
-        this.namespaces[p] + ', ' + this.prefixes[this.namespaces[p]] + '!')
+          this.namespaces[p] + ', ' + this.prefixes[this.namespaces[p]] + '!')
       }
     }
     for (ns in this.prefixes) {
       if (this.namespaces[this.prefixes[ns]] !== ns) {
         throw new Error('Serializer integity error 2: ' + ns + ', ' +
-        this.prefixs[ns] + ', ' + this.namespaces[this.prefixes[ns]] + '!')
+          this.prefixs[ns] + ', ' + this.namespaces[this.prefixes[ns]] + '!')
       }
     }
   }
 
   // Make up an unused prefix for a random namespace
-  __Serializer.prototype.makeUpPrefix = function (uri) {
+  makeUpPrefix(uri) {
     var p = uri
     function canUseMethod (pp) {
-      if (!__Serializer.prototype.validPrefix.test(pp)) return false // bad format
+      if (!this.validPrefix.test(pp)) return false // bad format
       if (pp === 'ns') return false // boring
       if (pp in this.namespaces) return false // already used
       this.prefixes[uri] = pp
@@ -131,13 +143,13 @@ export default (function () {
     if (canUse(p.slice(0, 4))) return p.slice(0, 4)
     if (canUse(p.slice(0, 1))) return p.slice(0, 1)
     if (canUse(p.slice(0, 5))) return p.slice(0, 5)
-    if (!__Serializer.prototype.validPrefix.test(p)) {
+    if (!this.validPrefix.test(p)) {
       p = 'n' // Otherwise the loop below may never termimnate
     }
     for (var j = 0; ; j++) if (canUse(p.slice(0, 3) + j)) return p.slice(0, 3) + j
   }
 
-  __Serializer.prototype.rootSubjects = function (sts) {
+  rootSubjects(sts) {
     var incoming = {}
     var subjects = {}
     var allBnodes = {}
@@ -194,15 +206,15 @@ export default (function () {
 
   // //////////////////////////////////////////////////////
 
-  __Serializer.prototype.toN3 = function (f) {
+  toN3(f) {
     return this.statementsToN3(f.statements)
   }
 
-  __Serializer.prototype._notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~'
-  __Serializer.prototype._notNameChars =
-    (__Serializer.prototype._notQNameChars + ':')
+  _notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~'
+  _notNameChars =
+    (this._notQNameChars + ':')
 
-  __Serializer.prototype.explicitURI = function (uri) {
+  explicitURI(uri) {
     if (this.flags.indexOf('r') < 0 && this.base) {
       uri = Uri.refTo(this.base, uri)
     } else if (this.flags.indexOf('u') >= 0) { // Unicode encoding NTriples style
@@ -213,7 +225,7 @@ export default (function () {
     return '<' + uri + '>'
   }
 
-  __Serializer.prototype.statementsToNTriples = function (sts) {
+  statementsToNTriples(sts) {
     var sorted = sts.slice()
     sorted.sort()
     var str = ''
@@ -250,7 +262,7 @@ export default (function () {
     return str
   }
 
-  __Serializer.prototype.statementsToN3 = function (sts) {
+  statementsToN3(sts) {
     var indent = 4
     var width = 80
     var kb = this.store
@@ -400,9 +412,10 @@ export default (function () {
       results = results.concat([objects])
       return results
     }
+
     var propertyTree = propertyTreeMethod.bind(this)
 
-    function objectTreeMethod (obj, stats, force) {
+    function objectTreeMethod(obj, stats, force) {
       if (obj.termType === 'BlankNode' &&
         (force || stats.rootsHash[obj.toNT()] === undefined)) {// if not a root
         if (stats.subjects[this.toStr(obj)]) {
@@ -413,9 +426,10 @@ export default (function () {
       }
       return termToN3(obj, stats)
     }
+
     var objectTree = objectTreeMethod.bind(this)
 
-    function termToN3Method (expr, stats) { //
+    function termToN3Method(expr, stats) { //
       var i, res
       switch (expr.termType) {
         case 'Graph':
@@ -435,7 +449,7 @@ export default (function () {
           return this.atomicTermToN3(expr)
       }
     }
-    __Serializer.prototype.termToN3 = termToN3
+    Serializer.prototype.termToN3 = termToN3
     var termToN3 = termToN3Method.bind(this)
 
     function prefixDirectivesMethod () {
@@ -459,7 +473,7 @@ export default (function () {
   // //////////////////////////////////////////// Atomic Terms
 
   //  Deal with term level things and nesting with no bnode structure
-  __Serializer.prototype.atomicTermToN3 = function atomicTermToN3 (expr, stats) {
+  atomicTermToN3 (expr, stats) {
     switch (expr.termType) {
       case 'BlankNode':
       case 'Variable':
@@ -508,11 +522,11 @@ export default (function () {
 
   //  stringToN3:  String escaping for N3
 
-  __Serializer.prototype.validPrefix = new RegExp(/^[a-zA-Z][a-zA-Z0-9]*$/)
+  validPrefix = new RegExp(/^[a-zA-Z][a-zA-Z0-9]*$/)
 
-  __Serializer.prototype.forbidden1 = new RegExp(/[\\"\b\f\r\v\t\n\u0080-\uffff]/gm)
-  __Serializer.prototype.forbidden3 = new RegExp(/[\\"\b\f\r\v\u0080-\uffff]/gm)
-  __Serializer.prototype.stringToN3 = function stringToN3 (str, flags) {
+  forbidden1 = new RegExp(/[\\"\b\f\r\v\t\n\u0080-\uffff]/gm)
+  forbidden3 = new RegExp(/[\\"\b\f\r\v\u0080-\uffff]/gm)
+  stringToN3(str, flags) {
     if (!flags) flags = 'e'
     var res = ''
     var i, j, k
@@ -523,10 +537,10 @@ export default (function () {
         flags.indexOf('n') < 0 && // Force single line
         (str.indexOf('\n') > 0 || str.indexOf('"') > 0)) {
       delim = '"""'
-      forbidden = __Serializer.prototype.forbidden3
+      forbidden = this.forbidden3
     } else {
       delim = '"'
-      forbidden = __Serializer.prototype.forbidden1
+      forbidden = this.forbidden1
     }
     for (i = 0; i < str.length;) {
       forbidden.lastIndex = 0
@@ -556,7 +570,7 @@ export default (function () {
   }
   //  A single symbol, either in  <> or namespace notation
 
-  __Serializer.prototype.symbolToN3 = function symbolToN3 (x) { // c.f. symbolString() in notation3.py
+  symbolToN3 (x) { // c.f. symbolString() in notation3.py
     var uri = x.uri
     var j = uri.indexOf('#')
     if (j < 0 && this.flags.indexOf('/') < 0) {
@@ -567,7 +581,7 @@ export default (function () {
       (uri.indexOf('http') === 0 || uri.indexOf('ws') === 0 || uri.indexOf('file') === 0)) {
       var canSplit = true
       for (var k = j + 1; k < uri.length; k++) {
-        if (__Serializer.prototype._notNameChars.indexOf(uri[k]) >= 0) {
+        if (this._notNameChars.indexOf(uri[k]) >= 0) {
           canSplit = false
           break
         }
@@ -604,33 +618,12 @@ export default (function () {
     }
     return this.explicitURI(uri)
   }
-  // String escaping utilities
-
-  function hexify (str) { // also used in parser
-    return encodeURI(str)
-  }
-
-  function backslashUify (str) {
-    var res = ''
-    var k
-    for (var i = 0; i < str.length; i++) {
-      k = str.charCodeAt(i)
-      if (k > 65535) {
-        res += '\\U' + ('00000000' + k.toString(16)).slice(-8) // convert to upper?
-      } else if (k > 126) {
-        res += '\\u' + ('0000' + k.toString(16)).slice(-4)
-      } else {
-        res += str[i]
-      }
-    }
-    return res
-  }
 
   // /////////////////////////// Quad store serialization
 
   // @para. write  - a function taking a single string to be output
   //
-  __Serializer.prototype.writeStore = function (write) {
+  writeStore(write) {
     var kb = this.store
     var fetcher = kb.fetcher
     var session = fetcher && fetcher.appNode
@@ -671,7 +664,7 @@ export default (function () {
 
   // ////////////////////////////////////////////// XML serialization
 
-  __Serializer.prototype.statementsToXML = function (sts) {
+  statementsToXML(sts) {
     var indent = 4
     var width = 80
 
@@ -935,7 +928,7 @@ export default (function () {
       if (j < 0) throw new Error('Cannot make qname out of <' + uri + '>')
 
       for (var k = j + 1; k < uri.length; k++) {
-        if (__Serializer.prototype._notNameChars.indexOf(uri[k]) >= 0) {
+        if (this._notNameChars.indexOf(uri[k]) >= 0) {
           throw new Error('Invalid character "' + uri[k] + '" cannot be in XML qname for URI: ' + uri)
         }
       }
@@ -970,7 +963,26 @@ export default (function () {
     var tree2 = [str, tree, '</rdf:RDF>'] // @@ namespace declrations
     return XMLtreeToString(tree2, -1)
   } // End @@ body
-
-  var Serializer = function (store) { return new __Serializer(store) }
-  return Serializer
-}())
+}
+
+// String escaping utilities
+
+function hexify (str) { // also used in parser
+  return encodeURI(str)
+}
+
+function backslashUify (str) {
+  var res = ''
+  var k
+  for (var i = 0; i < str.length; i++) {
+    k = str.charCodeAt(i)
+    if (k > 65535) {
+      res += '\\U' + ('00000000' + k.toString(16)).slice(-8) // convert to upper?
+    } else if (k > 126) {
+      res += '\\u' + ('0000' + k.toString(16)).slice(-4)
+    } else {
+      res += str[i]
+    }
+  }
+  return res
+}

package/src/xsd.js

@@ -1,19 +1,21 @@
-import CanonicalDataFactory from './factories/canonical-data-factory'
+import CanonicalDataFactory from "./factories/canonical-data-factory";
 
 export function createXSD(localFactory = CanonicalDataFactory) {
-  class XSD {}
-
-  XSD.boolean = localFactory.namedNode('http://www.w3.org/2001/XMLSchema#boolean')
-  XSD.dateTime = localFactory.namedNode('http://www.w3.org/2001/XMLSchema#dateTime')
-  XSD.decimal = localFactory.namedNode('http://www.w3.org/2001/XMLSchema#decimal')
-  XSD.double = localFactory.namedNode('http://www.w3.org/2001/XMLSchema#double')
-  XSD.integer = localFactory.namedNode('http://www.w3.org/2001/XMLSchema#integer')
-  XSD.langString = localFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString')
-  XSD.string = localFactory.namedNode('http://www.w3.org/2001/XMLSchema#string')
-
-  return XSD
+  return {
+    boolean: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#boolean"),
+    dateTime: localFactory.namedNode(
+      "http://www.w3.org/2001/XMLSchema#dateTime"
+    ),
+    decimal: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#decimal"),
+    double: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#double"),
+    integer: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#integer"),
+    langString: localFactory.namedNode(
+      "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    ),
+    string: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#string"),
+  };
 }
 
-const defaultXSD = createXSD(CanonicalDataFactory)
+const defaultXSD = createXSD(CanonicalDataFactory);
 
-export default defaultXSD
+export default defaultXSD;