fix libs location in test-run,add jpeg png support

README.md

@@ -51,6 +51,7 @@ npm run push:docker
 [xlsx-template-next](https://www.npmjs.com/package/xlsx-template-next)
 
 ``` bash
+cd test-run
 $ npx ts-node docx-template.ts 
 Output extension(docx,pdf,odt): pdf
 JSON data path(./docx.json): 

libs/convert-libs.ts

@@ -51,9 +51,14 @@ import { LibreOfficeFileConverter } from 'libreoffice-file-converter';
  *             schema:
  *               type: string
  *               format: binary
- *           text/html:
+ *           image/png:
  *             schema:
  *               type: string
+ *               format: binary
+ *           image/jpeg:
+ *             schema:
+ *               type: string
+ *               format: binary
  *       500:
  *         description: Server error
  *

libs/docx-templates-lib.ts

@@ -50,8 +50,6 @@ export async function docxTemplateX(base: string=".", tdata: templateData, outpu
 
 }
 
-
-
 /** javascript-obfuscator:disable
  * @swagger
  * /api/v1/report-template/docx:
@@ -117,6 +115,14 @@ docxTemplateRoute.get("/", async function (req, res) {
  *             schema:
  *               type: string
  *               format: binary
+ *           image/png:
+ *             schema:
+ *               type: string
+ *               format: binary
+ *           image/jpeg:
+ *             schema:
+ *               type: string
+ *               format: binary
  *       500:
  *         description: Server error
  *

libs/report-template.ts

@@ -23,7 +23,9 @@ export function mimeToExtension(mime: string): string {
       "text/csv": "csv",
       "text/markdown": "md",
       "text/plain": "txt",
-      "application/rtf": "rtf"
+      "application/rtf": "rtf",
+      "image/png": "png",
+      "image/jpeg": "jpeg",      
   }
   if (mimeList[mime]) {
       return mimeList[mime]

libs/swagger-specs.json

@@ -85,6 +85,18 @@
                 "schema": {
                   "type": "string"
                 }
+              },
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "image/jpeg": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
               }
             }
           },
@@ -185,6 +197,18 @@
                   "type": "string",
                   "format": "binary"
                 }
+              },
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "image/jpeg": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
               }
             }
           },
@@ -301,6 +325,18 @@
                   "type": "string",
                   "format": "binary"
                 }
+              },
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "image/jpeg": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
               }
             }
           },

libs/xlsx-template-lib.ts

@@ -104,6 +104,14 @@ xlsxTemplateRoute.get("/", async function (req, res) {
  *             schema:
  *               type: string
  *               format: binary
+ *           image/png:
+ *             schema:
+ *               type: string
+ *               format: binary
+ *           image/jpeg:
+ *             schema:
+ *               type: string
+ *               format: binary
  *       500:
  *         description: Server error
  *

test-run/docx-template.ts

@@ -2,12 +2,12 @@
 // npx ts-node docx-templates.ts
 import * as readline from 'node:readline/promises';  // This uses the promise-based APIs
 import { stdin as input, stdout as output } from 'node:process';
-import { docxTemplateX} from '../src/libs/docx-templates-lib';
+import { docxTemplateX} from '../libs/docx-templates-lib';
-import {templateData} from '../src/libs/report-template'
+import {templateData} from '../libs/report-template'
 import fs from 'fs';
 (async ()=>{
     const rl = readline.createInterface({ input, output });
-    const e = await rl.question('Output extension(docx,pdf,odt): ');
+    const e = await rl.question('Output extension(docx,pdf,odt,png,jpeg): ');
     const ext =e?e:"docx"
     const dpath = await rl.question('JSON data path(./docx.json): ');
     const datapath = dpath?dpath:"./docx.json"

test-run/xlsx-template.ts

@@ -2,12 +2,12 @@
 // npx ts-node xlsx-template.ts
 import * as readline from 'node:readline/promises';  // This uses the promise-based APIs
 import { stdin as input, stdout as output } from 'node:process';
-import {xlsxTemplateX} from '../src/libs/xlsx-template-lib'
+import {xlsxTemplateX} from '../libs/xlsx-template-lib'
-import {templateData} from '../src/libs/report-template'
+import {templateData} from '../libs/report-template'
 import fs from 'fs';
 (async ()=>{
     const rl = readline.createInterface({ input, output });
-    const e = await rl.question('Output extension(xlsx,pdf,ods): ');
+    const e = await rl.question('Output extension(xlsx,pdf,ods,png,jpeg): ');
     const ext =e?e:"xlsx"
     const dpath = await rl.question('JSON data path(./xlsx.json): ');
     const datapath = dpath?dpath:"./xlsx.json"