node-opcua-xml2json 2.175.6 → 2.179.0
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.
- package/dist/source/definition_parser.d.ts +1 -1
- package/dist/source/definition_parser.js +3 -3
- package/dist/source/definition_parser.js.map +1 -1
- package/dist/source/fragment_cloner.d.ts +5 -5
- package/dist/source/fragment_cloner.js +5 -5
- package/dist/source/fragment_cloner.js.map +1 -1
- package/dist/source/fragment_cloner_parser.d.ts +2 -2
- package/dist/source/fragment_cloner_parser.js +5 -3
- package/dist/source/fragment_cloner_parser.js.map +1 -1
- package/dist/source/index.d.ts +3 -3
- package/dist/source/index.js +3 -3
- package/dist/source/index.js.map +1 -1
- package/dist/source/nodejs/xml2json_fs.d.ts +1 -1
- package/dist/source/nodejs/xml2json_fs.js +2 -2
- package/dist/source/nodejs/xml2json_fs.js.map +1 -1
- package/dist/source/thirdparties/escape.js +9 -14
- package/dist/source/thirdparties/escape.js.map +1 -1
- package/dist/source/thirdparties/parser/lts.d.ts +1 -1
- package/dist/source/thirdparties/parser/lts.js +8 -8
- package/dist/source/thirdparties/parser/lts.js.map +1 -1
- package/dist/source/xml2Json_pojo_tools.js.map +1 -1
- package/dist/source/xml2json.d.ts +4 -4
- package/dist/source/xml2json.js +17 -15
- package/dist/source/xml2json.js.map +1 -1
- package/dist/source/xml2json_pojo.d.ts +2 -2
- package/dist/source/xml2json_pojo.js +6 -3
- package/dist/source/xml2json_pojo.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
- package/source/definition_parser.ts +9 -5
- package/source/fragment_cloner.ts +6 -6
- package/source/fragment_cloner_parser.ts +7 -5
- package/source/index.ts +3 -3
- package/source/nodejs/xml2json_fs.ts +3 -3
- package/source/thirdparties/escape.ts +9 -20
- package/source/thirdparties/parser/lts.ts +18 -24
- package/source/xml2Json_pojo_tools.ts +2 -4
- package/source/xml2json.ts +31 -26
- package/source/xml2json_pojo.ts +8 -5
|
@@ -11,12 +11,12 @@ exports.definitionReaderStateParser = exports._definitionParser = void 0;
|
|
|
11
11
|
// </Definition>
|
|
12
12
|
const node_opcua_assert_1 = __importDefault(require("node-opcua-assert"));
|
|
13
13
|
exports._definitionParser = {
|
|
14
|
-
init(
|
|
14
|
+
init(_name, attrs, _parent, _engine) {
|
|
15
15
|
(0, node_opcua_assert_1.default)(!this.parent.nFields || this.parent.definitionFields.length === 0);
|
|
16
16
|
this.parent.definitionFields = [];
|
|
17
17
|
this.parent.definitionName = attrs.SymbolicName || attrs.Name;
|
|
18
18
|
this.array = this.parent.definitionFields;
|
|
19
|
-
this.isUnion = attrs.IsUnion === "true"
|
|
19
|
+
this.isUnion = attrs.IsUnion === "true";
|
|
20
20
|
},
|
|
21
21
|
parser: {
|
|
22
22
|
Field: {
|
|
@@ -60,7 +60,7 @@ exports._definitionParser = {
|
|
|
60
60
|
obj.arrayDimensions = this.attrs.ArrayDimensions.split(",").map((e) => parseInt(e, 10));
|
|
61
61
|
}
|
|
62
62
|
if (this.attrs.IsOptional !== undefined) {
|
|
63
|
-
obj.isOptional = this.attrs.IsOptional === "true"
|
|
63
|
+
obj.isOptional = this.attrs.IsOptional === "true";
|
|
64
64
|
}
|
|
65
65
|
if (this.attrs.SymbolicName !== undefined) {
|
|
66
66
|
obj.symbolicName = this.attrs.SymbolicName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition_parser.js","sourceRoot":"","sources":["../../source/definition_parser.ts"],"names":[],"mappings":";;;;;;AAAA,8BAA8B;AAC9B,sFAAsF;AACtF,yCAAyC;AACzC,YAAY;AACZ,gBAAgB;AAChB,0EAAuC;
|
|
1
|
+
{"version":3,"file":"definition_parser.js","sourceRoot":"","sources":["../../source/definition_parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { Xml2Json, XmlAttributes
|
|
1
|
+
import type { IReaderState, Xml2Json, XmlAttributes } from "./xml2json";
|
|
2
2
|
export declare class InternalFragmentClonerReaderState implements IReaderState {
|
|
3
3
|
private _xw;
|
|
4
|
-
value:
|
|
4
|
+
value: string | null;
|
|
5
5
|
initLevel: number;
|
|
6
6
|
engine?: Xml2Json;
|
|
7
|
-
_on_startElement(
|
|
7
|
+
_on_startElement(_level: number, elementName: string, attrs: XmlAttributes): void;
|
|
8
8
|
_on_endElement(level: number, elementName: string): void;
|
|
9
|
-
_on_init(elementName: string, attrs: XmlAttributes,
|
|
9
|
+
_on_init(elementName: string, attrs: XmlAttributes, _parent: IReaderState, level: number, engine: Xml2Json): void;
|
|
10
10
|
_on_finish(): void;
|
|
11
|
-
_on_endElement2(
|
|
11
|
+
_on_endElement2(_level: number, _elementName: string): void;
|
|
12
12
|
_on_text(text: string): void;
|
|
13
13
|
}
|
|
@@ -4,10 +4,10 @@ exports.InternalFragmentClonerReaderState = void 0;
|
|
|
4
4
|
const XMLWriter = require("xml-writer");
|
|
5
5
|
class InternalFragmentClonerReaderState {
|
|
6
6
|
_xw = new XMLWriter(true);
|
|
7
|
-
value;
|
|
7
|
+
value = null;
|
|
8
8
|
initLevel = 0;
|
|
9
9
|
engine;
|
|
10
|
-
_on_startElement(
|
|
10
|
+
_on_startElement(_level, elementName, attrs) {
|
|
11
11
|
this._xw.startElement(elementName);
|
|
12
12
|
for (const [attName, attValue] of Object.entries(attrs)) {
|
|
13
13
|
this._xw.writeAttribute(attName, attValue);
|
|
@@ -17,12 +17,12 @@ class InternalFragmentClonerReaderState {
|
|
|
17
17
|
this._xw.endElement();
|
|
18
18
|
if (this.initLevel === level) {
|
|
19
19
|
this.value = this._xw.toString();
|
|
20
|
-
this.engine
|
|
20
|
+
this.engine?._demote(this, this.engine?.currentLevel, elementName);
|
|
21
21
|
this.engine = undefined;
|
|
22
22
|
this._on_finish();
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
_on_init(elementName, attrs,
|
|
25
|
+
_on_init(elementName, attrs, _parent, level, engine) {
|
|
26
26
|
this.engine = engine;
|
|
27
27
|
this.initLevel = level;
|
|
28
28
|
this._xw = new XMLWriter(true);
|
|
@@ -34,7 +34,7 @@ class InternalFragmentClonerReaderState {
|
|
|
34
34
|
_on_finish() {
|
|
35
35
|
/** */
|
|
36
36
|
}
|
|
37
|
-
_on_endElement2(
|
|
37
|
+
_on_endElement2(_level, _elementName) {
|
|
38
38
|
/** */
|
|
39
39
|
}
|
|
40
40
|
_on_text(text) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment_cloner.js","sourceRoot":"","sources":["../../source/fragment_cloner.ts"],"names":[],"mappings":";;;AAaA,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAExC,MAAa,iCAAiC;IAClC,GAAG,GAAc,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,
|
|
1
|
+
{"version":3,"file":"fragment_cloner.js","sourceRoot":"","sources":["../../source/fragment_cloner.ts"],"names":[],"mappings":";;;AAaA,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAExC,MAAa,iCAAiC;IAClC,GAAG,GAAc,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,GAAkB,IAAI,CAAC;IAC5B,SAAS,GAAG,CAAC,CAAC;IACd,MAAM,CAAY;IAElB,gBAAgB,CAAC,MAAc,EAAE,WAAmB,EAAE,KAAoB;QAC7E,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IACM,cAAc,CAAC,KAAa,EAAE,WAAmB;QACpD,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;IACM,QAAQ,CAAC,WAAmB,EAAE,KAAoB,EAAE,OAAqB,EAAE,KAAa,EAAE,MAAgB;QAC7G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAEM,UAAU;QACb,MAAM;IACV,CAAC;IAEM,eAAe,CAAC,MAAc,EAAE,YAAoB;QACvD,MAAM;IACV,CAAC;IAEM,QAAQ,CAAC,IAAY;QACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACJ;AA1CD,8EA0CC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { XmlAttributes } from "./xml2json";
|
|
1
|
+
import type { XmlAttributes } from "./xml2json";
|
|
2
2
|
export declare class FragmentClonerParser {
|
|
3
|
-
value:
|
|
3
|
+
value: string | null | undefined;
|
|
4
4
|
private _cloneFragment?;
|
|
5
5
|
private engine?;
|
|
6
6
|
startElement(elementName: string, attrs: XmlAttributes): void;
|
|
@@ -8,11 +8,13 @@ class FragmentClonerParser {
|
|
|
8
8
|
engine;
|
|
9
9
|
startElement(elementName, attrs) {
|
|
10
10
|
this._cloneFragment = new fragment_cloner_1.InternalFragmentClonerReaderState();
|
|
11
|
-
this.engine
|
|
11
|
+
this.engine?._promote(this._cloneFragment, this.engine?.currentLevel, elementName, attrs);
|
|
12
12
|
}
|
|
13
13
|
finish() {
|
|
14
|
-
this.value = this._cloneFragment
|
|
15
|
-
this._cloneFragment
|
|
14
|
+
this.value = this._cloneFragment?.value;
|
|
15
|
+
if (this._cloneFragment) {
|
|
16
|
+
this._cloneFragment.value = null;
|
|
17
|
+
}
|
|
16
18
|
}
|
|
17
19
|
}
|
|
18
20
|
exports.FragmentClonerParser = FragmentClonerParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment_cloner_parser.js","sourceRoot":"","sources":["../../source/fragment_cloner_parser.ts"],"names":[],"mappings":";;;AAAA,uDAAsE;AAGtE,MAAa,oBAAoB;IACtB,KAAK,
|
|
1
|
+
{"version":3,"file":"fragment_cloner_parser.js","sourceRoot":"","sources":["../../source/fragment_cloner_parser.ts"],"names":[],"mappings":";;;AAAA,uDAAsE;AAGtE,MAAa,oBAAoB;IACtB,KAAK,CAA4B;IAChC,cAAc,CAAqC;IACnD,MAAM,CAGZ;IAEK,YAAY,CAAC,WAAmB,EAAE,KAAoB;QACzD,IAAI,CAAC,cAAc,GAAG,IAAI,mDAAiC,EAAE,CAAC;QAC9D,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9F,CAAC;IACM,MAAM;QACT,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC;QACxC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC;QACrC,CAAC;IACL,CAAC;CACJ;AAlBD,oDAkBC"}
|
package/dist/source/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from "./
|
|
1
|
+
export * from "./definition_parser";
|
|
2
2
|
export * from "./fragment_cloner";
|
|
3
|
-
export * from "./xml2json_pojo";
|
|
4
3
|
export * from "./fragment_cloner_parser";
|
|
5
|
-
export * from "./
|
|
4
|
+
export * from "./xml2json";
|
|
5
|
+
export * from "./xml2json_pojo";
|
package/dist/source/index.js
CHANGED
|
@@ -14,9 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./
|
|
17
|
+
__exportStar(require("./definition_parser"), exports);
|
|
18
18
|
__exportStar(require("./fragment_cloner"), exports);
|
|
19
|
-
__exportStar(require("./xml2json_pojo"), exports);
|
|
20
19
|
__exportStar(require("./fragment_cloner_parser"), exports);
|
|
21
|
-
__exportStar(require("./
|
|
20
|
+
__exportStar(require("./xml2json"), exports);
|
|
21
|
+
__exportStar(require("./xml2json_pojo"), exports);
|
|
22
22
|
//# sourceMappingURL=index.js.map
|
package/dist/source/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,oDAAkC;AAClC,2DAAyC;AACzC,6CAA2B;AAC3B,kDAAgC"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Xml2JsonFs = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
8
|
const xml2json_1 = require("../xml2json");
|
|
9
9
|
class Xml2JsonFs extends xml2json_1.Xml2Json {
|
|
10
10
|
/**
|
|
@@ -12,7 +12,7 @@ class Xml2JsonFs extends xml2json_1.Xml2Json {
|
|
|
12
12
|
*/
|
|
13
13
|
async parse(xmlFile) {
|
|
14
14
|
// slightly faster but require more memory ..
|
|
15
|
-
let data = await
|
|
15
|
+
let data = await node_fs_1.default.promises.readFile(xmlFile);
|
|
16
16
|
if (data[0] === 0xef && data[1] === 0xbb && data[2] === 0xbf) {
|
|
17
17
|
data = data.subarray(3);
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml2json_fs.js","sourceRoot":"","sources":["../../../source/nodejs/xml2json_fs.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"xml2json_fs.js","sourceRoot":"","sources":["../../../source/nodejs/xml2json_fs.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0CAAuC;AAEvC,MAAa,UAAW,SAAQ,mBAAQ;IACpC;;OAEG;IACI,KAAK,CAAC,KAAK,CAAC,OAAe;QAC9B,6CAA6C;QAC7C,IAAI,IAAI,GAAG,MAAM,iBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC3D,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;CACJ;AAbD,gCAaC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.escapeXML = escapeXML;
|
|
4
4
|
exports.unescapeXML = unescapeXML;
|
|
@@ -9,7 +9,7 @@ const escapeXMLTable = {
|
|
|
9
9
|
"<": "<",
|
|
10
10
|
">": ">",
|
|
11
11
|
'"': """,
|
|
12
|
-
"'": "'"
|
|
12
|
+
"'": "'"
|
|
13
13
|
};
|
|
14
14
|
function escapeXMLReplace(match) {
|
|
15
15
|
return escapeXMLTable[match];
|
|
@@ -19,14 +19,12 @@ const unescapeXMLTable = {
|
|
|
19
19
|
"<": "<",
|
|
20
20
|
">": ">",
|
|
21
21
|
""": '"',
|
|
22
|
-
"'": "'"
|
|
22
|
+
"'": "'"
|
|
23
23
|
};
|
|
24
24
|
function unescapeXMLReplace(_match) {
|
|
25
25
|
const match = _match;
|
|
26
26
|
if (match[1] === "#") {
|
|
27
|
-
const num = match[2] === "x"
|
|
28
|
-
? parseInt(match.slice(3), 16)
|
|
29
|
-
: parseInt(match.slice(2), 10);
|
|
27
|
+
const num = match[2] === "x" ? parseInt(match.slice(3), 16) : parseInt(match.slice(2), 10);
|
|
30
28
|
// https://www.w3.org/TR/xml/#NT-Char defines legal XML characters:
|
|
31
29
|
// #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
|
|
32
30
|
if (num === 0x9 ||
|
|
@@ -37,12 +35,12 @@ function unescapeXMLReplace(_match) {
|
|
|
37
35
|
(num >= 0x10000 && num <= 0x10ffff)) {
|
|
38
36
|
return String.fromCodePoint(num);
|
|
39
37
|
}
|
|
40
|
-
throw new Error(
|
|
38
|
+
throw new Error(`Illegal XML character 0x${num.toString(16)}`);
|
|
41
39
|
}
|
|
42
40
|
if (unescapeXMLTable[match]) {
|
|
43
41
|
return unescapeXMLTable[match] || match;
|
|
44
42
|
}
|
|
45
|
-
throw new Error(
|
|
43
|
+
throw new Error(`Illegal XML entity ${match}`);
|
|
46
44
|
}
|
|
47
45
|
function escapeXML(s) {
|
|
48
46
|
return s.replace(/["&'<>]/g, escapeXMLReplace);
|
|
@@ -52,12 +50,9 @@ function unescapeXML(s) {
|
|
|
52
50
|
let start = -1;
|
|
53
51
|
let end = -1;
|
|
54
52
|
let previous = 0;
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
result =
|
|
58
|
-
result +
|
|
59
|
-
s.slice(previous, start) +
|
|
60
|
-
unescapeXMLReplace(s.slice(start, end + 1));
|
|
53
|
+
// biome-ignore lint/suspicious/noAssignInExpressions: ordered scan, both advance together each iteration
|
|
54
|
+
while ((start = s.indexOf("&", previous)) !== -1 && (end = s.indexOf(";", start + 1)) !== -1) {
|
|
55
|
+
result = result + s.slice(previous, start) + unescapeXMLReplace(s.slice(start, end + 1));
|
|
61
56
|
previous = end + 1;
|
|
62
57
|
}
|
|
63
58
|
// shortcut if loop never entered:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"escape.js","sourceRoot":"","sources":["../../../source/thirdparties/escape.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"escape.js","sourceRoot":"","sources":["../../../source/thirdparties/escape.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SaxLtx = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_events_1 = require("node:events");
|
|
5
5
|
const escape_1 = require("../escape");
|
|
6
6
|
const STATE_TEXT = 0;
|
|
7
7
|
const STATE_IGNORE_COMMENT = 1;
|
|
@@ -14,7 +14,7 @@ const STATE_ATTR_QUOT = 7;
|
|
|
14
14
|
const STATE_ATTR_VALUE = 8;
|
|
15
15
|
const STATE_CDATA = 9;
|
|
16
16
|
const STATE_IGNORE_CDATA = 10;
|
|
17
|
-
class SaxLtx extends
|
|
17
|
+
class SaxLtx extends node_events_1.EventEmitter {
|
|
18
18
|
#write;
|
|
19
19
|
constructor() {
|
|
20
20
|
super();
|
|
@@ -29,7 +29,6 @@ class SaxLtx extends events_1.EventEmitter {
|
|
|
29
29
|
this.emit("endElement", tagName, false);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
;
|
|
33
32
|
let state = STATE_TEXT;
|
|
34
33
|
let remainder = null;
|
|
35
34
|
let parseRemainder = false;
|
|
@@ -136,8 +135,7 @@ class SaxLtx extends events_1.EventEmitter {
|
|
|
136
135
|
recordStart = pos + 8;
|
|
137
136
|
state = STATE_CDATA;
|
|
138
137
|
}
|
|
139
|
-
else if (data.length < pos + 8 &&
|
|
140
|
-
"[CDATA[".startsWith(data.slice(pos + 1))) {
|
|
138
|
+
else if (data.length < pos + 8 && "[CDATA[".startsWith(data.slice(pos + 1))) {
|
|
141
139
|
// We potentially have CDATA, but the chunk is ending; stop here and let the next write() decide
|
|
142
140
|
parseRemainder = true;
|
|
143
141
|
pos = data.length;
|
|
@@ -215,8 +213,10 @@ class SaxLtx extends events_1.EventEmitter {
|
|
|
215
213
|
break;
|
|
216
214
|
case STATE_ATTR_VALUE:
|
|
217
215
|
if (c === attrQuote) {
|
|
218
|
-
const
|
|
219
|
-
|
|
216
|
+
const recorded = endRecording();
|
|
217
|
+
if (recorded !== undefined && attrName !== undefined) {
|
|
218
|
+
attrs[attrName] = (0, escape_1.unescapeXML)(recorded);
|
|
219
|
+
}
|
|
220
220
|
attrName = undefined;
|
|
221
221
|
state = STATE_TAG;
|
|
222
222
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lts.js","sourceRoot":"","sources":["../../../../source/thirdparties/parser/lts.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"lts.js","sourceRoot":"","sources":["../../../../source/thirdparties/parser/lts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml2Json_pojo_tools.js","sourceRoot":"","sources":["../../source/xml2Json_pojo_tools.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,yCAAmG;AAGnG,MAAa,YAAa,SAAQ,0BAAe;IACtC,MAAM,CAAY;IAClB,KAAK,CAAU;IAEtB,0DAA0D;IACnD,QAAQ,CAAM;IACd,IAAI,CAAS;IACb,SAAS,CAAiB;
|
|
1
|
+
{"version":3,"file":"xml2Json_pojo_tools.js","sourceRoot":"","sources":["../../source/xml2Json_pojo_tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,9 +47,9 @@ export declare class ReaderState extends ReaderStateBase {
|
|
|
47
47
|
_finish?: () => void;
|
|
48
48
|
_startElement?: (name: string, attrs: XmlAttributes) => void;
|
|
49
49
|
_endElement?: (name: string) => void;
|
|
50
|
-
parser:
|
|
50
|
+
parser: Parser;
|
|
51
51
|
attrs?: XmlAttributes;
|
|
52
|
-
chunks:
|
|
52
|
+
chunks: string[];
|
|
53
53
|
text: string;
|
|
54
54
|
name?: string | undefined;
|
|
55
55
|
level: number;
|
|
@@ -57,7 +57,7 @@ export declare class ReaderState extends ReaderStateBase {
|
|
|
57
57
|
engine?: Xml2Json;
|
|
58
58
|
parent?: IReaderState;
|
|
59
59
|
root?: Xml2Json;
|
|
60
|
-
data?:
|
|
60
|
+
data?: Record<string, unknown>;
|
|
61
61
|
constructor(options: ReaderStateParser | ReaderState);
|
|
62
62
|
/**
|
|
63
63
|
* @protected
|
|
@@ -74,7 +74,7 @@ export declare class ReaderState extends ReaderStateBase {
|
|
|
74
74
|
/**
|
|
75
75
|
* @protected
|
|
76
76
|
*/
|
|
77
|
-
_on_endElement2(
|
|
77
|
+
_on_endElement2(_level: number, elementName: string): void;
|
|
78
78
|
/**
|
|
79
79
|
|
|
80
80
|
* @protected
|
package/dist/source/xml2json.js
CHANGED
|
@@ -25,6 +25,7 @@ function _coerceParser(parser) {
|
|
|
25
25
|
}
|
|
26
26
|
return parser;
|
|
27
27
|
}
|
|
28
|
+
// biome-ignore lint/suspicious/noUnsafeDeclarationMerging: interface adds typed members/overloads for this class
|
|
28
29
|
class ReaderStateBase {
|
|
29
30
|
}
|
|
30
31
|
exports.ReaderStateBase = ReaderStateBase;
|
|
@@ -93,14 +94,14 @@ class ReaderState extends ReaderStateBase {
|
|
|
93
94
|
if (this._startElement) {
|
|
94
95
|
this._startElement(elementName, attrs);
|
|
95
96
|
}
|
|
96
|
-
if (this.engine && Object.
|
|
97
|
+
if (this.engine && Object.hasOwn(this.parser, elementName)) {
|
|
97
98
|
this.engine._promote(this.parser[elementName], level, elementName, attrs);
|
|
98
99
|
}
|
|
99
100
|
}
|
|
100
101
|
/**
|
|
101
102
|
* @protected
|
|
102
103
|
*/
|
|
103
|
-
_on_endElement2(
|
|
104
|
+
_on_endElement2(_level, elementName) {
|
|
104
105
|
if (this._endElement) {
|
|
105
106
|
this._endElement(elementName);
|
|
106
107
|
}
|
|
@@ -123,10 +124,8 @@ class ReaderState extends ReaderStateBase {
|
|
|
123
124
|
this.chunks = [];
|
|
124
125
|
// this is the end
|
|
125
126
|
this._on_finish();
|
|
126
|
-
if (this.parent &&
|
|
127
|
-
this.
|
|
128
|
-
Object.prototype.hasOwnProperty.call(this.parent.parser, elementName)) {
|
|
129
|
-
this.engine._demote(this, level, elementName);
|
|
127
|
+
if (this.parent instanceof ReaderState && Object.hasOwn(this.parent.parser, elementName)) {
|
|
128
|
+
this.engine?._demote(this, level, elementName);
|
|
130
129
|
}
|
|
131
130
|
}
|
|
132
131
|
}
|
|
@@ -221,6 +220,10 @@ class Xml2Json {
|
|
|
221
220
|
});
|
|
222
221
|
const parent = this.current_state;
|
|
223
222
|
this.current_state = new_state;
|
|
223
|
+
// parent is null only for the root element; every _on_init implementation in this codebase
|
|
224
|
+
// names the parameter `_parent` (unused), so widening the public IReaderState signature to
|
|
225
|
+
// accept null would ripple into every consumer package that already treats it as non-null.
|
|
226
|
+
// biome-ignore lint/style/noNonNullAssertion: see comment above
|
|
224
227
|
this.current_state._on_init(name || "???", attr, parent, level, this);
|
|
225
228
|
}
|
|
226
229
|
/**
|
|
@@ -229,7 +232,11 @@ class Xml2Json {
|
|
|
229
232
|
*/
|
|
230
233
|
_demote(cur_state, level, elementName) {
|
|
231
234
|
/// assert(this.current_state === cur_state);
|
|
232
|
-
const
|
|
235
|
+
const popped = this.state_stack.pop();
|
|
236
|
+
if (!popped) {
|
|
237
|
+
throw new Error("_demote called without a matching _promote");
|
|
238
|
+
}
|
|
239
|
+
const { state, backup } = popped;
|
|
233
240
|
this.current_state = state;
|
|
234
241
|
if (this.current_state) {
|
|
235
242
|
this.current_state._on_endElement2(level, elementName);
|
|
@@ -287,15 +294,10 @@ class Xml2Json {
|
|
|
287
294
|
});
|
|
288
295
|
parser.write(data);
|
|
289
296
|
parser.end("");
|
|
297
|
+
if (!this.current_state) {
|
|
298
|
+
return {};
|
|
299
|
+
}
|
|
290
300
|
return this.current_state._pojo;
|
|
291
|
-
/*
|
|
292
|
-
return await new Promise((resolve) => {
|
|
293
|
-
parser.once("close", () => {
|
|
294
|
-
resolve((this.current_state! as any)._pojo);
|
|
295
|
-
});
|
|
296
|
-
//parser.write(data);
|
|
297
|
-
parser.end(data);
|
|
298
|
-
})*/
|
|
299
301
|
}
|
|
300
302
|
}
|
|
301
303
|
exports.Xml2Json = Xml2Json;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml2json.js","sourceRoot":"","sources":["../../source/xml2json.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;
|
|
1
|
+
{"version":3,"file":"xml2json.js","sourceRoot":"","sources":["../../source/xml2json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { type withPojoLambda } from "./xml2Json_pojo_tools";
|
|
2
|
+
import { type ReaderState, type ReaderStateParser, Xml2Json, type XmlAttributes } from "./xml2json";
|
|
3
3
|
export declare const json_parser: ReaderStateParser;
|
|
4
4
|
export declare function startPojo(pThis: ReaderState, elementName: string, attrs: XmlAttributes, withPojo: withPojoLambda): void;
|
|
5
5
|
export declare class Xml2JsonPojo extends Xml2Json {
|
|
@@ -2,22 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Xml2JsonPojo = exports.json_parser = void 0;
|
|
4
4
|
exports.startPojo = startPojo;
|
|
5
|
-
const xml2json_1 = require("./xml2json");
|
|
6
5
|
const xml2Json_pojo_tools_1 = require("./xml2Json_pojo_tools");
|
|
6
|
+
const xml2json_1 = require("./xml2json");
|
|
7
7
|
const json_extractor = new xml2Json_pojo_tools_1.ReaderState2();
|
|
8
8
|
exports.json_parser = {
|
|
9
9
|
init(elementName, attrs, parent, engine) {
|
|
10
10
|
json_extractor._on_init(elementName, attrs, parent, 0, engine);
|
|
11
11
|
},
|
|
12
|
+
// ReaderStateParser.finish declares `this: IReaderState`, which doesn't expose `.parent` — the
|
|
13
|
+
// runtime `this` here is always the ReaderState instance that owns this parser entry.
|
|
14
|
+
// biome-ignore lint/suspicious/noExplicitAny: see comment above
|
|
12
15
|
finish() {
|
|
13
16
|
this.parent._pojo = json_extractor._pojo;
|
|
14
17
|
}
|
|
15
18
|
};
|
|
16
19
|
function startPojo(pThis, elementName, attrs, withPojo) {
|
|
17
|
-
pThis.engine
|
|
20
|
+
pThis.engine?._promote(json_extractor, pThis.engine?.currentLevel, elementName, attrs);
|
|
18
21
|
json_extractor._withPojo = (name, pojo) => {
|
|
19
22
|
withPojo(name, pojo);
|
|
20
|
-
pThis.engine
|
|
23
|
+
pThis.engine?._demote(json_extractor, pThis.engine?.currentLevel, elementName);
|
|
21
24
|
};
|
|
22
25
|
}
|
|
23
26
|
class Xml2JsonPojo extends xml2json_1.Xml2Json {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml2json_pojo.js","sourceRoot":"","sources":["../../source/xml2json_pojo.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"xml2json_pojo.js","sourceRoot":"","sources":["../../source/xml2json_pojo.ts"],"names":[],"mappings":";;;AAgBA,8BAMC;AAtBD,+DAA0E;AAC1E,yCAAuH;AAEvH,MAAM,cAAc,GAAiB,IAAI,kCAAY,EAAE,CAAC;AAC3C,QAAA,WAAW,GAAsB;IAC1C,IAAI,CAAqB,WAAmB,EAAE,KAAoB,EAAE,MAAoB,EAAE,MAAgB;QACtG,cAAc,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IACD,+FAA+F;IAC/F,sFAAsF;IACtF,gEAAgE;IAChE,MAAM;QACF,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IAC7C,CAAC;CACJ,CAAC;AAEF,SAAgB,SAAS,CAAC,KAAkB,EAAE,WAAmB,EAAE,KAAoB,EAAE,QAAwB;IAC7G,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IACvF,cAAc,CAAC,SAAS,GAAG,CAAC,IAAY,EAAE,IAAa,EAAE,EAAE;QACvD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrB,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IACnF,CAAC,CAAC;AACN,CAAC;AAED,MAAa,YAAa,SAAQ,mBAAQ;IACtC;QACI,KAAK,CAAC,cAAmC,CAAC,CAAC;IAC/C,CAAC;CACJ;AAJD,oCAIC"}
|