From 402e1be938cf6a9683d43bf7eeaee0c17670461f Mon Sep 17 00:00:00 2001 From: wannT-1 <200890097+wannT-1@users.noreply.github.com> Date: Tue, 11 Aug 2026 14:10:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(portfolio-import):=20=E4=BC=9A=E8=AE=A1?= =?UTF-8?q?=E6=8B=AC=E5=8F=B7=E5=92=8C=E5=B0=BE=E9=9A=8F=E5=87=8F=E5=8F=B7?= =?UTF-8?q?=E6=8C=89=E8=B4=9F=E6=95=B0=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对账单里的 (180.50)、($1,234.50) 和 1,234.56- 不再被当成无效成本。全角括号同样按负数解析。只有括号或货币符号、没有数字时仍然无效。 --- .../src/portfolio-import/parsers.test.ts | 16 ++++++++++ .../shared/src/portfolio-import/parsers.ts | 30 +++++++++++++++++-- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/packages/shared/src/portfolio-import/parsers.test.ts b/packages/shared/src/portfolio-import/parsers.test.ts index 3e0e175b..c8606bb3 100644 --- a/packages/shared/src/portfolio-import/parsers.test.ts +++ b/packages/shared/src/portfolio-import/parsers.test.ts @@ -79,6 +79,17 @@ describe('toFiniteNumber', () => { expect(toFiniteNumber(' 1,234.56 ')).toBe(1234.56) }) + it('reads accounting parentheses and a trailing minus as negative amounts', () => { + expect(toFiniteNumber('(180.50)')).toBe(-180.5) + expect(toFiniteNumber('($1,234.56)')).toBe(-1234.56) + expect(toFiniteNumber('(180.50)')).toBe(-180.5) + expect(toFiniteNumber('1,234.56-')).toBe(-1234.56) + expect(toFiniteNumber('($0.00)')).toBe(0) + expect(toFiniteNumber('()')).toBeUndefined() + expect(toFiniteNumber('($)')).toBeUndefined() + expect(toFiniteNumber('-45.2')).toBe(-45.2) + }) + it('returns undefined for null, empty, and junk', () => { expect(toFiniteNumber(null)).toBeUndefined() expect(toFiniteNumber(undefined)).toBeUndefined() @@ -132,6 +143,11 @@ describe('parseCsv', () => { expect(mapped).toMatchObject({ symbol: 'AAPL.US', quantity: 1000, costPrice: 180.5, issues: [] }) }) + it('parses parenthesized cost cells as negative amounts', () => { + const [row] = parseCsv('Symbol,Quantity,Cost\nAAPL.US,(100),"($1,234.50)"') + expect(row).toMatchObject({ symbol: 'AAPL.US', quantity: -100, costPrice: -1234.5, confidence: 1, issues: [] }) + }) + it('flags formatting-only quantities and costs without inventing zeros', () => { const rows = parseCsv('Symbol,Quantity,Cost\nAAPL.US,100,$\nMSFT.US,",",180.5\n0700.HK,500,320') expect(rows).toHaveLength(3) diff --git a/packages/shared/src/portfolio-import/parsers.ts b/packages/shared/src/portfolio-import/parsers.ts index a2a141fd..83f92e25 100644 --- a/packages/shared/src/portfolio-import/parsers.ts +++ b/packages/shared/src/portfolio-import/parsers.ts @@ -83,9 +83,30 @@ export function checkSymbol(raw: string): SymbolCheck { } } +/** + * Accounting exports write negatives as `(180.50)` or `180.50-`. + * Fullwidth parentheses are accepted. A normal leading minus is left for + * the numeric parse. + */ +function takeAccountingSign(value: string): { text: string; negative: boolean } { + let text = value.trim() + let negative = false + const wrapped = /^(?:\(|()\s*(.*?)\s*(?:\)|))$/.exec(text) + if (wrapped) { + negative = true + text = wrapped[1].trim() + } + if (text.endsWith('-') && !/^[+-]/.test(text)) { + negative = true + text = text.slice(0, -1).trim() + } + return { text, negative } +} + /** * Coerce a CSV/paste cell to a finite number. Strings with thousands * separators or a leading `$` are handled; empty/null/non-numeric → undefined. + * Accounting parentheses and a trailing minus are negative amounts. */ export function toFiniteNumber(value: unknown): number | undefined { if (typeof value === 'number') { @@ -94,17 +115,20 @@ export function toFiniteNumber(value: unknown): number | undefined { if (typeof value !== 'string') { return undefined } - const trimmed = value.trim() + const accounting = takeAccountingSign(value) + const trimmed = accounting.text.trim() if (trimmed === '') { return undefined } const cleaned = trimmed.replace(/[,$\s]/g, '') // Number('') is zero, but formatting alone does not supply a numeric value. - if (cleaned === '') { + if (cleaned === '' || cleaned === '+' || cleaned === '-') { return undefined } const parsed = Number(cleaned) - return Number.isFinite(parsed) ? parsed : undefined + if (!Number.isFinite(parsed)) return undefined + if (parsed === 0) return 0 + return accounting.negative ? -Math.abs(parsed) : parsed } // ── CSV ──────────────────────────────────────────────────────────────────── From 4ce827c46497c757605f06352d9acc9c18505151 Mon Sep 17 00:00:00 2001 From: wannT-1 <200890097+wannT-1@users.noreply.github.com> Date: Wed, 19 Aug 2026 16:25:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(portfolio-import):=20=E5=85=A8=E8=A7=92?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=92=8C=E5=88=86=E9=9A=94=E7=AC=A6=E6=8C=89?= =?UTF-8?q?=E5=8D=8A=E8=A7=92=E6=95=B0=E5=80=BC=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 中文表格里的全角数字、全角逗号、全角小数点和全角美元符号不再让数量或成本变成缺失字段。 --- .../shared/src/portfolio-import/parsers.test.ts | 13 +++++++++++++ packages/shared/src/portfolio-import/parsers.ts | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/shared/src/portfolio-import/parsers.test.ts b/packages/shared/src/portfolio-import/parsers.test.ts index c8606bb3..d452a3dc 100644 --- a/packages/shared/src/portfolio-import/parsers.test.ts +++ b/packages/shared/src/portfolio-import/parsers.test.ts @@ -90,6 +90,14 @@ describe('toFiniteNumber', () => { expect(toFiniteNumber('-45.2')).toBe(-45.2) }) + it('folds fullwidth digits and separators before parsing', () => { + expect(toFiniteNumber('1,234.56')).toBe(1234.56) + expect(toFiniteNumber('$180.50')).toBe(180.5) + expect(toFiniteNumber('(180.50)')).toBe(-180.5) + expect(toFiniteNumber('-45.2')).toBe(-45.2) + expect(toFiniteNumber(',,,')).toBeUndefined() + }) + it('returns undefined for null, empty, and junk', () => { expect(toFiniteNumber(null)).toBeUndefined() expect(toFiniteNumber(undefined)).toBeUndefined() @@ -143,6 +151,11 @@ describe('parseCsv', () => { expect(mapped).toMatchObject({ symbol: 'AAPL.US', quantity: 1000, costPrice: 180.5, issues: [] }) }) + it('parses fullwidth quantity and cost cells', () => { + const [row] = parseCsv('代码,数量,成本\n600519.SH,10,1,600.50') + expect(row).toMatchObject({ symbol: '600519.SH', quantity: 10, costPrice: 1600.5, confidence: 1, issues: [] }) + }) + it('parses parenthesized cost cells as negative amounts', () => { const [row] = parseCsv('Symbol,Quantity,Cost\nAAPL.US,(100),"($1,234.50)"') expect(row).toMatchObject({ symbol: 'AAPL.US', quantity: -100, costPrice: -1234.5, confidence: 1, issues: [] }) diff --git a/packages/shared/src/portfolio-import/parsers.ts b/packages/shared/src/portfolio-import/parsers.ts index 83f92e25..daaf983e 100644 --- a/packages/shared/src/portfolio-import/parsers.ts +++ b/packages/shared/src/portfolio-import/parsers.ts @@ -83,6 +83,16 @@ export function checkSymbol(raw: string): SymbolCheck { } } +/** Map fullwidth digits and separators onto the ASCII forms `Number` understands. */ +function foldNumericWidth(value: string): string { + return value + .replace(/[0-9]/g, (digit) => String.fromCharCode(digit.charCodeAt(0) - 0xfee0)) + .replace(/./g, '.') + .replace(/,/g, ',') + .replace(/[-−]/g, '-') + .replace(/$/g, '$') +} + /** * Accounting exports write negatives as `(180.50)` or `180.50-`. * Fullwidth parentheses are accepted. A normal leading minus is left for @@ -115,7 +125,7 @@ export function toFiniteNumber(value: unknown): number | undefined { if (typeof value !== 'string') { return undefined } - const accounting = takeAccountingSign(value) + const accounting = takeAccountingSign(foldNumericWidth(value)) const trimmed = accounting.text.trim() if (trimmed === '') { return undefined