Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 67ae86d69b | |||
| 87db4d4755 | |||
| 0fb1e13ba0 | |||
| ff4401934c | |||
| ce3c8d012a | |||
| a86e8350ee | |||
| 7b4e17e4c4 | |||
| fa66820c76 | |||
| 49a2df8cd4 |
11
index.html
11
index.html
@ -6,14 +6,11 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script type="module">
|
<script type="module">
|
||||||
import {fromCsv, toCsv} from './dist/index.mjs';
|
import {formatDate} from './dist/index.mjs';
|
||||||
|
|
||||||
const csv = '' +
|
console.log(formatDate(new Date(), 'HH:mm:ss z', 5));
|
||||||
'_id,any,boolean,date,file,foreignKey,formula,javaScript,number,string,_createdBy,_createdDate,_updatedBy,_updatedDate\n' +
|
console.log(formatDate(new Date(), 'HH:mm:ss z', 0));
|
||||||
'48,"test,test,test",,,,,,,,,system,2024-11-09T19:05:04.932Z,system,2024-11-09T19:05:04.932Z\n' +
|
console.log(formatDate(new Date(), 'HH:mm:ss z', -5));
|
||||||
'49,,,,,,,,,,system,2024-11-09T19:05:04.933Z,system,2024-11-09T19:05:04.933Z';
|
|
||||||
|
|
||||||
console.log(fromCsv(csv, false));
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.22.6",
|
"version": "0.23.0",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
@ -13,6 +13,7 @@ export * from './misc';
|
|||||||
export * from './objects';
|
export * from './objects';
|
||||||
export * from './path-events';
|
export * from './path-events';
|
||||||
export * from './promise-progress';
|
export * from './promise-progress';
|
||||||
|
export * from './search';
|
||||||
export * from './string';
|
export * from './string';
|
||||||
export * from './time';
|
export * from './time';
|
||||||
export * from './types';
|
export * from './types';
|
||||||
|
|||||||
38
src/search.ts
Normal file
38
src/search.ts
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
import {dotNotation, JSONAttemptParse} from './objects';
|
||||||
|
|
||||||
|
export function search(rows: any[], search: string, regex?: boolean, transform: Function = (r: any) => r) {
|
||||||
|
if(!rows) return [];
|
||||||
|
return rows.filter(r => {
|
||||||
|
// Empty search
|
||||||
|
const value = transform(r);
|
||||||
|
if(!search) return true;
|
||||||
|
// Regex search
|
||||||
|
if(regex) {
|
||||||
|
return !!Object.values(value).filter((v: any) => {
|
||||||
|
try { return RegExp(search, 'gm').test(v.toString()); }
|
||||||
|
catch { return false; }
|
||||||
|
}).length
|
||||||
|
}
|
||||||
|
// Make sure at least one OR passes
|
||||||
|
const or = search.split('||').map(p => p.trim()).filter(p => !!p);
|
||||||
|
return -1 != or.findIndex(p => {
|
||||||
|
// Make sure all ANDs pass
|
||||||
|
const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
|
||||||
|
return and.filter(p => {
|
||||||
|
// Boolean operator
|
||||||
|
const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
|
||||||
|
if(prop) {
|
||||||
|
const a = JSON.stringify(JSONAttemptParse(dotNotation<any>(value, prop[1])));
|
||||||
|
const operator = prop[2] == '=' ? '==' : prop[2];
|
||||||
|
const b = JSON.stringify(JSONAttemptParse(prop[3]));
|
||||||
|
return eval(`${a} ${operator} ${b}`);
|
||||||
|
}
|
||||||
|
// Case-sensitive
|
||||||
|
const v = Object.values(value).join('');
|
||||||
|
if(/[A-Z]/g.test(search)) return v.includes(p);
|
||||||
|
// Case-insensitive
|
||||||
|
return v.toLowerCase().includes(p);
|
||||||
|
}).length == and.length;
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
105
src/time.ts
105
src/time.ts
@ -1,5 +1,3 @@
|
|||||||
import {strSplice} from './string.ts';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Like setInterval but will adjust the timeout value to account for runtime
|
* Like setInterval but will adjust the timeout value to account for runtime
|
||||||
* @param {Function} cb Callback function that will be ran
|
* @param {Function} cb Callback function that will be ran
|
||||||
@ -27,10 +25,46 @@ export function adjustedInterval(cb: Function, ms: number) {
|
|||||||
*
|
*
|
||||||
* @param {Date | number | string} date Date or timestamp to convert to string
|
* @param {Date | number | string} date Date or timestamp to convert to string
|
||||||
* @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
|
* @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
|
||||||
|
* @param tz Override timezone, can be either string or number
|
||||||
* @return {string} Formated date
|
* @return {string} Formated date
|
||||||
*/
|
*/
|
||||||
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm '): string {
|
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm', tz?: string | number): string {
|
||||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
const timezones = [
|
||||||
|
['IDLW', -12],
|
||||||
|
['SST', -11],
|
||||||
|
['HST', -10],
|
||||||
|
['AKST', -9],
|
||||||
|
['PST', -8],
|
||||||
|
['MST', -7],
|
||||||
|
['CST', -6],
|
||||||
|
['EST', -5],
|
||||||
|
['AST', -4],
|
||||||
|
['BRT', -3],
|
||||||
|
['MAT', -2],
|
||||||
|
['AZOT', -1],
|
||||||
|
['UTC', 0],
|
||||||
|
['CET', 1],
|
||||||
|
['EET', 2],
|
||||||
|
['MSK', 3],
|
||||||
|
['AST', 4],
|
||||||
|
['PKT', 5],
|
||||||
|
['IST', 5.5],
|
||||||
|
['BST', 6],
|
||||||
|
['ICT', 7],
|
||||||
|
['CST', 8],
|
||||||
|
['JST', 9],
|
||||||
|
['AEST', 10],
|
||||||
|
['SBT', 11],
|
||||||
|
['FJT', 12],
|
||||||
|
['TOT', 13],
|
||||||
|
['LINT', 14]
|
||||||
|
];
|
||||||
|
|
||||||
|
function adjustTz(date: Date, gmt: number) {
|
||||||
|
const currentOffset = date.getTimezoneOffset();
|
||||||
|
const adjustedOffset = gmt * 60;
|
||||||
|
return new Date(date.getTime() + (adjustedOffset + currentOffset) * 60000);
|
||||||
|
}
|
||||||
|
|
||||||
function day(num: number): string {
|
function day(num: number): string {
|
||||||
switch(num) {
|
switch(num) {
|
||||||
@ -84,37 +118,14 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
|
|||||||
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function timezone(offset: number) {
|
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||||
const hours = offset / 60;
|
|
||||||
switch (hours) {
|
// Handle timezones
|
||||||
case -12: return "IDLW";
|
let t!: [string, number];
|
||||||
case -11: return "SST";
|
if(tz == null) tz = -(date.getTimezoneOffset() / 60);
|
||||||
case -10: return "HST";
|
t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
|
||||||
case -9: return "AKST";
|
if(!t) throw new Error(`Unknown timezone: ${tz}`);
|
||||||
case -8: return "PST";
|
date = adjustTz(date, t[1]);
|
||||||
case -7: return "MST";
|
|
||||||
case -6: return "CST";
|
|
||||||
case -5: return "EST";
|
|
||||||
case -4: return "AST";
|
|
||||||
case -3: return "ART";
|
|
||||||
case -2: return "FNT";
|
|
||||||
case -1: return "AZOT";
|
|
||||||
case 0: return "UTC";
|
|
||||||
case 1: return "CET";
|
|
||||||
case 2: return "EET";
|
|
||||||
case 3: return "MSK";
|
|
||||||
case 4: return "SAMT";
|
|
||||||
case 5: return "YEKT";
|
|
||||||
case 6: return "OMST";
|
|
||||||
case 7: return "KRAT";
|
|
||||||
case 8: return "CST";
|
|
||||||
case 9: return "JST";
|
|
||||||
case 10: return "AEST";
|
|
||||||
case 11: return "SBT";
|
|
||||||
case 12: return "NZST";
|
|
||||||
default: return '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return format
|
return format
|
||||||
// Year
|
// Year
|
||||||
@ -122,7 +133,7 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
|
|||||||
.replaceAll('YY', date.getFullYear().toString().slice(2))
|
.replaceAll('YY', date.getFullYear().toString().slice(2))
|
||||||
// Month
|
// Month
|
||||||
.replaceAll('MMMM', month(date.getMonth()))
|
.replaceAll('MMMM', month(date.getMonth()))
|
||||||
.replaceAll('MMM', month(date.getMonth()).slice(0, 2))
|
.replaceAll('MMM', month(date.getMonth()).slice(0, 3))
|
||||||
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
||||||
.replaceAll('M', (date.getMonth() + 1).toString())
|
.replaceAll('M', (date.getMonth() + 1).toString())
|
||||||
// Day
|
// Day
|
||||||
@ -146,16 +157,28 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
|
|||||||
.replaceAll('ss', date.getSeconds().toString().padStart(2, '0'))
|
.replaceAll('ss', date.getSeconds().toString().padStart(2, '0'))
|
||||||
.replaceAll('s', date.getSeconds().toString())
|
.replaceAll('s', date.getSeconds().toString())
|
||||||
// Millisecond
|
// Millisecond
|
||||||
.replaceAll('SSS', date.getMilliseconds().toString())
|
.replaceAll('SSS', date.getMilliseconds().toString().padEnd(3, '0'))
|
||||||
.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1))
|
.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1).padEnd(2, '0'))
|
||||||
.replaceAll('S', date.getMilliseconds().toString()[0])
|
.replaceAll('S', date.getMilliseconds().toString()[0])
|
||||||
// Period/Meridian (AM/PM)
|
// Period/Meridian (AM/PM)
|
||||||
.replaceAll('A', date.getHours() >= 12 ? 'PM' : 'AM')
|
.replaceAll('A', date.getHours() >= 12 ? 'PM' : 'AM')
|
||||||
.replaceAll('a', date.getHours() >= 12 ? 'pm' : 'am')
|
.replaceAll('a', date.getHours() >= 12 ? 'pm' : 'am')
|
||||||
// Timezone
|
// Timezone
|
||||||
.replaceAll('ZZ', tzOffset(date.getTimezoneOffset()).replace(':', ''))
|
.replaceAll('ZZ', tzOffset(t[1] * 60).replace(':', ''))
|
||||||
.replaceAll('Z', tzOffset(date.getTimezoneOffset()))
|
.replaceAll('Z', tzOffset(t[1] * 60))
|
||||||
.replaceAll('z', timezone(date.getTimezoneOffset()));
|
.replaceAll('z', typeof tz == 'string' ? tz : (<any>t)[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a function immediately & repeat every x ms
|
||||||
|
*
|
||||||
|
* @param {() => any} fn Callback function
|
||||||
|
* @param {number} interval Repeat in ms
|
||||||
|
* @return {number} Clear Interval ID
|
||||||
|
*/
|
||||||
|
export function instantInterval(fn: () => any, interval: number) {
|
||||||
|
fn();
|
||||||
|
return setInterval(fn, interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user