sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-05 03:30:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #699 from sasjs/special-missing

Browse Source 
Special missing function from @sasjs/utils
This commit is contained in:
Allan Bowe
2022-04-26 13:54:11 +03:00
committed by GitHub
parent 102898ac33 c00c8007e5
commit 4ebf949912
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@@ -8,7 +8,7 @@
"hasInstallScript": true, "hasInstallScript": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@sasjs/utils": "2.42.0", "@sasjs/utils": "2.44.0",
"axios": "0.26.0", "axios": "0.26.0",
"axios-cookiejar-support": "1.0.1", "axios-cookiejar-support": "1.0.1",
"form-data": "4.0.0", "form-data": "4.0.0",
@@ -1142,9 +1142,9 @@
} }
}, },
"node_modules/@sasjs/utils": { "node_modules/@sasjs/utils": {
"version": "2.42.0", "version": "2.44.0",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz", "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.44.0.tgz",
"integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==", "integrity": "sha512-hpC4erHYA8Mcb38mzxFEP0cXehfa0iKeqSW2d9MmxZ9g2qpy0BU6xyZJohN9kOiafXo5H359ndNKsg4DOq5YgA==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
@@ -13870,9 +13870,9 @@
} }
}, },
"@sasjs/utils": { "@sasjs/utils": {
"version": "2.42.0", "version": "2.44.0",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz", "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.44.0.tgz",
"integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==", "integrity": "sha512-hpC4erHYA8Mcb38mzxFEP0cXehfa0iKeqSW2d9MmxZ9g2qpy0BU6xyZJohN9kOiafXo5H359ndNKsg4DOq5YgA==",
"requires": { "requires": {
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/prompts": "2.0.13", "@types/prompts": "2.0.13",

2
package.json
View File

@@ -72,7 +72,7 @@
}, },
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@sasjs/utils": "2.42.0", "@sasjs/utils": "2.44.0",
"axios": "0.26.0", "axios": "0.26.0",
"axios-cookiejar-support": "1.0.1", "axios-cookiejar-support": "1.0.1",
"form-data": "4.0.0", "form-data": "4.0.0",

2
src/test/utils/formatDataForRequest.spec.ts
View File

@@ -62,7 +62,7 @@ describe('formatDataForRequest', () => {
expect(() => formatDataForRequest(tableWithMissingValues)).toThrow( expect(() => formatDataForRequest(tableWithMissingValues)).toThrow(
new Error( new Error(
'Special missing value can only be a single character from A to Z or _' `A Special missing value can only be a single character from 'A' to 'Z', '_', '.[a-z]', '._'`
) )
) )
}) })

9
src/utils/convertToCsv.ts
View File

@@ -1,3 +1,5 @@
import { isSpecialMissing } from '@sasjs/utils'
/** /**
* Converts the given JSON object array to a CSV string. * Converts the given JSON object array to a CSV string.
* @param data - the array of JSON objects to convert. * @param data - the array of JSON objects to convert.
@@ -18,7 +20,6 @@ export const convertToCSV = (
let headers: string[] = [] let headers: string[] = []
let csvTest let csvTest
let invalidString = false let invalidString = false
const specialMissingValueRegExp = /^[a-z_]{1}$/i
if (formats) { if (formats) {
headers = Object.keys(formats).map((key) => `${key}:${formats![key]}`) headers = Object.keys(formats).map((key) => `${key}:${formats![key]}`)
@@ -36,7 +37,7 @@ export const convertToCSV = (
hasNullOrNumber = true hasNullOrNumber = true
} else if ( } else if (
typeof row[field] === 'string' && typeof row[field] === 'string' &&
specialMissingValueRegExp.test(row[field]) isSpecialMissing(row[field])
) { ) {
hasSpecialMissingString = true hasSpecialMissingString = true
} }
@@ -130,10 +131,10 @@ export const convertToCSV = (
value = currentCell === null ? '' : currentCell value = currentCell === null ? '' : currentCell
if (formats && formats[fieldName] === 'best.') { if (formats && formats[fieldName] === 'best.') {
if (value && !specialMissingValueRegExp.test(value)) { if (value && !isSpecialMissing(value)) {
console.log(`🤖[value]🤖`, value) console.log(`🤖[value]🤖`, value)
throw new Error( throw new Error(
'Special missing value can only be a single character from A to Z or _' `A Special missing value can only be a single character from 'A' to 'Z', '_', '.[a-z]', '._'`
) )
} }