eyeling 1.31.0 → 1.32.0

package/dist/browser/eyeling.browser.js

@@ -16909,7 +16909,8 @@ function termEquals(self, other) {
       !!self.datatype &&
       typeof self.datatype.equals === 'function' &&
       self.datatype.equals(other.datatype) &&
-      self.language === (other.language || '')
+      self.language === (other.language || '') &&
+      (self.direction || '') === (other.direction || '')
     );
   }
 
@@ -16974,6 +16975,7 @@ class Literal {
     this.termType = 'Literal';
     this.value = String(value);
     this.language = '';
+    this.direction = '';
     this.datatype = null;
 
     if (typeof languageOrDatatype === 'string') {
@@ -16981,6 +16983,10 @@ class Literal {
       this.datatype = new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
     } else if (isRdfJsTerm(languageOrDatatype)) {
       this.datatype = languageOrDatatype;
+    } else if (languageOrDatatype && typeof languageOrDatatype === 'object') {
+      this.language = String(languageOrDatatype.language || '');
+      this.direction = languageOrDatatype.direction || '';
+      this.datatype = new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
     } else {
       this.datatype = new NamedNode(XSD_NS + 'string');
     }
@@ -17027,6 +17033,38 @@ const dataFactory = {
   quad(subject, predicate, object, graph) {
     return new Quad(subject, predicate, object, graph || defaultGraphSingleton);
   },
+  fromTerm(original) {
+    if (!isRdfJsTerm(original)) throw new TypeError('Expected an RDF/JS term');
+
+    switch (original.termType) {
+      case 'NamedNode':
+        return new NamedNode(original.value);
+      case 'BlankNode':
+        return new BlankNode(original.value);
+      case 'Literal':
+        if (original.language || original.direction) {
+          return new Literal(original.value, { language: original.language || '', direction: original.direction || '' });
+        }
+        return new Literal(original.value, original.datatype ? dataFactory.fromTerm(original.datatype) : undefined);
+      case 'Variable':
+        return new Variable(original.value);
+      case 'DefaultGraph':
+        return defaultGraphSingleton;
+      case 'Quad':
+        return dataFactory.fromQuad(original);
+      default:
+        throw new TypeError(`Unsupported RDF/JS termType ${JSON.stringify(original.termType)}`);
+    }
+  },
+  fromQuad(original) {
+    if (!isRdfJsQuad(original)) throw new TypeError('Expected an RDF/JS Quad');
+    return new Quad(
+      dataFactory.fromTerm(original.subject),
+      dataFactory.fromTerm(original.predicate),
+      dataFactory.fromTerm(original.object),
+      dataFactory.fromTerm(original.graph),
+    );
+  },
 };
 
 function getDataFactory(factory) {

package/eyeling.js

@@ -16909,7 +16909,8 @@ function termEquals(self, other) {
       !!self.datatype &&
       typeof self.datatype.equals === 'function' &&
       self.datatype.equals(other.datatype) &&
-      self.language === (other.language || '')
+      self.language === (other.language || '') &&
+      (self.direction || '') === (other.direction || '')
     );
   }
 
@@ -16974,6 +16975,7 @@ class Literal {
     this.termType = 'Literal';
     this.value = String(value);
     this.language = '';
+    this.direction = '';
     this.datatype = null;
 
     if (typeof languageOrDatatype === 'string') {
@@ -16981,6 +16983,10 @@ class Literal {
       this.datatype = new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
     } else if (isRdfJsTerm(languageOrDatatype)) {
       this.datatype = languageOrDatatype;
+    } else if (languageOrDatatype && typeof languageOrDatatype === 'object') {
+      this.language = String(languageOrDatatype.language || '');
+      this.direction = languageOrDatatype.direction || '';
+      this.datatype = new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
     } else {
       this.datatype = new NamedNode(XSD_NS + 'string');
     }
@@ -17027,6 +17033,38 @@ const dataFactory = {
   quad(subject, predicate, object, graph) {
     return new Quad(subject, predicate, object, graph || defaultGraphSingleton);
   },
+  fromTerm(original) {
+    if (!isRdfJsTerm(original)) throw new TypeError('Expected an RDF/JS term');
+
+    switch (original.termType) {
+      case 'NamedNode':
+        return new NamedNode(original.value);
+      case 'BlankNode':
+        return new BlankNode(original.value);
+      case 'Literal':
+        if (original.language || original.direction) {
+          return new Literal(original.value, { language: original.language || '', direction: original.direction || '' });
+        }
+        return new Literal(original.value, original.datatype ? dataFactory.fromTerm(original.datatype) : undefined);
+      case 'Variable':
+        return new Variable(original.value);
+      case 'DefaultGraph':
+        return defaultGraphSingleton;
+      case 'Quad':
+        return dataFactory.fromQuad(original);
+      default:
+        throw new TypeError(`Unsupported RDF/JS termType ${JSON.stringify(original.termType)}`);
+    }
+  },
+  fromQuad(original) {
+    if (!isRdfJsQuad(original)) throw new TypeError('Expected an RDF/JS Quad');
+    return new Quad(
+      dataFactory.fromTerm(original.subject),
+      dataFactory.fromTerm(original.predicate),
+      dataFactory.fromTerm(original.object),
+      dataFactory.fromTerm(original.graph),
+    );
+  },
 };
 
 function getDataFactory(factory) {

package/index.d.ts

@@ -1,50 +1,14 @@
 declare module 'eyeling' {
-  export interface RdfJsTerm {
-    termType: string;
-    value: string;
-    equals(other: RdfJsTerm | null | undefined): boolean;
-  }
-
-  export interface RdfJsNamedNode extends RdfJsTerm {
-    termType: 'NamedNode';
-  }
-
-  export interface RdfJsBlankNode extends RdfJsTerm {
-    termType: 'BlankNode';
-  }
-
-  export interface RdfJsVariable extends RdfJsTerm {
-    termType: 'Variable';
-  }
-
-  export interface RdfJsDefaultGraph extends RdfJsTerm {
-    termType: 'DefaultGraph';
-    value: '';
-  }
-
-  export interface RdfJsLiteral extends RdfJsTerm {
-    termType: 'Literal';
-    language: string;
-    datatype: RdfJsNamedNode;
-  }
-
-  export interface RdfJsQuad extends RdfJsTerm {
-    termType: 'Quad';
-    value: '';
-    subject: RdfJsTerm;
-    predicate: RdfJsTerm;
-    object: RdfJsTerm;
-    graph: RdfJsTerm;
-  }
-
-  export interface RdfJsDataFactory {
-    namedNode(value: string): RdfJsNamedNode;
-    blankNode(value?: string): RdfJsBlankNode;
-    literal(value: string, languageOrDatatype?: string | RdfJsNamedNode): RdfJsLiteral;
+  export type RdfJsTerm = import('@rdfjs/types').Term;
+  export type RdfJsNamedNode = import('@rdfjs/types').NamedNode;
+  export type RdfJsBlankNode = import('@rdfjs/types').BlankNode;
+  export type RdfJsVariable = import('@rdfjs/types').Variable;
+  export type RdfJsDefaultGraph = import('@rdfjs/types').DefaultGraph;
+  export type RdfJsLiteral = import('@rdfjs/types').Literal;
+  export type RdfJsQuad = import('@rdfjs/types').Quad;
+  export type RdfJsDataFactory = import('@rdfjs/types').DataFactory<RdfJsQuad> & {
     variable(value: string): RdfJsVariable;
-    defaultGraph(): RdfJsDefaultGraph;
-    quad(subject: RdfJsTerm, predicate: RdfJsTerm, object: RdfJsTerm, graph?: RdfJsTerm): RdfJsQuad;
-  }
+  };
 
   export interface EyelingPrefixEnv {
     _type?: 'PrefixEnv';

package/lib/rdfjs.js

@@ -100,7 +100,8 @@ function termEquals(self, other) {
       !!self.datatype &&
       typeof self.datatype.equals === 'function' &&
       self.datatype.equals(other.datatype) &&
-      self.language === (other.language || '')
+      self.language === (other.language || '') &&
+      (self.direction || '') === (other.direction || '')
     );
   }
 
@@ -165,6 +166,7 @@ class Literal {
     this.termType = 'Literal';
     this.value = String(value);
     this.language = '';
+    this.direction = '';
     this.datatype = null;
 
     if (typeof languageOrDatatype === 'string') {
@@ -172,6 +174,10 @@ class Literal {
       this.datatype = new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
     } else if (isRdfJsTerm(languageOrDatatype)) {
       this.datatype = languageOrDatatype;
+    } else if (languageOrDatatype && typeof languageOrDatatype === 'object') {
+      this.language = String(languageOrDatatype.language || '');
+      this.direction = languageOrDatatype.direction || '';
+      this.datatype = new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
     } else {
       this.datatype = new NamedNode(XSD_NS + 'string');
     }
@@ -218,6 +224,38 @@ const dataFactory = {
   quad(subject, predicate, object, graph) {
     return new Quad(subject, predicate, object, graph || defaultGraphSingleton);
   },
+  fromTerm(original) {
+    if (!isRdfJsTerm(original)) throw new TypeError('Expected an RDF/JS term');
+
+    switch (original.termType) {
+      case 'NamedNode':
+        return new NamedNode(original.value);
+      case 'BlankNode':
+        return new BlankNode(original.value);
+      case 'Literal':
+        if (original.language || original.direction) {
+          return new Literal(original.value, { language: original.language || '', direction: original.direction || '' });
+        }
+        return new Literal(original.value, original.datatype ? dataFactory.fromTerm(original.datatype) : undefined);
+      case 'Variable':
+        return new Variable(original.value);
+      case 'DefaultGraph':
+        return defaultGraphSingleton;
+      case 'Quad':
+        return dataFactory.fromQuad(original);
+      default:
+        throw new TypeError(`Unsupported RDF/JS termType ${JSON.stringify(original.termType)}`);
+    }
+  },
+  fromQuad(original) {
+    if (!isRdfJsQuad(original)) throw new TypeError('Expected an RDF/JS Quad');
+    return new Quad(
+      dataFactory.fromTerm(original.subject),
+      dataFactory.fromTerm(original.predicate),
+      dataFactory.fromTerm(original.object),
+      dataFactory.fromTerm(original.graph),
+    );
+  },
 };
 
 function getDataFactory(factory) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [
@@ -60,6 +60,9 @@
     "preversion": "npm test",
     "postversion": "git push origin HEAD --follow-tags"
   },
+  "dependencies": {
+    "@rdfjs/types": "^2.0.1"
+  },
   "devDependencies": {
     "eslint": "^9.0.0",
     "rdf-test-suite": "^2.1.4"