xml-toolkit 1.0.32 → 1.0.34

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 (38) hide show
  1. package/lib/EntityResolver.js +10 -4
  2. package/package.json +22 -3
  3. package/test/20040.wsdl +0 -1812
  4. package/test/20186.wsdl +0 -114
  5. package/test/30017.xsd +0 -62
  6. package/test/30282.xsd +0 -29
  7. package/test/E05a.xml +0 -5
  8. package/test/F9ASyncService.xsd +0 -33
  9. package/test/F9ASyncService_1.wsdl +0 -72
  10. package/test/F9ASyncService_1.xsd +0 -43
  11. package/test/F9ASyncService_1_2.xsd +0 -42
  12. package/test/F9SyncService.xsd +0 -19
  13. package/test/F9SyncService_1.xsd +0 -33
  14. package/test/F9SyncService_1_2.xsd +0 -42
  15. package/test/commons/dom-gosuslugi-ru-smev3-common.xsd +0 -465
  16. package/test/commons/fns-common-types.xsd +0 -1993
  17. package/test/commons/fns-dohflna-types.xsd +0 -524
  18. package/test/commons/pfr-common-types-1.0.0.xsd +0 -29
  19. package/test/commons/smev-supplementary-commons-1.0.1.xsd +0 -689
  20. package/test/commons/smev-supplementary-commons.xsd +0 -689
  21. package/test/dom-gosuslugi-ru-smev3-debt-responses.xsd +0 -776
  22. package/test/ent.xml +0 -6
  23. package/test/fns-dohflna-ru-root.xsd +0 -299
  24. package/test/fns-inn-singular-ru-root.xsd +0 -62
  25. package/test/fns-innfdrfio-root.xsd +0 -89
  26. package/test/not-sa01.xml +0 -10
  27. package/test/not-sa02.xml +0 -30
  28. package/test/param_types.xml +0 -1
  29. package/test/sign.xsd +0 -71
  30. package/test/smev-message-exchange-basic-1.1.xsd +0 -380
  31. package/test/smev-message-exchange-faults-1.1.xsd +0 -365
  32. package/test/smev-message-exchange-service-1.1.xsd +0 -643
  33. package/test/smev-message-exchange-types-1.1.xsd +0 -697
  34. package/test/snils-by-additionalData-1.0.1.xsd +0 -29
  35. package/test/soap.xml +0 -40
  36. package/test/supplementary/fns-common-types.xsd +0 -430
  37. package/test/supplementary/smev-supplementary-commons.xsd +0 -689
  38. package/test/test.js +0 -532
@@ -1,6 +1,7 @@
1
1
  const XMLReader = require ('./XMLReader.js')
2
2
 
3
3
  const CH_HASH = '#'.charCodeAt (0)
4
+ const CH_X = 'x'.charCodeAt (0)
4
5
 
5
6
  const PREDEFINED = new Map ([
6
7
  ['lt' , '<'],
@@ -37,18 +38,23 @@ const EntityResolver = class {
37
38
  r += body.get (key)
38
39
 
39
40
  }
40
- else {
41
+ else if (key.charCodeAt (0) === CH_HASH) {
41
42
 
42
- const charCode = key.charCodeAt (0) === CH_HASH ? parseInt (key.slice (1), 16) : parseInt (key, 10)
43
-
44
- if (isNaN (charCode) || charCode <= 0) throw new Error ('Unknown entity reference ' + key + ' in ' + JSON.stringify ([s]))
43
+ const charCode = key.charCodeAt (1) === CH_X ? parseInt (key.slice (2), 16) : parseInt (key.slice (1), 10)
45
44
 
45
+ if (isNaN (charCode) || charCode <= 0) throw Error ('Invalid character reference ' + key + ' in ' + JSON.stringify ([s]))
46
+
46
47
  const c = String.fromCharCode (charCode)
47
48
 
48
49
  body.set (key, c)
49
50
 
50
51
  r += c
51
52
 
53
+ }
54
+ else {
55
+
56
+ throw Error ('Unknown entity reference ' + key + ' in ' + JSON.stringify ([s]))
57
+
52
58
  }
53
59
 
54
60
  start = s.indexOf ('&', ++ end)
package/package.json CHANGED
@@ -1,10 +1,25 @@
1
1
  {
2
2
  "name": "xml-toolkit",
3
- "version": "1.0.32",
4
- "description": "Collection of classes for dealing with XML",
3
+ "version": "1.0.34",
4
+ "description": "XML parser, marshaller, SOAP adapter",
5
5
  "main": "index.js",
6
+ "files": ["/lib", "/badges"],
6
7
  "scripts": {
7
- "test": "node test/test.js"
8
+ "test": "jest",
9
+ "test-ci": "jest --ci --coverage"
10
+ },
11
+ "jest": {
12
+ "collectCoverageFrom": [
13
+ "lib/**/*.js"
14
+ ],
15
+ "coverageReporters": ["clover", "json", "lcov", "text", "json-summary"],
16
+ "verbose": false,
17
+ "testPathIgnorePatterns": [
18
+ "/node_modules/",
19
+ "/__tests__/0ld",
20
+ "/__tests__/data",
21
+ "/__tests__/lib"
22
+ ]
8
23
  },
9
24
  "repository": {
10
25
  "type": "git",
@@ -14,6 +29,7 @@
14
29
  "xml",
15
30
  "soap",
16
31
  "xsd",
32
+ "wsdl",
17
33
  "sax"
18
34
  ],
19
35
  "author": "Dmitry Ovsyanko",
@@ -22,6 +38,9 @@
22
38
  "url": "https://github.com/do-/node-xml-toolkit/issues"
23
39
  },
24
40
  "homepage": "https://github.com/do-/node-xml-toolkit#readme",
41
+ "devDependencies": {
42
+ "jest": "^29.3.1"
43
+ },
25
44
  "dependencies": {
26
45
  "string-escape-map": "^1.0.0"
27
46
  }