@json-to-office/core-pptx 0.7.0 → 0.8.0

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

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/core/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EAEhB,MAAM,UAAU,CAAC;AAOlB,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,qBAAqB,EAChC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAC3B,OAAO,CAAC,SAAS,CAAC,CAiOpB"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/core/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EAEhB,MAAM,UAAU,CAAC;AAUlB,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,qBAAqB,EAChC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAC3B,OAAO,CAAC,SAAS,CAAC,CAuOpB"}

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

@@ -1 +1 @@
-{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["../../src/core/structure.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAEV,+BAA+B,EAC/B,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAQlB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,+BAA+B,EACzC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,qBAAqB,CAyFvB"}
+{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["../../src/core/structure.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAEV,+BAA+B,EAC/B,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAQlB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,+BAA+B,EACzC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,qBAAqB,CA6GvB"}

package/dist/index.js

@@ -212,11 +212,113 @@ function getPptxTheme(name) {
 }
 var pptxThemes = PPTX_THEMES;
 
+// src/utils/componentDefaults.ts
+import { mergeWithDefaults } from "@json-to-office/shared";
+function getComponentDefaults(theme) {
+  return theme.componentDefaults || {};
+}
+function getTextDefaults(theme) {
+  return getComponentDefaults(theme).text || {};
+}
+function getImageDefaults(theme) {
+  return getComponentDefaults(theme).image || {};
+}
+function getShapeDefaults(theme) {
+  return getComponentDefaults(theme).shape || {};
+}
+function getTableDefaults(theme) {
+  return getComponentDefaults(theme).table || {};
+}
+function getHighchartsDefaults(theme) {
+  return getComponentDefaults(theme).highcharts || {};
+}
+function getChartDefaults(theme) {
+  return getComponentDefaults(theme).chart || {};
+}
+function getCustomComponentDefaults(theme, componentName) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.[componentName] || {};
+}
+function resolveTextProps(props, theme) {
+  return mergeWithDefaults(props, getTextDefaults(theme));
+}
+function resolveImageProps(props, theme) {
+  return mergeWithDefaults(props, getImageDefaults(theme));
+}
+function resolveShapeProps(props, theme) {
+  return mergeWithDefaults(props, getShapeDefaults(theme));
+}
+function resolveTableProps(props, theme) {
+  return mergeWithDefaults(props, getTableDefaults(theme));
+}
+function resolveHighchartsProps(props, theme) {
+  return mergeWithDefaults(props, getHighchartsDefaults(theme));
+}
+function resolveChartProps(props, theme) {
+  return mergeWithDefaults(props, getChartDefaults(theme));
+}
+function resolveCustomComponentProps(props, theme, componentName) {
+  const defaults = getCustomComponentDefaults(theme, componentName);
+  return mergeWithDefaults(props, defaults);
+}
+var TYPE_GETTERS = {
+  text: getTextDefaults,
+  image: getImageDefaults,
+  shape: getShapeDefaults,
+  table: getTableDefaults,
+  highcharts: getHighchartsDefaults,
+  chart: getChartDefaults
+};
+function getDefaultsForType(componentName, theme) {
+  const getter = TYPE_GETTERS[componentName];
+  return getter ? getter(theme) : getCustomComponentDefaults(theme, componentName);
+}
+
+// src/utils/resolveComponentTree.ts
+var RESOLVER_MAP = {
+  text: resolveTextProps,
+  image: resolveImageProps,
+  shape: resolveShapeProps,
+  table: resolveTableProps,
+  highcharts: resolveHighchartsProps,
+  chart: resolveChartProps
+};
+function resolveComponentDefaults(component, theme) {
+  const resolver = RESOLVER_MAP[component.name];
+  const resolvedProps = resolver ? resolver(component.props, theme) : resolveCustomComponentProps(
+    component.props,
+    theme,
+    component.name
+  );
+  return { ...component, props: resolvedProps };
+}
+function resolveComponentTree(components, theme) {
+  return components.map((component) => {
+    const resolved = resolveComponentDefaults(component, theme);
+    if (resolved.children && resolved.children.length > 0) {
+      return {
+        ...resolved,
+        children: resolveComponentTree(resolved.children, theme)
+      };
+    }
+    return resolved;
+  });
+}
+
 // src/core/structure.ts
+import { mergeWithDefaults as mergeWithDefaults2 } from "@json-to-office/shared";
 function processPresentation(document, options) {
   const { props, children = [] } = document;
   const themeName = props.theme ?? "default";
-  const theme = options?.customThemes?.[themeName] ?? getPptxTheme(themeName);
+  const baseTheme = options?.customThemes?.[themeName] ?? getPptxTheme(themeName);
+  const presDefaults = props.componentDefaults;
+  const theme = presDefaults ? {
+    ...baseTheme,
+    componentDefaults: mergeWithDefaults2(
+      presDefaults,
+      baseTheme.componentDefaults || {}
+    )
+  } : baseTheme;
   const slideWidth = props.slideWidth ?? 10;
   const slideHeight = props.slideHeight ?? 7.5;
   let templates;
@@ -240,7 +342,8 @@ function processPresentation(document, options) {
           grid: void 0
         };
       });
-      const resolvedObjects = m.objects?.map(
+      const defaultedObjects = m.objects ? resolveComponentTree(m.objects, theme) : void 0;
+      const resolvedObjects = defaultedObjects?.map(
         (obj) => resolveComponentGridPosition(
           obj,
           effectiveGrid,
@@ -260,8 +363,9 @@ function processPresentation(document, options) {
           slideComponents.push(slideChild);
         }
       }
+      const resolvedComponents = resolveComponentTree(slideComponents, theme);
       slides.push({
-        components: slideComponents,
+        components: resolvedComponents,
         background: child.props.background,
         notes: child.props.notes,
         layout: child.props.layout,
@@ -1014,6 +1118,7 @@ function buildSlideTemplateProps(def, theme, warnings) {
 }
 
 // src/core/render.ts
+import { mergeWithDefaults as mergeWithDefaults3 } from "@json-to-office/shared";
 async function renderPresentation(processed, warnings) {
   const pptx = new PptxGenJS();
   if (processed.metadata.title) pptx.title = processed.metadata.title;
@@ -1141,16 +1246,18 @@ async function renderPresentation(processed, warnings) {
             processed.slideHeight,
             warnings
           );
+          const typeDefaults = getDefaultsForType(
+            component.name,
+            processed.theme
+          );
           const posDefaults = {};
           if (phDef.x != null) posDefaults.x = phDef.x;
           if (phDef.y != null) posDefaults.y = phDef.y;
           if (phDef.w != null) posDefaults.w = phDef.w;
           if (phDef.h != null) posDefaults.h = phDef.h;
-          const props = {
-            ...posDefaults,
-            ...phDef.defaults?.props ?? {},
-            ...gridResolved.props
-          };
+          let props = mergeWithDefaults3(posDefaults, typeDefaults);
+          props = mergeWithDefaults3(phDef.defaults?.props ?? {}, props);
+          props = mergeWithDefaults3(gridResolved.props, props);
           await renderComponent(
             slide,
             { ...gridResolved, props },
@@ -1165,10 +1272,14 @@ async function renderPresentation(processed, warnings) {
         for (const [phName, component] of Object.entries(
           slideData.placeholders
         )) {
-          const hasPosition = component.props.x != null || component.props.y != null || component.props.grid;
+          const defaulted = resolveComponentDefaults(
+            component,
+            processed.theme
+          );
+          const hasPosition = defaulted.props.x != null || defaulted.props.y != null || defaulted.props.grid;
           if (hasPosition) {
             const resolved = resolveComponentGridPosition(
-              component,
+              defaulted,
               effectiveGrid,
               processed.slideWidth,
               processed.slideHeight,