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

package/dist/index.js

@@ -1895,6 +1895,7 @@ __export(office_open_exports, {
   createOfficeOpenPptxRenderer: () => createOfficeOpenPptxRenderer
 });
 import { readFile } from "fs/promises";
+import { assetUnreadableError } from "@json-to-office/shared/rendering";
 async function createOfficeOpenPptxRenderer() {
   const backend = await import(
     /* @vite-ignore */
@@ -1993,32 +1994,28 @@ function colorSchemeOptions(palette) {
 }
 async function loadResourceBytes(resources) {
   const entries = await Promise.all(
-    resources.map(async (resource) => {
-      switch (resource.origin.kind) {
-        case "inline":
-          return [resource.id, resource.origin.bytes];
-        case "file":
-          return [
-            resource.id,
-            new Uint8Array(await readFile(resource.origin.path))
-          ];
-        case "remote": {
-          const response = await fetch(resource.origin.url);
-          if (!response.ok) {
-            throw new Error(
-              `failed to fetch image ${resource.origin.url}: ${response.status} ${response.statusText}`
-            );
-          }
-          return [
-            resource.id,
-            new Uint8Array(await response.arrayBuffer())
-          ];
-        }
-      }
-    })
+    resources.map(
+      async (resource) => [resource.id, await resourceBytes(resource.origin)]
+    )
   );
   return new Map(entries);
 }
+async function resourceBytes(origin) {
+  if (origin.kind === "inline") return origin.bytes;
+  const location = origin.kind === "file" ? origin.path : origin.url;
+  try {
+    if (origin.kind === "file") {
+      return new Uint8Array(await readFile(origin.path));
+    }
+    const response = await fetch(origin.url);
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status} ${response.statusText}`);
+    }
+    return new Uint8Array(await response.arrayBuffer());
+  } catch (error) {
+    throw assetUnreadableError(location, error);
+  }
+}
 var OFFICE_OPEN_PPTX_RENDERER_ID, OFFICE_OPEN_PPTX, OFFICE_OPEN_CAPABILITIES, SCHEME_SLOTS;
 var init_office_open = __esm({
   "src/renderers/office-open/index.ts"() {
@@ -6585,7 +6582,9 @@ function preparePptxQualityDocument(document, options = {}) {
       excerpt: occurrence.match.excerpt
     });
   });
-  collectColorLiterals(document).forEach((literal, index) => {
+  const content = { ...document, props: { ...props } };
+  delete content.props.theme;
+  collectColorLiterals(content).forEach((literal, index) => {
     addFact({
       id: `pptx:color:${index}:${literal.path}`,
       kind: "pptx/color",
@@ -6594,7 +6593,7 @@ function preparePptxQualityDocument(document, options = {}) {
       hex: literal.hex
     });
   });
-  collectFontFamilies(document).forEach((use, index) => {
+  collectFontFamilies(content).forEach((use, index) => {
     addFact({
       id: `pptx:font:${index}:${use.path}`,
       kind: "pptx/font-family",