@silurus/ooxml 0.64.3 → 0.66.0

package/dist/types/pptx.d.ts

@@ -45,7 +45,38 @@ export declare interface Bevel3d {
     prst: string;
 }
 
-export declare type Bullet = {
+/**
+ * Picture bullet — ECMA-376 §21.1.2.4.2 `<a:buBlip><a:blip r:embed>`. The
+ * embed is resolved to the blip's embedded zip path + mime at parse time
+ * (mirrors {@link ImageFill}); the renderer fetches the bytes lazily by path
+ * via the same `getCachedBitmap(imagePath, mimeType, fetchImage)` path used for
+ * `pic`/blipFill. PPTX-only: the shared core `Bullet` union (used by docx/xlsx,
+ * which have no picture bullets) does not carry this variant, so it lives on
+ * the PPTX side, exactly like {@link Paragraph} extends the core paragraph.
+ */
+export declare interface BlipBullet {
+    type: 'blip';
+    /** Embedded zip path of the bullet image (e.g. "ppt/media/image1.png"). */
+    imagePath: string;
+    /** MIME type of the blip at {@link BlipBullet.imagePath} (e.g. `image/png`). */
+    mimeType: string;
+    /**
+     * `<a:buSzPct val>` (ECMA-376 §21.1.2.4.3) as a percentage of the text size
+     * (100 = same size). `null` when no explicit `<a:buSzPct>` is present, in
+     * which case the renderer uses the spec default of 100%.
+     */
+    sizePct: number | null;
+}
+
+/**
+ * PPTX bullet marker. The shared core {@link CoreBullet} union
+ * (none/inherit/char/autoNum) plus the PPTX-only picture bullet
+ * ({@link BlipBullet}, §21.1.2.4.2). The parser emits the `blip` variant with
+ * `type: "blip"`, so this is a discriminated union just like the core one.
+ */
+export declare type Bullet = Bullet_2 | BlipBullet;
+
+declare type Bullet_2 = {
     type: 'none';
 } | {
     type: 'inherit';
@@ -213,6 +244,9 @@ export declare interface ChartElement {
     /** `<c:chartSpace><c:spPr><a:ln@w>` border width in EMU. null = 1px hairline
      * when a color is present. */
     chartBorderWidthEmu?: number | null;
+    /** Secondary value axis for combo charts (bar + line with a right-hand
+     * axis). null/absent for the common single value-axis case. */
+    secondaryValAxis?: SecondaryValueAxis | null;
 }
 
 declare interface ChartErrBars {
@@ -427,6 +461,13 @@ export declare interface ChartModel {
      * ("standard" — line, no fill). Only consulted for `chartType === "radar"`.
      */
     radarStyle?: string | null;
+    /**
+     * Secondary value axis for combo charts (bar + line). When present, series
+     * with `useSecondaryAxis` are plotted against this axis's independent scale
+     * and the axis is drawn on the right edge of the plot. null/absent = single
+     * value axis (the common case). See {@link SecondaryValueAxis}.
+     */
+    secondaryValAxis?: SecondaryValueAxis | null;
 }
 
 export declare interface ChartSeries {
@@ -456,10 +497,19 @@ export declare interface ChartSeries {
      */
     labelColor?: string | null;
     /**
-     * Mixed chart: per-series chart type override. Currently only "line" (XLSX)
-     * is honoured; other values are treated as the chart's primary type.
+     * Mixed chart: per-series chart type override. Currently only "line" (XLSX
+     * and PPTX combo charts) is honoured; other values are treated as the
+     * chart's primary type.
      */
     seriesType?: string | null;
+    /**
+     * Combo chart: this series is plotted against the SECONDARY value axis
+     * (`ChartModel.secondaryValAxis`) — the `<c:valAx>` with `axPos="r"` /
+     * `<c:crosses val="max">`. When false/absent the series uses the primary
+     * (left) value-axis scale. PowerPoint's "Revenue vs. gross margin" combo
+     * (sample-14 slide-8) puts the margin line on a 0–100% secondary axis.
+     */
+    useSecondaryAxis?: boolean | null;
     /**
      * Scatter-only X values (as strings). When null the series uses
      * `ChartModel.categories` as X.
@@ -875,6 +925,13 @@ export declare interface NoFill {
  * `eaLnBrk` flag that the pptx parser emits but the shared core model does not
  * carry (docx/xlsx paragraphs don't surface it). Mirrors the Rust
  * `Paragraph` struct's `ea_ln_brk` field 1:1.
+ *
+ * Note on `bullet`: the parser also emits the picture-bullet variant
+ * ({@link BlipBullet}, `type: "blip"`) at runtime, but `bullet` keeps the
+ * narrower core type here because a TS interface can only *narrow* an inherited
+ * property, not widen its union (the core `Paragraph.bullet` is used by
+ * docx/xlsx, which have no picture bullets). Consumers that need the picture
+ * variant narrow `bullet` with {@link asBullet} / a `type === 'blip'` check.
  */
 export declare interface Paragraph extends Paragraph_2 {
     /**
@@ -901,7 +958,7 @@ declare interface Paragraph_2 {
     spaceLine: SpaceLine | null;
     /** List nesting level (0–8) */
     lvl: number;
-    bullet: Bullet;
+    bullet: Bullet_2;
     defFontSize: number | null;
     defColor: string | null;
     defBold: boolean | null;
@@ -1416,6 +1473,43 @@ export declare interface Scene3d {
     lightRig?: LightRig;
 }
 
+/**
+ * A secondary value axis (combo charts). Mirrors the primary value-axis
+ * properties but lives in its own object so the flat primary-axis fields stay
+ * untouched. Parsed from the right-hand `<c:valAx>` (`axPos="r"`,
+ * `<c:crosses val="max">`).
+ */
+declare interface SecondaryValueAxis {
+    /** `<c:scaling><c:min val>`. null = derive from the series data. */
+    min: number | null;
+    /** `<c:scaling><c:max val>`. null = derive from the series data. */
+    max: number | null;
+    /** `<c:title>` plain text. null = no title. */
+    title: string | null;
+    /** `<c:delete val="1"/>` — hide labels/ticks entirely. */
+    hidden: boolean;
+    /** `<c:numFmt formatCode>` for tick labels. */
+    formatCode?: string | null;
+    /** `<c:txPr>…<a:solidFill>` tick-label color (hex without '#'). */
+    fontColor?: string | null;
+    /** `<c:txPr>` tick-label font size (hpt). */
+    fontSizeHpt?: number | null;
+    /** `<c:spPr><a:ln><a:solidFill>` axis-line color (hex without '#'). */
+    lineColor?: string | null;
+    /** `<c:spPr><a:ln w>` axis-line width in EMU. */
+    lineWidthEmu?: number | null;
+    /** `<c:spPr><a:ln><a:noFill>` — hide just the axis rule. */
+    lineHidden: boolean;
+    /** `<c:majorTickMark>` — "cross" (default) | "out" | "in" | "none". */
+    majorTickMark: string;
+    /** `<c:title>` run-prop font size (hpt). */
+    titleFontSizeHpt?: number | null;
+    /** `<c:title>` run-prop bold flag. */
+    titleFontBold?: boolean | null;
+    /** `<c:title>` run-prop color (hex without '#'). */
+    titleFontColor?: string | null;
+}
+
 export declare interface Shadow {
     color: string;
     alpha: number;

package/dist/types/xlsx.d.ts

@@ -757,7 +757,7 @@ export declare interface RenderViewportOptions {
     cellScale?: number;
     /** Pre-decoded image sources keyed by their zip `imagePath` (for ImageAnchor
      *  and group-leaf image rendering). */
-    loadedImages?: Map<string, CanvasImageSource>;
+    loadedImages?: Map<string, CanvasImageSource | null>;
     /** Fetch an embedded image's bytes by zip path, wrapped in a Blob of the given
      *  MIME (twin of pptx/docx `fetchImage`). The orchestrator decodes these into
      *  {@link loadedImages} before the synchronous draw. Supplied by