@json-to-office/core-docx 6.2.0 → 6.6.0

package/dist/core/imageResources.d.ts

@@ -27,9 +27,14 @@ export interface LoadedImage {
  *
  * A source that could not be loaded is absent rather than recorded as an
  * error: the compiler reports it against the component's own path, which is
- * more use than an error attached to a URL.
+ * more use than an error attached to a URL. Why it failed is kept beside the
+ * images, so that report can say — and so a source that was tried and failed
+ * can be told from one the walk never reached.
  */
-export type ImageResources = ReadonlyMap<string, LoadedImage>;
+export interface ImageResources extends ReadonlyMap<string, LoadedImage> {
+    /** What each source that did not load threw. */
+    readonly failures?: ReadonlyMap<string, unknown>;
+}
 /** Load every image source in `components`, following nested content. */
 export declare function loadImageResources(components: Iterable<ComponentDefinition | undefined>): Promise<ImageResources>;
 //# sourceMappingURL=imageResources.d.ts.map

package/dist/core/imageResources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageResources.d.ts","sourceRoot":"","sources":["../../src/core/imageResources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;;AAMH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAOpD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mDAAmD;IACnD,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C;AAED;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE9D,yEAAyE;AACzE,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,GAAG,SAAS,CAAC,GACpD,OAAO,CAAC,cAAc,CAAC,CAyBzB"}
+{"version":3,"file":"imageResources.d.ts","sourceRoot":"","sources":["../../src/core/imageResources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;;AAMH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAOpD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mDAAmD;IACnD,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC;IACtE,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClD;AAED,yEAAyE;AACzE,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,GAAG,SAAS,CAAC,GACpD,OAAO,CAAC,cAAc,CAAC,CA2BzB"}

package/dist/index.js

@@ -2670,9 +2670,7 @@ async function downloadImageFromUrl(url) {
     });
     clearTimeout(timeoutId);
     if (!response.ok) {
-      throw new Error(
-        `Failed to download image: HTTP ${response.status} ${response.statusText}`
-      );
+      throw new Error(`HTTP ${response.status} ${response.statusText}`);
     }
     const contentType = response.headers.get("content-type") || void 0;
     const arrayBuffer = await response.arrayBuffer();
@@ -2684,9 +2682,9 @@ async function downloadImageFromUrl(url) {
           "Failed to download image: Request timeout after 10 seconds"
         );
       }
-      throw new Error(`Failed to download image from ${url}: ${error.message}`);
+      throw new Error(`Failed to download image: ${error.message}`);
     }
-    throw new Error(`Failed to download image from ${url}: Unknown error`);
+    throw new Error("Failed to download image: Unknown error");
   }
 }
 function resolveImageSource(props) {
@@ -6221,6 +6219,7 @@ async function loadImageResources(components) {
   const sources = /* @__PURE__ */ new Set();
   for (const component of components) collectSources(component, sources);
   const loaded = /* @__PURE__ */ new Map();
+  const failures = /* @__PURE__ */ new Map();
   await Promise.all(
     [...sources].map(async (source) => {
       try {
@@ -6231,11 +6230,12 @@ async function loadImageResources(components) {
           ...result.contentType ? { contentType: result.contentType } : {},
           ...intrinsic ? { intrinsic } : {}
         });
-      } catch {
+      } catch (error) {
+        failures.set(source, error);
       }
     })
   );
-  return loaded;
+  return Object.assign(loaded, { failures });
 }
 function readIntrinsic(bytes, source) {
   try {
@@ -6305,7 +6305,8 @@ function collectCellSource(content, out) {
 // src/ir/compiler.ts
 init_colorUtils();
 import {
-  FeatureRequirementCollector
+  FeatureRequirementCollector,
+  assetUnreadableError
 } from "@json-to-office/shared/rendering";
 import { capsFormatting as capsFormatting2, synthesizeFamilyName as synthesizeFamilyName2 } from "@json-to-office/shared";
 import {
@@ -9291,7 +9292,7 @@ function compileChromeImage(component, scope) {
   }
   const loaded = ctx.images.get(source);
   if (!loaded) {
-    throw new Error(`Failed to load image from ${source.substring(0, 50)}`);
+    throw unreadableImage(source, ctx) ?? new Error(`Failed to load image from ${source.substring(0, 50)}`);
   }
   const mediaType = detectImageType(source, loaded.contentType);
   if (mediaType === "svg") ctx.features.require("svg-images", path4);
@@ -10900,6 +10901,10 @@ function visualPlacementPixels(props, canvas, reference) {
   );
 }
 var UNLOWERED_IMAGE_PROPS = ["comment"];
+function unreadableImage(source, ctx) {
+  const { failures } = ctx.images;
+  return failures?.has(source) ? assetUnreadableError(source, failures.get(source)) : void 0;
+}
 function compileImage2(component, scope) {
   const { ctx, path: path4 } = scope;
   const props = component.props ?? {};
@@ -10916,7 +10921,9 @@ function compileImage2(component, scope) {
     );
   }
   const loaded = ctx.images.get(source);
-  if (!loaded) throw new Error(`Failed to load image from ${source}`);
+  if (!loaded) {
+    throw unreadableImage(source, ctx) ?? new Error(`Failed to load image from ${source}`);
+  }
   const mediaType = detectImageType(source, loaded.contentType);
   if (mediaType === "svg") ctx.features.require("svg-images", path4);
   if (typeof props.alt === "string" && props.alt) {
@@ -13942,7 +13949,9 @@ function prepareDocxQualityDocument(document, options = {}) {
       )
     ]
   });
-  collectColorLiterals(document).forEach((literal, index) => {
+  const content = { ...document, props: { ...asRecord2(document.props) } };
+  delete content.props.themeOverrides;
+  collectColorLiterals(content).forEach((literal, index) => {
     addFact({
       id: `docx:color:${index}:${literal.path}`,
       kind: "docx/color",
@@ -13951,7 +13960,7 @@ function prepareDocxQualityDocument(document, options = {}) {
       hex: literal.hex
     });
   });
-  collectFontFamilies(document).forEach((use, index) => {
+  collectFontFamilies(content).forEach((use, index) => {
     addFact({
       id: `docx:font:${index}:${use.path}`,
       kind: "docx/font-family",