Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
9a0f32323e | |||
f952abc95a | |||
21fc1378b8 | |||
a03567eba3 | |||
f9fc4fb7ff |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.23.17",
|
"version": "0.23.22",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@ -14,9 +14,9 @@
|
|||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
"exports": {
|
"exports": {
|
||||||
".": {
|
".": {
|
||||||
|
"types": "./dist/index.d.ts",
|
||||||
"import": "./dist/index.mjs",
|
"import": "./dist/index.mjs",
|
||||||
"require": "./dist/index.cjs",
|
"require": "./dist/index.cjs"
|
||||||
"types": "./dist/index.d.ts"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -34,7 +34,7 @@
|
|||||||
"typedoc": "^0.26.7",
|
"typedoc": "^0.26.7",
|
||||||
"typescript": "^5.3.3",
|
"typescript": "^5.3.3",
|
||||||
"vite": "^5.0.12",
|
"vite": "^5.0.12",
|
||||||
"vite-plugin-dts": "^3.7.2"
|
"vite-plugin-dts": "^4.5.3"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist"
|
"dist"
|
||||||
|
19
src/csv.ts
19
src/csv.ts
@ -23,29 +23,29 @@ export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
|
|||||||
i++;
|
i++;
|
||||||
} else inQuotes = !inQuotes;
|
} else inQuotes = !inQuotes;
|
||||||
} else if (char === ',' && !inQuotes) {
|
} else if (char === ',' && !inQuotes) {
|
||||||
columns.push(current);
|
columns.push(current.trim()); // Trim column values
|
||||||
current = '';
|
current = '';
|
||||||
} else current += char;
|
} else current += char;
|
||||||
}
|
}
|
||||||
columns.push(current);
|
columns.push(current.trim()); // Trim last column value
|
||||||
return columns.map(col => col.replace(/^"|"$/g, '').replace(/""/g, '"'));
|
return columns.map(col => col.replace(/^"|"$/g, '').replace(/""/g, '"'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Split rows
|
// Normalize line endings and split rows
|
||||||
const rows = [];
|
const rows = [];
|
||||||
let currentRow = '', inQuotes = false;
|
let currentRow = '', inQuotes = false;
|
||||||
for (const char of csv) {
|
for (const char of csv.replace(/\r\n/g, '\n')) { // Normalize \r\n to \n
|
||||||
if (char === '"') inQuotes = !inQuotes;
|
if (char === '"') inQuotes = !inQuotes;
|
||||||
if (char === '\n' && !inQuotes) {
|
if (char === '\n' && !inQuotes) {
|
||||||
rows.push(currentRow);
|
rows.push(currentRow.trim()); // Trim row
|
||||||
currentRow = '';
|
currentRow = '';
|
||||||
} else currentRow += char;
|
} else currentRow += char;
|
||||||
}
|
}
|
||||||
if(currentRow) rows.push(currentRow);
|
if (currentRow) rows.push(currentRow.trim()); // Trim last row
|
||||||
|
|
||||||
// Figure out headers
|
// Extract headers
|
||||||
let headers: any = hasHeaders ? rows.splice(0, 1)[0] : null;
|
let headers: any = hasHeaders ? rows.splice(0, 1)[0] : null;
|
||||||
if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g);
|
if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)?.map((h: any) => h.trim());
|
||||||
|
|
||||||
// Parse rows
|
// Parse rows
|
||||||
return <T[]>rows.map(r => {
|
return <T[]>rows.map(r => {
|
||||||
@ -64,6 +64,7 @@ export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert an array of objects to a CSV string
|
* Convert an array of objects to a CSV string
|
||||||
*
|
*
|
||||||
@ -80,7 +81,7 @@ export function toCsv(target: any, flatten=true) {
|
|||||||
const value = dotNotation<any>(row, h);
|
const value = dotNotation<any>(row, h);
|
||||||
if(value == null) return '';
|
if(value == null) return '';
|
||||||
if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
|
if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
|
||||||
if(typeof value == 'string' && /[\n"]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
|
if(typeof value == 'string' && /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
|
||||||
return value;
|
return value;
|
||||||
}).join(','))
|
}).join(','))
|
||||||
].join('\n');
|
].join('\n');
|
||||||
|
13
src/http.ts
13
src/http.ts
@ -30,7 +30,13 @@ class HttpResponse<T = any> extends Response {
|
|||||||
url!: string;
|
url!: string;
|
||||||
|
|
||||||
constructor(resp: Response, stream: ReadableStream) {
|
constructor(resp: Response, stream: ReadableStream) {
|
||||||
super(stream, {headers: resp.headers, status: resp.status, statusText: resp.statusText});
|
const body = [204, 205, 304].includes(resp.status) ? null : stream;
|
||||||
|
super(body, {
|
||||||
|
headers: resp.headers,
|
||||||
|
status: resp.status,
|
||||||
|
statusText: resp.statusText,
|
||||||
|
});
|
||||||
|
|
||||||
this.ok = resp.ok;
|
this.ok = resp.ok;
|
||||||
this.redirected = resp.redirected;
|
this.redirected = resp.redirected;
|
||||||
this.type = resp.type;
|
this.type = resp.type;
|
||||||
@ -70,8 +76,9 @@ export class Http {
|
|||||||
|
|
||||||
request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>> {
|
request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>> {
|
||||||
if(!this.url && !opts.url) throw new Error('URL needs to be set');
|
if(!this.url && !opts.url) throw new Error('URL needs to be set');
|
||||||
let url = (opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
|
let url = opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '');
|
||||||
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
|
url = url.replaceAll(/([^:]\/)\/+/g, '$1');
|
||||||
|
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
|
||||||
if(opts.query) {
|
if(opts.query) {
|
||||||
const q = Array.isArray(opts.query) ? opts.query :
|
const q = Array.isArray(opts.query) ? opts.query :
|
||||||
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
||||||
|
@ -19,12 +19,10 @@ export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
|||||||
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
|
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts text to camel case
|
* Converts text to camelCase
|
||||||
*/
|
*/
|
||||||
export function camelCase(text?: string) {
|
export function camelCase(str?: string) {
|
||||||
if(!text) return '';
|
const text = pascalCase(str);
|
||||||
text = text.replaceAll(/^[0-9]+/g, '')
|
|
||||||
.replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => args[1]?.toUpperCase() || '');
|
|
||||||
return text[0].toLowerCase() + text.slice(1);
|
return text[0].toLowerCase() + text.slice(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +72,17 @@ export function insertAt(target: string, str: string, index: number): String {
|
|||||||
return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
|
return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts text to kebab-case
|
||||||
|
*/
|
||||||
|
export function kebabCase(str: string) {
|
||||||
|
if(!str) return '';
|
||||||
|
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
|
||||||
|
.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `-${args[0].toLowerCase()}`)
|
||||||
|
.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}-${args[2]}`)
|
||||||
|
.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `-${args[1] ?? ''}`).toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add padding to string
|
* Add padding to string
|
||||||
*
|
*
|
||||||
@ -96,6 +105,18 @@ export function pad(text: any, length: number, char: string = ' ', start = true)
|
|||||||
return text.toString().padEnd(length, char);
|
return text.toString().padEnd(length, char);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert text to PascalCase
|
||||||
|
* @param {string} str
|
||||||
|
* @return {string}
|
||||||
|
*/
|
||||||
|
export function pascalCase(str?: string) {
|
||||||
|
if(!str) return '';
|
||||||
|
const text = str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
|
||||||
|
.replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => args[1]?.toUpperCase() || '');
|
||||||
|
return text[0].toUpperCase() + text.slice(1);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate a random hexadecimal value
|
* Generate a random hexadecimal value
|
||||||
*
|
*
|
||||||
@ -159,6 +180,17 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
|
|||||||
}).join('');
|
}).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts text to snake_case
|
||||||
|
*/
|
||||||
|
export function snakeCase(str?: string) {
|
||||||
|
if(!str) return '';
|
||||||
|
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
|
||||||
|
.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `_${args[0].toLowerCase()}`)
|
||||||
|
.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}_${args[2]}`)
|
||||||
|
.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `_${args[1] ?? ''}`).toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Splice a string together (Similar to Array.splice)
|
* Splice a string together (Similar to Array.splice)
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user