echogarden 3.2.0 → 3.4.0

package/src/api/Synthesis.ts

@@ -353,7 +353,11 @@ async function synthesizeSegment(text: string, options: SynthesisOptions, callba
 	let language: string
 
 	if (options.language) {
-		language = await normalizeIdentifierToLanguageCode(options.language)
+		try {
+			language = await normalizeIdentifierToLanguageCode(options.language)
+		} catch {
+			language = selectedVoice.languages[0]
+		}
 	} else {
 		language = selectedVoice.languages[0]
 	}
@@ -1814,24 +1818,7 @@ export async function requestVoiceList(options: VoiceListRequestOptions, callbac
 		voiceList = await loadVoiceList()
 	}
 
-	const languageCode = await normalizeIdentifierToLanguageCode(options.language || '')
-
-	if (languageCode) {
-		let filteredVoiceList = voiceList.filter(voice => voice.languages.includes(languageCode))
-
-		if (filteredVoiceList.length == 0 && languageCode.includes('-')) {
-			const shortLanguageCode = getShortLanguageCode(languageCode)
-
-			filteredVoiceList = voiceList.filter(voice => voice.languages.includes(shortLanguageCode))
-		}
-
-		voiceList = filteredVoiceList
-	}
-
-	if (options.voiceGender) {
-		const genderLowercase = options.voiceGender.toLowerCase()
-		voiceList = voiceList.filter(voice => voice.gender == genderLowercase || voice.gender == 'unknown')
-	}
+	let bestMatchingVoice: SynthesisVoice
 
 	if (options.voice) {
 		const namePatternLowerCase = options.voice.toLocaleLowerCase()
@@ -1853,17 +1840,42 @@ export async function requestVoiceList(options: VoiceListRequestOptions, callbac
 				return false
 			})
 		}
-	}
 
-	let bestMatchingVoice = voiceList[0]
+		bestMatchingVoice = voiceList[0]
+	} else {
+		let languageCode = ''
 
-	if (bestMatchingVoice && voiceList.length > 1 && defaultDialectForLanguageCode[languageCode]) {
-		const expandedLanguageCode = defaultDialectForLanguageCode[languageCode]
+		if (options.language) {
+			languageCode = await normalizeIdentifierToLanguageCode(options.language || '')
 
-		for (const voice of voiceList) {
-			if (voice.languages.includes(expandedLanguageCode)) {
-				bestMatchingVoice = voice
-				break
+			let filteredVoiceList = voiceList.filter(voice => voice.languages.includes(languageCode))
+
+			if (filteredVoiceList.length == 0 && languageCode.includes('-')) {
+				const shortLanguageCode = getShortLanguageCode(languageCode)
+
+				filteredVoiceList = voiceList.filter(voice => voice.languages.includes(shortLanguageCode))
+			}
+
+			voiceList = filteredVoiceList
+		}
+
+		if (options.voiceGender) {
+			const genderLowercase = options.voiceGender.toLowerCase()
+
+			voiceList = voiceList.filter(voice => voice.gender == genderLowercase || voice.gender == 'unknown')
+		}
+
+		bestMatchingVoice = voiceList[0]
+
+		if (bestMatchingVoice && voiceList.length > 1 && defaultDialectForLanguageCode[languageCode]) {
+			const expandedLanguageCode = defaultDialectForLanguageCode[languageCode]
+
+			for (const voice of voiceList) {
+				if (voice.languages.includes(expandedLanguageCode)) {
+					bestMatchingVoice = voice
+
+					break
+				}
 			}
 		}
 	}

package/src/nlp/TextNormalizer.ts

@@ -289,8 +289,7 @@ const isAllLettersOrApostrophePattern = [
 	inputStart,
 
 	unicodeProperty('Letter'),
-	zeroOrMore(anyOf(unicodeProperty('Letter'), `'`)),
-
+	zeroOrMore(anyOf(unicodeProperty('Letter'), `'`, `’`)),
 	inputEnd,
 ]
 

package/src/synthesis/EspeakTTS.ts

@@ -257,12 +257,29 @@ export async function synthesizeFragments(fragments: string[], espeakOptions: Es
 		}
 	}
 
-	const canInsertSeparators = !['roa/an', 'art/eo', 'trk/ky', 'zlw/pl', 'zle/uk'].includes(voice)
+	const separatorString = ` | `
+
+	const canInsertSeparators = ![
+		'roa/an',
+		'an',
+		'art/eo',
+		'eo',
+		'trk/ky',
+		'ky',
+		'zlw/pl',
+		'pl',
+		'zle/uk',
+		'uk',
+		'gmw/nl',
+		'nl'
+	].includes(voice)
 
 	let textWithMarkers: string
 
-	if (canInsertSeparators) {
-		textWithMarkers = `() | `
+	// Added `espeakOptions.insertSeparators` here because I'm not sure if adding the separator
+	// here is completely necessary, and it is causing issues with some languages.
+	if (espeakOptions.insertSeparators && canInsertSeparators) {
+		textWithMarkers = `()${separatorString}`
 	} else {
 		textWithMarkers = `() `
 	}
@@ -280,9 +297,7 @@ export async function synthesizeFragments(fragments: string[], espeakOptions: Es
 		}
 
 		if (espeakOptions.insertSeparators && canInsertSeparators) {
-			const separator = ` | `
-
-			textWithMarkers += `<mark name="s-${i}"/>${separator}${fragment}${separator}<mark name="e-${i}"/>`
+			textWithMarkers += `<mark name="s-${i}"/>${separatorString}${fragment}${separatorString}<mark name="e-${i}"/>`
 		} else {
 			if (fragment.endsWith('.')) {
 				fragment += ' ()'

package/src/utilities/Timer.ts

@@ -1,79 +1,99 @@
-import { logToStderr, roundToDigits } from './Utilities.js'
+import { logToStderr } from './Utilities.js'
 
 export class Timer {
-	startTime = 0
+	private readonly logger: TimerLogger
+
+	private startTime = 0
+
+	constructor(logger?: TimerLogger) {
+		if (logger) {
+			this.logger = logger
+		} else {
+			this.logger = logToStderr
+		}
 
-	constructor() {
 		this.restart()
 	}
 
-	restart() {
+	// Resets the timer to the current time.
+	restart(): void {
 		this.startTime = Timer.currentTime
 	}
 
+	// Elapsed time in milliseconds (monotonic where supported).
 	get elapsedTime(): number {
-		// Elapsed time (milliseconds)
 		return Timer.currentTime - this.startTime
 	}
 
+	// Elapsed time in seconds.
 	get elapsedTimeSeconds(): number {
-		// Elapsed time (seconds)
 		return this.elapsedTime / 1000
 	}
 
+	// Returns elapsed ms and restarts the timer.
 	getElapsedTimeAndRestart(): number {
-		const elapsedTime = this.elapsedTime
+		const elapsed = this.elapsedTime
 		this.restart()
 
-		return elapsedTime
+		return elapsed
 	}
 
+	// Logs elapsed time (in ms) and restarts the timer.
 	logAndRestart(title: string, timePrecision = 3): number {
-		const elapsedTime = this.elapsedTime
-
-		//
-		const message = `${title}: ${roundToDigits(elapsedTime, timePrecision)}ms`
-
-		logToStderr(message)
-		//
-
+		const elapsedMs = this.elapsedTime
+		this.logger(`${title}: ${roundToDigits(elapsedMs, timePrecision)}ms`)
 		this.restart()
 
-		return elapsedTime
+		return elapsedMs
 	}
 
+	// Current high-resolution timestamp in milliseconds since Unix epoch.
 	static get currentTime(): number {
-		if (!this.getTimestamp) {
-			this.createTimestampFunction()
-		}
-
-		return this.getTimestamp()
+		return this.timestampFunc()
 	}
 
+	// Current timestamp in microseconds (integer).
 	static get microsecondTimestamp(): number {
 		return Math.floor(Timer.currentTime * 1000)
 	}
 
-	private static createTimestampFunction() {
-		if (typeof process === 'object' && typeof process.hrtime === 'function') {
-			let baseTimestamp = 0
+	// Clock setup
+	private static timestampFunc: () => number = Timer.createTimestampFunction()
 
-			this.getTimestamp = () => {
-				const nodeTimeNanoSeconds = process.hrtime.bigint()
-				const nodeTimeMilliseconds = Number(nodeTimeNanoSeconds) / 1_000_000
+	private static createTimestampFunction(): () => number {
+		const g = globalThis as any
 
-				return baseTimestamp + nodeTimeMilliseconds
-			}
+		// 1. Modern standard: performance.now() (Browsers & Node 16+)
+		if (typeof g.performance === 'object' && typeof g.performance.now === 'function') {
+			const timeOrigin =
+				g.performance.timeOrigin ?? (Date.now() - g.performance.now())
 
-			baseTimestamp = Date.now() - this.getTimestamp()
-		} else if (typeof performance === 'object' && performance.now) {
-			const baseTimestamp = Date.now() - performance.now()
+			return () => timeOrigin + g.performance.now()
+		}
 
-			this.getTimestamp = () => baseTimestamp + performance.now()
-		} else {
-			this.getTimestamp = () => Date.now()
+		// 2. Node.js high resolution timer (BigInt variant, Node 10.4+)
+		if (typeof g.process === 'object' && typeof g.process.hrtime === 'function') {
+			const startNs = g.process.hrtime.bigint()
+
+			const epochBaseMs = Date.now() - (Number(startNs) / 1e6)
+
+			return () =>
+				epochBaseMs + Number(g.process.hrtime.bigint()) / 1e6
+		}
+
+		// 3. Last-resort fallback (non-monotonic)
+		if (typeof Date.now === 'function') {
+			return () => Date.now()
 		}
+
+		return () => new Date().getTime()
 	}
+}
 
-	private static getTimestamp: () => number
+export function roundToDigits(value: number, digits: number): number {
+	const factor = 10 ** digits
+
+	return Math.round(value * factor) / factor
 }
+
+type TimerLogger = (msg: string) => void

package/tsconfig.json

@@ -1,55 +1,53 @@
 {
-  // Visit https://aka.ms/tsconfig to read more about this file
-  "compilerOptions": {
-	// File Layout
-	"rootDir": "./src",
-	"outDir": "./dist",
-
-	// Environment Settings
-	// See also https://aka.ms/tsconfig/module
-	"module": "nodenext",
-	"target": "esnext",
-	"types": ["node"],
-	// For nodejs:
-	// "lib": ["esnext"],
-	// "types": ["node"],
-	// and npm install -D @types/node
-
-	// Other Outputs
-	"sourceMap": true,
-	"declaration": true,
-	"declarationMap": true,
-
-	// Stricter Typechecking Options
-	// "noUncheckedIndexedAccess": true,
-	// "exactOptionalPropertyTypes": true,
-
-	// Style Options
-	"noImplicitReturns": true,
-	// "noImplicitOverride": true,
-	// "noUnusedLocals": true,
-	// "noUnusedParameters": true,
-	// "noFallthroughCasesInSwitch": true,
-	// "noPropertyAccessFromIndexSignature": true,
-
-	// Recommended Options
-	"strict": true,
-	"jsx": "react-jsx",
-	// "verbatimModuleSyntax": true,
-	"isolatedModules": true,
-	"noUncheckedSideEffectImports": true,
-	"moduleDetection": "force",
-	"skipLibCheck": true,
-
-	// Extended options not in generated tsconfig.json
-	"newLine": "lf",
-	"forceConsistentCasingInFileNames": true,
-	"alwaysStrict": true,
-
-	"noImplicitThis": true,
-	"strictBindCallApply": true,
-	"strictFunctionTypes": true,
-
-	"noErrorTruncation": true,
-  }
+	// Visit https://aka.ms/tsconfig to read more about this file
+	// Only compile library sources; tests under /tests are run by vitest and typechecked separately (tsconfig.tests.json)
+	"compilerOptions": {
+		// File Layout
+		"rootDir": "./src",
+		"outDir": "./dist",
+		// Environment Settings
+		// See also https://aka.ms/tsconfig/module
+		"module": "nodenext",
+		"target": "esnext",
+		"types": [
+			"node"
+		],
+		// For nodejs:
+		// "lib": ["esnext"],
+		// "types": ["node"],
+		// and npm install -D @types/node
+		// Other Outputs
+		"sourceMap": true,
+		"declaration": true,
+		"declarationMap": true,
+		// Stricter Typechecking Options
+		// "noUncheckedIndexedAccess": true,
+		// "exactOptionalPropertyTypes": true,
+		// Style Options
+		"noImplicitReturns": true,
+		// "noImplicitOverride": true,
+		// "noUnusedLocals": true,
+		// "noUnusedParameters": true,
+		// "noFallthroughCasesInSwitch": true,
+		// "noPropertyAccessFromIndexSignature": true,
+		// Recommended Options
+		"strict": true,
+		"jsx": "react-jsx",
+		// "verbatimModuleSyntax": true,
+		"isolatedModules": true,
+		"noUncheckedSideEffectImports": true,
+		"moduleDetection": "force",
+		"skipLibCheck": true,
+		// Extended options not in generated tsconfig.json
+		"newLine": "lf",
+		"forceConsistentCasingInFileNames": true,
+		"alwaysStrict": true,
+		"noImplicitThis": true,
+		"strictBindCallApply": true,
+		"strictFunctionTypes": true,
+		"noErrorTruncation": true,
+	},
+	"include": [
+		"src"
+	]
 }

package/dist/encodings/HtmlEscape.d.ts

@@ -1,2 +0,0 @@
-export declare function escapeHtml(text: string): string;
-//# sourceMappingURL=HtmlEscape.d.ts.map

package/dist/encodings/HtmlEscape.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"HtmlEscape.d.ts","sourceRoot":"","sources":["../../src/encodings/HtmlEscape.ts"],"names":[],"mappings":"AACA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,UAKtC"}

package/dist/encodings/HtmlEscape.js

@@ -1,30 +0,0 @@
-export function escapeHtml(text) {
-    return text.replaceAll(/[&<>"']/g, (char) => htmlEscapeLookup[char]);
-}
-const htmlEscapeLookup = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    "'": '&#39;',
-    '"': '&quot;'
-};
-// This HTML unescape method is not fully standard compliant
-// I implemented a fully compliant one in the package html-escape-compliant
-function unescapeHtml(text) {
-    return text.replaceAll(/&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160);/g, (str) => htmlUnescapeLookup[str]);
-}
-const htmlUnescapeLookup = {
-    '&amp;': '&',
-    '&#38;': '&',
-    '&lt;': '<',
-    '&#60;': '<',
-    '&gt;': '>',
-    '&#62;': '>',
-    '&apos;': "'",
-    '&#39;': "'",
-    '&quot;': '"',
-    '&#34;': '"',
-    '&nbsp;': '\u00A0',
-    '&#160;': '\u00A0'
-};
-//# sourceMappingURL=HtmlEscape.js.map

package/dist/encodings/HtmlEscape.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HtmlEscape.js","sourceRoot":"","sources":["../../src/encodings/HtmlEscape.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,UAAU,CAAC,IAAY;IACtC,OAAO,IAAI,CAAC,UAAU,CACrB,UAAU,EACV,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAChC,CAAA;AACF,CAAC;AAED,MAAM,gBAAgB,GAA2B;IAChD,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,QAAQ;CACb,CAAA;AAED,4DAA4D;AAC5D,2EAA2E;AAC3E,SAAS,YAAY,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,UAAU,CACrB,0DAA0D,EAC1D,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAChC,CAAA;AACF,CAAC;AAED,MAAM,kBAAkB,GAA2B;IAClD,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,GAAG;IACb,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,GAAG;IACb,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;CAClB,CAAA"}

package/dist/encodings/LEB128.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=LEB128.d.ts.map

package/dist/encodings/LEB128.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LEB128.d.ts","sourceRoot":"","sources":["../../src/encodings/LEB128.ts"],"names":[],"mappings":""}

package/dist/encodings/LEB128.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=LEB128.js.map

package/dist/encodings/LEB128.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LEB128.js","sourceRoot":"","sources":["../../src/encodings/LEB128.ts"],"names":[],"mappings":""}

package/dist/utilities/StringBuilder.d.ts

@@ -1,11 +0,0 @@
-export declare class StringBuilder {
-    private outputBuffer;
-    constructor(initialCapacity?: number);
-    appendCharCode(charCode: number): void;
-    appendCharCodes(...charCodes: number[]): void;
-    appendCharCodeArray(charCodes: ArrayLike<number>): void;
-    appendString(str: string): void;
-    appendCodePoint(codePoint: number): void;
-    toString(): string;
-}
-//# sourceMappingURL=StringBuilder.d.ts.map

package/dist/utilities/StringBuilder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StringBuilder.d.ts","sourceRoot":"","sources":["../../src/utilities/StringBuilder.ts"],"names":[],"mappings":"AAGA,qBAAa,aAAa;IACzB,OAAO,CAAC,YAAY,CAAoB;IAExC,YAAY,eAAe,SAAI,EAE9B;IAED,cAAc,CAAC,QAAQ,EAAE,MAAM,QAE9B;IAED,eAAe,CAAC,GAAG,SAAS,EAAE,MAAM,EAAE,QAErC;IAED,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,QAE/C;IAED,YAAY,CAAC,GAAG,EAAE,MAAM,QAMvB;IAED,eAAe,CAAC,SAAS,EAAE,MAAM,QAShC;IAED,QAAQ,WAEP;CACD"}

package/dist/utilities/StringBuilder.js

@@ -1,39 +0,0 @@
-import { createDynamicUint16Array } from '../data-structures/DynamicTypedArray.js';
-import { decodeUtf16 } from '../encodings/Utf16.js';
-export class StringBuilder {
-    outputBuffer;
-    constructor(initialCapacity = 8) {
-        this.outputBuffer = createDynamicUint16Array(initialCapacity);
-    }
-    appendCharCode(charCode) {
-        this.outputBuffer.add(charCode);
-    }
-    appendCharCodes(...charCodes) {
-        this.outputBuffer.addArray(charCodes);
-    }
-    appendCharCodeArray(charCodes) {
-        this.outputBuffer.addArray(charCodes);
-    }
-    appendString(str) {
-        const length = str.length;
-        for (let i = 0; i < length; i++) {
-            this.appendCharCode(str.charCodeAt(i));
-        }
-    }
-    appendCodePoint(codePoint) {
-        if (codePoint <= 0xffff) {
-            this.appendCharCode(codePoint);
-        }
-        else if (codePoint <= 0x10ffff) {
-            this.appendCharCode(0xd800 + ((codePoint - 0x10000) >>> 10));
-            this.appendCharCode(0xdc00 + ((codePoint - 0x10000) & 1023));
-        }
-        else {
-            throw new Error(`appendCodePoint: A code point of ${codePoint} cannot be encoded in UTF-16`);
-        }
-    }
-    toString() {
-        return decodeUtf16(this.outputBuffer.toTypedArray());
-    }
-}
-//# sourceMappingURL=StringBuilder.js.map

package/dist/utilities/StringBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StringBuilder.js","sourceRoot":"","sources":["../../src/utilities/StringBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,yCAAyC,CAAA;AACtG,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,MAAM,OAAO,aAAa;IACjB,YAAY,CAAoB;IAExC,YAAY,eAAe,GAAG,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAA;IAC9D,CAAC;IAED,cAAc,CAAC,QAAgB;QAC9B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;IAED,eAAe,CAAC,GAAG,SAAmB;QACrC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC;IAED,mBAAmB,CAAC,SAA4B;QAC/C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC;IAED,YAAY,CAAC,GAAW;QACvB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;QACvC,CAAC;IACF,CAAC;IAED,eAAe,CAAC,SAAiB;QAChC,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QAC/B,CAAC;aAAM,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC5D,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAC7D,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,oCAAoC,SAAS,8BAA8B,CAAC,CAAA;QAC7F,CAAC;IACF,CAAC;IAED,QAAQ;QACP,OAAO,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAA;IACrD,CAAC;CACD"}