abstract-document 16.0.14 → 16.0.15
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/lib/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.d.ts +1 -1
- package/lib/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.d.ts.map +1 -1
- package/lib/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.js +3 -3
- package/lib/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.js.map +1 -1
- package/package.json +2 -2
- package/src/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.ts +6 -6
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AbstractDoc } from "../../abstract-document/index.js";
|
|
2
|
-
export declare function abstractDocXml(template: string, data: any, partials: Record<string, string>, rendered?: "Mustache" | "Handlebars"): readonly [AbstractDoc.AbstractDoc, images: Record<string, ImageProps>, fonts: Record<string,
|
|
2
|
+
export declare function abstractDocXml(template: string, data: any, partials: Record<string, string>, rendered?: "Mustache" | "Handlebars"): readonly [AbstractDoc.AbstractDoc, images: Record<string, ImageProps>, fonts: Record<string, true>];
|
|
3
3
|
export type ImageProps = {
|
|
4
4
|
readonly src: string;
|
|
5
5
|
readonly width: number | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-doc-of-xml.d.ts","sourceRoot":"","sources":["../../../src/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAI/D,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,QAAQ,GAAE,UAAU,GAAG,YAA2B,GACjD,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"abstract-doc-of-xml.d.ts","sourceRoot":"","sources":["../../../src/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAI/D,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,QAAQ,GAAE,UAAU,GAAG,YAA2B,GACjD,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAKrG;AA4FD,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC"}
|
|
@@ -5,8 +5,8 @@ const creator_js_1 = require("./creator.js");
|
|
|
5
5
|
const handlebars_xml_1 = require("handlebars-xml");
|
|
6
6
|
function abstractDocXml(template, data, partials, rendered = "Handlebars") {
|
|
7
7
|
const xml = rendered === "Mustache" ? (0, handlebars_xml_1.parseMustacheXml)(template, data, partials) : (0, handlebars_xml_1.parseHandlebarsXml)(template, data, partials);
|
|
8
|
-
const [imageUrls,
|
|
9
|
-
return [abstractDocXmlRecursive((0, creator_js_1.creators)(styleNames), xml[0]), imageUrls,
|
|
8
|
+
const [imageUrls, fontFamilies, styleNames] = extractImageFontsStyleNames(xml);
|
|
9
|
+
return [abstractDocXmlRecursive((0, creator_js_1.creators)(styleNames), xml[0]), imageUrls, fontFamilies];
|
|
10
10
|
}
|
|
11
11
|
function abstractDocXmlRecursive(creators, xmlElement, onlyChildren = false) {
|
|
12
12
|
const children = [];
|
|
@@ -103,7 +103,7 @@ function extractImageFontsStyleNames(xmlElement, styleNames = {}, images = {}, f
|
|
|
103
103
|
};
|
|
104
104
|
}
|
|
105
105
|
else if (item.attributes?.fontFamily) {
|
|
106
|
-
fonts[item.attributes.
|
|
106
|
+
fonts[item.attributes.fontFamily] = true;
|
|
107
107
|
if (item.tagName === "StyleName" && item.attributes.name && item.attributes.type) {
|
|
108
108
|
styleNames[item.attributes.name] = item.attributes.type;
|
|
109
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-doc-of-xml.js","sourceRoot":"","sources":["../../../src/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.ts"],"names":[],"mappings":";;AAIA,wCAUC;AAbD,6CAAoE;AACpE,mDAAuF;AAEvF,SAAgB,cAAc,CAC5B,QAAgB,EAChB,IAAS,EACT,QAAgC,EAChC,WAAsC,YAAY;IAElD,MAAM,GAAG,GACP,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,IAAA,iCAAgB,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAA,mCAAkB,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtH,MAAM,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"abstract-doc-of-xml.js","sourceRoot":"","sources":["../../../src/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-document",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.0.15",
|
|
4
4
|
"description": "Dynamically create documents using code or JSX and render to any format",
|
|
5
5
|
"repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-document",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"vite": "^6.0.1",
|
|
49
49
|
"vitest": "^2.1.6"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "b4b37a5fe6e1a52f86f9b3d9ef5f66cad4ebb531"
|
|
52
52
|
}
|
|
@@ -7,11 +7,11 @@ export function abstractDocXml(
|
|
|
7
7
|
data: any,
|
|
8
8
|
partials: Record<string, string>,
|
|
9
9
|
rendered: "Mustache" | "Handlebars" = "Handlebars"
|
|
10
|
-
): readonly [AbstractDoc.AbstractDoc, images: Record<string, ImageProps>, fonts: Record<string,
|
|
10
|
+
): readonly [AbstractDoc.AbstractDoc, images: Record<string, ImageProps>, fonts: Record<string, true>] {
|
|
11
11
|
const xml =
|
|
12
12
|
rendered === "Mustache" ? parseMustacheXml(template, data, partials) : parseHandlebarsXml(template, data, partials);
|
|
13
|
-
const [imageUrls,
|
|
14
|
-
return [abstractDocXmlRecursive(creators(styleNames), xml[0]!), imageUrls,
|
|
13
|
+
const [imageUrls, fontFamilies, styleNames] = extractImageFontsStyleNames(xml);
|
|
14
|
+
return [abstractDocXmlRecursive(creators(styleNames), xml[0]!), imageUrls, fontFamilies];
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
function abstractDocXmlRecursive(
|
|
@@ -114,8 +114,8 @@ function extractImageFontsStyleNames(
|
|
|
114
114
|
xmlElement: ReadonlyArray<XmlElement>,
|
|
115
115
|
styleNames: Record<string, string> = {},
|
|
116
116
|
images: Record<string, ImageProps> = {},
|
|
117
|
-
fonts: Record<string,
|
|
118
|
-
): readonly [images: Record<string, ImageProps>, fonts: Record<string,
|
|
117
|
+
fonts: Record<string, true> = {}
|
|
118
|
+
): readonly [images: Record<string, ImageProps>, fonts: Record<string, true>, styleNames: Record<string, string>] {
|
|
119
119
|
xmlElement.forEach((item) => {
|
|
120
120
|
if (item.tagName.startsWith("Image") && item.attributes?.src) {
|
|
121
121
|
images[item.attributes.src as string] = {
|
|
@@ -124,7 +124,7 @@ function extractImageFontsStyleNames(
|
|
|
124
124
|
width: item.attributes.width ? Number(item.attributes.width) : undefined,
|
|
125
125
|
};
|
|
126
126
|
} else if (item.attributes?.fontFamily) {
|
|
127
|
-
fonts[item.attributes.
|
|
127
|
+
fonts[item.attributes.fontFamily as string] = true;
|
|
128
128
|
if (item.tagName === "StyleName" && item.attributes.name && item.attributes.type) {
|
|
129
129
|
styleNames[item.attributes.name as string] = item.attributes.type;
|
|
130
130
|
}
|