refactoring

apps/api/src/app/endpoints/ai/ai.service.ts

@@ -1,3 +1,5 @@
+import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import {
   PROPERTY_API_KEY_OPENROUTER,
   PROPERTY_OPENROUTER_MODEL
@@ -8,9 +10,7 @@ import type { AiPromptMode } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { generateText } from 'ai';
-
+import { tablemark } from 'tablemark';
-import { PropertyService } from '../../../services/property/property.service';
-import { PortfolioService } from '../../portfolio/portfolio.service';
 
 @Injectable()
 export class AiService {
@@ -59,9 +59,20 @@ export class AiService {
       userId
     });
 
+    const holdingsTableColumns = [
+      { name: 'Name' },
+      { name: 'Symbol' },
+      { name: 'Currency' },
+      { name: 'Asset Class' },
+      { name: 'Asset Sub Class' },
+      { name: 'Allocation in Percentage', align: 'right' as const }
+    ];
+
     // Build rows for tablemark
     const rows = Object.values(holdings)
-      .sort((a, b) => b.allocationInPercentage - a.allocationInPercentage)
+      .sort((a, b) => {
+        return b.allocationInPercentage - a.allocationInPercentage;
+      })
       .map(
         ({
           allocationInPercentage,
@@ -82,33 +93,10 @@ export class AiService {
         }
       );
 
-    // Render Markdown table using tablemark, with safe fallback
+    // Render Markdown table using tablemark
-    let holdingsTableString = '';
+    const holdingsTableString = tablemark(rows, {
-    try {
+      columns: holdingsTableColumns
-      const tablemarkModule: any = await import('tablemark');
+    });
-      const tablemark = tablemarkModule?.default ?? tablemarkModule;
-      holdingsTableString = tablemark(rows, {
-        columns: [
-          { name: 'Name' },
-          { name: 'Symbol' },
-          { name: 'Currency' },
-          { name: 'Asset Class' },
-          { name: 'Asset Sub Class' },
-          { name: 'Allocation in Percentage', align: 'right' }
-        ]
-      });
-    } catch {
-      // Fallback to manual rendering if tablemark is unavailable at runtime
-      const manual = [
-        '| Name | Symbol | Currency | Asset Class | Asset Sub Class | Allocation in Percentage |',
-        '| --- | --- | --- | --- | --- | --- |',
-        ...rows.map(
-          (r) =>
-            `| ${r['Name']} | ${r['Symbol']} | ${r['Currency']} | ${r['Asset Class']} | ${r['Asset Sub Class']} | ${r['Allocation in Percentage']} |`
-        )
-      ];
-      holdingsTableString = manual.join('\n');
-    }
 
     if (mode === 'portfolio') {
       return holdingsTableString;

apps/api/src/types/tablemark.d.ts

@@ -1,16 +0,0 @@
-declare module 'tablemark' {
-  interface TablemarkColumnOption {
-    name: string;
-    align?: 'left' | 'center' | 'right';
-  }
-
-  interface TablemarkOptions {
-    columns?: (string | TablemarkColumnOption)[];
-  }
-
-  function tablemark(
-    rows: Record<string, unknown>[],
-    options?: TablemarkOptions
-  ): string;
-  export = tablemark;
-}

package-lock.json

@@ -90,7 +90,7 @@
         "rxjs": "7.8.1",
         "stripe": "18.5.0",
         "svgmap": "2.12.2",
-        "tablemark": "^4.1.0",
+        "tablemark": "4.1.0",
         "twitter-api-v2": "1.23.0",
         "uuid": "11.1.0",
         "yahoo-finance2": "3.10.0",

package.json

@@ -136,7 +136,7 @@
     "rxjs": "7.8.1",
     "stripe": "18.5.0",
     "svgmap": "2.12.2",
-    "tablemark": "^4.1.0",
+    "tablemark": "4.1.0",
     "twitter-api-v2": "1.23.0",
     "uuid": "11.1.0",
     "yahoo-finance2": "3.10.0",