Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e32e5d6f71 | |||
| 41bc5e7eb5 | |||
| fda92e46d5 | |||
| 1be2c1118f | |||
| ead8fcffc0 | |||
| 367b026cea | |||
| 1b5e16ae5f | |||
| 1b0061b714 | |||
| 3048b74b2f | |||
| 49959f3060 | |||
| cabfc93773 | |||
| 38207eb618 | |||
| 1352e69895 | |||
| 1b05af09fb | |||
| 32c61fff42 | |||
| df517b6078 | |||
| 1e54ee57a1 | |||
| b6f8da512c | |||
| 9cf86f4be1 | |||
| 2240c93db5 |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.27.13",
|
"version": "0.28.11",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
@@ -122,6 +122,8 @@ export function sortByProp(prop: string, reverse = false) {
|
|||||||
return function (a: any, b: any) {
|
return function (a: any, b: any) {
|
||||||
const aVal = dotNotation<any>(a, prop);
|
const aVal = dotNotation<any>(a, prop);
|
||||||
const bVal = dotNotation<any>(b, prop);
|
const bVal = dotNotation<any>(b, prop);
|
||||||
|
if(aVal === undefined) return 1;
|
||||||
|
if(bVal === undefined) return -1;
|
||||||
if(typeof aVal == 'number' && typeof bVal == 'number')
|
if(typeof aVal == 'number' && typeof bVal == 'number')
|
||||||
return (reverse ? -1 : 1) * (aVal - bVal);
|
return (reverse ? -1 : 1) * (aVal - bVal);
|
||||||
if(aVal > bVal) return reverse ? -1 : 1;
|
if(aVal > bVal) return reverse ? -1 : 1;
|
||||||
|
|||||||
@@ -113,6 +113,18 @@ export class NotAcceptableError extends CustomError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class TooManyRequestsError extends CustomError {
|
||||||
|
static code = 429;
|
||||||
|
|
||||||
|
constructor(message: string = 'Rate Limit Reached') {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
static instanceof(err: Error) {
|
||||||
|
return (<any>err).constructor.code == this.code;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class InternalServerError extends CustomError {
|
export class InternalServerError extends CustomError {
|
||||||
static code = 500;
|
static code = 500;
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ export * from './path-events';
|
|||||||
export * from './promise-progress';
|
export * from './promise-progress';
|
||||||
export * from './search';
|
export * from './search';
|
||||||
export * from './string';
|
export * from './string';
|
||||||
|
export * from './template';
|
||||||
export * from './time';
|
export * from './time';
|
||||||
|
export * from './tts';
|
||||||
export * from './types';
|
export * from './types';
|
||||||
export * from 'var-persist';
|
export * from 'var-persist';
|
||||||
|
|||||||
17
src/misc.ts
17
src/misc.ts
@@ -76,6 +76,23 @@ export function gravatar(email: string, def='mp') {
|
|||||||
return `https://www.gravatar.com/avatar/${md5(email)}?d=${def}`;
|
return `https://www.gravatar.com/avatar/${md5(email)}?d=${def}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if IP address falls within CIDR range
|
||||||
|
* @param {string} ip IPV4 to check (192.168.0.12)
|
||||||
|
* @param {string} cidr IP range to check against (example: 192.168.0.0/24)
|
||||||
|
* @returns {boolean} Whether IP address is within range
|
||||||
|
*/
|
||||||
|
export function matchesCidr(ip: string, cidr: string): boolean {
|
||||||
|
if(!cidr) return true;
|
||||||
|
if(!ip) return false;
|
||||||
|
if(!cidr?.includes('/')) return ip === cidr; // Single IP
|
||||||
|
const [range, bits] = cidr.split('/');
|
||||||
|
const mask = ~(2 ** (32 - parseInt(bits)) - 1);
|
||||||
|
const ipToInt = (str: string) => str.split('.')
|
||||||
|
.reduce((int, octet) => (int << 8) + parseInt(octet), 0) >>> 0;
|
||||||
|
return (ipToInt(ip) & mask) === (ipToInt(range) & mask);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert IPv6 to v4 because who uses that, NAT4Life
|
* Convert IPv6 to v4 because who uses that, NAT4Life
|
||||||
* @param {string} ip IPv6 address, e.g. 2001:0db8:85a3:0000:0000:8a2e:0370:7334
|
* @param {string} ip IPv6 address, e.g. 2001:0db8:85a3:0000:0000:8a2e:0370:7334
|
||||||
|
|||||||
@@ -65,6 +65,8 @@ export class PathEvent {
|
|||||||
module!: string;
|
module!: string;
|
||||||
/** Entire path, including the module & name */
|
/** Entire path, including the module & name */
|
||||||
fullPath!: string;
|
fullPath!: string;
|
||||||
|
/** Parent directory, excludes module & name */
|
||||||
|
dir!: string;
|
||||||
/** Path including the name, excluding the module */
|
/** Path including the name, excluding the module */
|
||||||
path!: string;
|
path!: string;
|
||||||
/** Last segment of path */
|
/** Last segment of path */
|
||||||
@@ -109,35 +111,22 @@ export class PathEvent {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check cache first
|
if(PathEvent.pathEventCache.has(e)) {
|
||||||
if (PathEvent.pathEventCache.has(e)) {
|
|
||||||
Object.assign(this, PathEvent.pathEventCache.get(e)!);
|
Object.assign(this, PathEvent.pathEventCache.get(e)!);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let [p, method] = e.replaceAll(/\/{2,}/g, '/').split(':');
|
let [p, method] = e.replaceAll(/(^|\/)\*+\/?$/g, '').split(':');
|
||||||
if(!method) method = '*';
|
if(!method) method = '*';
|
||||||
|
|
||||||
// Handle special cases
|
// Handle special cases
|
||||||
if(p === '' || p === undefined) {
|
if(p === '' || p === undefined || p === '*') {
|
||||||
// Empty string matches nothing
|
|
||||||
this.module = '';
|
|
||||||
this.path = '';
|
|
||||||
this.fullPath = '';
|
|
||||||
this.name = '';
|
|
||||||
this.methods = new ASet<Method>(['n']);
|
|
||||||
this.hasGlob = false;
|
|
||||||
PathEvent.pathEventCache.set(e, this);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(p === '*') {
|
|
||||||
// Wildcard means any path any event
|
|
||||||
this.module = '';
|
this.module = '';
|
||||||
this.path = '';
|
this.path = '';
|
||||||
|
this.dir = '';
|
||||||
this.fullPath = '**';
|
this.fullPath = '**';
|
||||||
this.name = '';
|
this.name = '';
|
||||||
this.methods = new ASet<Method>(['*']);
|
this.methods = new ASet<Method>(p === '*' ? ['*'] : <any>method.split(''));
|
||||||
this.hasGlob = true;
|
this.hasGlob = true;
|
||||||
PathEvent.pathEventCache.set(e, this);
|
PathEvent.pathEventCache.set(e, this);
|
||||||
return;
|
return;
|
||||||
@@ -146,19 +135,77 @@ export class PathEvent {
|
|||||||
let temp = p.split('/').filter(p => !!p);
|
let temp = p.split('/').filter(p => !!p);
|
||||||
this.module = temp.splice(0, 1)[0] || '';
|
this.module = temp.splice(0, 1)[0] || '';
|
||||||
this.path = temp.join('/');
|
this.path = temp.join('/');
|
||||||
|
this.dir = temp.length > 2 ? temp.slice(0, -1).join('/') : '';
|
||||||
this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`;
|
this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`;
|
||||||
this.name = temp.pop() || '';
|
this.name = temp.pop() || '';
|
||||||
|
|
||||||
// Don't trim /** - it's needed for glob matching to work properly
|
|
||||||
// Only trim if there's something after it which won't happen with our parsing
|
|
||||||
|
|
||||||
this.hasGlob = this.fullPath.includes('*');
|
this.hasGlob = this.fullPath.includes('*');
|
||||||
this.methods = new ASet(<any>method.split(''));
|
this.methods = new ASet(<any>method.split(''));
|
||||||
|
|
||||||
// Store in cache
|
|
||||||
PathEvent.pathEventCache.set(e, this);
|
PathEvent.pathEventCache.set(e, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a filter pattern matches a target path
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
private static matches(pattern: PathEvent, target: PathEvent): boolean {
|
||||||
|
const methodsMatch = pattern.all || target.all || pattern.methods.intersection(target.methods).length > 0;
|
||||||
|
if(!methodsMatch) return false;
|
||||||
|
if(!pattern.hasGlob && !target.hasGlob) {
|
||||||
|
const last = pattern.fullPath[target.fullPath.length];
|
||||||
|
return pattern.fullPath.startsWith(target.fullPath) && (last == null || last == '/');
|
||||||
|
}
|
||||||
|
if(pattern.hasGlob) return this.pathMatchesGlob(target.fullPath, pattern.fullPath);
|
||||||
|
return this.pathMatchesGlob(pattern.fullPath, target.fullPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a path matches a glob pattern
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
private static pathMatchesGlob(path: string, pattern: string): boolean {
|
||||||
|
if(pattern === path) return true;
|
||||||
|
const pathParts = path.split('/').filter(p => !!p);
|
||||||
|
const patternParts = pattern.split('/').filter(p => !!p);
|
||||||
|
|
||||||
|
let pathIdx = 0;
|
||||||
|
let patternIdx = 0;
|
||||||
|
while (patternIdx < patternParts.length && pathIdx < pathParts.length) {
|
||||||
|
const patternPart = patternParts[patternIdx];
|
||||||
|
if(patternPart === '**') {
|
||||||
|
if(patternIdx === patternParts.length - 1) return true;
|
||||||
|
while (pathIdx < pathParts.length) {
|
||||||
|
if(PathEvent.pathMatchesGlob(pathParts.slice(pathIdx).join('/'), patternParts.slice(patternIdx + 1).join('/'))) return true;
|
||||||
|
pathIdx++;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
} else if(patternPart === '*') {
|
||||||
|
pathIdx++;
|
||||||
|
patternIdx++;
|
||||||
|
} else {
|
||||||
|
if(patternPart !== pathParts[pathIdx]) return false;
|
||||||
|
pathIdx++;
|
||||||
|
patternIdx++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(patternIdx < patternParts.length) return patternParts.slice(patternIdx).every(p => p === '**');
|
||||||
|
return pathIdx === pathParts.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Score a path for specificity ranking (lower = more specific = higher priority)
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
private static scoreSpecificity(path: string): number {
|
||||||
|
if(path === '**' || path === '') return Number.MAX_SAFE_INTEGER;
|
||||||
|
const segments = path.split('/').filter(p => !!p);
|
||||||
|
let score = -segments.length;
|
||||||
|
segments.forEach(seg => {
|
||||||
|
if(seg === '**') score += 0.5;
|
||||||
|
else if(seg === '*') score += 0.25;
|
||||||
|
});
|
||||||
|
return score;
|
||||||
|
}
|
||||||
|
|
||||||
/** Clear the cache of all PathEvents */
|
/** Clear the cache of all PathEvents */
|
||||||
static clearCache(): void {
|
static clearCache(): void {
|
||||||
PathEvent.pathEventCache.clear();
|
PathEvent.pathEventCache.clear();
|
||||||
@@ -169,82 +216,6 @@ export class PathEvent {
|
|||||||
PathEvent.permissionCache.clear();
|
PathEvent.permissionCache.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Score a path for specificity ranking (lower = more specific = higher priority)
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
private static scoreSpecificity(path: string): number {
|
|
||||||
if (path === '**' || path === '') return Number.MAX_SAFE_INTEGER; // Least specific
|
|
||||||
|
|
||||||
const segments = path.split('/').filter(p => !!p);
|
|
||||||
// Base score: number of segments (more segments = more specific = lower score)
|
|
||||||
let score = -segments.length;
|
|
||||||
|
|
||||||
// Penalty for wildcards (makes them less specific than exact matches)
|
|
||||||
// ADD to score to make it HIGHER/WORSE
|
|
||||||
segments.forEach(seg => {
|
|
||||||
if (seg === '**') score += 0.5;
|
|
||||||
else if (seg === '*') score += 0.25;
|
|
||||||
});
|
|
||||||
|
|
||||||
return score;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if a path matches a glob pattern
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
private static pathMatchesGlob(path: string, pattern: string): boolean {
|
|
||||||
// Handle exact match
|
|
||||||
if (pattern === path) return true;
|
|
||||||
|
|
||||||
const pathParts = path.split('/').filter(p => !!p);
|
|
||||||
const patternParts = pattern.split('/').filter(p => !!p);
|
|
||||||
|
|
||||||
let pathIdx = 0;
|
|
||||||
let patternIdx = 0;
|
|
||||||
|
|
||||||
while (patternIdx < patternParts.length && pathIdx < pathParts.length) {
|
|
||||||
const patternPart = patternParts[patternIdx];
|
|
||||||
|
|
||||||
if (patternPart === '**') {
|
|
||||||
// ** matches zero or more path segments
|
|
||||||
if (patternIdx === patternParts.length - 1) {
|
|
||||||
// ** at the end matches everything
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// Try matching from next pattern part onwards
|
|
||||||
const nextPattern = patternParts[patternIdx + 1];
|
|
||||||
while (pathIdx < pathParts.length) {
|
|
||||||
if (PathEvent.pathMatchesGlob(pathParts.slice(pathIdx).join('/'), patternParts.slice(patternIdx + 1).join('/'))) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
pathIdx++;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} else if (patternPart === '*') {
|
|
||||||
// * matches exactly one segment
|
|
||||||
pathIdx++;
|
|
||||||
patternIdx++;
|
|
||||||
} else {
|
|
||||||
// Exact match required
|
|
||||||
if (patternPart !== pathParts[pathIdx]) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
pathIdx++;
|
|
||||||
patternIdx++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if we've consumed all pattern parts
|
|
||||||
if (patternIdx < patternParts.length) {
|
|
||||||
// Remaining pattern parts must all be ** to match
|
|
||||||
return patternParts.slice(patternIdx).every(p => p === '**');
|
|
||||||
}
|
|
||||||
|
|
||||||
return pathIdx === pathParts.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Combine multiple events into one parsed object. Longest path takes precedent, but all subsequent methods are
|
* Combine multiple events into one parsed object. Longest path takes precedent, but all subsequent methods are
|
||||||
* combined until a "none" is reached
|
* combined until a "none" is reached
|
||||||
@@ -254,32 +225,22 @@ export class PathEvent {
|
|||||||
*/
|
*/
|
||||||
static combine(...paths: (string | PathEvent)[]): PathEvent {
|
static combine(...paths: (string | PathEvent)[]): PathEvent {
|
||||||
const parsed = paths.map(p => p instanceof PathEvent ? p : new PathEvent(p));
|
const parsed = paths.map(p => p instanceof PathEvent ? p : new PathEvent(p));
|
||||||
|
|
||||||
// Sort by specificity: lower score = more specific = higher priority
|
|
||||||
const sorted = parsed.toSorted((p1, p2) => {
|
const sorted = parsed.toSorted((p1, p2) => {
|
||||||
const score1 = PathEvent.scoreSpecificity(p1.fullPath);
|
const score1 = PathEvent.scoreSpecificity(p1.fullPath);
|
||||||
const score2 = PathEvent.scoreSpecificity(p2.fullPath);
|
const score2 = PathEvent.scoreSpecificity(p2.fullPath);
|
||||||
return score1 - score2;
|
return score1 - score2;
|
||||||
});
|
});
|
||||||
|
|
||||||
let result: PathEvent | null = null;
|
let result: PathEvent | null = null;
|
||||||
|
|
||||||
for (const p of sorted) {
|
for (const p of sorted) {
|
||||||
if (!result) {
|
if(!result) {
|
||||||
result = p;
|
result = p;
|
||||||
} else {
|
} else {
|
||||||
// Only combine if current result's path starts with or matches the new permission's path
|
if(result.fullPath.startsWith(p.fullPath)) {
|
||||||
if (result.fullPath.startsWith(p.fullPath)) {
|
if(p.none) break;
|
||||||
// If we hit a none at a parent level, stop here
|
|
||||||
if (p.none) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// Combine methods for permissions in the same hierarchy
|
|
||||||
result.methods = new ASet([...result.methods, ...p.methods]);
|
result.methods = new ASet([...result.methods, ...p.methods]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result || new PathEvent('');
|
return result || new PathEvent('');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -296,34 +257,6 @@ export class PathEvent {
|
|||||||
return parsedTarget.filter(t => !!parsedFilter.find(r => PathEvent.matches(r, t)));
|
return parsedTarget.filter(t => !!parsedFilter.find(r => PathEvent.matches(r, t)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if a filter pattern matches a target path
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
private static matches(pattern: PathEvent, target: PathEvent): boolean {
|
|
||||||
// Handle special cases
|
|
||||||
if (pattern.fullPath === '' || target.fullPath === '') return false;
|
|
||||||
if (pattern.fullPath === '*' || target.fullPath === '*') return pattern.methods.has('*') || target.methods.has('*') || pattern.methods.intersection(target.methods).length > 0;
|
|
||||||
|
|
||||||
// Check methods
|
|
||||||
const methodsMatch = pattern.all || target.all || pattern.methods.intersection(target.methods).length > 0;
|
|
||||||
if (!methodsMatch) return false;
|
|
||||||
|
|
||||||
// Check paths
|
|
||||||
if (!pattern.hasGlob && !target.hasGlob) {
|
|
||||||
// Fast path: no globs, use string comparison
|
|
||||||
return pattern.fullPath === target.fullPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pattern.hasGlob) {
|
|
||||||
// Pattern has glob, match target against it
|
|
||||||
return this.pathMatchesGlob(target.fullPath, pattern.fullPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Target has glob but pattern doesn't - pattern must match within target's glob range
|
|
||||||
return this.pathMatchesGlob(pattern.fullPath, target.fullPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Squash 2 sets of paths & return true if any overlap is found
|
* Squash 2 sets of paths & return true if any overlap is found
|
||||||
*
|
*
|
||||||
@@ -334,8 +267,6 @@ export class PathEvent {
|
|||||||
static has(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean {
|
static has(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean {
|
||||||
const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
||||||
const parsedRequired = makeArray(has).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
const parsedRequired = makeArray(has).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
||||||
|
|
||||||
// Check if any target permission matches any required permission
|
|
||||||
return !!parsedRequired.find(r => !!parsedTarget.find(t => PathEvent.matches(r, t)));
|
return !!parsedRequired.find(r => !!parsedTarget.find(t => PathEvent.matches(r, t)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -135,7 +135,15 @@ export function pascalCase(str?: string): string {
|
|||||||
.join('');
|
.join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove all emojis from a string
|
||||||
|
* @param {string} str Input string with emojis
|
||||||
|
* @returns {string} Sanitized string without emojis
|
||||||
|
*/
|
||||||
|
export function removeEmojis(str: string): string {
|
||||||
|
const emojiRegex = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud83c[\udde6-\uddff]|[\ud83d[\ude00-\ude4f]|[\ud83d[\ude80-\udeff]|[\ud83c[\udd00-\uddff]|[\ud83d[\ude50-\ude7f]|[\u2600-\u26ff]|[\u2700-\u27bf]|[\ud83e[\udd00-\uddff]|[\ud83c[\udf00-\uffff]|[\ud83d[\ude00-\udeff]|[\ud83c[\udde6-\uddff])/g;
|
||||||
|
return str.replace(emojiRegex, '');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate a random hexadecimal value
|
* Generate a random hexadecimal value
|
||||||
|
|||||||
241
src/template.ts
Normal file
241
src/template.ts
Normal file
@@ -0,0 +1,241 @@
|
|||||||
|
import {BadRequestError} from './errors.ts';
|
||||||
|
import {dotNotation} from './objects.ts';
|
||||||
|
import {matchAll} from './string.ts';
|
||||||
|
import {formatDate} from './time.ts';
|
||||||
|
|
||||||
|
export class TemplateError extends BadRequestError { }
|
||||||
|
|
||||||
|
export function findTemplateVars(html: string): Record<string, any> {
|
||||||
|
const variables = new Set<string>();
|
||||||
|
const arrays = new Set<string>();
|
||||||
|
const excluded = new Set<string>(['true', 'false', 'null', 'undefined']);
|
||||||
|
|
||||||
|
// Extract & exclude loop variables, mark arrays
|
||||||
|
for (const loop of matchAll(html, /\{\{\s*?\*\s*?(.+?)\s+in\s+(.+?)\s*?}}/g)) {
|
||||||
|
const [element, index = 'index'] = loop[1].replaceAll(/[()\s]/g, '').split(',');
|
||||||
|
excluded.add(element);
|
||||||
|
excluded.add(index);
|
||||||
|
const arrayVar = loop[2].trim();
|
||||||
|
const root = arrayVar.split('.')[0];
|
||||||
|
if(!excluded.has(root)) {
|
||||||
|
variables.add(arrayVar);
|
||||||
|
arrays.add(arrayVar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract variables from if/else-if conditions
|
||||||
|
for (const ifStmt of matchAll(html, /\{\{\s*?[!]?\?\s*?([^}]+?)\s*?}}/g)) {
|
||||||
|
const code = ifStmt[1].replace(/["'`][^"'`]*["'`]/g, '');
|
||||||
|
const cleaned = code.replace(/([a-zA-Z_$][a-zA-Z0-9_$.]*)\s*\(/g, (_, v) => {
|
||||||
|
const parts = v.split('.');
|
||||||
|
return parts.length > 1 ? parts.slice(0, -1).join('.') + ' ' : '';
|
||||||
|
});
|
||||||
|
const vars = cleaned.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/g) || [];
|
||||||
|
for (const v of vars) {
|
||||||
|
const root = v.split('.')[0];
|
||||||
|
if(!excluded.has(root)) variables.add(v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract from if block content & regular interpolations
|
||||||
|
const regex = /\{\{\s*([^<>\*\?!/}\s][^}]*?)\s*}}/g;
|
||||||
|
let match;
|
||||||
|
while ((match = regex.exec(html)) !== null) {
|
||||||
|
const code = match[1].trim().replace(/["'`][^"'`]*["'`]/g, '');
|
||||||
|
const cleaned = code.replace(/([a-zA-Z_$][a-zA-Z0-9_$.]*)\s*\(/g, (_, v) => {
|
||||||
|
const parts = v.split('.');
|
||||||
|
return parts.length > 1 ? parts.slice(0, -1).join('.') + ' ' : '';
|
||||||
|
});
|
||||||
|
const vars = cleaned.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/g) || [];
|
||||||
|
for (const v of vars) {
|
||||||
|
const root = v.split('.')[0];
|
||||||
|
if(!excluded.has(root)) variables.add(v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const result: Record<string, any> = {};
|
||||||
|
for (const path of variables) {
|
||||||
|
const parts = path.split('.');
|
||||||
|
let current = result;
|
||||||
|
for (let i = 0; i < parts.length; i++) {
|
||||||
|
const part = parts[i];
|
||||||
|
if(i === parts.length - 1) {
|
||||||
|
const fullPath = parts.slice(0, i + 1).join('.');
|
||||||
|
current[part] = arrays.has(fullPath) ? [] : '';
|
||||||
|
} else {
|
||||||
|
current[part] = current[part] || {};
|
||||||
|
current = current[part];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
export async function renderTemplate(template: string, data: any, fetch?: (file: string) => Promise<string>) {
|
||||||
|
if(!fetch) fetch = (file) => { throw new TemplateError(`Unable to fetch template: ${file}`); }
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const d = {
|
||||||
|
date: {
|
||||||
|
day: now.getDate(),
|
||||||
|
month: now.toLocaleString('default', { month: 'long' }),
|
||||||
|
year: now.getFullYear(),
|
||||||
|
time: now.toLocaleTimeString(),
|
||||||
|
format: formatDate
|
||||||
|
},
|
||||||
|
...(data || {}),
|
||||||
|
};
|
||||||
|
|
||||||
|
const evaluate = (code: string, data: object, fatal = true) => {
|
||||||
|
try {
|
||||||
|
return Function('data', `with(data) { return ${code}; }`)(data);
|
||||||
|
} catch(err: any) {
|
||||||
|
if(fatal) throw new TemplateError(`Failed to evaluate: ${code}\n${err.message || err.toString()}`);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function process(content: string, ctx: object = d): Promise<string> {
|
||||||
|
let result = content;
|
||||||
|
|
||||||
|
// Process extends first (they wrap everything)
|
||||||
|
const extendsMatch = result.match(/\{\{\s*>\s*(.+?):(.+?)\s*}}([\s\S]*?)\{\{\s*\/>\s*}}/);
|
||||||
|
if(extendsMatch) {
|
||||||
|
const parentTemplate = await (<Function>fetch)(extendsMatch[1].trim());
|
||||||
|
if(!parentTemplate) throw new TemplateError(`Unknown extended template: ${extendsMatch[1].trim()}`);
|
||||||
|
const slotName = extendsMatch[2].trim();
|
||||||
|
const slotContent = await process(extendsMatch[3], ctx);
|
||||||
|
return process(parentTemplate, {...ctx, [slotName]: slotContent});
|
||||||
|
}
|
||||||
|
|
||||||
|
let changed = true;
|
||||||
|
while(changed) {
|
||||||
|
changed = false;
|
||||||
|
const before = result;
|
||||||
|
|
||||||
|
// Process imports
|
||||||
|
const importMatch = result.match(/\{\{\s*<\s*(.+?)\s*}}/);
|
||||||
|
if(importMatch) {
|
||||||
|
const t = await (<Function>fetch)(importMatch[1].trim());
|
||||||
|
if(!t) throw new TemplateError(`Unknown imported template: ${importMatch[1].trim()}`);
|
||||||
|
const rendered = await process(t, ctx);
|
||||||
|
result = result.replace(importMatch[0], rendered);
|
||||||
|
changed = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process for-loops (innermost first)
|
||||||
|
const forMatch = findInnermostFor(result);
|
||||||
|
if(forMatch) {
|
||||||
|
const { full, vars, array, body, start } = forMatch;
|
||||||
|
const [element, index = 'index'] = vars.split(',').map(v => v.trim());
|
||||||
|
const arr: any[] = <any>dotNotation(ctx, array);
|
||||||
|
if(!arr || typeof arr != 'object') throw new TemplateError(`Cannot iterate: ${array}`);
|
||||||
|
let output = [];
|
||||||
|
for(let i = 0; i < arr.length; i++)
|
||||||
|
output.push(await process(body, {...ctx, [element]: arr[i], [index]: i}));
|
||||||
|
result = result.slice(0, start) + output.join('\n') + result.slice(start + full.length);
|
||||||
|
changed = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process if-statements (innermost first)
|
||||||
|
const ifMatch = findInnermostIf(result);
|
||||||
|
if(ifMatch) {
|
||||||
|
const { full, condition, body, start } = ifMatch;
|
||||||
|
const branches = parseIfBranches(body);
|
||||||
|
let output = '';
|
||||||
|
if(evaluate(condition, ctx, false)) {
|
||||||
|
output = branches.if;
|
||||||
|
} else {
|
||||||
|
for(const branch of branches.elseIf) {
|
||||||
|
if(evaluate(branch.condition, ctx, false)) {
|
||||||
|
output = branch.body;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!output && branches.else) output = branches.else;
|
||||||
|
}
|
||||||
|
result = result.slice(0, start) + output + result.slice(start + full.length);
|
||||||
|
changed = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if(before === result) changed = false;
|
||||||
|
}
|
||||||
|
return processVariables(result, ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
function processVariables(content: string, data: object): string {
|
||||||
|
return content.replace(/\{\{\s*([^<>\*\?!/}\s][^{}]*?)\s*}}/g, (match, code) => {
|
||||||
|
return evaluate(code.trim(), data) ?? '';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function findInnermostIf(content: string) {
|
||||||
|
const regex = /\{\{\s*\?\s*(.+?)\s*}}/g;
|
||||||
|
let match, lastMatch = null;
|
||||||
|
while((match = regex.exec(content)) !== null) {
|
||||||
|
const start = match.index;
|
||||||
|
const condition = match[1];
|
||||||
|
const bodyStart = match.index + match[0].length;
|
||||||
|
const end = findMatchingClose(content, bodyStart, /\{\{\s*\?\s*/, /\{\{\s*\/\?\s*}}/);
|
||||||
|
if(end === -1) throw new TemplateError(`Unmatched if-statement at position ${start}`);
|
||||||
|
const closeTag = content.slice(end).match(/\{\{\s*\/\?\s*}}/);
|
||||||
|
const full = content.slice(start, end + (<any>closeTag)[0].length);
|
||||||
|
const body = content.slice(bodyStart, end);
|
||||||
|
lastMatch = { full, condition, body, start };
|
||||||
|
}
|
||||||
|
return lastMatch;
|
||||||
|
}
|
||||||
|
|
||||||
|
function findInnermostFor(content: string) {
|
||||||
|
const regex = /\{\{\s*\*\s*(.+?)\s+in\s+(.+?)\s*}}/g;
|
||||||
|
let match, lastMatch = null;
|
||||||
|
while((match = regex.exec(content)) !== null) {
|
||||||
|
const start = match.index;
|
||||||
|
const vars = match[1].replaceAll(/[()\s]/g, '');
|
||||||
|
const array = match[2];
|
||||||
|
const bodyStart = match.index + match[0].length;
|
||||||
|
const end = findMatchingClose(content, bodyStart, /\{\{\s*\*\s*/, /\{\{\s*\/\*\s*}}/);
|
||||||
|
if(end === -1) throw new TemplateError(`Unmatched for-loop at position ${start}`);
|
||||||
|
const closeTag = content.slice(end).match(/\{\{\s*\/\*\s*}}/);
|
||||||
|
const full = content.slice(start, end + (<any>closeTag)[0].length);
|
||||||
|
const body = content.slice(bodyStart, end);
|
||||||
|
lastMatch = { full, vars, array, body, start };
|
||||||
|
}
|
||||||
|
return lastMatch;
|
||||||
|
}
|
||||||
|
|
||||||
|
function findMatchingClose(content: string, startIndex: number, openTag: RegExp, closeTag: RegExp): number {
|
||||||
|
let depth = 1, pos = startIndex;
|
||||||
|
while (depth > 0 && pos < content.length) {
|
||||||
|
const remaining = content.slice(pos);
|
||||||
|
const nextOpen = remaining.search(openTag);
|
||||||
|
const nextClose = remaining.search(closeTag);
|
||||||
|
if(nextClose === -1) return -1;
|
||||||
|
if(nextOpen !== -1 && nextOpen < nextClose) {
|
||||||
|
depth++;
|
||||||
|
pos += nextOpen + 1;
|
||||||
|
} else {
|
||||||
|
depth--;
|
||||||
|
if(depth === 0) return pos + nextClose;
|
||||||
|
pos += nextClose + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseIfBranches(body: string) {
|
||||||
|
const parts = body.split(/\{\{\s*!\?\s*/);
|
||||||
|
const result = { if: parts[0], elseIf: [] as any[], else: '' };
|
||||||
|
for(let i = 1; i < parts.length; i++) {
|
||||||
|
const closeBrace = parts[i].indexOf('}}');
|
||||||
|
const condition = parts[i].slice(0, closeBrace).trim();
|
||||||
|
const branchBody = parts[i].slice(closeBrace + 2);
|
||||||
|
if(!condition) result.else = branchBody;
|
||||||
|
else result.elseIf.push({ condition, body: branchBody });
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
return process(template);
|
||||||
|
}
|
||||||
161
src/tts.ts
Normal file
161
src/tts.ts
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
import {removeEmojis} from './string.ts';
|
||||||
|
|
||||||
|
export class TTS {
|
||||||
|
private static readonly QUALITY_PATTERNS = ['Google', 'Microsoft', 'Samantha', 'Premium', 'Natural', 'Neural'];
|
||||||
|
|
||||||
|
private _currentUtterance: SpeechSynthesisUtterance | null = null;
|
||||||
|
private _voicesLoaded: Promise<void>;
|
||||||
|
private _stoppedUtterances = new WeakSet<SpeechSynthesisUtterance>();
|
||||||
|
|
||||||
|
private _rate: number = 1.0;
|
||||||
|
get rate(): number { return this._rate; }
|
||||||
|
set rate(value: number) {
|
||||||
|
this._rate = value;
|
||||||
|
if(this._currentUtterance) this._currentUtterance.rate = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _pitch: number = 1.0;
|
||||||
|
get pitch(): number { return this._pitch; }
|
||||||
|
set pitch(value: number) {
|
||||||
|
this._pitch = value;
|
||||||
|
if(this._currentUtterance) this._currentUtterance.pitch = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _volume: number = 1.0;
|
||||||
|
get volume(): number { return this._volume; }
|
||||||
|
set volume(value: number) {
|
||||||
|
this._volume = value;
|
||||||
|
if(this._currentUtterance) this._currentUtterance.volume = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _voice: SpeechSynthesisVoice | undefined;
|
||||||
|
get voice(): SpeechSynthesisVoice | undefined { return this._voice; }
|
||||||
|
set voice(value: SpeechSynthesisVoice | undefined) {
|
||||||
|
this._voice = value;
|
||||||
|
if(this._currentUtterance && value) this._currentUtterance.voice = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Create a TTS instance with optional configuration */
|
||||||
|
constructor(config?: {rate?: number; pitch?: number; volume?: number; voice?: SpeechSynthesisVoice | null}) {
|
||||||
|
this._voicesLoaded = this.initializeVoices();
|
||||||
|
if(config) {
|
||||||
|
if(config.rate !== undefined) this._rate = config.rate;
|
||||||
|
if(config.pitch !== undefined) this._pitch = config.pitch;
|
||||||
|
if(config.volume !== undefined) this._volume = config.volume;
|
||||||
|
this._voice = config.voice === null ? undefined : (config.voice || undefined);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Initializes voice loading and sets default voice if needed */
|
||||||
|
private initializeVoices(): Promise<void> {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
const voices = window.speechSynthesis.getVoices();
|
||||||
|
if(voices.length > 0) {
|
||||||
|
if(!this._voice) this._voice = TTS.bestVoice();
|
||||||
|
resolve();
|
||||||
|
} else {
|
||||||
|
const handler = () => {
|
||||||
|
window.speechSynthesis.removeEventListener('voiceschanged', handler);
|
||||||
|
if(!this._voice) this._voice = TTS.bestVoice();
|
||||||
|
resolve();
|
||||||
|
};
|
||||||
|
window.speechSynthesis.addEventListener('voiceschanged', handler);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Selects the best available TTS voice, prioritizing high-quality options
|
||||||
|
* @param lang Speaking language
|
||||||
|
* @returns Highest quality voice
|
||||||
|
*/
|
||||||
|
private static bestVoice(lang = 'en'): SpeechSynthesisVoice | undefined {
|
||||||
|
const voices = window.speechSynthesis.getVoices();
|
||||||
|
for (const pattern of this.QUALITY_PATTERNS) {
|
||||||
|
const voice = voices.find(v => v.name.includes(pattern) && v.lang.startsWith(lang));
|
||||||
|
if(voice) return voice;
|
||||||
|
}
|
||||||
|
return voices.find(v => v.lang.startsWith(lang));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Cleans text for TTS by removing emojis, markdown and code block */
|
||||||
|
private static cleanText(text: string): string {
|
||||||
|
return removeEmojis(text)
|
||||||
|
.replace(/```[\s\S]*?```/g, ' code block ')
|
||||||
|
.replace(/[#*_~`]/g, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Creates a speech utterance with current options */
|
||||||
|
private createUtterance(text: string): SpeechSynthesisUtterance {
|
||||||
|
const cleanedText = TTS.cleanText(text);
|
||||||
|
const utterance = new SpeechSynthesisUtterance(cleanedText);
|
||||||
|
const voice = this._voice || TTS.bestVoice();
|
||||||
|
if(voice) utterance.voice = voice;
|
||||||
|
utterance.rate = this._rate;
|
||||||
|
utterance.pitch = this._pitch;
|
||||||
|
utterance.volume = this._volume;
|
||||||
|
return utterance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Speaks text and returns a Promise which resolves once complete */
|
||||||
|
async speak(text: string): Promise<void> {
|
||||||
|
if(!text.trim()) return Promise.resolve();
|
||||||
|
await this._voicesLoaded;
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
this._currentUtterance = this.createUtterance(text);
|
||||||
|
const utterance = this._currentUtterance;
|
||||||
|
utterance.onend = () => {
|
||||||
|
this._currentUtterance = null;
|
||||||
|
resolve();
|
||||||
|
};
|
||||||
|
utterance.onerror = (error) => {
|
||||||
|
this._currentUtterance = null;
|
||||||
|
if(this._stoppedUtterances.has(utterance) && error.error === 'interrupted') resolve();
|
||||||
|
else reject(error);
|
||||||
|
};
|
||||||
|
window.speechSynthesis.speak(utterance);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Stops all TTS */
|
||||||
|
stop(): void {
|
||||||
|
if(this._currentUtterance) this._stoppedUtterances.add(this._currentUtterance);
|
||||||
|
window.speechSynthesis.cancel();
|
||||||
|
this._currentUtterance = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize a stream that chunks text into sentences and speak them.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* const stream = tts.speakStream();
|
||||||
|
* stream.next("Hello ");
|
||||||
|
* stream.next("World. How");
|
||||||
|
* stream.next(" are you?");
|
||||||
|
* await stream.done();
|
||||||
|
*
|
||||||
|
* @returns Object with next function for passing chunk of streamed text and done for completing the stream
|
||||||
|
*/
|
||||||
|
speakStream(): {next: (text: string) => void, done: () => Promise<void>} {
|
||||||
|
let buffer = '';
|
||||||
|
let streamPromise: Promise<void> = Promise.resolve();
|
||||||
|
const sentenceRegex = /[^.!?\n]+[.!?\n]+/g;
|
||||||
|
return {
|
||||||
|
next: (text: string): void => {
|
||||||
|
buffer += text;
|
||||||
|
const sentences = buffer.match(sentenceRegex);
|
||||||
|
if(sentences) {
|
||||||
|
sentences.forEach(sentence => streamPromise = this.speak(sentence.trim()));
|
||||||
|
buffer = buffer.replace(sentenceRegex, '');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
done: async (): Promise<void> => {
|
||||||
|
if(buffer.trim()) {
|
||||||
|
streamPromise = this.speak(buffer.trim());
|
||||||
|
buffer = '';
|
||||||
|
}
|
||||||
|
await streamPromise;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -62,6 +62,11 @@ describe('Object utilities', () => {
|
|||||||
dotNotation(obj, 'd.e.f', 5);
|
dotNotation(obj, 'd.e.f', 5);
|
||||||
expect(obj.d.e.f).toBe(5);
|
expect(obj.d.e.f).toBe(5);
|
||||||
});
|
});
|
||||||
|
it('undefined', () => {
|
||||||
|
const obj: any = {a: 1};
|
||||||
|
const resp = dotNotation(obj, 'a.b');
|
||||||
|
expect(resp).toBe(undefined);
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('encodeQuery', () => {
|
describe('encodeQuery', () => {
|
||||||
|
|||||||
@@ -48,10 +48,9 @@ describe('Path Events', () => {
|
|||||||
expect(pe.hasAll('module:c', 'some/path:ud')).toBeTruthy();
|
expect(pe.hasAll('module:c', 'some/path:ud')).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('parses empty string as none', () => {
|
it('parses empty string as wildcard', () => {
|
||||||
const pe = new PathEvent('');
|
const pe = new PathEvent('');
|
||||||
expect(pe.none).toBe(true);
|
expect(pe.has('any/path:c')).toBe(true);
|
||||||
expect(pe.fullPath).toBe('');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('parses none method', () => {
|
it('parses none method', () => {
|
||||||
@@ -61,6 +60,10 @@ describe('Path Events', () => {
|
|||||||
expect(pe.none).toBe(false);
|
expect(pe.none).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('Test several wild card perms', () => {
|
||||||
|
expect(PathEvent.has(['actions:*', 'groups:*', 'users:*'], 'groups/AUTH:r')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
it('setters for methods', () => {
|
it('setters for methods', () => {
|
||||||
const pe = new PathEvent('users/system:r');
|
const pe = new PathEvent('users/system:r');
|
||||||
pe.create = true;
|
pe.create = true;
|
||||||
|
|||||||
304
tests/templates.spec.ts
Normal file
304
tests/templates.spec.ts
Normal file
@@ -0,0 +1,304 @@
|
|||||||
|
import {findTemplateVars, renderTemplate, TemplateError} from '../src';
|
||||||
|
|
||||||
|
describe('findTemplateVars', () => {
|
||||||
|
test('extracts simple variables', () => {
|
||||||
|
const result = findTemplateVars('Hello {{ name }}!');
|
||||||
|
expect(result).toEqual({ name: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extracts nested object paths', () => {
|
||||||
|
const result = findTemplateVars('{{ user.name }} is {{ user.age }}');
|
||||||
|
expect(result).toEqual({ user: { name: '', age: '' } });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extracts variables from if statements', () => {
|
||||||
|
const result = findTemplateVars('{{ ? active }}{{ message }}{{ /? }}');
|
||||||
|
expect(result).toEqual({ active: '', message: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extracts variables from else-if conditions', () => {
|
||||||
|
const result = findTemplateVars('{{ ? status == "paid" }}PAID{{ !? status == "pending" }}{{ value }}{{ /? }}');
|
||||||
|
expect(result).toEqual({ status: '', value: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extracts array reference from loops', () => {
|
||||||
|
const result = findTemplateVars('{{ * item in items }}{{ item }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ items: [] });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('excludes loop element variable', () => {
|
||||||
|
const result = findTemplateVars('{{ * item in items }}{{ item.name }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ items: [] });
|
||||||
|
expect(result).not.toHaveProperty('item');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('excludes loop index variable', () => {
|
||||||
|
const result = findTemplateVars('{{ * (item, i) in items }}{{ i }}:{{ item }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ items: [] });
|
||||||
|
expect(result).not.toHaveProperty('item');
|
||||||
|
expect(result).not.toHaveProperty('i');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extracts external vars used inside loops', () => {
|
||||||
|
const result = findTemplateVars('{{ * item in items }}{{ item }}-{{ prefix }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ items: [], prefix: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('handles nested loops', () => {
|
||||||
|
const result = findTemplateVars('{{ * row in rows }}{{ * col in row.cols }}{{ col }}{{ /* }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ rows: [] });
|
||||||
|
expect(result).not.toHaveProperty('row');
|
||||||
|
expect(result).not.toHaveProperty('col');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extracts from complex nested template', () => {
|
||||||
|
const tpl = `
|
||||||
|
{{ ? items.length > 0 }}
|
||||||
|
{{ * (item, i) in items }}
|
||||||
|
{{ i }}. {{ item.name }}: {{ currency }}{{ item.price }}
|
||||||
|
{{ /* }}
|
||||||
|
Total: {{ total }}
|
||||||
|
{{ !? }}
|
||||||
|
{{ emptyMessage }}
|
||||||
|
{{ /? }}`;
|
||||||
|
const result = findTemplateVars(tpl);
|
||||||
|
expect(result).toEqual({
|
||||||
|
items: [],
|
||||||
|
currency: '',
|
||||||
|
total: '',
|
||||||
|
emptyMessage: ''
|
||||||
|
});
|
||||||
|
expect(result).not.toHaveProperty('item');
|
||||||
|
expect(result).not.toHaveProperty('i');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('ignores template control syntax', () => {
|
||||||
|
const result = findTemplateVars('{{ < header.html }}{{ > layout.html:content }}content{{ /> }}');
|
||||||
|
expect(result).toEqual({});
|
||||||
|
});
|
||||||
|
|
||||||
|
test('handles multiple variables in expressions', () => {
|
||||||
|
const result = findTemplateVars('{{ firstName + " " + lastName }}');
|
||||||
|
expect(result).toEqual({ firstName: '', lastName: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('creates arrays for loop variables', () => {
|
||||||
|
const result = findTemplateVars('{{ * item in items }}{{ item }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ items: [] });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('creates nested arrays', () => {
|
||||||
|
const result = findTemplateVars('{{ * row in data.rows }}{{ row }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ data: { rows: [] } });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('creates multiple arrays', () => {
|
||||||
|
const result = findTemplateVars('{{ * user in users }}{{ user }}{{ /* }}{{ * post in posts }}{{ post }}{{ /* }}');
|
||||||
|
expect(result).toEqual({ users: [], posts: [] });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('excludes function calls', () => {
|
||||||
|
const result = findTemplateVars('{{ value.toFixed(2) }}');
|
||||||
|
expect(result).toEqual({ value: '' });
|
||||||
|
expect(result.value).not.toBe('toFixed');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('excludes method chains', () => {
|
||||||
|
const result = findTemplateVars('{{ text.replaceAll("\\n", "<br>") }}');
|
||||||
|
expect(result).toEqual({ text: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('handles mix of arrays and regular variables', () => {
|
||||||
|
const result = findTemplateVars('{{ * item in cart }}{{ item.name }}{{ /* }}{{ total }}');
|
||||||
|
expect(result).toEqual({ cart: [], total: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('real world template', async () => {
|
||||||
|
const wrapper = `<div> {{body}} </div>`;
|
||||||
|
const tpl = `
|
||||||
|
{{ > email:body }}
|
||||||
|
<div style="text-align: center">
|
||||||
|
{{ ? title }}<h1 style="margin: 0">{{ title }}</h1>{{ /? }}
|
||||||
|
{{ ? subject }}<h2 style="margin: 0">{{ subject }}</h2>{{ /? }}
|
||||||
|
{{ ? message }}<p style="margin-top: 1rem">{{ message }}</p>{{ /? }}
|
||||||
|
{{ ? link }}
|
||||||
|
<br>
|
||||||
|
<div style="background: #dedede; padding: 8px 20px; border-radius: 10px; overflow-x: auto;">
|
||||||
|
{{ ? link.startsWith('http') }}
|
||||||
|
<a style="word-break: break-all;" target="_blank" href="{{ link }}">{{ link }}</a>
|
||||||
|
{{ !? }}
|
||||||
|
<p style="margin: 0; word-break: break-all;">{{ link }}</p>
|
||||||
|
{{ /? }}
|
||||||
|
</div>
|
||||||
|
{{ /? }}
|
||||||
|
{{ ? footer }}
|
||||||
|
<br>
|
||||||
|
<p>{{ footer }}</p>
|
||||||
|
{{ /? }}
|
||||||
|
</div>
|
||||||
|
{{ /> }}`;
|
||||||
|
console.log(await renderTemplate(tpl, {
|
||||||
|
title: 'test',
|
||||||
|
subject: 'test',
|
||||||
|
message: 'test',
|
||||||
|
link: 'test',
|
||||||
|
footer: 'test',
|
||||||
|
}, async () => wrapper))
|
||||||
|
});
|
||||||
|
|
||||||
|
test('real world invoice template', () => {
|
||||||
|
const tpl = `
|
||||||
|
{{ settings.title }}
|
||||||
|
{{ * (row, index) in transaction.cart }}
|
||||||
|
{{ row.quantity }} x {{ row.name }} = \${{ row.cost.toFixed(2) }}
|
||||||
|
{{ /* }}
|
||||||
|
Total: \${{ transaction.total.toFixed(2) }}
|
||||||
|
{{ ? transaction.discount }}
|
||||||
|
Discount: {{ transaction.discount.value }}
|
||||||
|
{{ /? }}
|
||||||
|
`;
|
||||||
|
const result = findTemplateVars(tpl);
|
||||||
|
expect(result).toEqual({
|
||||||
|
settings: { title: '' },
|
||||||
|
transaction: {
|
||||||
|
cart: [],
|
||||||
|
total: '',
|
||||||
|
discount: { value: '' }
|
||||||
|
}
|
||||||
|
});
|
||||||
|
expect(result).not.toHaveProperty('row');
|
||||||
|
expect(result).not.toHaveProperty('index');
|
||||||
|
expect(result.transaction.cart).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('renderTemplate', () => {
|
||||||
|
test('basic variable interpolation', async () => {
|
||||||
|
const result = await renderTemplate('Hello {{ name }}!', { name: 'World' });
|
||||||
|
expect(result).toBe('Hello World!');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('nested object access', async () => {
|
||||||
|
const result = await renderTemplate('{{ user.name }} is {{ user.age }}', {
|
||||||
|
user: { name: 'Alice', age: 25 }
|
||||||
|
});
|
||||||
|
expect(result).toBe('Alice is 25');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('method calls', async () => {
|
||||||
|
const result = await renderTemplate('{{ price.toFixed(2) }}', { price: 9.5 });
|
||||||
|
expect(result).toBe('9.50');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('if statement true', async () => {
|
||||||
|
const result = await renderTemplate('{{ ? active }}YES{{ /? }}', { active: true });
|
||||||
|
expect(result).toBe('YES');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('if statement false', async () => {
|
||||||
|
const result = await renderTemplate('{{ ? active }}YES{{ /? }}', { active: false });
|
||||||
|
expect(result).toBe('');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('if-else', async () => {
|
||||||
|
const result = await renderTemplate('{{ ? active }}YES{{ !? }}NO{{ /? }}', { active: false });
|
||||||
|
expect(result).toBe('NO');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('if-elseif-else', async () => {
|
||||||
|
const tpl = '{{ ? status == "paid" }}PAID{{ !? status == "pending" }}PENDING{{ !? }}OTHER{{ /? }}';
|
||||||
|
expect(await renderTemplate(tpl, { status: 'paid' })).toBe('PAID');
|
||||||
|
expect(await renderTemplate(tpl, { status: 'pending' })).toBe('PENDING');
|
||||||
|
expect(await renderTemplate(tpl, { status: 'failed' })).toBe('OTHER');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('nested if statements', async () => {
|
||||||
|
const tpl = '{{ ? a }}A{{ ? b }}B{{ /? }}{{ /? }}';
|
||||||
|
expect(await renderTemplate(tpl, { a: true, b: true })).toBe('AB');
|
||||||
|
expect(await renderTemplate(tpl, { a: true, b: false })).toBe('A');
|
||||||
|
expect(await renderTemplate(tpl, { a: false, b: true })).toBe('');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('for loop', async () => {
|
||||||
|
const tpl = '{{ * item in items }}{{ item }}{{ /* }}';
|
||||||
|
const result = await renderTemplate(tpl, { items: ['a', 'b', 'c'] });
|
||||||
|
expect(result).toBe('a\nb\nc');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('for loop with index', async () => {
|
||||||
|
const tpl = '{{ * (item, i) in items }}{{ i }}:{{ item }}{{ /* }}';
|
||||||
|
const result = await renderTemplate(tpl, { items: ['a', 'b'] });
|
||||||
|
expect(result).toBe('0:a\n1:b');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('for loop with objects', async () => {
|
||||||
|
const tpl = '{{ * user in users }}{{ user.name }}{{ /* }}';
|
||||||
|
const result = await renderTemplate(tpl, {
|
||||||
|
users: [{ name: 'Alice' }, { name: 'Bob' }]
|
||||||
|
});
|
||||||
|
expect(result).toBe('Alice\nBob');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('for loop error on non-array', async () => {
|
||||||
|
await expect(
|
||||||
|
renderTemplate('{{ * x in notArray }}{{ x }}{{ /* }}', { notArray: 'string' })
|
||||||
|
).rejects.toThrow(TemplateError);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('import template', async () => {
|
||||||
|
const fetch = async (file: string) => {
|
||||||
|
if (file === 'header.html') return 'HEADER: {{ title }}';
|
||||||
|
throw new Error('Not found');
|
||||||
|
};
|
||||||
|
const result = await renderTemplate('{{ < header.html }}', { title: 'Test' }, fetch);
|
||||||
|
expect(result).toBe('HEADER: Test');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('import template error', async () => {
|
||||||
|
await expect(
|
||||||
|
renderTemplate('{{ < missing.html }}', {})
|
||||||
|
).rejects.toThrow(TemplateError);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('extend template', async () => {
|
||||||
|
const fetch = async (file: string) => {
|
||||||
|
if (file === 'layout.html') return '<div>{{ content }}</div>';
|
||||||
|
throw new Error('Not found');
|
||||||
|
};
|
||||||
|
const result = await renderTemplate('{{ > layout.html:content }}Hello{{ /> }}', {}, fetch);
|
||||||
|
expect(result).toBe('<div>Hello</div>');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('date object', async () => {
|
||||||
|
const result = await renderTemplate('{{ date.year }}', {});
|
||||||
|
expect(result).toBe(new Date().getFullYear().toString());
|
||||||
|
});
|
||||||
|
|
||||||
|
test('evaluation error', async () => {
|
||||||
|
await expect(
|
||||||
|
renderTemplate('{{ undefined.property }}', {})
|
||||||
|
).rejects.toThrow(TemplateError);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('complex nested example', async () => {
|
||||||
|
const tpl = `
|
||||||
|
{{ ? items.length > 0 }}
|
||||||
|
{{ * (item, i) in items }}
|
||||||
|
{{ i + 1 }}. {{ item.name }}: \${{ item.price.toFixed(2) }}
|
||||||
|
{{ /* }}
|
||||||
|
Total: \${{ total.toFixed(2) }}
|
||||||
|
{{ !? }}
|
||||||
|
No items
|
||||||
|
{{ /? }}`;
|
||||||
|
const result = await renderTemplate(tpl, {
|
||||||
|
items: [
|
||||||
|
{ name: 'A', price: 10 },
|
||||||
|
{ name: 'B', price: 20 }
|
||||||
|
],
|
||||||
|
total: 30
|
||||||
|
});
|
||||||
|
expect(result.trim()).toContain('1. A: $10.00');
|
||||||
|
expect(result.trim()).toContain('2. B: $20.00');
|
||||||
|
expect(result.trim()).toContain('Total: $30.00');
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user