@mak-98/xml-dirvi-app 0.11.0-beta.13 → 0.11.0-beta.15.2
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.
|
@@ -112,6 +112,20 @@ export declare const XmlProcessingInstructionValueSchema: z.ZodObject<{
|
|
|
112
112
|
}, z.core.$strip>;
|
|
113
113
|
export declare const xmlValueSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
114
114
|
kind: z.ZodLiteral<"document">;
|
|
115
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
116
|
+
kind: z.ZodLiteral<"declaration">;
|
|
117
|
+
version: z.ZodString;
|
|
118
|
+
encoding: z.ZodNullable<z.ZodString>;
|
|
119
|
+
standalone: z.ZodNullable<z.ZodEnum<{
|
|
120
|
+
yes: "yes";
|
|
121
|
+
no: "no";
|
|
122
|
+
}>>;
|
|
123
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
124
|
+
kind: z.ZodLiteral<"doctype">;
|
|
125
|
+
name: z.ZodString;
|
|
126
|
+
publicId: z.ZodNullable<z.ZodString>;
|
|
127
|
+
systemId: z.ZodNullable<z.ZodString>;
|
|
128
|
+
internalSubset: z.ZodNullable<z.ZodString>;
|
|
115
129
|
}, z.core.$strip>, z.ZodObject<{
|
|
116
130
|
kind: z.ZodLiteral<"element">;
|
|
117
131
|
name: z.ZodString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml-tree.d.ts","sourceRoot":"","sources":["../../src/domain/xml-tree.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"xml-tree.d.ts","sourceRoot":"","sources":["../../src/domain/xml-tree.ts"],"names":[],"mappings":"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"}
|
package/dist/domain/xml-tree.js
CHANGED
|
@@ -73,6 +73,8 @@ export const XmlProcessingInstructionValueSchema = z.object({
|
|
|
73
73
|
});
|
|
74
74
|
export const xmlValueSchema = z.discriminatedUnion('kind', [
|
|
75
75
|
XmlDocumentValueSchema,
|
|
76
|
+
XmlDeclarationValueSchema,
|
|
77
|
+
XmlDoctypeValueSchema,
|
|
76
78
|
XmlElementValueSchema,
|
|
77
79
|
XmlTextValueSchema,
|
|
78
80
|
XmlCommentValueSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-xml-entries.d.ts","sourceRoot":"","sources":["../../src/infrastructure/get-xml-entries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"get-xml-entries.d.ts","sourceRoot":"","sources":["../../src/infrastructure/get-xml-entries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAoIjE,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,CAK5E;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,KAAK,EAAE,GACrB,SAAS,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CA2C1C"}
|
|
@@ -27,10 +27,10 @@ function nodeName(node) {
|
|
|
27
27
|
node instanceof XmlDocumentType) {
|
|
28
28
|
return node.name;
|
|
29
29
|
}
|
|
30
|
-
if (node instanceof XmlText)
|
|
31
|
-
return '#text';
|
|
32
30
|
if (node instanceof XmlCdata)
|
|
33
31
|
return '#cdata';
|
|
32
|
+
if (node instanceof XmlText)
|
|
33
|
+
return '#text';
|
|
34
34
|
if (node instanceof XmlComment)
|
|
35
35
|
return '#comment';
|
|
36
36
|
if (node instanceof XmlDeclaration)
|
|
@@ -42,7 +42,9 @@ function describeChild(filePath, position, node) {
|
|
|
42
42
|
if (node instanceof XmlElement) {
|
|
43
43
|
return {
|
|
44
44
|
id,
|
|
45
|
-
kind: '
|
|
45
|
+
kind: node.attributes['xml:space'] === 'preserve'
|
|
46
|
+
? 'leaf'
|
|
47
|
+
: 'unloaded-branch',
|
|
46
48
|
value: {
|
|
47
49
|
kind: 'element',
|
|
48
50
|
name: node.name,
|
|
@@ -53,12 +55,12 @@ function describeChild(filePath, position, node) {
|
|
|
53
55
|
},
|
|
54
56
|
};
|
|
55
57
|
}
|
|
56
|
-
if (node instanceof XmlText) {
|
|
57
|
-
return { id, kind: 'leaf', value: { kind: 'text', text: node.text } };
|
|
58
|
-
}
|
|
59
58
|
if (node instanceof XmlCdata) {
|
|
60
59
|
return { id, kind: 'leaf', value: { kind: 'cdata', text: node.text } };
|
|
61
60
|
}
|
|
61
|
+
if (node instanceof XmlText) {
|
|
62
|
+
return { id, kind: 'leaf', value: { kind: 'text', text: node.text } };
|
|
63
|
+
}
|
|
62
64
|
if (node instanceof XmlComment) {
|
|
63
65
|
return {
|
|
64
66
|
id,
|
|
@@ -115,7 +117,12 @@ export function createXmlRoot(filePath) {
|
|
|
115
117
|
* root; an empty path selects the document itself.
|
|
116
118
|
*/
|
|
117
119
|
export function getXmlEntries(filePath, source, path) {
|
|
118
|
-
const document = parseXml(source
|
|
120
|
+
const document = parseXml(source, {
|
|
121
|
+
preserveCdata: true,
|
|
122
|
+
preserveComments: true,
|
|
123
|
+
preserveDocumentType: true,
|
|
124
|
+
preserveXmlDeclaration: true,
|
|
125
|
+
});
|
|
119
126
|
let children = document.children;
|
|
120
127
|
let position = [];
|
|
121
128
|
for (const segment of path) {
|
|
@@ -130,5 +137,11 @@ export function getXmlEntries(filePath, source, path) {
|
|
|
130
137
|
position = [...position, index];
|
|
131
138
|
children = node.children;
|
|
132
139
|
}
|
|
133
|
-
return children
|
|
140
|
+
return children
|
|
141
|
+
.map((node, index) => ({ node, index }))
|
|
142
|
+
.filter(({ node }) => !(node instanceof XmlText &&
|
|
143
|
+
!(node instanceof XmlCdata) &&
|
|
144
|
+
!node.preserveWhitespace &&
|
|
145
|
+
/^[\t\n\r ]*$/.test(node.text)))
|
|
146
|
+
.map(({ node, index }) => describeChild(filePath, [...position, index], node));
|
|
134
147
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mak-98/xml-dirvi-app",
|
|
3
|
-
"version": "0.11.0-beta.
|
|
3
|
+
"version": "0.11.0-beta.15.2",
|
|
4
4
|
"description": "XML file app for dirvi.",
|
|
5
5
|
"license": "GPL-3.0-or-later",
|
|
6
6
|
"type": "module",
|
|
@@ -20,12 +20,12 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@rgrove/parse-xml": "^5.0.0",
|
|
23
|
-
"dirvi-apis": "0.11.0-beta.
|
|
23
|
+
"dirvi-apis": "0.11.0-beta.15",
|
|
24
24
|
"env-paths": "^4.0.0",
|
|
25
25
|
"zod": "^4.4.3"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"dirvi-lib": "0.11.0-beta.
|
|
28
|
+
"dirvi-lib": "0.11.0-beta.15",
|
|
29
29
|
"@types/node": "^22.0.0",
|
|
30
30
|
"typescript": "^5.0.0"
|
|
31
31
|
},
|