Merge pull request #744 from Speech-Rule-Engine/refactor/remove_defau…

…lt_exports Remove default export in Engine module
Speech-Rule-Engine · Jan 10, 2024 · 8b7fea6 · 8b7fea6
2 parents 26119b5 + da0eef2
commit 8b7fea6
Show file tree

Hide file tree

Showing 63 changed files with 181 additions and 167 deletions.
diff --git a/ts/audio/abstract_audio_renderer.ts b/ts/audio/abstract_audio_renderer.ts
@@ -18,7 +18,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import { KeyCode } from '../common/event_util.js';
 import { AudioRenderer } from './audio_renderer.js';
 import { AuditoryDescription } from './auditory_description.js';

diff --git a/ts/audio/audio_util.ts b/ts/audio/audio_util.ts
@@ -20,7 +20,7 @@
 
 import { setdifference } from '../common/base_util.js';
 import * as EngineConst from '../common/engine_const.js';
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import { AuditoryDescription } from './auditory_description.js';
 import { Span } from './span.js';
 

diff --git a/ts/audio/aural_rendering.ts b/ts/audio/aural_rendering.ts
@@ -19,7 +19,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import * as EngineConst from '../common/engine_const.js';
 import { AcssRenderer } from './acss_renderer.js';
 import { AudioRenderer } from './audio_renderer.js';

diff --git a/ts/audio/layout_renderer.ts b/ts/audio/layout_renderer.ts
@@ -21,7 +21,7 @@
 import { Debugger } from '../common/debugger.js';
 import * as DomUtil from '../common/dom_util.js';
 import * as EngineConst from '../common/engine_const.js';
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import * as AudioUtil from './audio_util.js';
 import { AuditoryDescription } from './auditory_description.js';
 import { XmlRenderer } from './xml_renderer.js';

diff --git a/ts/audio/ssml_renderer.ts b/ts/audio/ssml_renderer.ts
@@ -18,7 +18,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import * as EngineConst from '../common/engine_const.js';
 import { Pause } from './audio_util.js';
 import { AuditoryDescription } from './auditory_description.js';

diff --git a/ts/audio/string_renderer.ts b/ts/audio/string_renderer.ts
@@ -18,7 +18,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import { AbstractAudioRenderer } from './abstract_audio_renderer.js';
 import { personalityMarkup } from './audio_util.js';
 import { AuditoryDescription } from './auditory_description.js';

diff --git a/ts/common/browser_util.ts b/ts/common/browser_util.ts
@@ -18,7 +18,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 import { xpath } from './xpath_util.js';
 
 /**

diff --git a/ts/common/cli.ts b/ts/common/cli.ts
@@ -27,7 +27,7 @@ import { EnginePromise, SREError } from './engine.js';
 import * as EngineConst from './engine_const.js';
 import * as ProcessorFactory from './processor_factory.js';
 import * as System from './system.js';
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 import { Variables } from './variables.js';
 
 export class Cli {

diff --git a/ts/common/debugger.ts b/ts/common/debugger.ts
@@ -18,7 +18,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 
 export class Debugger {
   private static instance: Debugger;

diff --git a/ts/common/dom_util.ts b/ts/common/dom_util.ts
@@ -22,9 +22,9 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine, { SREError } from './engine.js';
+import { Engine, SREError } from './engine.js';
 import * as EngineConst from '../common/engine_const.js';
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 import * as XpathUtil from './xpath_util.js';
 
 /**

diff --git a/ts/common/engine.ts b/ts/common/engine.ts
@@ -51,7 +51,7 @@ export class SREError extends Error {
  * Initializes the basic Speech engine and contains some global context.
  *
  */
-export default class Engine {
+export class Engine {
   /**
    * Binary feature vector.
    */

diff --git a/ts/common/engine_setup.ts b/ts/common/engine_setup.ts
@@ -22,9 +22,9 @@ import * as L10n from '../l10n/l10n.js';
 import * as MathMap from '../speech_rules/math_map.js';
 import * as BrowserUtil from './browser_util.js';
 import { Debugger } from './debugger.js';
-import Engine, { EnginePromise } from './engine.js';
+import { Engine, EnginePromise } from './engine.js';
 import * as FileUtil from './file_util.js';
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 
 // Engine setup method.
 /**

diff --git a/ts/common/file_util.ts b/ts/common/file_util.ts
@@ -19,7 +19,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 
 /**
  * Corrects pathnames to have trailing slashes.

diff --git a/ts/common/processor_factory.ts b/ts/common/processor_factory.ts
@@ -28,7 +28,7 @@ import * as SpeechGeneratorUtil from '../speech_generator/speech_generator_util.
 import * as WalkerFactory from '../walker/walker_factory.js';
 import * as WalkerUtil from '../walker/walker_util.js';
 import * as DomUtil from './dom_util.js';
-import Engine, { SREError } from './engine.js';
+import { Engine, SREError } from './engine.js';
 import * as EngineConst from '../common/engine_const.js';
 import { KeyCode } from './event_util.js';
 import { Processor, KeyProcessor } from './processor.js';

diff --git a/ts/common/system.ts b/ts/common/system.ts
@@ -20,13 +20,13 @@
 
 import { AuditoryDescription } from '../audio/auditory_description.js';
 
-import Engine, { EnginePromise, SREError } from './engine.js';
+import { Engine, EnginePromise, SREError } from './engine.js';
 import { setup } from './engine_setup.js';
 import * as EngineConst from './engine_const.js';
 import { KeyCode } from './event_util.js';
 import * as FileUtil from './file_util.js';
 import * as ProcessorFactory from './processor_factory.js';
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 import { Variables } from './variables.js';
 import { standardLoader } from '../speech_rules/math_map.js';
 

diff --git a/ts/common/system_external.ts b/ts/common/system_external.ts
@@ -27,7 +27,7 @@ declare let global: any;
 declare let require: (name: string) => any;
 declare let process: any;
 
-export default class SystemExternal {
+export class SystemExternal {
   /**
    * The local require function for NodeJS.
    *

diff --git a/ts/common/xpath_util.ts b/ts/common/xpath_util.ts
@@ -22,9 +22,9 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine from './engine.js';
+import { Engine } from './engine.js';
 import * as EngineConst from '../common/engine_const.js';
-import SystemExternal from './system_external.js';
+import { SystemExternal } from './system_external.js';
 
 /**
  * Returns whether or not xpath is supported.

diff --git a/ts/enrich_mathml/enrich_mathml.ts b/ts/enrich_mathml/enrich_mathml.ts
@@ -23,7 +23,7 @@
 
 import { Debugger } from '../common/debugger.js';
 import * as DomUtil from '../common/dom_util.js';
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import { NamedSymbol } from '../semantic_tree/semantic_attr.js';
 import {
   SemanticRole,

diff --git a/ts/l10n/l10n.ts b/ts/l10n/l10n.ts
@@ -18,7 +18,7 @@
  * @author [email protected] (Volker Sorge)
  */
 
-import Engine from '../common/engine.js';
+import { Engine } from '../common/engine.js';
 import { Variables } from '../common/variables.js';
 import { Grammar } from '../rule_engine/grammar.js';
 

diff --git a/ts/l10n/locales/locale_af.ts b/ts/l10n/locales/locale_af.ts
@@ -21,7 +21,7 @@
 import { Grammar } from '../../rule_engine/grammar.js';
 import { nestingToString } from '../locale_util.js';
 import { createLocale, Locale } from '../locale.js';
-import NUMBERS from '../numbers/numbers_af.js';
+import { NUMBERS } from '../numbers/numbers_af.js';
 import * as tr from '../transformers.js';
 
 const germanPostfixCombiner = function (

diff --git a/ts/l10n/locales/locale_ca.ts b/ts/l10n/locales/locale_ca.ts
@@ -24,7 +24,7 @@
 
 import { createLocale, Locale } from '../locale.js';
 import { combinePostfixIndex } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_ca.js';
+import { NUMBERS } from '../numbers/numbers_ca.js';
 import { Combiners } from '../transformers.js';
 
 const sansserifCombiner = function (letter: string, font: string, cap: string) {

diff --git a/ts/l10n/locales/locale_da.ts b/ts/l10n/locales/locale_da.ts
@@ -20,7 +20,7 @@
 
 import { createLocale, Locale } from '../locale.js';
 import { nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_da.js';
+import { NUMBERS } from '../numbers/numbers_da.js';
 import * as tr from '../transformers.js';
 
 let locale: Locale = null;

diff --git a/ts/l10n/locales/locale_de.ts b/ts/l10n/locales/locale_de.ts
@@ -25,7 +25,7 @@
 import { Grammar } from '../../rule_engine/grammar.js';
 import { localFont } from '../locale_util.js';
 import { createLocale, Locale } from '../locale.js';
-import NUMBERS from '../numbers/numbers_de.js';
+import { NUMBERS } from '../numbers/numbers_de.js';
 
 const germanPrefixCombiner = function (
   letter: string,

diff --git a/ts/l10n/locales/locale_en.ts b/ts/l10n/locales/locale_en.ts
@@ -21,7 +21,7 @@
 import { Grammar } from '../../rule_engine/grammar.js';
 import { createLocale, Locale } from '../locale.js';
 import { nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_en.js';
+import { NUMBERS } from '../numbers/numbers_en.js';
 import * as tr from '../transformers.js';
 
 let locale: Locale = null;

diff --git a/ts/l10n/locales/locale_es.ts b/ts/l10n/locales/locale_es.ts
@@ -24,7 +24,7 @@
 
 import { createLocale, Locale } from '../locale.js';
 import { combinePostfixIndex } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_es.js';
+import { NUMBERS } from '../numbers/numbers_es.js';
 import { Combiners } from '../transformers.js';
 
 const sansserifCombiner = function (letter: string, font: string, cap: string) {

diff --git a/ts/l10n/locales/locale_fr.ts b/ts/l10n/locales/locale_fr.ts
@@ -25,7 +25,7 @@
 import { Grammar } from '../../rule_engine/grammar.js';
 import { createLocale, Locale } from '../locale.js';
 import { combinePostfixIndex, nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_fr.js';
+import { NUMBERS } from '../numbers/numbers_fr.js';
 import { Combiners } from '../transformers.js';
 
 let locale: Locale = null;

diff --git a/ts/l10n/locales/locale_hi.ts b/ts/l10n/locales/locale_hi.ts
@@ -23,7 +23,7 @@
 //
 
 import { createLocale, Locale } from '../locale.js';
-import NUMBERS from '../numbers/numbers_hi.js';
+import { NUMBERS } from '../numbers/numbers_hi.js';
 import { Combiners } from '../transformers.js';
 import { nestingToString } from '../locale_util.js';
 

diff --git a/ts/l10n/locales/locale_it.ts b/ts/l10n/locales/locale_it.ts
@@ -24,7 +24,7 @@
 
 import { combinePostfixIndex, nestingToString } from '../locale_util.js';
 import { createLocale, Locale } from '../locale.js';
-import NUMBERS from '../numbers/numbers_it.js';
+import { NUMBERS } from '../numbers/numbers_it.js';
 import { Combiners } from '../transformers.js';
 
 const italianPostfixCombiner = function (

diff --git a/ts/l10n/locales/locale_ko.ts b/ts/l10n/locales/locale_ko.ts
@@ -22,7 +22,7 @@
 import { Grammar } from '../../rule_engine/grammar.js';
 import { createLocale, Locale } from '../locale.js';
 import { nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_ko.js';
+import { NUMBERS } from '../numbers/numbers_ko.js';
 import * as tr from '../transformers.js';
 
 

diff --git a/ts/l10n/locales/locale_nb.ts b/ts/l10n/locales/locale_nb.ts
@@ -24,7 +24,7 @@
 
 import { createLocale, Locale } from '../locale.js';
 import { nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_nn.js';
+import { NUMBERS } from '../numbers/numbers_nn.js';
 import * as tr from '../transformers.js';
 
 let locale: Locale = null;

diff --git a/ts/l10n/locales/locale_nemeth.ts b/ts/l10n/locales/locale_nemeth.ts
@@ -24,7 +24,7 @@
 //
 
 import { createLocale, Locale } from '../locale.js';
-import NUMBERS from '../numbers/numbers_nemeth.js';
+import { NUMBERS } from '../numbers/numbers_nemeth.js';
 import { identityTransformer } from '../transformers.js';
 
 /**

diff --git a/ts/l10n/locales/locale_nn.ts b/ts/l10n/locales/locale_nn.ts
@@ -24,7 +24,7 @@
 
 import { createLocale, Locale } from '../locale.js';
 import { nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_nn.js';
+import { NUMBERS } from '../numbers/numbers_nn.js';
 import * as tr from '../transformers.js';
 
 let locale: Locale = null;

diff --git a/ts/l10n/locales/locale_sv.ts b/ts/l10n/locales/locale_sv.ts
@@ -20,7 +20,7 @@
 
 import { createLocale, Locale } from '../locale.js';
 import { nestingToString } from '../locale_util.js';
-import NUMBERS from '../numbers/numbers_sv.js';
+import { NUMBERS } from '../numbers/numbers_sv.js';
 import * as tr from '../transformers.js';
 
 let locale: Locale = null;

diff --git a/ts/l10n/messages.ts b/ts/l10n/messages.ts
@@ -85,33 +85,36 @@ export interface Numbers {
   special?: { [key: string]: string | string[] };
 
   // Constructor methods
-  wordOrdinal: tr.Transformer;
-  numericOrdinal: tr.Transformer;
-  numberToWords: tr.Transformer;
-  numberToOrdinal: tr.GrammarCase;
+  wordOrdinal?: tr.Transformer;
+  numericOrdinal?: tr.Transformer;
+  numberToWords?: tr.Transformer;
+  numberToOrdinal?: tr.GrammarCase;
 
-  vulgarSep: string;
-  numSep: string;
+  vulgarSep?: string;
+  numSep?: string;
 }
 
 /**
  * @returns A numbers structure.
  */
-export function NUMBERS(): Numbers {
-  return {
-    zero: 'zero',
-    ones: [],
-    tens: [],
-    large: [],
-    special: {},
+export function NUMBERS(numbers: Numbers = {}): Numbers {
+  return Object.assign(
+    {
+      zero: 'zero',
+      ones: [],
+      tens: [],
+      large: [],
+      special: {},
 
-    wordOrdinal: tr.identityTransformer,
-    numericOrdinal: tr.identityTransformer,
-    numberToWords: tr.identityTransformer,
-    numberToOrdinal: tr.pluralCase,
-    vulgarSep: ' ',
-    numSep: ' '
-  };
+      wordOrdinal: tr.identityTransformer,
+      numericOrdinal: tr.identityTransformer,
+      numberToWords: tr.identityTransformer,
+      numberToOrdinal: tr.pluralCase,
+      vulgarSep: ' ',
+      numSep: ' '
+    },
+    numbers
+  );
 }
 
 /**

diff --git a/ts/l10n/numbers/numbers_af.ts b/ts/l10n/numbers/numbers_af.ts
@@ -132,10 +132,11 @@ function numericOrdinal(num: number): string {
   return num.toString() + '.';
 }
 
-const NUMBERS: Numbers = NUMB();
-NUMBERS.wordOrdinal = wordOrdinal;
-NUMBERS.numericOrdinal = numericOrdinal;
-NUMBERS.numberToWords = numberToWords;
-NUMBERS.numberToOrdinal = numberToOrdinal;
-
-export default NUMBERS;
+export const NUMBERS: Numbers = NUMB(
+  {
+    'wordOrdinal': wordOrdinal,
+    'numericOrdinal': numericOrdinal,
+    'numberToWords': numberToWords,
+    'numberToOrdinal': numberToOrdinal,
+  }
+);