From 1f5624e1c2b1532977c08c93a89f27db33bf8e65 Mon Sep 17 00:00:00 2001 From: Fityan Date: Thu, 9 Nov 2023 13:24:41 +0700 Subject: [PATCH] fix: regex writing for `.` and `/` characters --- test/data.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/data.spec.ts b/test/data.spec.ts index 0aa500e..fe20d14 100644 --- a/test/data.spec.ts +++ b/test/data.spec.ts @@ -64,14 +64,14 @@ validateCsvFile(path.join(__dirname, '../data/districts.csv'), { tag: 'districts', header: ['code', 'regency_code', 'name'], /* The regex is already tested in https://regex101.com/r/cBkfxx/4 */ - rowRegex: /^(\d{2}\.\d{2}\.\d{2}),(\d{2}\.\d{2}),(?!\s)((?!')[a-zA-Z0-9\-'.\\/() ]+)$/, + rowRegex: /^(\d{2}\.\d{2}\.\d{2}),(\d{2}\.\d{2}),(?!\s)((?!')[a-zA-Z0-9\-'./() ]+)$/, }); validateCsvFile(path.join(__dirname, '../data/villages.csv'), { tag: 'villages', header: ['code', 'district_code', 'name'], /* The regex is already tested in https://regex101.com/r/7FKCem/5 */ - rowRegex: /^(\d{2}\.\d{2}\.\d{2}\.\d{4}),(\d{2}\.\d{2}\.\d{2}),(?!\s)((?!'|")[a-zA-Z0-9\-'"’.*\\/() ]+)$/, + rowRegex: /^(\d{2}\.\d{2}\.\d{2}\.\d{4}),(\d{2}\.\d{2}\.\d{2}),(?!\s)((?!'|")[a-zA-Z0-9\-'"’.*/() ]+)$/, }); validateCsvFile(path.join(__dirname, '../data/islands.csv'), { @@ -84,6 +84,6 @@ validateCsvFile(path.join(__dirname, '../data/islands.csv'), { 'is_outermost_small', 'name', ], - /* The regex is already tested in https://regex101.com/r/NoRXu9/7 */ - rowRegex: /^(\d{2}\.\d{2}\.4\d{4}),(\d{2}\.\d{2}|),((?:[0-8][0-9]|90)°(?:[0-5][0-9]|60)'(?:[0-5][0-9].[0-9]{2}|60.00)"\s[N|S]\s(?:0\d{2}|1(?:[0-7][0-9]|80))°(?:[0-5][0-9]|60)'(?:[0-5][0-9].[0-9]{2}|60.00)"\s[W|E]),(0|1),(0|1),(?!\s)((?!')[a-zA-Z0-9\-'/ ]+)$/, + /* The regex is already tested in https://regex101.com/r/NoRXu9/8 */ + rowRegex: /^(\d{2}\.\d{2}\.4\d{4}),(\d{2}\.\d{2}|),((?:[0-8][0-9]|90)°(?:[0-5][0-9]|60)'(?:[0-5][0-9]\.[0-9]{2}|60\.00)"\s[N|S]\s(?:0\d{2}|1(?:[0-7][0-9]|80))°(?:[0-5][0-9]|60)'(?:[0-5][0-9]\.[0-9]{2}|60\.00)"\s[W|E]),(0|1),(0|1),(?!\s)((?!')[a-zA-Z0-9\-'/ ]+)$/, });