rdflib 2.3.1-233cf569 → 2.3.1-59aebb32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/rdflib.min.js +1 -1
  2. package/dist/rdflib.min.js.map +1 -1
  3. package/esm/serializer.js +8 -11
  4. package/lib/serializer.d.ts +7 -8
  5. package/lib/serializer.js +8 -11
  6. package/package.json +6 -4
  7. package/src/serializer.js +14 -15
package/esm/serializer.js CHANGED
@@ -6,14 +6,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
6
6
  ** This is or was https://github.com/linkeddata/rdflib.js/blob/main/src/serializer.js
7
7
  ** Licence: MIT
8
8
  */
9
- import NamedNode from './named-node';
10
- import BlankNode from './blank-node';
9
+ import * as ttl2jsonld from '@frogcat/ttl2jsonld';
10
+ import solidNs from 'solid-namespace';
11
+ import CanonicalDataFactory from './factories/canonical-data-factory';
11
12
  import * as Uri from './uri';
12
13
  import * as Util from './utils-js';
13
- import CanonicalDataFactory from './factories/canonical-data-factory';
14
14
  import { createXSD } from './xsd';
15
- import solidNs from 'solid-namespace';
16
- import * as ttl2jsonld from '@frogcat/ttl2jsonld';
17
15
  export default function createSerializer(store) {
18
16
  return new Serializer(store);
19
17
  }
@@ -43,7 +41,7 @@ export class Serializer {
43
41
 
44
42
  this.namespacesUsed = []; // Count actually used and so needed in @prefixes
45
43
  this.keywords = ['a']; // The only one we generate at the moment
46
- this.prefixchars = 'abcdefghijklmnopqustuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
44
+ this.prefixchars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
47
45
  this.incoming = null; // Array not calculated yet
48
46
  this.formulas = []; // remembering original formulae from hashes
49
47
  this.store = store;
@@ -170,9 +168,8 @@ export class Serializer {
170
168
  if (slash >= 0) p = p.slice(slash + 1);
171
169
  var i = 0;
172
170
  while (i < p.length) {
173
- if (this.prefixchars.indexOf(p[i])) {
174
- i++;
175
- } else {
171
+ i++;
172
+ if (this.prefixchars.indexOf(p[i]) >= 0) {} else {
176
173
  break;
177
174
  }
178
175
  }
@@ -876,7 +873,7 @@ export class Serializer {
876
873
  results = results.concat(['<' + t + ' rdf:resource="' + relURI(st.object) + '"/>']);
877
874
  break;
878
875
  case 'Literal':
879
- results = results.concat(['<' + t + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
876
+ results = results.concat(['<' + t + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
880
877
  break;
881
878
  case 'Collection':
882
879
  results = results.concat(['<' + t + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + t + '>']);
@@ -927,7 +924,7 @@ export class Serializer {
927
924
  results = results.concat(['<' + qname(st.predicate) + ' rdf:resource="' + relURI(st.object) + '"/>']);
928
925
  break;
929
926
  case 'Literal':
930
- results = results.concat(['<' + qname(st.predicate) + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
927
+ results = results.concat(['<' + qname(st.predicate) + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
931
928
  break;
932
929
  case 'Collection':
933
930
  results = results.concat(['<' + qname(st.predicate) + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + qname(st.predicate) + '>']);
package/lib/serializer.d.ts CHANGED
@@ -13,13 +13,13 @@ export class Serializer {
13
13
  store: any;
14
14
  rdfFactory: any;
15
15
  xsd: {
16
- boolean: NamedNode;
17
- dateTime: NamedNode;
18
- decimal: NamedNode;
19
- double: NamedNode;
20
- integer: NamedNode;
21
- langString: NamedNode;
22
- string: NamedNode;
16
+ boolean: import("./named-node").default;
17
+ dateTime: import("./named-node").default;
18
+ decimal: import("./named-node").default;
19
+ double: import("./named-node").default;
20
+ integer: import("./named-node").default;
21
+ langString: import("./named-node").default;
22
+ string: import("./named-node").default;
23
23
  };
24
24
  setBase(base: any): Serializer;
25
25
  /**
@@ -72,4 +72,3 @@ export class Serializer {
72
72
  statementsToXML(sts: any): string;
73
73
  statementsToJsonld(sts: any): string;
74
74
  }
75
- import NamedNode from './named-node';
package/lib/serializer.js CHANGED
@@ -7,14 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.Serializer = void 0;
8
8
  exports.default = createSerializer;
9
9
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
- var _namedNode = _interopRequireDefault(require("./named-node"));
11
- var _blankNode = _interopRequireDefault(require("./blank-node"));
10
+ var ttl2jsonld = _interopRequireWildcard(require("@frogcat/ttl2jsonld"));
11
+ var _solidNamespace = _interopRequireDefault(require("solid-namespace"));
12
+ var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
12
13
  var Uri = _interopRequireWildcard(require("./uri"));
13
14
  var Util = _interopRequireWildcard(require("./utils-js"));
14
- var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
15
15
  var _xsd = require("./xsd");
16
- var _solidNamespace = _interopRequireDefault(require("solid-namespace"));
17
- var ttl2jsonld = _interopRequireWildcard(require("@frogcat/ttl2jsonld"));
18
16
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
19
17
  /* Serialization of RDF Graphs
20
18
  **
@@ -53,7 +51,7 @@ class Serializer {
53
51
 
54
52
  this.namespacesUsed = []; // Count actually used and so needed in @prefixes
55
53
  this.keywords = ['a']; // The only one we generate at the moment
56
- this.prefixchars = 'abcdefghijklmnopqustuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
54
+ this.prefixchars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
57
55
  this.incoming = null; // Array not calculated yet
58
56
  this.formulas = []; // remembering original formulae from hashes
59
57
  this.store = store;
@@ -180,9 +178,8 @@ class Serializer {
180
178
  if (slash >= 0) p = p.slice(slash + 1);
181
179
  var i = 0;
182
180
  while (i < p.length) {
183
- if (this.prefixchars.indexOf(p[i])) {
184
- i++;
185
- } else {
181
+ i++;
182
+ if (this.prefixchars.indexOf(p[i]) >= 0) {} else {
186
183
  break;
187
184
  }
188
185
  }
@@ -886,7 +883,7 @@ class Serializer {
886
883
  results = results.concat(['<' + t + ' rdf:resource="' + relURI(st.object) + '"/>']);
887
884
  break;
888
885
  case 'Literal':
889
- results = results.concat(['<' + t + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
886
+ results = results.concat(['<' + t + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
890
887
  break;
891
888
  case 'Collection':
892
889
  results = results.concat(['<' + t + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + t + '>']);
@@ -937,7 +934,7 @@ class Serializer {
937
934
  results = results.concat(['<' + qname(st.predicate) + ' rdf:resource="' + relURI(st.object) + '"/>']);
938
935
  break;
939
936
  case 'Literal':
940
- results = results.concat(['<' + qname(st.predicate) + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
937
+ results = results.concat(['<' + qname(st.predicate) + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
941
938
  break;
942
939
  case 'Collection':
943
940
  results = results.concat(['<' + qname(st.predicate) + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + qname(st.predicate) + '>']);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "rdflib",
3
3
  "description": "an RDF library for node.js. Suitable for client and server side.",
4
- "version": "2.3.1-233cf569",
4
+ "version": "2.3.1-59aebb32",
5
5
  "private": false,
6
6
  "browserslist": [
7
7
  "> 0.5%"
@@ -78,6 +78,7 @@
78
78
  "nock": "^13.5.6",
79
79
  "node-fetch": "^3.3.2",
80
80
  "node-polyfill-webpack-plugin": "^2.0.1",
81
+ "rimraf": "^6.1.2",
81
82
  "sinon": "^15.2.0",
82
83
  "sinon-chai": "^3.7.0",
83
84
  "source-map-loader": "^4.0.2",
@@ -86,7 +87,7 @@
86
87
  "typescript": "^5.0.4",
87
88
  "webpack": "^5.98.0",
88
89
  "webpack-cli": "^5.1.4",
89
- "webpack-dev-server": "^4.15.2"
90
+ "webpack-dev-server": "^5.2.2"
90
91
  },
91
92
  "scripts": {
92
93
  "build": "babel src --extensions \".ts,.js\" -d lib",
@@ -101,7 +102,7 @@
101
102
  "test": "npm run test:unit && npm run test:serialize && npm run test:types",
102
103
  "test:clean": "rimraf tests/serialize/,*",
103
104
  "test:serialize": "npm run build && npm run test:serialize:all && npm run test:clean",
104
- "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15",
105
+ "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15 && npm run test:serialize:16 && npm run test:serialize:17 && npm run test:serialize:18",
105
106
  "test:serialize:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && fs-grep http://www.w3.org/2001/XMLSchema#integer ,t1.xml",
106
107
  "test:serialize:2": "cd ./tests/serialize && node ./data.js -in=t2.ttl -format=application/rdf+xml -out=,t2.xml && node diff ,t2.xml t2-ref.xml",
107
108
  "test:serialize:3": "cd ./tests/serialize && node ./data.js -in=t3.ttl -format=application/rdf+xml -out=,t3.xml && node diff ,t3.xml t3-ref.xml",
@@ -117,7 +118,8 @@
117
118
  "test:serialize:14": "cd ./tests/serialize && node ./data.js -in=t14.html -format=text/turtle -out=,t14.ttl && node diff ,t14.ttl t14-ref.ttl",
118
119
  "test:serialize:15": "cd ./tests/serialize && node ./data.js -in=t15.html -format=text/turtle -out=,t15.ttl && node diff ,t15.ttl t15-ref.ttl",
119
120
  "test:serialize:16": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/ld+json -out=,t1.jsonld && node diff ,t1.jsonld t16-ref.jsonld",
120
- "test:serialize:17": "cd ./tests/serialize && node ./data.js -in=t17.ttl -format=application/rdf+xml -out=,t17.xml && node diff ,t17.xml t17-ref.xml",
121
+ "test:serialize:17": "cd ./tests/serialize && node ./data.js -in=t17.ttl -format=application/rdf+xml -out=,t17.xml && node diff ,t17.xml t17-ref.xml",
122
+ "test:serialize:18": "cd ./tests/serialize && node ./data.js -in=t18.ttl -format=application/rdf+xml -out=,t18.xml && node diff ,t18.xml t18-ref.xml",
121
123
  "test:types": "tsc --noEmit --target es2019 --moduleResolution node tests/types/*.ts",
122
124
  "test:unit": "mocha --growl --require ./tests/babel-register.js tests/unit/**-test.*",
123
125
  "test:unit:egp": "mocha --require ./tests/babel-register.js tests/unit/fetcher-egp-test.js",
package/src/serializer.js CHANGED
@@ -5,14 +5,12 @@
5
5
  ** This is or was https://github.com/linkeddata/rdflib.js/blob/main/src/serializer.js
6
6
  ** Licence: MIT
7
7
  */
8
- import NamedNode from './named-node'
9
- import BlankNode from './blank-node'
8
+ import * as ttl2jsonld from '@frogcat/ttl2jsonld'
9
+ import solidNs from 'solid-namespace'
10
+ import CanonicalDataFactory from './factories/canonical-data-factory'
10
11
  import * as Uri from './uri'
11
12
  import * as Util from './utils-js'
12
- import CanonicalDataFactory from './factories/canonical-data-factory'
13
13
  import { createXSD } from './xsd'
14
- import solidNs from 'solid-namespace'
15
- import * as ttl2jsonld from '@frogcat/ttl2jsonld'
16
14
 
17
15
 
18
16
  export default function createSerializer(store) {
@@ -39,7 +37,7 @@ export class Serializer {
39
37
 
40
38
  this.namespacesUsed = [] // Count actually used and so needed in @prefixes
41
39
  this.keywords = ['a'] // The only one we generate at the moment
42
- this.prefixchars = 'abcdefghijklmnopqustuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
40
+ this.prefixchars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
43
41
  this.incoming = null // Array not calculated yet
44
42
  this.formulas = [] // remembering original formulae from hashes
45
43
  this.store = store
@@ -176,8 +174,8 @@ export class Serializer {
176
174
  if (slash >= 0) p = p.slice(slash + 1)
177
175
  var i = 0
178
176
  while (i < p.length) {
179
- if (this.prefixchars.indexOf(p[i])) {
180
- i++
177
+ i++
178
+ if (this.prefixchars.indexOf(p[i]) >= 0) {
181
179
  } else {
182
180
  break
183
181
  }
@@ -914,10 +912,10 @@ export class Serializer {
914
912
  break
915
913
  case 'Literal':
916
914
  results = results.concat(['<' + t +
917
- (st.object.datatype.equals(this.xsd.string)
918
- ? ''
919
- : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') +
920
- (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') +
915
+ (st.object.language ? ' xml:lang="' + st.object.language + '"' :
916
+ (st.object.datatype.equals(this.xsd.string)
917
+ ? ''
918
+ : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"')) +
921
919
  '>' + escapeForXML(st.object.value) +
922
920
  '</' + t + '>'])
923
921
  break
@@ -980,9 +978,10 @@ export class Serializer {
980
978
  break
981
979
  case 'Literal':
982
980
  results = results.concat(['<' + qname(st.predicate) +
983
- (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') +
984
- (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') +
985
- '>' + escapeForXML(st.object.value) +
981
+ (st.object.language ?
982
+ ' xml:lang="' + st.object.language + '"' :
983
+ (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"'))
984
+ + '>' + escapeForXML(st.object.value) +
986
985
  '</' + qname(st.predicate) + '>'])
987
986
  break
988
987
  case 'Collection':