added fileText method

improved toCSV
Fixed PathEvents double slash
2024-11-09 15:35:05 -05:00 · 2024-11-09 13:49:04 -05:00 · 2024-11-08 18:49:11 -05:00 · 2024-11-07 10:46:56 -05:00
8 changed files with 39 additions and 32 deletions
--- a/index.html
+++ b/index.html
@ -6,9 +6,9 @@
 	</head>
 	<body>
 		<script type="module">
-			import {PathEvent} from './dist/index.mjs';
+			import {toCsv} from './dist/index.mjs';
-			console.log(PathEvent.has(['data/Inventory:n', 'logs:c'], `logs/client:n`));
+			console.log(toCsv([{test:123, test2: {test: [1, 2, 3, 4], test3: true, test4: 'okay'}}]));
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.22.0",
+	"version": "0.22.4",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
--- a/src/csv.ts
+++ b/src/csv.ts
@ -1,4 +1,5 @@
-import {dotNotation, flattenObj} from './objects.ts';
+import {ASet} from './aset.ts';
 import {dotNotation, flattenObj, JSONAttemptParse, JSONSanitize} from './objects.ts';
 /**
 * Convert an object to a CSV string
@ -7,20 +8,13 @@ import {dotNotation, flattenObj} from './objects.ts';
 * @param {boolean} flatten Should nested object be flattened or treated as values
 * @return {string} CSV string
 */
-export function csv(target: any[], flatten=true) {
+export function toCsv(target: any[], flatten=true) {
-	const headers = target.reduce((acc, row) => {
+	const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
 		Object.keys(flatten ? flattenObj(row) : row)
 			.forEach(key => { if(!acc.includes(key)) acc.push(key); });
 		return acc;
 	}, []);
 	return [
 		headers.join(','),
 		...target.map(row => headers.map((h: string) => {
 			const value = dotNotation<any>(row, h);
-			const type = typeof value;
+			return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
 			if(type == 'string' && value.includes(',')) return `"${value}"`;
 			if(type == 'object') return `"${JSON.stringify(value)}"`;
 			return value;
 		}).join(','))
 	].join('\n');
 }
--- a/src/files.ts
+++ b/src/files.ts
@ -52,6 +52,21 @@ export function fileBrowser(options: {accept?: string, multiple?: boolean} = {})
 	});
 }
 /**
 * Extract text from a file
 *
 * @param file File to extract text from
 * @return {Promise<string | null>} File contents
 */
 export function fileText(file: any): Promise<string | null> {
 	return new Promise((resolve, reject) => {
 		const reader = new FileReader();
 		reader.onload = () => resolve(<string>reader.result);
 		reader.onerror = () => reject(reader.error);
 		reader.readAsText(file);
 	});
 }
 /**
 * Create timestamp intended for filenames from a date
 *
--- a/src/objects.ts
+++ b/src/objects.ts
@ -29,10 +29,10 @@ export function clean<T>(obj: T, undefinedOnly = false): Partial<T> {
 * Should be replaced by `structuredClone` once released.
 * @param {T} value Object to copy
 * @returns {T} Type
 * @deprecated Please use `structuredClone`
 */
 export function deepCopy<T>(value: T): T {
-	return structuredClone(value);
+	try {return structuredClone(value); }
 	catch { return JSON.parse(JSONSanitize(value)); }
 }
 /**
@ -91,7 +91,6 @@ export function dotNotation<T>(obj: any, prop: string, set?: T): T | undefined {
 	}, obj);
 }
 /**
 * Convert object into URL encoded query string
 *
@ -128,8 +127,9 @@ export function encodeQuery(data: any): string {
 export function flattenObj(obj: any, parent?: any, result: any = {}) {
 	if(typeof obj === "object" && !Array.isArray(obj)) {
 		for(const key of Object.keys(obj)) {
-			const propName = parent ? parent + '.' + key : key;
+			const propName = parent ? `${parent}.${key}` : key;
-			if(typeof obj[key] === 'object') {
+			if(typeof obj[key] === 'object' && obj[key] != null && !Array.isArray(obj[key])) {
 				console.log(propName, );
 				flattenObj(obj[key], propName, result);
 			} else {
 				result[propName] = obj[key];
@ -216,11 +216,11 @@ export function mixin(target: any, constructors: any[]) {
 /**
 * Parse JSON but return the original string if it fails
 *
- * @param {string} json JSON string to parse
+ * @param {any} json JSON string to parse
 * @return {string | T} Object if successful, original string otherwise
 */
-export function JSONAttemptParse<T>(json: string): T | string {
+export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
-	try { return JSON.parse(json); }
+	try { return JSON.parse(<any>json); }
 	catch { return json; }
 }
@ -234,10 +234,8 @@ export function JSONAttemptParse<T>(json: string): T | string {
 export function JSONSanitize(obj: any, space?: number): string {
 	let cache: any[] = [];
 	return JSON.stringify(obj, (key, value) => {
-		if (typeof value === 'object' && value !== null) {
+		if(typeof value === 'object' && value !== null)
-			if (cache.includes(value)) return;
+			if(!cache.includes(value)) cache.push(value);
 			cache.push(value);
 		}
 		return value;
 	}, space);
 }
--- a/src/path-events.ts
+++ b/src/path-events.ts
@ -25,7 +25,7 @@ export type Method = '*' | 'n' | 'c' | 'r' | 'u' | 'd' | 'x';
 * @param {string} args
 * @return {PathEvent} Event object
 */
-export function PE(str: TemplateStringsArray, ...args: string[]) {
+export function PE(str: TemplateStringsArray, ...args: any[]) {
 	const combined = [];
 	for(let i = 0; i < str.length || i < args.length; i++) {
 		if(str[i]) combined.push(str[i]);
@ -92,7 +92,7 @@ export class PathEvent {
 	constructor(Event: string | PathEvent) {
 		if(typeof Event == 'object') return Object.assign(this, Event);
-		let [p, scope, method] = Event.split(':');
+		let [p, scope, method] = Event.replaceAll(/\/{2,}/g, '/').split(':');
 		if(!method) method = scope || '*';
 		if(p == '*' || !p && method == '*') {
 			p = '';
--- a/src/string.ts
+++ b/src/string.ts
@ -1,5 +1,3 @@
 import {dotNotation, flattenObj} from './objects.ts';
 /**
 * String of all letters
 */
@ -44,7 +42,7 @@ export function formatBytes(bytes: number, decimals = 2) {
 export function formatPhoneNumber(number: string) {
 	const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);
 	if(!parts) throw new Error(`Number cannot be parsed: ${number}`);
-	return `${parts[1] ?? ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
+	return `${parts[1] ? '+1' : ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
 }
 /**
@ -60,6 +58,7 @@ export function formatPhoneNumber(number: string) {
 * @param {string} str - Value that will be injected to parent
 * @param {number} index - Position to inject string at
 * @returns {string} - New string
 * @deprecated use `strSplice()`
 */
 export function insertAt(target: string, str: string, index: number): String {
 	return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
@ -210,6 +209,7 @@ export type ParsedUrl = {
 *
 * @param {string} url URL string that will be parsed
 * @returns {RegExpExecArray} Parts of URL
 * @deprecated Use built-in URL object: `new URL('...')`;
 */
 export function parseUrl(url: string): ParsedUrl {
 	const processed = new RegExp(
--- a/src/types.ts
+++ b/src/types.ts
@ -15,6 +15,6 @@
 *
 * @return {Array<keyof T>} Available keys
 */
-export function tyoeKeys<T extends object>() {
+export function typeKeys<T extends object>() {
 	return Object.keys(<T>{}) as Array<keyof T>;
 }
Author	SHA1	Message	Date
ztimson	0eab2630ad	added fileText method All checks were successful Build / Build NPM Project (push) Successful in 37s Details Build / Tag Version (push) Successful in 6s Details Build / Publish Documentation (push) Successful in 2m21s Details	2024-11-09 15:35:05 -05:00
ztimson	2f59a9d02e	improved toCSV All checks were successful Build / Build NPM Project (push) Successful in 41s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 1m41s Details	2024-11-09 13:49:04 -05:00
ztimson	ce2f32dd45	Fixed PathEvents double slash All checks were successful Build / Build NPM Project (push) Successful in 1m10s Details Build / Tag Version (push) Successful in 13s Details Build / Publish Documentation (push) Successful in 1m54s Details	2024-11-08 18:49:11 -05:00
ztimson	ce40b5b1e7	Deprecated old methods All checks were successful Build / Build NPM Project (push) Successful in 39s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 1m41s Details	2024-11-07 10:46:56 -05:00