From e611b557aa029807ac4b834c75111b7f8dd0e5cb Mon Sep 17 00:00:00 2001 From: Marc Satkowski Date: Sun, 6 Apr 2025 13:35:27 +0200 Subject: [PATCH 1/3] fixed the missing handling of numbers for renderer - sql functions like sum or count would result in numbers in the data object, however, those were incorrectly handeled --- src/cellParser/ModernCellParser.ts | 2 ++ src/cellParser/parseResults.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/cellParser/ModernCellParser.ts b/src/cellParser/ModernCellParser.ts index 22ad288..da65b62 100644 --- a/src/cellParser/ModernCellParser.ts +++ b/src/cellParser/ModernCellParser.ts @@ -82,6 +82,8 @@ export class ModernCellParser { const res = this.prepare(content) if (typeof res === 'string' || !res) { return res + } else if (typeof res === 'number') { + return res.toString() } else if (res instanceof HTMLElement) { return res } else { diff --git a/src/cellParser/parseResults.ts b/src/cellParser/parseResults.ts index d26811e..ff9a368 100644 --- a/src/cellParser/parseResults.ts +++ b/src/cellParser/parseResults.ts @@ -26,6 +26,8 @@ export class ParseResults { } } else if (typeof data === 'string') { res[col] = data + } else if (typeof data === 'number') { + res[col] = data.toString() } else if (!data) { res[col] = '' } else { From bb2596a4625fe2c57d15ef0a399adf2d71256c7e Mon Sep 17 00:00:00 2001 From: Marc Satkowski Date: Wed, 9 Apr 2025 19:43:05 +0200 Subject: [PATCH 2/3] broaden the union type of CellParserResult by adding number --- src/cellParser/ModernCellParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cellParser/ModernCellParser.ts b/src/cellParser/ModernCellParser.ts index da65b62..91a72fb 100644 --- a/src/cellParser/ModernCellParser.ts +++ b/src/cellParser/ModernCellParser.ts @@ -11,7 +11,7 @@ export interface Result { onRunCallback?: OnRunCallback } -export type CellParserResult = Result | string | HTMLElement +export type CellParserResult = Result | string | HTMLElement | number export class ModernCellParser { From 119177b2581ef3cd064d97ed6762d4e2b93468d1 Mon Sep 17 00:00:00 2001 From: Marc Satkowski Date: Wed, 9 Apr 2025 19:46:08 +0200 Subject: [PATCH 3/3] forgot to handle the union type change somewhere in RenderContext --- src/cellParser/RenderContext.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cellParser/RenderContext.ts b/src/cellParser/RenderContext.ts index e7b7c07..43bf8e5 100644 --- a/src/cellParser/RenderContext.ts +++ b/src/cellParser/RenderContext.ts @@ -14,7 +14,7 @@ class RenderContext { render(context: string) { const res = this.cellParser.prepare(context) - if (typeof res === 'string') { + if (typeof res === 'string' || typeof res === 'number') { return res } if (res instanceof HTMLElement) {