@flighthq/xml 0.3.0-next.1032.e2b99fc → 0.3.0-next.1162.e90e518
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/xmlParse.d.ts.map +1 -1
- package/dist/xmlParse.js +81 -19
- package/dist/xmlParse.js.map +1 -1
- package/package.json +2 -2
- package/src/xmlParse.test.ts +26 -0
package/dist/xmlParse.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xmlParse.d.ts","sourceRoot":"","sources":["../src/xmlParse.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D;8EAC8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxE;AAED;;qEAEqE;AACrE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"xmlParse.d.ts","sourceRoot":"","sources":["../src/xmlParse.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D;8EAC8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxE;AAED;;qEAEqE;AACrE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAQ/D"}
|
package/dist/xmlParse.js
CHANGED
|
@@ -21,14 +21,10 @@ export function parseXmlAttributes(attrs) {
|
|
|
21
21
|
* Returns the root element, or null when the input contains no recognizable element.
|
|
22
22
|
* Does not validate DTD, namespaces, or processing instructions. */
|
|
23
23
|
export function parseXmlDocument(xml) {
|
|
24
|
-
// Normalize: strip comments
|
|
25
|
-
let src =
|
|
26
|
-
// Strip XML declaration and DOCTYPE
|
|
27
|
-
|
|
28
|
-
src = src
|
|
29
|
-
.replace(/<\?[\s\S]*?\?>/g, '')
|
|
30
|
-
.replace(/<!DOCTYPE[^>[]*(?:\[[\s\S]*?\][^>]*)?>/gi, '')
|
|
31
|
-
.trim();
|
|
24
|
+
// Normalize: strip comments and normalize line endings.
|
|
25
|
+
let src = stripXmlComments(xml).replace(/\r\n?/g, '\n');
|
|
26
|
+
// Strip XML declaration and DOCTYPE before parsing the root element.
|
|
27
|
+
src = stripXmlDoctypes(src.replace(/<\?[\s\S]*?\?>/g, '')).trim();
|
|
32
28
|
return parseElement(src, { pos: 0 });
|
|
33
29
|
}
|
|
34
30
|
const XML_ENTITIES = {
|
|
@@ -39,12 +35,15 @@ const XML_ENTITIES = {
|
|
|
39
35
|
quot: '"',
|
|
40
36
|
};
|
|
41
37
|
function decodeXmlEntities(s) {
|
|
42
|
-
return s.replace(/&(?:#(\d+)|#x([\da-fA-F]+)|(\w+));/g, (
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
38
|
+
return s.replace(/&(?:#(\d+)|#x([\da-fA-F]+)|(\w+));/g, (reference, dec, hex, name) => {
|
|
39
|
+
const numeric = dec ?? hex;
|
|
40
|
+
if (numeric !== undefined) {
|
|
41
|
+
const codepoint = parseInt(numeric, dec !== undefined ? 10 : 16);
|
|
42
|
+
if (codepoint > 0x10ffff || (codepoint >= 0xd800 && codepoint <= 0xdfff))
|
|
43
|
+
return reference;
|
|
44
|
+
return String.fromCodePoint(codepoint);
|
|
45
|
+
}
|
|
46
|
+
return XML_ENTITIES[name] ?? reference;
|
|
48
47
|
});
|
|
49
48
|
}
|
|
50
49
|
function parseElement(src, state) {
|
|
@@ -109,6 +108,17 @@ function parseElement(src, state) {
|
|
|
109
108
|
content.push(decoded);
|
|
110
109
|
continue;
|
|
111
110
|
}
|
|
111
|
+
if (src.slice(state.pos, state.pos + 9) === '<![CDATA[') {
|
|
112
|
+
const cdataStart = state.pos + 9;
|
|
113
|
+
const cdataEnd = src.indexOf(']]>', cdataStart);
|
|
114
|
+
const contentEnd = cdataEnd >= 0 ? cdataEnd : src.length;
|
|
115
|
+
const cdata = src.slice(cdataStart, contentEnd);
|
|
116
|
+
text += cdata.trim();
|
|
117
|
+
if (cdata !== '')
|
|
118
|
+
content.push(cdata);
|
|
119
|
+
state.pos = cdataEnd >= 0 ? cdataEnd + 3 : src.length;
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
112
122
|
// Check for closing tag
|
|
113
123
|
if (src[state.pos + 1] === '/') {
|
|
114
124
|
// Skip to '>'
|
|
@@ -130,11 +140,63 @@ function skipWhitespace(src, state) {
|
|
|
130
140
|
while (state.pos < src.length && /\s/.test(src[state.pos]))
|
|
131
141
|
state.pos++;
|
|
132
142
|
}
|
|
133
|
-
function stripCdata(xml) {
|
|
134
|
-
// Replace CDATA with its raw content
|
|
135
|
-
return xml.replace(/<!\[CDATA\[[\s\S]*?]]>/g, (m) => m.slice(9, m.length - 3));
|
|
136
|
-
}
|
|
137
143
|
function stripXmlComments(xml) {
|
|
138
|
-
|
|
144
|
+
let copyStart = 0;
|
|
145
|
+
let output = '';
|
|
146
|
+
let pos = 0;
|
|
147
|
+
while (pos < xml.length) {
|
|
148
|
+
if (xml.slice(pos, pos + 9) === '<![CDATA[') {
|
|
149
|
+
const cdataEnd = xml.indexOf(']]>', pos + 9);
|
|
150
|
+
pos = cdataEnd >= 0 ? cdataEnd + 3 : xml.length;
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
if (xml.slice(pos, pos + 4) !== '<!--') {
|
|
154
|
+
pos++;
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
output += xml.slice(copyStart, pos);
|
|
158
|
+
const commentEnd = xml.indexOf('-->', pos + 4);
|
|
159
|
+
pos = commentEnd >= 0 ? commentEnd + 3 : xml.length;
|
|
160
|
+
copyStart = pos;
|
|
161
|
+
}
|
|
162
|
+
return output + xml.slice(copyStart);
|
|
163
|
+
}
|
|
164
|
+
function stripXmlDoctypes(xml) {
|
|
165
|
+
let copyStart = 0;
|
|
166
|
+
let output = '';
|
|
167
|
+
let pos = 0;
|
|
168
|
+
while (pos < xml.length) {
|
|
169
|
+
if (xml[pos] !== '<' || xml.slice(pos, pos + 9).toLowerCase() !== '<!doctype') {
|
|
170
|
+
pos++;
|
|
171
|
+
continue;
|
|
172
|
+
}
|
|
173
|
+
output += xml.slice(copyStart, pos);
|
|
174
|
+
pos += 9;
|
|
175
|
+
let internalSubsetDepth = 0;
|
|
176
|
+
let quote = '';
|
|
177
|
+
while (pos < xml.length) {
|
|
178
|
+
const ch = xml[pos];
|
|
179
|
+
if (quote) {
|
|
180
|
+
if (ch === quote)
|
|
181
|
+
quote = '';
|
|
182
|
+
}
|
|
183
|
+
else if (ch === '"' || ch === "'") {
|
|
184
|
+
quote = ch;
|
|
185
|
+
}
|
|
186
|
+
else if (ch === '[') {
|
|
187
|
+
internalSubsetDepth++;
|
|
188
|
+
}
|
|
189
|
+
else if (ch === ']' && internalSubsetDepth > 0) {
|
|
190
|
+
internalSubsetDepth--;
|
|
191
|
+
}
|
|
192
|
+
else if (ch === '>' && internalSubsetDepth === 0) {
|
|
193
|
+
pos++;
|
|
194
|
+
break;
|
|
195
|
+
}
|
|
196
|
+
pos++;
|
|
197
|
+
}
|
|
198
|
+
copyStart = pos;
|
|
199
|
+
}
|
|
200
|
+
return output + xml.slice(copyStart);
|
|
139
201
|
}
|
|
140
202
|
//# sourceMappingURL=xmlParse.js.map
|
package/dist/xmlParse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xmlParse.js","sourceRoot":"","sources":["../src/xmlParse.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,0FAA0F;AAC1F,4EAA4E;AAC5E,oFAAoF;AACpF,sEAAsE;AAItE;8EAC8E;AAC9E,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,kEAAkE;IAClE,MAAM,EAAE,GAAG,2CAA2C,CAAC;IACvD,IAAI,CAAyB,CAAC;IAC9B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,QAAQ,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;qEAEqE;AACrE,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,
|
|
1
|
+
{"version":3,"file":"xmlParse.js","sourceRoot":"","sources":["../src/xmlParse.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/xml",
|
|
3
|
-
"version": "0.3.0-next.
|
|
3
|
+
"version": "0.3.0-next.1162.e90e518",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/flighthq/flight.git",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@flighthq/types": "0.3.0-next.
|
|
39
|
+
"@flighthq/types": "0.3.0-next.1162.e90e518"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"typescript": "^5.3.0"
|
package/src/xmlParse.test.ts
CHANGED
|
@@ -39,6 +39,11 @@ describe('parseXmlAttributes', () => {
|
|
|
39
39
|
expect(attrs['name']).toBe('A');
|
|
40
40
|
});
|
|
41
41
|
|
|
42
|
+
it('preserves out-of-range numeric references without throwing', () => {
|
|
43
|
+
const attrs = parseXmlAttributes('decimal="�" hex="�"');
|
|
44
|
+
expect(attrs).toEqual({ decimal: '�', hex: '�' });
|
|
45
|
+
});
|
|
46
|
+
|
|
42
47
|
it('returns empty object for empty string', () => {
|
|
43
48
|
expect(parseXmlAttributes('')).toEqual({});
|
|
44
49
|
});
|
|
@@ -145,6 +150,14 @@ describe('parseXmlDocument', () => {
|
|
|
145
150
|
expect(doc?.text).toBe('Hello!');
|
|
146
151
|
});
|
|
147
152
|
|
|
153
|
+
it('preserves markup and comment syntax inside CDATA as text', () => {
|
|
154
|
+
const doc = parseXmlDocument('<root><![CDATA[<tag>&<!-- literal -->]]><child/>tail</root>');
|
|
155
|
+
|
|
156
|
+
expect(doc?.children.map((child) => child.name)).toEqual(['child']);
|
|
157
|
+
expect(doc?.content[0]).toBe('<tag>&<!-- literal -->');
|
|
158
|
+
expect(doc?.text).toBe('<tag>&<!-- literal -->tail');
|
|
159
|
+
});
|
|
160
|
+
|
|
148
161
|
it('keeps a > inside a quoted attribute value as data, not tag-end', () => {
|
|
149
162
|
const root = parseXmlDocument('<node attr="a>b"/>');
|
|
150
163
|
expect(root?.name).toBe('node');
|
|
@@ -167,4 +180,17 @@ describe('parseXmlDocument', () => {
|
|
|
167
180
|
expect(doc?.name).toBe('plist');
|
|
168
181
|
expect(doc?.attributes.version).toBe('1.0');
|
|
169
182
|
});
|
|
183
|
+
|
|
184
|
+
it('strips an internal subset when an entity value contains ] and >', () => {
|
|
185
|
+
const xml = '<!DOCTYPE root [<!ENTITY tricky "a ] > b"><!ELEMENT root (#PCDATA)>]>' + '<root value="ok"/>';
|
|
186
|
+
const doc = parseXmlDocument(xml);
|
|
187
|
+
expect(doc?.name).toBe('root');
|
|
188
|
+
expect(doc?.attributes.value).toBe('ok');
|
|
189
|
+
});
|
|
190
|
+
|
|
191
|
+
it('strips a DOCTYPE when its external identifier contains >', () => {
|
|
192
|
+
const xml = '<!DOCTYPE root SYSTEM "https://example.invalid/a>b.dtd"><root/>';
|
|
193
|
+
const doc = parseXmlDocument(xml);
|
|
194
|
+
expect(doc?.name).toBe('root');
|
|
195
|
+
});
|
|
170
196
|
});
|