odf.js 2.3.8 → 2.4.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.
Files changed (3) hide show
  1. package/dist/typed/shared/paragraph.cjs +15 -6
  2. package/dist/typed/shared/paragraph.js +15 -6
  3. package/package.json +2 -2
package/dist/typed/shared/paragraph.cjs CHANGED
@@ -4,26 +4,35 @@ const require_xml_query = require("../../xml/query.cjs");
4
4
  const require_typed_shared_text = require("./text.cjs");
5
5
  const require_typed_shared_cascade = require("./cascade.cjs");
6
6
  //#region src/typed/shared/paragraph.ts
7
- function collectRuns(nodes, baseProperties, pkg, out) {
7
+ function collectRuns(nodes, baseProperties, pkg, out, hyperlinkTarget = void 0) {
8
8
  for (const node of nodes) {
9
9
  if (node.type === "text") {
10
- if (node.value.length > 0) out.push(runFromText(require_xml_entities.decodeXmlText(node.value), baseProperties));
10
+ if (node.value.length > 0) pushRun(out, runFromText(require_xml_entities.decodeXmlText(node.value), baseProperties), hyperlinkTarget);
11
11
  continue;
12
12
  }
13
13
  if (node.type !== "element") continue;
14
- if (node.tag === "text:s") out.push(runFromText(" ".repeat(require_typed_shared_text.getOdfSpaceCount(node)), baseProperties));
15
- else if (node.tag === "text:tab") out.push(runFromText(" ", baseProperties));
16
- else if (node.tag === "text:line-break") out.push(runFromText("\n", baseProperties));
14
+ if (node.tag === "text:s") pushRun(out, runFromText(" ".repeat(require_typed_shared_text.getOdfSpaceCount(node)), baseProperties), hyperlinkTarget);
15
+ else if (node.tag === "text:tab") pushRun(out, runFromText(" ", baseProperties), hyperlinkTarget);
16
+ else if (node.tag === "text:line-break") pushRun(out, runFromText("\n", baseProperties), hyperlinkTarget);
17
17
  else if (node.tag === "text:span") {
18
18
  const styleName = require_xml_query.attrValue(node, "text:style-name");
19
19
  const spanProperties = {
20
20
  ...baseProperties,
21
21
  ...require_typed_shared_cascade.resolveStyle(styleName, "text", pkg).properties
22
22
  };
23
- collectRuns(node.children, spanProperties, pkg, out);
23
+ collectRuns(node.children, spanProperties, pkg, out, hyperlinkTarget);
24
+ } else if (node.tag === "text:a") {
25
+ const href = require_xml_query.attrValue(node, "xlink:href");
26
+ collectRuns(node.children, baseProperties, pkg, out, href ?? hyperlinkTarget);
24
27
  }
25
28
  }
26
29
  }
30
+ function pushRun(out, run, hyperlinkTarget) {
31
+ out.push(hyperlinkTarget === void 0 ? run : {
32
+ ...run,
33
+ hyperlink: hyperlinkTarget
34
+ });
35
+ }
27
36
  function runFromText(text, properties) {
28
37
  return {
29
38
  text,
package/dist/typed/shared/paragraph.js CHANGED
@@ -3,26 +3,35 @@ import { attrValue } from "../../xml/query.js";
3
3
  import { getOdfSpaceCount } from "./text.js";
4
4
  import { resolveStyle } from "./cascade.js";
5
5
  //#region src/typed/shared/paragraph.ts
6
- function collectRuns(nodes, baseProperties, pkg, out) {
6
+ function collectRuns(nodes, baseProperties, pkg, out, hyperlinkTarget = void 0) {
7
7
  for (const node of nodes) {
8
8
  if (node.type === "text") {
9
- if (node.value.length > 0) out.push(runFromText(decodeXmlText(node.value), baseProperties));
9
+ if (node.value.length > 0) pushRun(out, runFromText(decodeXmlText(node.value), baseProperties), hyperlinkTarget);
10
10
  continue;
11
11
  }
12
12
  if (node.type !== "element") continue;
13
- if (node.tag === "text:s") out.push(runFromText(" ".repeat(getOdfSpaceCount(node)), baseProperties));
14
- else if (node.tag === "text:tab") out.push(runFromText(" ", baseProperties));
15
- else if (node.tag === "text:line-break") out.push(runFromText("\n", baseProperties));
13
+ if (node.tag === "text:s") pushRun(out, runFromText(" ".repeat(getOdfSpaceCount(node)), baseProperties), hyperlinkTarget);
14
+ else if (node.tag === "text:tab") pushRun(out, runFromText(" ", baseProperties), hyperlinkTarget);
15
+ else if (node.tag === "text:line-break") pushRun(out, runFromText("\n", baseProperties), hyperlinkTarget);
16
16
  else if (node.tag === "text:span") {
17
17
  const styleName = attrValue(node, "text:style-name");
18
18
  const spanProperties = {
19
19
  ...baseProperties,
20
20
  ...resolveStyle(styleName, "text", pkg).properties
21
21
  };
22
- collectRuns(node.children, spanProperties, pkg, out);
22
+ collectRuns(node.children, spanProperties, pkg, out, hyperlinkTarget);
23
+ } else if (node.tag === "text:a") {
24
+ const href = attrValue(node, "xlink:href");
25
+ collectRuns(node.children, baseProperties, pkg, out, href ?? hyperlinkTarget);
23
26
  }
24
27
  }
25
28
  }
29
+ function pushRun(out, run, hyperlinkTarget) {
30
+ out.push(hyperlinkTarget === void 0 ? run : {
31
+ ...run,
32
+ hyperlink: hyperlinkTarget
33
+ });
34
+ }
26
35
  function runFromText(text, properties) {
27
36
  return {
28
37
  text,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "odf.js",
3
- "version": "2.3.8",
3
+ "version": "2.4.0",
4
4
  "description": "Type-safe, lossless round-trip conversion between OpenDocument Format packages (odt, ods, odp) and JSON, hand-written and dependency-minimal, built on Zod 4 codecs.",
5
5
  "type": "module",
6
6
  "repository": {
@@ -69,7 +69,7 @@
69
69
  "license": "MIT",
70
70
  "packageManager": "pnpm@11.6.0",
71
71
  "dependencies": {
72
- "document-schema.js": "^2.3.3",
72
+ "document-schema.js": "^2.3.4",
73
73
  "fast-xml-parser": "^5.10.1",
74
74
  "fflate": "^0.8.3",
75
75
  "zod": "^4.4.3"