@8btc/ppt-generator-mcp 0.0.32-beta.2 → 0.0.32

package/dist/tools/generate-ppt.d.ts

@@ -86,36 +86,18 @@ declare const t: z.ZodObject<{
                 title: string;
                 text: string;
             }>, "many">;
-            images: z.ZodArray<z.ZodObject<{
-                imageType: z.ZodEnum<["pageFigure", "itemFigure"]>;
-                src: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }, {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }>, "many">;
         }, "strip", z.ZodTypeAny, {
             title: string;
             items: {
                 title: string;
                 text: string;
             }[];
-            images: {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }[];
         }, {
             title: string;
             items: {
                 title: string;
                 text: string;
             }[];
-            images: {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }[];
         }>;
     }, "strip", z.ZodTypeAny, {
         type: "content";
@@ -125,10 +107,6 @@ declare const t: z.ZodObject<{
                 title: string;
                 text: string;
             }[];
-            images: {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }[];
         };
     }, {
         type: "content";
@@ -138,10 +116,6 @@ declare const t: z.ZodObject<{
                 title: string;
                 text: string;
             }[];
-            images: {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }[];
         };
     }>, z.ZodObject<{
         type: z.ZodLiteral<"end">;
@@ -177,10 +151,6 @@ declare const t: z.ZodObject<{
                 title: string;
                 text: string;
             }[];
-            images: {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }[];
         };
     } | {
         type: "end";
@@ -214,10 +184,6 @@ declare const t: z.ZodObject<{
                 title: string;
                 text: string;
             }[];
-            images: {
-                src: string;
-                imageType: "pageFigure" | "itemFigure";
-            }[];
         };
     } | {
         type: "end";

package/dist/tools/generate-ppt.js

@@ -47,10 +47,6 @@ const inputSchema = {
                     title: zod_1.z.string(),
                     text: zod_1.z.string(),
                 })),
-                images: zod_1.z.array(zod_1.z.object({
-                    imageType: zod_1.z.enum(["pageFigure", "itemFigure"]), // 先不要背景
-                    src: zod_1.z.string(),
-                })),
             }),
         }),
         zod_1.z.object({
@@ -76,13 +72,6 @@ const toolHandler = async ({ outline, templateFilePath, outputPath, }) => {
     if (!outputPath) {
         outputPath = process.cwd();
     }
-    // 去掉有几率传入的后缀
-    if (outputPath.endsWith(".pptx")) {
-        outputPath = outputPath.substring(0, outputPath.length - 5);
-    }
-    if (outputPath.endsWith(".ppt")) {
-        outputPath = outputPath.substring(0, outputPath.length - 4);
-    }
     outputPath = node_path_1.default.resolve(outputPath);
     try {
         fs_extra_1.default.ensureDirSync(outputPath);

package/dist/tools/get-ppt-template-list.js

@@ -23,30 +23,30 @@ const toolHandler = async () => {
                 {
                     type: "text",
                     text: JSON.stringify([
-                        // {
-                        //   name: "清新风格模板-图标比较多",
-                        //   path: path.join(__dirname, "..", "tpls", "tpl-3.json"),
-                        // },
-                        // {
-                        //   name: "研究报告风格模板-紫色系",
-                        //   path: path.join(__dirname, "..", "tpls", "tpl-4.json"),
-                        // },
-                        // {
-                        //   name: "简约风格模板-莫兰迪色系",
-                        //   path: path.join(__dirname, "..", "tpls", "tpl-2.json"),
-                        // },
-                        // {
-                        //   name: "简单模板-蓝色调",
-                        //   path: path.join(__dirname, "..", "tpls", "tpl-1.json"),
-                        // },
+                        {
+                            name: "清新风格模板-图标比较多",
+                            path: node_path_1.default.join(__dirname, "..", "tpls", "tpl-3.json"),
+                        },
+                        {
+                            name: "研究报告风格模板-紫色系",
+                            path: node_path_1.default.join(__dirname, "..", "tpls", "tpl-4.json"),
+                        },
+                        {
+                            name: "简约风格模板-莫兰迪色系",
+                            path: node_path_1.default.join(__dirname, "..", "tpls", "tpl-2.json"),
+                        },
+                        {
+                            name: "简单模板-蓝色调",
+                            path: node_path_1.default.join(__dirname, "..", "tpls", "tpl-1.json"),
+                        },
                         {
                             name: "通用模板-商务风格",
                             path: node_path_1.default.join(__dirname, "..", "tpls", "custom-1.json"),
                         },
-                        // {
-                        //   name: "通用模板-报告风格",
-                        //   path: path.join(__dirname, "..", "tpls", "custom-2.json"),
-                        // },
+                        {
+                            name: "通用模板-报告风格",
+                            path: node_path_1.default.join(__dirname, "..", "tpls", "custom-2.json"),
+                        },
                     ]),
                 },
             ],

package/dist/tools/index.d.ts

@@ -1,3 +1,2 @@
 export { get_ppt_template_list } from "./get-ppt-template-list";
 export { generate_ppt } from "./generate-ppt";
-export { update_ppt_outline } from "./update-ppt-outline";

package/dist/tools/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.update_ppt_outline = exports.generate_ppt = exports.get_ppt_template_list = void 0;
+exports.generate_ppt = exports.get_ppt_template_list = void 0;
 var get_ppt_template_list_1 = require("./get-ppt-template-list");
 Object.defineProperty(exports, "get_ppt_template_list", { enumerable: true, get: function () { return get_ppt_template_list_1.get_ppt_template_list; } });
 var generate_ppt_1 = require("./generate-ppt");
 Object.defineProperty(exports, "generate_ppt", { enumerable: true, get: function () { return generate_ppt_1.generate_ppt; } });
-var update_ppt_outline_1 = require("./update-ppt-outline");
-Object.defineProperty(exports, "update_ppt_outline", { enumerable: true, get: function () { return update_ppt_outline_1.update_ppt_outline; } });

package/dist/tools/pptGenerator/export-pptx.js

@@ -137,13 +137,6 @@ const exportPPTX = (_slides, ignoreMedia, options) => {
                     w: el.width / ratioPx2Inch(viewportSize),
                     h: el.height / ratioPx2Inch(viewportSize),
                 };
-                if (el.imageType) {
-                    options.sizing = {
-                        type: "contain",
-                        w: el.width / ratioPx2Inch(viewportSize),
-                        h: el.height / ratioPx2Inch(viewportSize),
-                    };
-                }
                 if (isBase64Image(el.src))
                     options.data = el.src;
                 else

package/dist/tools/pptGenerator/generate-ppt-slides.d.ts

@@ -6,5 +6,5 @@ interface ImgPoolItem {
     width: number;
     height: number;
 }
-export declare const generatePPTSlides: (templateSlides: Slide[], outlineList: Outline[], imgs?: ImgPoolItem[]) => Promise<Slide[]>;
+export declare const generatePPTSlides: (templateSlides: Slide[], outlineList: Outline[], imgs?: ImgPoolItem[]) => Slide[];
 export {};

package/dist/tools/pptGenerator/generate-ppt-slides.js

@@ -1,12 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePPTSlides = void 0;
-const logger_1 = __importDefault(require("../../utils/logger"));
-const loadImage_1 = require("../../utils/loadImage");
-const slides_util_1 = require("./slides-util");
 class CanvasBrowser {
     constructor(width, height) {
         this.el = document.createElement("canvas");
@@ -24,7 +18,7 @@ if (!globalThis.CanvasImpl) {
 const nanoid = (length = 10) => {
     return Math.random().toString(16).slice(0, length);
 };
-const generatePPTSlides = async (templateSlides, outlineList, imgs = []) => {
+const generatePPTSlides = (templateSlides, outlineList, imgs = []) => {
     const slides = [];
     const coverTemplates = [];
     const contentsTemplates = [];
@@ -62,7 +56,7 @@ const generatePPTSlides = async (templateSlides, outlineList, imgs = []) => {
             transitionIndex += 1;
         }
         else if (outlineItem.type === "content") {
-            const contentSlide = await generateContent(outlineItem, contentTemplates);
+            const contentSlide = generateContent(outlineItem, imgs, contentTemplates);
             slides.push(contentSlide);
         }
         else if (outlineItem.type === "end") {
@@ -76,7 +70,7 @@ exports.generatePPTSlides = generatePPTSlides;
 const formatOutlineList = (outlineList, contentsTemplates) => {
     const normalizedOutlineList = [];
     const maxContentsCount = contentsTemplates.reduce((acc, cur) => {
-        const count = cur.elements.filter((el) => (0, slides_util_1.checkTextType)(el, "item")).length;
+        const count = cur.elements.filter((el) => checkTextType(el, "item")).length;
         acc = Math.max(acc, count);
         return acc;
     }, 1);
@@ -180,21 +174,14 @@ const generateCover = (outlineItem, imgs, coverTemplates) => {
             return getNewImgElement(el, imgs);
         if (el.type !== "text" && el.type !== "shape")
             return el;
-        if ((0, slides_util_1.checkTextType)(el, "title") && outlineItem.data.title) {
+        if (checkTextType(el, "title") && outlineItem.data.title) {
             return getNewTextElement({
                 el,
                 text: outlineItem.data.title,
                 maxLine: 1,
             });
         }
-        if ((0, slides_util_1.checkTextType)(el, "subtitle") && outlineItem.data.subtitle) {
-            return getNewTextElement({
-                el,
-                text: outlineItem.data.subtitle,
-                maxLine: 1,
-            });
-        }
-        if ((0, slides_util_1.checkTextType)(el, "content") && outlineItem.data.text) {
+        if (checkTextType(el, "content") && outlineItem.data.text) {
             return getNewTextElement({
                 el,
                 text: outlineItem.data.text,
@@ -210,9 +197,9 @@ const generateCover = (outlineItem, imgs, coverTemplates) => {
     };
 };
 const generateContents = (outlineItem, imgs, contentsTemplates) => {
-    const _contentsTemplates = (0, slides_util_1.getUseableTemplates)(contentsTemplates, outlineItem.data.items.length, "item");
+    const _contentsTemplates = getUseableTemplates(contentsTemplates, outlineItem.data.items.length, "item");
     const contentsTemplate = _contentsTemplates[Math.floor(Math.random() * _contentsTemplates.length)];
-    const sortedNumberItems = contentsTemplate.elements.filter((el) => (0, slides_util_1.checkTextType)(el, "itemNumber"));
+    const sortedNumberItems = contentsTemplate.elements.filter((el) => checkTextType(el, "itemNumber"));
     const sortedNumberItemIds = sortedNumberItems
         .sort((a, b) => {
         if (sortedNumberItems.length > 6) {
@@ -237,7 +224,7 @@ const generateContents = (outlineItem, imgs, contentsTemplates) => {
         return aIndex - bIndex;
     })
         .map((el) => el.id);
-    const sortedItems = contentsTemplate.elements.filter((el) => (0, slides_util_1.checkTextType)(el, "item"));
+    const sortedItems = contentsTemplate.elements.filter((el) => checkTextType(el, "item"));
     const sortedItemIds = sortedItems
         .sort((a, b) => {
         if (sortedItems.length > 6) {
@@ -262,7 +249,7 @@ const generateContents = (outlineItem, imgs, contentsTemplates) => {
             return getNewImgElement(el, imgs);
         if (el.type !== "text" && el.type !== "shape")
             return el;
-        if ((0, slides_util_1.checkTextType)(el, "item")) {
+        if (checkTextType(el, "item")) {
             const index = sortedItemIds.findIndex((id) => id === el.id);
             const itemTitle = outlineItem.data.items[index];
             if (itemTitle)
@@ -276,7 +263,7 @@ const generateContents = (outlineItem, imgs, contentsTemplates) => {
             if (el.groupId)
                 unusedGroupIds.push(el.groupId);
         }
-        if ((0, slides_util_1.checkTextType)(el, "itemNumber")) {
+        if (checkTextType(el, "itemNumber")) {
             const index = sortedNumberItemIds.findIndex((id) => id === el.id);
             const offset = outlineItem.offset || 0;
             return getNewTextElement({
@@ -302,21 +289,21 @@ const generateTransition = (outlineItem, imgs, transitionTemplate, transitionInd
             return getNewImgElement(el, imgs);
         if (el.type !== "text" && el.type !== "shape")
             return el;
-        if ((0, slides_util_1.checkTextType)(el, "title") && outlineItem.data.title) {
+        if (checkTextType(el, "title") && outlineItem.data.title) {
             return getNewTextElement({
                 el,
                 text: outlineItem.data.title,
                 maxLine: 1,
             });
         }
-        if ((0, slides_util_1.checkTextType)(el, "content") && outlineItem.data.text) {
+        if (checkTextType(el, "content") && outlineItem.data.text) {
             return getNewTextElement({
                 el,
                 text: outlineItem.data.text,
                 maxLine: 3,
             });
         }
-        if ((0, slides_util_1.checkTextType)(el, "partNumber")) {
+        if (checkTextType(el, "partNumber")) {
             return getNewTextElement({
                 el,
                 text: transitionIndex + "",
@@ -332,11 +319,11 @@ const generateTransition = (outlineItem, imgs, transitionTemplate, transitionInd
         elements,
     };
 };
-const generateContent = async (outlineItem, contentTemplates) => {
-    const _contentTemplates = (0, slides_util_1.getUseableContentTemplates)(contentTemplates, outlineItem);
+const generateContent = (outlineItem, imgs, contentTemplates) => {
+    const _contentTemplates = getUseableTemplates(contentTemplates, outlineItem.data.items.length, "item");
     const contentTemplate = _contentTemplates[Math.floor(Math.random() * _contentTemplates.length)];
     const sortedTitleItemIds = contentTemplate.elements
-        .filter((el) => (0, slides_util_1.checkTextType)(el, "itemTitle"))
+        .filter((el) => checkTextType(el, "itemTitle"))
         .sort((a, b) => {
         const aIndex = a.left + a.top * 2;
         const bIndex = b.left + b.top * 2;
@@ -344,7 +331,7 @@ const generateContent = async (outlineItem, contentTemplates) => {
     })
         .map((el) => el.id);
     const sortedTextItemIds = contentTemplate.elements
-        .filter((el) => (0, slides_util_1.checkTextType)(el, "item"))
+        .filter((el) => checkTextType(el, "item"))
         .sort((a, b) => {
         const aIndex = a.left + a.top * 2;
         const bIndex = b.left + b.top * 2;
@@ -352,15 +339,7 @@ const generateContent = async (outlineItem, contentTemplates) => {
     })
         .map((el) => el.id);
     const sortedNumberItemIds = contentTemplate.elements
-        .filter((el) => (0, slides_util_1.checkTextType)(el, "itemNumber"))
-        .sort((a, b) => {
-        const aIndex = a.left + a.top * 2;
-        const bIndex = b.left + b.top * 2;
-        return aIndex - bIndex;
-    })
-        .map((el) => el.id);
-    const sortedImageItemIds = contentTemplate.elements
-        .filter((el) => el.type === "image" && el.imageType)
+        .filter((el) => checkTextType(el, "itemNumber"))
         .sort((a, b) => {
         const aIndex = a.left + a.top * 2;
         const bIndex = b.left + b.top * 2;
@@ -377,17 +356,14 @@ const generateContent = async (outlineItem, contentTemplates) => {
     }
     const longestTitle = itemTitles.reduce((longest, current) => (current.length > longest.length ? current : longest), "");
     const longestText = itemTexts.reduce((longest, current) => (current.length > longest.length ? current : longest), "");
-    const getEl = async (el) => {
-        if (el.type === "image" && el.imageType) {
-            const index = sortedImageItemIds.findIndex((id) => id === el.id);
-            const imageItem = outlineItem.data.images?.[index];
-            return await updateImgElement(el, imageItem);
-        }
+    const elements = contentTemplate.elements.map((el) => {
+        if (el.type === "image" && el.imageType)
+            return getNewImgElement(el, imgs);
         if (el.type !== "text" && el.type !== "shape")
             return el;
         if (outlineItem.data.items.length === 1) {
             const contentItem = outlineItem.data.items[0];
-            if ((0, slides_util_1.checkTextType)(el, "content") && contentItem.text) {
+            if (checkTextType(el, "content") && contentItem.text) {
                 return getNewTextElement({
                     el,
                     text: contentItem.text,
@@ -396,7 +372,7 @@ const generateContent = async (outlineItem, contentTemplates) => {
             }
         }
         else {
-            if ((0, slides_util_1.checkTextType)(el, "itemTitle")) {
+            if (checkTextType(el, "itemTitle")) {
                 const index = sortedTitleItemIds.findIndex((id) => id === el.id);
                 const contentItem = outlineItem.data.items[index];
                 if (contentItem && contentItem.title) {
@@ -408,7 +384,7 @@ const generateContent = async (outlineItem, contentTemplates) => {
                     });
                 }
             }
-            if ((0, slides_util_1.checkTextType)(el, "item")) {
+            if (checkTextType(el, "item")) {
                 const index = sortedTextItemIds.findIndex((id) => id === el.id);
                 const contentItem = outlineItem.data.items[index];
                 if (contentItem && contentItem.text) {
@@ -420,7 +396,7 @@ const generateContent = async (outlineItem, contentTemplates) => {
                     });
                 }
             }
-            if ((0, slides_util_1.checkTextType)(el, "itemNumber")) {
+            if (checkTextType(el, "itemNumber")) {
                 const index = sortedNumberItemIds.findIndex((id) => id === el.id);
                 const offset = outlineItem.offset || 0;
                 return getNewTextElement({
@@ -431,26 +407,15 @@ const generateContent = async (outlineItem, contentTemplates) => {
                 });
             }
         }
-        if ((0, slides_util_1.checkTextType)(el, "title") && outlineItem.data.title) {
+        if (checkTextType(el, "title") && outlineItem.data.title) {
             return getNewTextElement({
                 el,
                 text: outlineItem.data.title,
                 maxLine: 1,
             });
         }
-        if ((0, slides_util_1.checkTextType)(el, "subtitle") && outlineItem.data.subtitle) {
-            return getNewTextElement({
-                el,
-                text: outlineItem.data.subtitle,
-                maxLine: 1,
-            });
-        }
         return el;
-    };
-    const elements = [];
-    for (const el of contentTemplate.elements) {
-        elements.push(await getEl(el));
-    }
+    });
     return {
         ...contentTemplate,
         id: `${contentTemplate.id}-${nanoid(10)}`,
@@ -521,28 +486,46 @@ const getNewImgElement = (el, imgs) => {
         height: randomImg.height,
     };
 };
-// 替换图片元素
-const updateImgElement = async (el, imageItem) => {
-    if (!imageItem)
-        return el;
-    try {
-        if (imageItem.src.startsWith("http")) {
-            const result = await (0, loadImage_1.imageToBase64)(imageItem.src);
-            return {
-                ...el,
-                src: result.dataUrl,
-            };
-        }
-        return {
-            ...el,
-            src: imageItem.src,
-        };
+const checkTextType = (el, type) => {
+    return ((el.type === "text" && el.textType === type) ||
+        (el.type === "shape" && el.text && el.text.type === type));
+};
+const getUseableTemplates = (templates, n, type) => {
+    if (n === 1) {
+        const list = templates.filter((slide) => {
+            const items = slide.elements.filter((el) => checkTextType(el, type));
+            const titles = slide.elements.filter((el) => checkTextType(el, "title"));
+            const texts = slide.elements.filter((el) => checkTextType(el, "content"));
+            return !items.length && titles.length === 1 && texts.length === 1;
+        });
+        if (list.length)
+            return list;
     }
-    catch (e) {
-        logger_1.default.error("imageToBase64: " + e);
-        logger_1.default.error("imageItem.src: " + imageItem.src);
+    let target = null;
+    const list = templates.filter((slide) => {
+        const len = slide.elements.filter((el) => checkTextType(el, type)).length;
+        return len >= n;
+    });
+    if (list.length === 0) {
+        const sorted = templates.sort((a, b) => {
+            const aLen = a.elements.filter((el) => checkTextType(el, type)).length;
+            const bLen = b.elements.filter((el) => checkTextType(el, type)).length;
+            return aLen - bLen;
+        });
+        target = sorted[sorted.length - 1];
+    }
+    else {
+        target = list.reduce((closest, current) => {
+            const currentLen = current.elements.filter((el) => checkTextType(el, type)).length;
+            const closestLen = closest.elements.filter((el) => checkTextType(el, type)).length;
+            return currentLen - n <= closestLen - n ? current : closest;
+        });
     }
-    return el;
+    return templates.filter((slide) => {
+        const len = slide.elements.filter((el) => checkTextType(el, type)).length;
+        const targetLen = target.elements.filter((el) => checkTextType(el, type)).length;
+        return len === targetLen;
+    });
 };
 const getNewTextElement = ({ el, text, maxLine, longestText, digitPadding, }) => {
     const padding = 10;

package/dist/tools/pptGenerator/ppt-generator.js

@@ -11,7 +11,7 @@ class PPTGenerator {
         try {
             const { outline, templateData } = params;
             // 使用AIPPT函数生成slides
-            const generatedSlides = await (0, generate_ppt_slides_1.generatePPTSlides)(templateData.slides, outline);
+            const generatedSlides = (0, generate_ppt_slides_1.generatePPTSlides)(templateData.slides, outline);
             // 构建完整的result对象，包含模板的其他属性
             const resultData = {
                 width: templateData.width,

package/dist/types/outline.d.ts

@@ -1,13 +1,7 @@
-import { type ImageType } from "./slide";
-export interface IImage {
-    imageType: ImageType;
-    src: string;
-}
 export interface OutlineCover {
     type: "cover";
     data: {
         title: string;
-        subtitle?: string;
         text: string;
     };
 }
@@ -15,7 +9,6 @@ export interface OutlineContents {
     type: "contents";
     data: {
         items: string[];
-        images?: IImage[];
     };
     offset?: number;
 }
@@ -24,19 +17,16 @@ export interface OutlineTransition {
     data: {
         title: string;
         text: string;
-        images?: IImage[];
     };
 }
 export interface OutlineContent {
     type: "content";
     data: {
         title: string;
-        subtitle?: string;
         items: {
             title: string;
             text: string;
         }[];
-        images?: IImage[];
     };
     offset?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@8btc/ppt-generator-mcp",
-  "version": "0.0.32-beta.2",
+  "version": "0.0.32",
   "description": "MCP service for generating PPT files from AI-generated outlines and templates",
   "main": "dist/index.js",
   "scripts": {