BREAKING CHANGE: Make class Term constructors internal (#338)

These constructors take the `id` at face value so can be interpreted as the wrong term type if an invalid value is given; for instance a `NamedNode` can be interpred as a `Literal` if instantiated with `new NamedNode('"hellow world"')`. Consumers of the library should use the `DataFactory` instead to create new terms.
rdfjs · Mar 27, 2023 · f4887f3 · f4887f3
1 parent e733c1f
commit f4887f3
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 49 deletions.
diff --git a/src/index.js b/src/index.js
@@ -9,15 +9,6 @@ import * as Util from './N3Util';
 import {
   default as DataFactory,
 
-  Term,
-  NamedNode,
-  Literal,
-  BlankNode,
-  Variable,
-  DefaultGraph,
-  Quad,
-  Triple,
-
   termFromId,
   termToId,
 } from './N3DataFactory';
@@ -34,15 +25,6 @@ export {
 
   DataFactory,
 
-  Term,
-  NamedNode,
-  Literal,
-  BlankNode,
-  Variable,
-  DefaultGraph,
-  Quad,
-  Triple,
-
   termFromId,
   termToId,
 };
@@ -59,15 +41,6 @@ export default {
 
   DataFactory,
 
-  Term,
-  NamedNode,
-  Literal,
-  BlankNode,
-  Variable,
-  DefaultGraph,
-  Quad,
-  Triple,
-
   termFromId,
   termToId,
 };
diff --git a/test/BlankNode-test.js b/test/BlankNode-test.js
@@ -1,4 +1,4 @@
-import { BlankNode, Term } from '../src/';
+import { BlankNode, Term } from '../src/N3DataFactory';
 
 describe('BlankNode', () => {
   describe('The BlankNode module', () => {

diff --git a/test/DefaultGraph-test.js b/test/DefaultGraph-test.js
@@ -1,4 +1,4 @@
-import { DefaultGraph, Term } from '../src/';
+import { DefaultGraph, Term } from '../src/N3DataFactory';
 
 describe('DefaultGraph', () => {
   describe('The DefaultGraph module', () => {

diff --git a/test/Literal-test.js b/test/Literal-test.js
@@ -1,4 +1,4 @@
-import { Literal, NamedNode, Term } from '../src/';
+import { Literal, NamedNode, Term } from '../src/N3DataFactory';
 
 describe('Literal', () => {
   describe('The Literal module', () => {

diff --git a/test/N3DataFactory-test.js b/test/N3DataFactory-test.js
@@ -1,12 +1,12 @@
 import {
-  DataFactory,
   NamedNode,
   Literal,
   BlankNode,
   Variable,
   DefaultGraph,
   Quad,
-} from '../src/';
+} from '../src/N3DataFactory';
+import { DataFactory } from '../src';
 
 describe('DataFactory', () => {
   describe('namedNode', () => {

diff --git a/test/N3Parser-test.js b/test/N3Parser-test.js
@@ -1,4 +1,5 @@
-import { Parser, NamedNode, BlankNode, Quad, termFromId } from '../src/';
+import { Parser, termFromId } from '../src/';
+import { NamedNode, BlankNode, Quad } from '../src/N3DataFactory';
 
 const BASE_IRI = 'http://example.org/';
 

diff --git a/test/N3Store-test.js b/test/N3Store-test.js
@@ -1,11 +1,13 @@
 import {
   Store,
+  termFromId, termToId,
+} from '../src/';
+import {
   NamedNode,
   Literal,
   DefaultGraph,
   Quad,
-  termFromId, termToId,
-} from '../src/';
+} from '../src/N3DataFactory';
 import namespaces from '../src/IRIs';
 import chai, { expect } from 'chai';
 import { Readable } from 'readable-stream';

diff --git a/test/N3StreamParser-test.js b/test/N3StreamParser-test.js
@@ -1,4 +1,5 @@
-import { StreamParser, NamedNode } from '../src/';
+import { StreamParser } from '../src/';
+import { NamedNode } from '../src/N3DataFactory';
 import { Readable, Writable } from 'readable-stream';
 
 describe('StreamParser', () => {

diff --git a/test/N3StreamWriter-test.js b/test/N3StreamWriter-test.js
@@ -1,4 +1,5 @@
-import { StreamWriter, Quad, NamedNode, termFromId } from '../src/';
+import { StreamWriter, termFromId } from '../src/';
+import { Quad, NamedNode } from '../src/N3DataFactory';
 import { Readable, Writable } from 'readable-stream';
 
 describe('StreamWriter', () => {

diff --git a/test/N3Writer-test.js b/test/N3Writer-test.js
@@ -1,11 +1,11 @@
 import {
   Writer,
-  NamedNode,
-  BlankNode,
-  Literal,
-  Quad,
   termFromId,
 } from '../src/';
+import { NamedNode,
+  BlankNode,
+  Literal,
+  Quad } from '../src/N3DataFactory';
 import namespaces from '../src/IRIs';
 
 const { xsd } = namespaces;

diff --git a/test/NamedNode-test.js b/test/NamedNode-test.js
@@ -1,4 +1,4 @@
-import { NamedNode, Term } from '../src/';
+import { NamedNode, Term } from '../src/N3DataFactory';
 
 describe('NamedNode', () => {
   describe('The NamedNode module', () => {

diff --git a/test/Quad-test.js b/test/Quad-test.js
@@ -1,4 +1,4 @@
-import { Quad, Triple, DefaultGraph, termFromId, Term } from '../src/';
+import { Quad, Triple, DefaultGraph, termFromId, Term } from '../src/N3DataFactory';
 
 describe('Quad', () => {
   describe('The Quad module', () => {

diff --git a/test/Term-test.js b/test/Term-test.js
@@ -1,3 +1,8 @@
+import {
+  termToId,
+  termFromId,
+} from '../src/';
+
 import {
   Term,
   NamedNode,
@@ -6,11 +11,6 @@ import {
   Variable,
   DefaultGraph,
   Quad,
-  termToId,
-  termFromId,
-} from '../src/';
-
-import {
   escapeQuotes,
   unescapeQuotes,
 } from '../src/N3DataFactory';

diff --git a/test/Variable-test.js b/test/Variable-test.js
@@ -1,4 +1,4 @@
-import { Variable, Term } from '../src/';
+import { Variable, Term } from '../src/N3DataFactory';
 
 describe('Variable', () => {
   describe('The Variable module', () => {