echogarden 2.6.0 → 2.8.0

package/dist/dsp/SpeexResampler.js

@@ -1,6 +1,6 @@
 import { cloneRawAudio } from '../audio/AudioUtilities.js';
 import { concatFloat32Arrays, isWasmSimdSupported } from '../utilities/Utilities.js';
-import { WasmMemoryManager } from '../utilities/WasmMemoryManager.js';
+import { wrapEmscriptenModuleHeap } from 'wasm-heap-manager';
 let speexResamplerInstance;
 export async function resampleAudioSpeex(rawAudio, outSampleRate, quality = 0) {
     const channelCount = rawAudio.audioChannels.length;
@@ -17,14 +17,14 @@ export async function resampleAudioSpeex(rawAudio, outSampleRate, quality = 0) {
         };
     }
     const m = await getSpeexResamplerInstance();
-    const wasmMemory = new WasmMemoryManager(m);
+    const wasmHeap = wrapEmscriptenModuleHeap(m);
     function speexResultCodeToString(resultCode) {
         const errorStrPtr = m._speex_resampler_strerror(resultCode);
-        const errorStrRef = wasmMemory.wrapUint8Array(errorStrPtr, 1024);
-        const message = errorStrRef.readAsNullTerminatedUtf8String();
+        const messageRef = wasmHeap.wrapNullTerminatedUtf8String(errorStrPtr);
+        const message = messageRef.value;
         return message;
     }
-    const initErrRef = wasmMemory.allocInt32();
+    const initErrRef = wasmHeap.allocInt32();
     const resamplerStateAddress = m._speex_resampler_init(channelCount, inSampleRate, outSampleRate, quality, initErrRef.address);
     let resultCode = initErrRef.value;
     if (resultCode != 0) {
@@ -33,10 +33,10 @@ export async function resampleAudioSpeex(rawAudio, outSampleRate, quality = 0) {
     const inputLatency = m._speex_resampler_get_input_latency(resamplerStateAddress);
     const outputLatency = m._speex_resampler_get_output_latency(resamplerStateAddress);
     const maxChunkSize = 2 ** 20;
-    const inputChunkSampleCountRef = wasmMemory.allocInt32();
-    const outputChunkSampleCountRef = wasmMemory.allocInt32();
-    const inputChunkSamplesRef = wasmMemory.allocFloat32Array(maxChunkSize * 2);
-    const outputChunkSamplesRef = wasmMemory.allocFloat32Array(Math.floor(maxChunkSize * sampleRateRatio) * 2);
+    const inputChunkSampleCountRef = wasmHeap.allocInt32();
+    const outputChunkSampleCountRef = wasmHeap.allocInt32();
+    const inputChunkSamplesRef = wasmHeap.allocFloat32Array(maxChunkSize * 2);
+    const outputChunkSamplesRef = wasmHeap.allocFloat32Array(Math.floor(maxChunkSize * sampleRateRatio) * 2);
     const resampledAudioChunksForChannels = [];
     for (let channelIndex = 0; channelIndex < channelCount; channelIndex++) {
         resampledAudioChunksForChannels.push([]);
@@ -46,7 +46,7 @@ export async function resampleAudioSpeex(rawAudio, outSampleRate, quality = 0) {
             const isLastChunk = readOffset + maxChunkSize >= totalSampleCount;
             const inputPaddingSize = isLastChunk ? inputLatency : 0;
             const maxSamplesToRead = Math.min(maxChunkSize, totalSampleCount - readOffset) + inputPaddingSize;
-            const maxSamplesToWrite = outputChunkSamplesRef.length;
+            const maxSamplesToWrite = outputChunkSamplesRef.elementCount;
             const inputChunkSamplesForChannel = rawAudio.audioChannels[channelIndex].slice(readOffset, readOffset + maxSamplesToRead);
             inputChunkSampleCountRef.value = maxSamplesToRead;
             outputChunkSampleCountRef.value = maxSamplesToWrite;
@@ -63,7 +63,7 @@ export async function resampleAudioSpeex(rawAudio, outSampleRate, quality = 0) {
         }
     }
     m._speex_resampler_destroy(resamplerStateAddress);
-    wasmMemory.freeAll();
+    wasmHeap.freeAll();
     const resampledAudio = {
         audioChannels: [],
         sampleRate: outSampleRate

package/dist/dsp/SpeexResampler.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpeexResampler.js","sourceRoot":"","sources":["../../src/dsp/SpeexResampler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SpeexResampler.js","sourceRoot":"","sources":["../../src/dsp/SpeexResampler.ts"],"names":[],"mappings":"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"}

package/dist/encodings/Ascii.js

@@ -31,7 +31,7 @@ export class ChunkedAsciiDecoder {
     str = '';
     textDecoder = new TextDecoder('windows-1252');
     writeChunk(chunk) {
-        const decodedChunk = this.textDecoder.decode(chunk);
+        const decodedChunk = this.textDecoder.decode(chunk, { stream: true });
         this.str += decodedChunk;
     }
     toString() {

package/dist/encodings/Ascii.js.map

@@ -1 +1 @@
-{"version":3,"file":"Ascii.js","sourceRoot":"","sources":["../../src/encodings/Ascii.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAC,WAAmB;IAC9C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAA;IAEpC,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAA;IAE7C,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;IAE7D,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,WAAmB,EAAE,YAAwB;IAC5E,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAA;IAE9B,IAAI,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAEnD,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,cAAc,WAAW,CAAC,UAAU,CAAC,YAAY,QAAQ,kDAAkD,CAAC,CAAA;QAC7H,CAAC;QAED,YAAY,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAA;IACpC,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,aAAyB;IACpD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,CAAA;IAE9B,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAA;IAEzC,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,cAAc,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC,CAAA;QAErE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAED,MAAM,OAAO,mBAAmB;IACvB,GAAG,GAAG,EAAE,CAAA;IACC,WAAW,GAAG,IAAI,WAAW,CAAC,cAAc,CAAC,CAAA;IAE9D,UAAU,CAAC,KAAiB;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEnD,IAAI,CAAC,GAAG,IAAI,YAAY,CAAA;IACzB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,GAAG,CAAA;IAChB,CAAC;CACD"}
+{"version":3,"file":"Ascii.js","sourceRoot":"","sources":["../../src/encodings/Ascii.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAC,WAAmB;IAC9C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAA;IAEpC,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAA;IAE7C,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;IAE7D,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,WAAmB,EAAE,YAAwB;IAC5E,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAA;IAE9B,IAAI,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAEnD,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,cAAc,WAAW,CAAC,UAAU,CAAC,YAAY,QAAQ,kDAAkD,CAAC,CAAA;QAC7H,CAAC;QAED,YAAY,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAA;IACpC,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,aAAyB;IACpD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,CAAA;IAE9B,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAA;IAEzC,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,cAAc,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC,CAAA;QAErE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAED,MAAM,OAAO,mBAAmB;IACvB,GAAG,GAAG,EAAE,CAAA;IACC,WAAW,GAAG,IAAI,WAAW,CAAC,cAAc,CAAC,CAAA;IAE9D,UAAU,CAAC,KAAiB;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAErE,IAAI,CAAC,GAAG,IAAI,YAAY,CAAA;IACzB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,GAAG,CAAA;IAChB,CAAC;CACD"}

package/dist/encodings/Utf16.js

@@ -26,7 +26,7 @@ export class ChunkedUtf16Decoder {
     str = '';
     textDecoder = new TextDecoder('utf-16le');
     writeChunk(chunk) {
-        const decodedChunk = this.textDecoder.decode(chunk);
+        const decodedChunk = this.textDecoder.decode(chunk, { stream: true });
         this.str += decodedChunk;
     }
     toString() {

package/dist/encodings/Utf16.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utf16.js","sourceRoot":"","sources":["../../src/encodings/Utf16.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAC,IAAY;IACvC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEhD,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IAEtD,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,YAAyB;IACtE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAA;IAEvB,IAAI,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;IAC7E,CAAC;IAED,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;QACzD,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACvD,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,aAA0B;IACrD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,CAAA;IAE9B,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAA;IAEzC,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,cAAc,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC,CAAA;QAErE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAED,MAAM,OAAO,mBAAmB;IACvB,GAAG,GAAG,EAAE,CAAA;IACC,WAAW,GAAG,IAAI,WAAW,CAAC,UAAU,CAAC,CAAA;IAE1D,UAAU,CAAC,KAAkB;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEnD,IAAI,CAAC,GAAG,IAAI,YAAY,CAAA;IACzB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,GAAG,CAAA;IAChB,CAAC;CACD"}
+{"version":3,"file":"Utf16.js","sourceRoot":"","sources":["../../src/encodings/Utf16.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAC,IAAY;IACvC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEhD,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IAEtD,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,YAAyB;IACtE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAA;IAEvB,IAAI,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;IAC7E,CAAC;IAED,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;QACzD,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACvD,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,aAA0B;IACrD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,CAAA;IAE9B,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAA;IAEzC,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,cAAc,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC,CAAA;QAErE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAED,MAAM,OAAO,mBAAmB;IACvB,GAAG,GAAG,EAAE,CAAA;IACC,WAAW,GAAG,IAAI,WAAW,CAAC,UAAU,CAAC,CAAA;IAE1D,UAAU,CAAC,KAAkB;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAErE,IAAI,CAAC,GAAG,IAAI,YAAY,CAAA;IACzB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,GAAG,CAAA;IAChB,CAAC;CACD"}

package/dist/encodings/Utf8.js

@@ -20,7 +20,7 @@ export class ChunkedUtf8Decoder {
     str = '';
     textDecoder = new TextDecoder('utf-8');
     writeChunk(chunk) {
-        const decodedChunk = this.textDecoder.decode(chunk);
+        const decodedChunk = this.textDecoder.decode(chunk, { stream: true });
         this.str += decodedChunk;
     }
     toString() {

package/dist/encodings/Utf8.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utf8.js","sourceRoot":"","sources":["../../src/encodings/Utf8.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Utf8.js","sourceRoot":"","sources":["../../src/encodings/Utf8.ts"],"names":[],"mappings":"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"}

package/dist/nlp/EspeakPhonemizer.js

@@ -46,7 +46,7 @@ export async function phonemizeText(text, voice, substitutionMap) {
         .replaceAll(')', ', ')
         .replaceAll('«', ', ')
         .replaceAll('»', ', ');
-    const segmentedText = await Segmentation.parse(text, voice);
+    const segmentedText = await Segmentation.parseTextAndConvertToFragmentObjects(text, voice);
     const preparedPhrases = [];
     const phraseBreakers = [];
     for (const sentence of segmentedText) {

package/dist/nlp/EspeakPhonemizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"EspeakPhonemizer.js","sourceRoot":"","sources":["../../src/nlp/EspeakPhonemizer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EspeakPhonemizer.js","sourceRoot":"","sources":["../../src/nlp/EspeakPhonemizer.ts"],"names":[],"mappings":"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"}

package/dist/nlp/Segmentation.d.ts

@@ -1,13 +1,23 @@
 import { ParagraphBreakType, WhitespaceProcessing } from '../api/Common.js';
-export declare const wordCharacterPattern: RegExp;
-export declare const punctuationPattern: RegExp;
+import * as TextSegmentation from '@echogarden/text-segmentation';
+export declare const wordCharacterRegExp: RegExp;
+export declare const emojiCharacterRegExp: RegExp;
+export declare const punctuationRegExp: RegExp;
 export declare const phraseSeparators: string[];
 export declare const symbolWords: string[];
 export declare function isWordOrSymbolWord(str: string): boolean;
 export declare function isSymbolWord(str: string): boolean;
 export declare function isWord(str: string): boolean;
-export declare function isPunctuation(str: string): boolean;
+export declare function includesPunctuation(str: string): boolean;
+export declare function includesEmoji(str: string): boolean;
 export declare function isWhitespace(str: string): boolean;
+export declare function splitToParagraphs(text: string, paragraphBreakType: ParagraphBreakType, whitespaceProcessingMethod: WhitespaceProcessing): string[];
+export declare function splitToLines(text: string): string[];
+export declare function parseText(text: string, langCode: string): Promise<TextSegmentation.SegmentationResult>;
+export declare function splitToWords(text: string, langCode: string): Promise<TextSegmentation.WordSequence>;
+export declare function applyWhitespaceProcessing(text: string, whitespaceProcessingMethod: WhitespaceProcessing): string;
+export declare function splitToFragments(text: string, maxFragmentLength: number, langCode: string, preserveSentences?: boolean, preservePhrases?: boolean): Promise<Fragment[]>;
+export declare function parseTextAndConvertToFragmentObjects(text: string, langCode: string): Promise<Sentence[]>;
 export declare class Sentence {
     phrases: Phrase[];
     readonly isSentenceFinalizer = true;
@@ -39,10 +49,3 @@ export declare class Fragment {
     get isNonempty(): boolean;
     get lastSegment(): Segment | undefined;
 }
-export declare function splitToFragments(text: string, maxFragmentLength: number, langCode: string, preserveSentences?: boolean, preservePhrases?: boolean): Promise<Fragment[]>;
-export declare function parse(text: string, langCode: string): Promise<Sentence[]>;
-export declare function splitToSentences(text: string, langCode: string): string[];
-export declare function splitToWords(text: string, langCode: string): Promise<string[]>;
-export declare function splitToParagraphs(text: string, paragraphBreaks: ParagraphBreakType, whitespaceProcessingMethod: WhitespaceProcessing): string[];
-export declare function applyWhitespaceProcessing(text: string, whitespaceProcessingMethod: WhitespaceProcessing): string;
-export declare function splitToLines(text: string): string[];

package/dist/nlp/Segmentation.js

@@ -1,74 +1,109 @@
-import * as CldrSegmentation from 'cldr-segmentation';
-import { splitChineseTextToWords_Jieba } from './ChineseSegmentation.js';
 import { sumArray, logToStderr } from '../utilities/Utilities.js';
 import { getShortLanguageCode } from '../utilities/Locale.js';
+import { includesAnyOf, splitAndPreserveSeparators } from '../utilities/StringUtilities.js';
+import * as TextSegmentation from '@echogarden/text-segmentation';
+import { splitChineseTextToWords_Jieba } from './ChineseSegmentation.js';
 import { splitJapaneseTextToWords_Kuromoji } from './JapaneseSegmentation.js';
-import { includesAnyOf, indexOfAnyOf } from '../utilities/StringUtilities.js';
 const log = logToStderr;
-export const wordCharacterPattern = /[\p{Letter}\p{Number}]/u;
-export const punctuationPattern = /[\p{Punctuation}]/u;
-export const phraseSeparators = [',', ';', ':', '，', '、'];
+export const wordCharacterRegExp = /[\p{Letter}\p{Number}]/u;
+export const emojiCharacterRegExp = /[\p{Emoji}]/u;
+export const punctuationRegExp = /[\p{Punctuation}]/u;
+export const phraseSeparators = [',', '、', '，', '،', ';', '；', ':', '：', '—'];
 export const symbolWords = ['$', '€', '¢', '£', '¥', '©', '®', '™', '%', '&', '#', '~', '@', '+', '±', '÷', '/', '*', '=', '¼', '½', '¾'];
+///////////////////////////////////////////////////////////////////////////////////////////////
+// Predicates
+///////////////////////////////////////////////////////////////////////////////////////////////
 export function isWordOrSymbolWord(str) {
-    return isWord(str) || symbolWords.includes(str);
+    return isWord(str) || includesEmoji(str) || symbolWords.includes(str);
 }
 export function isSymbolWord(str) {
     return symbolWords.includes(str.trim());
 }
 export function isWord(str) {
-    return wordCharacterPattern.test(str.trim());
+    return wordCharacterRegExp.test(str.trim());
 }
-export function isPunctuation(str) {
-    return punctuationPattern.test(str.trim());
+export function includesPunctuation(str) {
+    return punctuationRegExp.test(str.trim());
+}
+export function includesEmoji(str) {
+    return emojiCharacterRegExp.test(str.trim());
 }
 export function isWhitespace(str) {
     return str.trim().length === 0;
 }
-export class Sentence {
-    phrases = [];
-    isSentenceFinalizer = true;
-    get length() { return sumArray(this.phrases, (phrase) => phrase.length); }
-    get text() { return this.phrases.reduce((result, phrase) => result + phrase.text, ''); }
+///////////////////////////////////////////////////////////////////////////////////////////////
+// Paragraph, line, sentence, phrase, and word segmentation
+///////////////////////////////////////////////////////////////////////////////////////////////
+export function splitToParagraphs(text, paragraphBreakType, whitespaceProcessingMethod) {
+    let paragraphs = [];
+    if (paragraphBreakType === 'single') {
+        paragraphs = splitAndPreserveSeparators(text, /(\r?\n)+/g);
+    }
+    else if (paragraphBreakType === 'double') {
+        paragraphs = splitAndPreserveSeparators(text, /(\r?\n)(\r?\n)+/g);
+    }
+    else {
+        throw new Error(`Invalid paragraph break type: '${paragraphBreakType}'`);
+    }
+    paragraphs = paragraphs.map(p => applyWhitespaceProcessing(p, whitespaceProcessingMethod));
+    paragraphs = paragraphs.filter(p => p.length > 0);
+    return paragraphs;
 }
-export class Phrase {
-    words = [];
-    get length() { return sumArray(this.words, (word) => word.length); }
-    get text() { return this.words.reduce((result, word) => result + word.text, ''); }
-    get lastWord() {
-        if (this.words.length == 0) {
-            return undefined;
+export function splitToLines(text) {
+    return splitAndPreserveSeparators(text, /\r?\n/g);
+}
+export async function parseText(text, langCode) {
+    const shortLangCode = getShortLanguageCode(langCode || '');
+    const wordSequence = await splitToWords(text, shortLangCode);
+    const parsedText = await TextSegmentation.segmentWordSequence(wordSequence);
+    return parsedText;
+}
+export async function splitToWords(text, langCode) {
+    const shortLangCode = getShortLanguageCode(langCode || '');
+    if (shortLangCode === 'zh' || shortLangCode === 'cmn' || shortLangCode === 'ja') {
+        let wordArray = [];
+        if (shortLangCode === 'zh' || shortLangCode === 'cmn') {
+            wordArray = await splitChineseTextToWords_Jieba(text);
         }
-        return this.words[this.words.length - 1];
+        else {
+            wordArray = await splitJapaneseTextToWords_Kuromoji(text);
+        }
+        const wordSequence = new TextSegmentation.WordSequence();
+        let offset = 0;
+        for (const wordText of wordArray) {
+            const startOffset = offset;
+            const endOffset = startOffset + wordText.length;
+            const isNonPunctuation = isWordOrSymbolWord(wordText);
+            wordSequence.addWord(wordText, startOffset, isNonPunctuation);
+            offset = endOffset;
+        }
+        return wordSequence;
     }
-    get isSentenceFinalizer() { return this.lastWord != null ? this.lastWord.isSentenceFinalizer : false; }
-}
-export class Word {
-    text;
-    isSentenceFinalizer;
-    constructor(text, isSentenceFinalizer) {
-        this.text = text;
-        this.isSentenceFinalizer = isSentenceFinalizer;
+    else {
+        return TextSegmentation.splitToWords(text, { language: langCode });
     }
-    get containsOnlyPunctuation() { return !wordCharacterPattern.test(this.text) && !this.isSymbolWord; }
-    get isSymbolWord() { return symbolWords.includes(this.text); }
-    get isPhraseSeperator() { return this.containsOnlyPunctuation && includesAnyOf(this.text, phraseSeparators); }
-    get length() { return this.text.length; }
 }
-export class Fragment {
-    segments = [];
-    get length() { return sumArray(this.segments, (phrase) => phrase.length); }
-    get text() { return this.segments.reduce((result, segment) => result + segment.text, ''); }
-    get isEmpty() { return this.length == 0; }
-    get isNonempty() { return !this.isEmpty; }
-    get lastSegment() {
-        if (this.isEmpty) {
-            return undefined;
-        }
-        return this.segments[this.segments.length - 1];
+export function applyWhitespaceProcessing(text, whitespaceProcessingMethod) {
+    if (whitespaceProcessingMethod === 'removeLineBreaks') {
+        return text.trim().replaceAll(/(\r?\n)+/g, ' ');
+    }
+    else if (whitespaceProcessingMethod === 'collapse') {
+        return text.trim().replaceAll(/\s+/g, ' ');
+    }
+    else if (whitespaceProcessingMethod === 'preserve') {
+        return text;
+    }
+    else {
+        throw new Error(`Invalid whitespace processing method: '${whitespaceProcessingMethod}'`);
     }
 }
+///////////////////////////////////////////////////////////////////////////////////////////////
+// Fragment segmentation
+//
+// Used to split text to fragments, to fit particular size constraints.
+///////////////////////////////////////////////////////////////////////////////////////////////
 export async function splitToFragments(text, maxFragmentLength, langCode, preserveSentences = true, preservePhrases = true) {
-    const parsedText = await parse(text, langCode);
+    const parsedText = await parseTextAndConvertToFragmentObjects(text, langCode);
     const fragments = [];
     let currentFragment = new Fragment();
     const remainingCharactersInCurrentFragment = () => maxFragmentLength - currentFragment.length;
@@ -120,79 +155,67 @@ export async function splitToFragments(text, maxFragmentLength, langCode, preser
     createNewFragmentIfNeeded();
     return fragments;
 }
-export async function parse(text, langCode) {
-    const sentencesText = splitToSentences(text, langCode);
+export async function parseTextAndConvertToFragmentObjects(text, langCode) {
+    const segmentedText = await parseText(text, langCode);
     const sentences = [];
-    for (const sentenceText of sentencesText) {
+    for (const sentenceEntry of segmentedText.sentences) {
         const sentence = new Sentence();
-        let currentPhrase = new Phrase();
-        const wordTexts = await splitToWords(sentenceText, langCode);
-        for (let wordIndex = 0; wordIndex < wordTexts.length; wordIndex++) {
-            const word = new Word(wordTexts[wordIndex], wordIndex == wordTexts.length - 1);
-            if (word.isPhraseSeperator) {
-                const separatorIndex = indexOfAnyOf(word.text, phraseSeparators);
-                currentPhrase.words.push(new Word(word.text.substring(0, separatorIndex + 1), word.isSentenceFinalizer));
-                sentence.phrases.push(currentPhrase);
-                currentPhrase = new Phrase();
-                currentPhrase.words.push(new Word(word.text.substring(separatorIndex + 1), false));
+        for (const phraseEntry of sentenceEntry.phrases) {
+            const phrase = new Phrase();
+            for (const wordEntry of phraseEntry.words.entries) {
+                const isSentenceFinalizer = wordEntry === sentenceEntry.words.lastEntry;
+                const word = new Word(wordEntry.text, isSentenceFinalizer);
+                phrase.words.push(word);
             }
-            else {
-                currentPhrase.words.push(word);
+            if (phrase.words.length > 0) {
+                sentence.phrases.push(phrase);
             }
         }
-        if (currentPhrase.words.length > 0) {
-            sentence.phrases.push(currentPhrase);
-        }
         sentences.push(sentence);
     }
     return sentences;
 }
-export function splitToSentences(text, langCode) {
-    const shortLangCode = getShortLanguageCode(langCode || '');
-    return CldrSegmentation.sentenceSplit(text, CldrSegmentation.suppressions[shortLangCode]);
+export class Sentence {
+    phrases = [];
+    isSentenceFinalizer = true;
+    get length() { return sumArray(this.phrases, (phrase) => phrase.length); }
+    get text() { return this.phrases.reduce((result, phrase) => result + phrase.text, ''); }
 }
-export async function splitToWords(text, langCode) {
-    const shortLangCode = getShortLanguageCode(langCode || '');
-    if (shortLangCode == 'zh' || shortLangCode == 'cmn') {
-        return splitChineseTextToWords_Jieba(text, undefined, true);
-    }
-    else if (shortLangCode == 'ja') {
-        return splitJapaneseTextToWords_Kuromoji(text);
-    }
-    else {
-        return CldrSegmentation.wordSplit(text, CldrSegmentation.suppressions[shortLangCode]);
+export class Phrase {
+    words = [];
+    get length() { return sumArray(this.words, (word) => word.length); }
+    get text() { return this.words.reduce((result, word) => result + word.text, ''); }
+    get lastWord() {
+        if (this.words.length == 0) {
+            return undefined;
+        }
+        return this.words[this.words.length - 1];
     }
+    get isSentenceFinalizer() { return this.lastWord != null ? this.lastWord.isSentenceFinalizer : false; }
 }
-export function splitToParagraphs(text, paragraphBreaks, whitespaceProcessingMethod) {
-    let paragraphs = [];
-    if (paragraphBreaks === 'single') {
-        paragraphs = text.split(/(\r?\n)+/g);
-    }
-    else if (paragraphBreaks === 'double') {
-        paragraphs = text.split(/(\r?\n)(\r?\n)+/g);
-    }
-    else {
-        throw new Error(`Invalid paragraph break type: '${paragraphBreaks}'`);
+export class Word {
+    text;
+    isSentenceFinalizer;
+    constructor(text, isSentenceFinalizer) {
+        this.text = text;
+        this.isSentenceFinalizer = isSentenceFinalizer;
     }
-    paragraphs = paragraphs.map(p => applyWhitespaceProcessing(p.trim(), whitespaceProcessingMethod));
-    paragraphs = paragraphs.filter(p => p.length > 0);
-    return paragraphs;
+    get containsOnlyPunctuation() { return !wordCharacterRegExp.test(this.text) && !this.isSymbolWord; }
+    get isSymbolWord() { return symbolWords.includes(this.text); }
+    get isPhraseSeperator() { return this.containsOnlyPunctuation && includesAnyOf(this.text, phraseSeparators); }
+    get length() { return this.text.length; }
 }
-export function applyWhitespaceProcessing(text, whitespaceProcessingMethod) {
-    if (whitespaceProcessingMethod === 'removeLineBreaks') {
-        return text.replaceAll(/(\r?\n)+/g, ' ');
-    }
-    else if (whitespaceProcessingMethod === 'collapse') {
-        return text.replaceAll(/\s+/g, ' ');
-    }
-    else if (whitespaceProcessingMethod === 'preserve') {
-        return text;
-    }
-    else {
-        throw new Error(`Invalid whitespace processing method: '${whitespaceProcessingMethod}'`);
+export class Fragment {
+    segments = [];
+    get length() { return sumArray(this.segments, (phrase) => phrase.length); }
+    get text() { return this.segments.reduce((result, segment) => result + segment.text, ''); }
+    get isEmpty() { return this.length == 0; }
+    get isNonempty() { return !this.isEmpty; }
+    get lastSegment() {
+        if (this.isEmpty) {
+            return undefined;
+        }
+        return this.segments[this.segments.length - 1];
     }
 }
-export function splitToLines(text) {
-    return text.split(/\r?\n/g);
-}
 //# sourceMappingURL=Segmentation.js.map

package/dist/nlp/Segmentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Segmentation.js","sourceRoot":"","sources":["../../src/nlp/Segmentation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Segmentation.js","sourceRoot":"","sources":["../../src/nlp/Segmentation.ts"],"names":[],"mappings":"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"}