From 8e23b11dfcb357e82f37d1b04dbcf14a3b9e745d Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 09:38:48 +0700
Subject: [PATCH 01/22] chore(developer): convert Server to ES Modules

Fixes #9672.

Also rewrote build.sh as a builder script in order to simplify some of
the build changes.

Makes /web a dependency of Keyman Developer Server, which is a
significant improvement, but we need to consider if we want to use web's
debug build as we did in the past.
---
 developer/src/server/build-addins.inc.sh      |   2 +-
 developer/src/server/build.sh                 | 201 +++++++-----------
 developer/src/server/package.json             |  12 +-
 developer/src/server/postbuild.sh             |  25 ---
 developer/src/server/src/config.ts            |   2 +-
 developer/src/server/src/data.ts              |   4 +-
 developer/src/server/src/environment.ts       |   4 +-
 .../src/handlers/api/debugobject/get.ts       |   6 +-
 .../src/handlers/api/debugobject/register.ts  |  12 +-
 .../handlers/api/debugobject/unregister.ts    |   8 +-
 .../server/src/handlers/api/font/register.ts  |   6 +-
 .../src/handlers/api/keyboard/register.ts     |   6 +-
 .../src/handlers/api/package/register.ts      |   6 +-
 .../server/src/handlers/inc/keyboards-css.ts  |   6 +-
 .../server/src/handlers/inc/keyboards-js.ts   |   4 +-
 .../server/src/handlers/inc/packages-json.ts  |   6 +-
 developer/src/server/src/index.ts             |  26 +--
 developer/src/server/src/ngrok.d.ts           |   1 +
 developer/src/server/src/routes.ts            |  38 ++--
 developer/src/server/src/tray.ts              |   4 +-
 developer/src/server/src/version-data.test.ts |   2 +-
 developer/src/server/src/win32-tray.ts        |  13 +-
 .../src/server/src/win32/console/index.d.ts   |   5 -
 .../src/server/src/win32/console/index.js     |   7 -
 .../src/server/src/win32/console/index.ts     |   6 +
 .../src/win32/trayicon/{index.js => index.ts} |  23 +-
 developer/src/server/tsconfig.json            |   9 +-
 27 files changed, 183 insertions(+), 261 deletions(-)
 delete mode 100755 developer/src/server/postbuild.sh
 create mode 100644 developer/src/server/src/ngrok.d.ts
 delete mode 100644 developer/src/server/src/win32/console/index.d.ts
 delete mode 100644 developer/src/server/src/win32/console/index.js
 create mode 100644 developer/src/server/src/win32/console/index.ts
 rename developer/src/server/src/win32/trayicon/{index.js => index.ts} (68%)

diff --git a/developer/src/server/build-addins.inc.sh b/developer/src/server/build-addins.inc.sh
index cce1e9ae6f..3643ebffcd 100644
--- a/developer/src/server/build-addins.inc.sh
+++ b/developer/src/server/build-addins.inc.sh
@@ -11,7 +11,7 @@ isNodeX64() {
   # [[ $(file -b "$(which node)" | grep x86-64) ]] && echo 1 || echo 0
 }
 
-build_addins() {
+do_build_addins() {
   local NODEX64=$(isNodeX64)
   local ARCH=x64
   local TRAYICON_TARGET=addon.x64.node
diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index c735e26fec..e609635b11 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -1,10 +1,4 @@
 #!/usr/bin/env bash
-#
-# Compiles Keyman Developer Server for deployment
-#
-
-# Exit on command failure and when using unset variables:
-set -eu
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
@@ -16,121 +10,64 @@ EX_USAGE=64
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
-pushd "$(dirname "$THIS_SCRIPT")"
+cd "$THIS_SCRIPT_PATH"
 
-# Build the main script.
-build () {
-  npm run build || builder_die "Could not build top-level JavaScript file."
+builder_describe "Build Keyman Developer Server" \
+  @/common/web/keyman-version \
+  @/web \
+  clean \
+  configure \
+  build \
+  test \
+  "installer   Prepare for Keyman Developer installer" \
+  "publish     Publish to NPM" \
+  ":server     Keyman Developer Server main program" \
+  ":addins     Windows addins for GUI integration"
+
+builder_describe_outputs \
+  configure:server     /node_modules \
+  configure:addins     /node_modules \
+  build:server         /developer/src/server/build/src/index.js \
+  build:addins         /developer/src/server/build/src/win32/console/index.js
+
+builder_parse "$@"
+
+#-------------------------------------------------------------------------------------------------------------------
+
+function clean_server() {
+  rm -rf "$THIS_SCRIPT_PATH/build"
+  rm -rf "$THIS_SCRIPT_PATH/node_modules"
+  rm -rf "$THIS_SCRIPT_PATH/tsconfig.tsbuildinfo"
+  rm -rf "$THIS_SCRIPT_PATH/src/site/resource"
+
+  # No longer in use, cleanup from previous versions:
+  rm -rf "$THIS_SCRIPT_PATH/dist"
 }
 
-display_usage ( ) {
-  echo "Usage: $0 [--production|--watch] [--test|--tdd]"
-  echo "       $0 --help"
-  echo
-  echo "  --help                      displays this screen and exits"
-  echo "  --production, -p            builds production release in /developer/bin/server/"
-  echo "  --skip-package-install, -S  don't run npm install (not valid with --production)"
-  echo "  --test, -t                  runs unit tests after building"
-  #echo "  --watch, -w                 builds dev server in watch mode"
-  echo "  --tdd                       runs unit tests WITHOUT building"
-  echo "  --no-build-addins           don't build/copy Win32 addins"
-  echo "  --no-build-kmw              don't build KeymanWeb"
-  echo "  --no-copy-kmw               don't copy KeymanWeb"
-}
-
-################################ Main script ################################
-
-run_tests=0
-production=0
-build=1
-install_dependencies=1
-build_keymanweb=1
-copy_keymanweb=1
-build_addins=1
-
-# Process command-line arguments
-while [[ $# -gt 0 ]] ; do
-  key="$1"
-  case $key in
-    --help|-h|-?)
-      display_usage
-      exit
-      ;;
-    --production|-p)
-      production=1
-      ;;
-    --skip-package-install|-S)
-      install_dependencies=0
-      ;;
-    --no-build-kmw)
-      build_keymanweb=0
-      ;;
-    --no-build-addins)
-      build_addins=0
-      ;;
-    --no-copy-kmw)
-      copy_keymanweb=0
-      ;;
-    --test)
-      run_tests=1
-      ;;
-    --tdd)
-      run_tests=1
-      build=0
-      install_dependencies=0
-      ;;
-    *)
-      echo "$0: invalid option: $key"
-      display_usage
-      exit $EX_USAGE
-  esac
-  shift # past the processed argument
-done
-
-# ----------------------------------------
-# Install dependencies
-# ----------------------------------------
-
-# Check if Node.JS/npm is installed.
-type npm >/dev/null ||\
-    builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
-
-if (( install_dependencies )) ; then
+function configure_server() {
   verify_npm_setup
   # See https://github.com/bubenshchykov/ngrok/issues/254, https://github.com/bubenshchykov/ngrok/pull/255
   # TODO: this is horrible; is there a way we can avoid this?
   rm -f "$KEYMAN_ROOT"/node_modules/ngrok/bin/ngrok.exe
-fi
+}
 
-# ----------------------------------------
-# Rebuild and bundle addins
-# ----------------------------------------
-
-if (( build_addins )); then
-  . ./build-addins.inc.sh
+function build_addins() {
+  # Rebuild and bundle addins
+  source ./build-addins.inc.sh
 
   # If we have an x64 version of node installed
   if [[ $(isNodeX64) ]]; then
-    build_addins
+    do_build_addins
   fi
 
   # Build with the Keyman Developer x86 version of node
-  PATH="$KEYMAN_ROOT/developer/src/inst/node/dist:$PATH" build_addins
-fi
+  PATH="$KEYMAN_ROOT/developer/src/inst/node/dist:$PATH" do_build_addins
+}
 
-# ----------------------------------------
-# Build and bundle KeymanWeb
-# ----------------------------------------
-
-if (( build_keymanweb )); then
-  pushd "$KEYMAN_ROOT/web/"
-  ./build.sh build --debug
-  popd
-fi
-
-if (( copy_keymanweb )); then
-  WEB_SRC="$KEYMAN_ROOT/web/build/publish/debug"
-  DST="$(dirname "$THIS_SCRIPT")/src/site/resource"
+function build_server() {
+  # Copy keymanweb build artifacts
+  local WEB_SRC="$KEYMAN_ROOT/web/build/publish/debug"
+  local DST="$THIS_SCRIPT_PATH/src/site/resource"
 
   rm -rf "$DST"
   mkdir -p "$DST/osk"
@@ -140,33 +77,26 @@ if (( copy_keymanweb )); then
   cp -R "$WEB_SRC/ui/"* "$DST/ui/"
   cp "$KEYMAN_ROOT/web/LICENSE" "$DST/"
   cp "$KEYMAN_ROOT/web/README.md" "$DST/"
-fi
 
-# ----------------------------------------
-# Build the project
-# ----------------------------------------
+  # Build server
+  tsc --build
 
-npm run build || builder_die "Compilation failed."
-echo "Typescript compilation successful."
+  # Post build
+  mkdir -p "$THIS_SCRIPT_PATH/build/src/site/"
+  mkdir -p "$THIS_SCRIPT_PATH/build/src/win32/"
+  cp -r "$THIS_SCRIPT_PATH/src/site/"** "$THIS_SCRIPT_PATH/build/src/site/"
+  cp -r "$THIS_SCRIPT_PATH/src/win32/"** "$THIS_SCRIPT_PATH/build/src/win32/"
 
-# ----------------------------------------
-# Unit tests
-# ----------------------------------------
+  replaceVersionStrings "$THIS_SCRIPT_PATH/build/src/site/lib/sentry/init.js.in" "$THIS_SCRIPT_PATH/build/src/site/lib/sentry/init.js"
+  rm "$THIS_SCRIPT_PATH/build/src/site/lib/sentry/init.js.in"
+}
 
-if (( run_tests )); then
-  npm test || builder_die "Tests failed"
-fi
-
-# ----------------------------------------
-# Deploy to dist/
-# ----------------------------------------
-
-if (( production )) ; then
+function installer_server() {
   # We need to build in a tmp folder so that npm doesn't get confused by our
   # monorepo setup, and so we can copy the relevant node_modules in, because
   # we'll need them in order to build the deployable version.
 
-  PRODBUILDTEMP=`mktemp -d`
+  local PRODBUILDTEMP=`mktemp -d`
   echo "Preparing in $PRODBUILDTEMP"
   # Remove @keymanapp devDependencies because they won't install outside the
   # monorepo context
@@ -180,14 +110,27 @@ if (( production )) ; then
   rm -f node_modules/ngrok/bin/ngrok.exe
   popd
 
-  # @keymanapp/keyman-version is required in dist now but we need to copy it in manually
+  # @keymanapp/keyman-version is required in build/ now but we need to copy it in manually
   mkdir -p "$PRODBUILDTEMP/node_modules/@keymanapp/"
   cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/keyman-version/" "$PRODBUILDTEMP/node_modules/@keymanapp/"
 
   # We'll build in the $KEYMAN_ROOT/developer/bin/server/ folder
   rm -rf "$KEYMAN_ROOT/developer/bin/server/"
-  mkdir -p "$KEYMAN_ROOT/developer/bin/server/dist/"
-  cp -R dist/* "$KEYMAN_ROOT/developer/bin/server/dist/"
+  mkdir -p "$KEYMAN_ROOT/developer/bin/server/build/"
+  cp -R build/* "$KEYMAN_ROOT/developer/bin/server/build/"
   cp -R "$PRODBUILDTEMP"/* "$KEYMAN_ROOT/developer/bin/server/"
   rm -rf "$PRODBUILDTEMP"
-fi
+}
+builder_run_action clean:server        clean_server
+builder_run_action configure:server    configure_server
+builder_run_action build:server        build_server
+builder_run_action build:addins        build_addins
+builder_run_action test:server         mocha
+# builder_run_action test:addins       # no op
+builder_run_action installer:server    installer_server
+
+# TODO: consider 'watch'
+# function watch_server() {
+#   tsc-watch --onSuccess "node --inspect ." --onFailure "node --inspect ."
+# }
+# builder_run_action watch:server      watch_server
diff --git a/developer/src/server/package.json b/developer/src/server/package.json
index dd779db1a4..6d23e11bfb 100644
--- a/developer/src/server/package.json
+++ b/developer/src/server/package.json
@@ -1,13 +1,11 @@
 {
   "name": "@keymanapp/developer-server",
   "description": "Keyman Developer backend server",
-  "main": "dist/index.js",
+  "main": "build/src/index.js",
+  "type": "module",
   "scripts": {
-    "build": "tsc -b",
-    "postbuild": "npx gosh ./postbuild.sh",
-    "prod": "node .",
-    "test": "mocha",
-    "watch": "npm run postbuild && tsc-watch --onSuccess \"node --inspect .\" --onFailure \"node --inspect .\""
+    "build": "npx gosh ./build.sh build",
+    "test": "npx gosh ./build.sh test"
   },
   "license": "MIT",
   "dependencies": {
@@ -24,8 +22,8 @@
     "node-windows-trayicon": "keymanapp/node-windows-trayicon#keyman-16.0"
   },
   "devDependencies": {
-    "@keymanapp/resources-gosh": "*",
     "@keymanapp/keyman-version": "*",
+    "@keymanapp/resources-gosh": "*",
     "@types/chai": "^4.3.0",
     "@types/express": "^4.17.13",
     "@types/mocha": "^9.1.0",
diff --git a/developer/src/server/postbuild.sh b/developer/src/server/postbuild.sh
deleted file mode 100755
index e4b90e7e50..0000000000
--- a/developer/src/server/postbuild.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-# postbuild script run by npm during/after a build
-#
-
-# Exit on command failure and when using unset variables:
-set -eu
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-LOCAL_ROOT="$(dirname "$THIS_SCRIPT")"
-
-mkdir -p "$LOCAL_ROOT/dist/site/"
-mkdir -p "$LOCAL_ROOT/dist/win32/"
-cp -r "$LOCAL_ROOT/src/site/"** "$LOCAL_ROOT/dist/site/"
-cp -r "$LOCAL_ROOT/src/win32/"** "$LOCAL_ROOT/dist/win32/"
-
-replaceVersionStrings "$LOCAL_ROOT/dist/site/lib/sentry/init.js.in" "$LOCAL_ROOT/dist/site/lib/sentry/init.js"
-rm "$LOCAL_ROOT/dist/site/lib/sentry/init.js.in"
diff --git a/developer/src/server/src/config.ts b/developer/src/server/src/config.ts
index 5c67cd8c7e..6197cde05a 100644
--- a/developer/src/server/src/config.ts
+++ b/developer/src/server/src/config.ts
@@ -1,4 +1,4 @@
-import fs = require('fs');
+import * as fs from 'fs';
 
 export class Configuration {
   public readonly appDataPath: string;
diff --git a/developer/src/server/src/data.ts b/developer/src/server/src/data.ts
index fcc750495d..58763f0701 100644
--- a/developer/src/server/src/data.ts
+++ b/developer/src/server/src/data.ts
@@ -1,5 +1,5 @@
-import fs = require('fs');
-import { configuration } from './config';
+import * as fs from 'fs';
+import { configuration } from './config.js';
 
 export interface DebugObject {
   id: string;
diff --git a/developer/src/server/src/environment.ts b/developer/src/server/src/environment.ts
index be359f81d3..f3e0566024 100644
--- a/developer/src/server/src/environment.ts
+++ b/developer/src/server/src/environment.ts
@@ -1,5 +1,5 @@
-import { extractVersionData } from './version-data';
+import { extractVersionData } from './version-data.js';
 // TODO: environment should be just KEYMAN_VERSION
 
-const KEYMAN_VERSION = require("@keymanapp/keyman-version").KEYMAN_VERSION;
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
 export const environment = extractVersionData(KEYMAN_VERSION.VERSION_WITH_TAG);
diff --git a/developer/src/server/src/handlers/api/debugobject/get.ts b/developer/src/server/src/handlers/api/debugobject/get.ts
index 3da2896d55..a701ca3a8f 100644
--- a/developer/src/server/src/handlers/api/debugobject/get.ts
+++ b/developer/src/server/src/handlers/api/debugobject/get.ts
@@ -1,6 +1,6 @@
-import chalk = require('chalk');
-import express = require('express');
-import { DebugObject, isValidId, simplifyId } from "../../../data";
+import * as express from 'express';
+import chalk from 'chalk';
+import { DebugObject, isValidId, simplifyId } from "../../../data.js";
 
 export default function apiGet (data: { [id: string]: DebugObject }, req: express.Request, res: express.Response, next: express.NextFunction) {
   let id = req.query['id'] as string;
diff --git a/developer/src/server/src/handlers/api/debugobject/register.ts b/developer/src/server/src/handlers/api/debugobject/register.ts
index 9b52b577d8..a1f7a72cd4 100644
--- a/developer/src/server/src/handlers/api/debugobject/register.ts
+++ b/developer/src/server/src/handlers/api/debugobject/register.ts
@@ -1,9 +1,9 @@
-import express = require('express');
-import { DebugObject, isValidId, simplifyId } from "../../../data";
-import fs = require('fs');
-import crypto = require('crypto');
-import { configuration } from '../../../config';
-import chalk = require('chalk');
+import * as express from 'express';
+import { DebugObject, isValidId, simplifyId } from "../../../data.js";
+import * as fs from 'fs';
+import * as crypto from 'crypto';
+import { configuration } from '../../../config.js';
+import chalk from 'chalk';
 
 // We allow only 12 objects of each type in the cache
 const MAX_OBJECTS = 12;
diff --git a/developer/src/server/src/handlers/api/debugobject/unregister.ts b/developer/src/server/src/handlers/api/debugobject/unregister.ts
index 6473c2edbd..59a846d135 100644
--- a/developer/src/server/src/handlers/api/debugobject/unregister.ts
+++ b/developer/src/server/src/handlers/api/debugobject/unregister.ts
@@ -1,7 +1,7 @@
-import express = require('express');
-import { DebugObject, isValidId, simplifyId } from "../../../data";
-import fs = require('fs');
-import chalk = require('chalk');
+import * as express from 'express';
+import { DebugObject, isValidId, simplifyId } from "../../../data.js";
+import * as fs from 'fs';
+import chalk from 'chalk';
 
 export default function apiUnregister<O extends DebugObject> (root:{ [id: string]: O }, req: express.Request, res: express.Response, next: express.NextFunction) {
   let id = req.body['id'];
diff --git a/developer/src/server/src/handlers/api/font/register.ts b/developer/src/server/src/handlers/api/font/register.ts
index 14d60e8e12..8da3646a63 100644
--- a/developer/src/server/src/handlers/api/font/register.ts
+++ b/developer/src/server/src/handlers/api/font/register.ts
@@ -1,6 +1,6 @@
-import chalk = require('chalk');
-import express = require('express');
-import { data, DebugFont, simplifyId } from "../../../data";
+import chalk from 'chalk';
+import * as express from 'express';
+import { data, DebugFont, simplifyId } from "../../../data.js";
 
 export default function apiKeyboardRegister (req: express.Request, res: express.Response, next: express.NextFunction) {
   const id = simplifyId(req.body['id']);
diff --git a/developer/src/server/src/handlers/api/keyboard/register.ts b/developer/src/server/src/handlers/api/keyboard/register.ts
index 02bdd3dde7..bb89d7b4c3 100644
--- a/developer/src/server/src/handlers/api/keyboard/register.ts
+++ b/developer/src/server/src/handlers/api/keyboard/register.ts
@@ -1,6 +1,6 @@
-import chalk = require('chalk');
-import express = require('express');
-import { data, DebugKeyboard } from "../../../data";
+import chalk from 'chalk';
+import * as express from 'express';
+import { data, DebugKeyboard } from "../../../data.js";
 
 export default function apiKeyboardRegister (req: express.Request, res: express.Response, next: express.NextFunction) {
   const keyboard: DebugKeyboard = data.keyboards[req.body['id']];
diff --git a/developer/src/server/src/handlers/api/package/register.ts b/developer/src/server/src/handlers/api/package/register.ts
index c21340c7fe..cf6e238846 100644
--- a/developer/src/server/src/handlers/api/package/register.ts
+++ b/developer/src/server/src/handlers/api/package/register.ts
@@ -1,6 +1,6 @@
-import chalk = require('chalk');
-import express = require('express');
-import { data, DebugPackage } from "../../../data";
+import chalk from 'chalk';
+import * as express from 'express';
+import { data, DebugPackage } from "../../../data.js";
 
 export default function apiPackageRegister (req: express.Request, res: express.Response, next: express.NextFunction) {
   const kmp: DebugPackage = data.packages[req.body['id']];
diff --git a/developer/src/server/src/handlers/inc/keyboards-css.ts b/developer/src/server/src/handlers/inc/keyboards-css.ts
index 9302fd1164..ed4cc7e15b 100644
--- a/developer/src/server/src/handlers/inc/keyboards-css.ts
+++ b/developer/src/server/src/handlers/inc/keyboards-css.ts
@@ -1,6 +1,6 @@
-import express = require('express');
-import path = require('path');
-import { data, SiteData } from "../../data";
+import * as express from 'express';
+import * as path from 'path';
+import { data, SiteData } from "../../data.js";
 
 export default function handleIncKeyboardsCss (req: express.Request, res: express.Response) {
   let headers = {"Content-Type": "text/css"};
diff --git a/developer/src/server/src/handlers/inc/keyboards-js.ts b/developer/src/server/src/handlers/inc/keyboards-js.ts
index ee09fa0f37..3c42702bf9 100644
--- a/developer/src/server/src/handlers/inc/keyboards-js.ts
+++ b/developer/src/server/src/handlers/inc/keyboards-js.ts
@@ -1,5 +1,5 @@
-import express = require('express');
-import { SiteData, data } from "../../data";
+import * as express from 'express';
+import { SiteData, data } from "../../data.js";
 
 export default function handleIncKeyboardsJs (req: express.Request, res: express.Response) {
   let headers = {"Content-Type": "application/javascript"};
diff --git a/developer/src/server/src/handlers/inc/packages-json.ts b/developer/src/server/src/handlers/inc/packages-json.ts
index a27fb00615..44449a5ef6 100644
--- a/developer/src/server/src/handlers/inc/packages-json.ts
+++ b/developer/src/server/src/handlers/inc/packages-json.ts
@@ -1,6 +1,6 @@
-import express = require('express');
-import { data } from "../../data";
-import { environment } from '../../environment';
+import * as express from 'express';
+import { data } from "../../data.js";
+import { environment } from '../../environment.js';
 
 export default function handleIncPackagesJson (req: express.Request, res: express.Response) {
   const packages = Object.keys(data.packages).map(id => { return { id: id, filename: id+'.kmp', name: data.packages[id].name} });
diff --git a/developer/src/server/src/index.ts b/developer/src/server/src/index.ts
index a6d109f1ba..a297554573 100644
--- a/developer/src/server/src/index.ts
+++ b/developer/src/server/src/index.ts
@@ -1,21 +1,21 @@
-import { environment } from './environment';
+import { environment } from './environment.js';
 
-const Sentry = require("@sentry/node");
+import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://39b25a09410349a58fe12aaf721565af@o1005580.ingest.sentry.io/5983519',  // Keyman Developer
   environment: environment.versionEnvironment,
   release: environment.versionGitTag
 });
 
-import express = require('express');
-import ws = require('ws');
-import os = require('os');
-import multer = require('multer');
-import fs = require('fs');
-import setupRoutes from './routes';
-import { configuration } from './config';
-import tray from './tray';
-import chalk = require('chalk');
+import express from 'express';
+import * as ws from 'ws';
+import * as os from 'os';
+import multer from 'multer';
+import * as fs from 'fs';
+import setupRoutes from './routes.js';
+import { configuration } from './config.js';
+import tray from './tray.js';
+import chalk from 'chalk';
 
 const options = {
   ngrokLog: false,   // Set this to true if you need to see ngrok logs in the console
@@ -58,7 +58,7 @@ const upload = multer({ storage: multer.memoryStorage(), limits: { fileSize: 102
 
 /* Websockets */
 
-const wsServer = new ws.Server({ noServer: true });
+const wsServer = new ws.WebSocketServer({ noServer: true });
 wsServer.on('connection', socket => {
   socket.on('message', (message) => {
     console.debug('wsServer.socket.onmessage: '+message.toString());
@@ -87,7 +87,7 @@ server.on('upgrade', (request, socket, head) => {
 configuration.ngrokEndpoint = '';
 
 if(configuration.useNgrok && os.platform() == 'win32' && fs.existsSync(configuration.ngrokBinPath)) {
-  const ngrok = require('ngrok');
+  const ngrok: any = await import('ngrok');
   (async function() {
     configuration.ngrokEndpoint = await ngrok.connect({
       proto: 'http',
diff --git a/developer/src/server/src/ngrok.d.ts b/developer/src/server/src/ngrok.d.ts
new file mode 100644
index 0000000000..61f00d7a0b
--- /dev/null
+++ b/developer/src/server/src/ngrok.d.ts
@@ -0,0 +1 @@
+declare module 'ngrok';
\ No newline at end of file
diff --git a/developer/src/server/src/routes.ts b/developer/src/server/src/routes.ts
index fdd2e421aa..20c09f838f 100644
--- a/developer/src/server/src/routes.ts
+++ b/developer/src/server/src/routes.ts
@@ -1,21 +1,21 @@
-import express = require('express');
-import multer = require('multer');
-import ws = require('ws');
-import handleIncKeyboardsJs from './handlers/inc/keyboards-js';
-import { data, DebugFont, DebugKeyboard, DebugModel, DebugObject, DebugPackage, isValidId } from './data';
-import apiGet from './handlers/api/debugobject/get';
-import apiRegister, { apiRegisterFile } from './handlers/api/debugobject/register';
-import apiKeyboardRegister from './handlers/api/keyboard/register';
-import apiFontRegister from './handlers/api/font/register';
-import apiUnregister from './handlers/api/debugobject/unregister';
-import handleIncPackagesJson from './handlers/inc/packages-json';
-import apiPackageRegister from './handlers/api/package/register';
-import handleIncKeyboardsCss from './handlers/inc/keyboards-css';
-import { Environment } from './version-data';
-import { configuration } from './config';
-import chalk = require('chalk');
+import * as express from 'express';
+import * as ws from 'ws';
+import * as multer from 'multer';
+import handleIncKeyboardsJs from './handlers/inc/keyboards-js.js';
+import { data, DebugFont, DebugKeyboard, DebugModel, DebugObject, DebugPackage, isValidId } from './data.js';
+import apiGet from './handlers/api/debugobject/get.js';
+import apiRegister, { apiRegisterFile } from './handlers/api/debugobject/register.js';
+import apiKeyboardRegister from './handlers/api/keyboard/register.js';
+import apiFontRegister from './handlers/api/font/register.js';
+import apiUnregister from './handlers/api/debugobject/unregister.js';
+import handleIncPackagesJson from './handlers/inc/packages-json.js';
+import apiPackageRegister from './handlers/api/package/register.js';
+import handleIncKeyboardsCss from './handlers/inc/keyboards-css.js';
+import { Environment } from './version-data.js';
+import { configuration } from './config.js';
+import chalk from 'chalk';
 
-export default function setupRoutes(app: express.Express, upload: multer.Multer, wsServer: ws.Server, environment: Environment ) {
+export default function setupRoutes(app: express.Express, upload: multer.Multer, wsServer: ws.WebSocketServer, environment: Environment ) {
 
   /* Middleware - JSON and logging */
 
@@ -49,7 +49,7 @@ export default function setupRoutes(app: express.Express, upload: multer.Multer,
 
   /* All routes */
 
-  app.use('/', express.static('dist/site'));
+  app.use('/', express.static('build/src/site'));
 
   app.post('/upload', localhostOnly, upload.single('file'), (req, res, next) => {
     const name = req.file.originalname;
@@ -170,7 +170,7 @@ export default function setupRoutes(app: express.Express, upload: multer.Multer,
 
 /* Utility functions */
 
-function notifyClients(wsServer: ws.Server, res: express.Request, req: express.Response, next: express.NextFunction) {
+function notifyClients(wsServer: ws.WebSocketServer, res: express.Request, req: express.Response, next: express.NextFunction) {
   wsServer.clients.forEach(c => {
     c.send('refresh', (err) => {
       if(err) console.error(chalk.red('Websocket send error '+err.message));
diff --git a/developer/src/server/src/tray.ts b/developer/src/server/src/tray.ts
index 0c9c3bf2f6..780d9c792c 100644
--- a/developer/src/server/src/tray.ts
+++ b/developer/src/server/src/tray.ts
@@ -1,4 +1,4 @@
-import os = require('os');
+import * as os from 'os';
 
 class TrayStub {
   public start(localPort: number, ngrokAddress: string) {}
@@ -9,7 +9,7 @@ class TrayStub {
 let tray = new TrayStub();
 
 if(os.platform() == 'win32') {
-  const Win32Tray = require('./win32-tray');
+  const { Win32Tray } = await import('./win32-tray.js');
   tray = new Win32Tray();
 }
 
diff --git a/developer/src/server/src/version-data.test.ts b/developer/src/server/src/version-data.test.ts
index 5f33932b3b..9f7ebd385f 100644
--- a/developer/src/server/src/version-data.test.ts
+++ b/developer/src/server/src/version-data.test.ts
@@ -1,7 +1,7 @@
 import {assert} from 'chai';
 import 'mocha';
 
-import { extractVersionData } from './version-data';
+import { extractVersionData } from './version-data.js';
 
 
 describe('extractVersionData', function() {
diff --git a/developer/src/server/src/win32-tray.ts b/developer/src/server/src/win32-tray.ts
index b17c775f00..02ef0a4db8 100644
--- a/developer/src/server/src/win32-tray.ts
+++ b/developer/src/server/src/win32-tray.ts
@@ -1,14 +1,15 @@
-import path = require("path");
+import * as path from "path";
+import * as url from 'url';
 
 // TODO: this is a Windows-only tray icon. There are a number of
 // cross-platform solutions but none of them are wonderful. We
 // should replace this when we find a decent one.
 
-const WindowsTrayicon = require("./win32/trayicon");
-const WindowsConsole = require("./win32/console");
-const open = require("open");
+import WindowsTrayicon from "./win32/trayicon/index.js";
+import WindowsConsole from "./win32/console/index.js";
+import open from 'open';
 
-module.exports = class Win32Tray {
+export class Win32Tray {
   private myTrayApp: any;
 
   public restart(localPort: number, ngrokAddress: string) {
@@ -55,7 +56,7 @@ module.exports = class Win32Tray {
 
     this.myTrayApp = new WindowsTrayicon({
       title: "Keyman Developer Server",
-      icon: path.resolve(__dirname, "site", "favicon.ico"),
+      icon: path.resolve(url.fileURLToPath(new URL('.', import.meta.url)), "site", "favicon.ico"),
       menu: menu
     });
 
diff --git a/developer/src/server/src/win32/console/index.d.ts b/developer/src/server/src/win32/console/index.d.ts
deleted file mode 100644
index ac9e647fa4..0000000000
--- a/developer/src/server/src/win32/console/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module "node-hide-console-window" {
-    function hideConsole(): void
-
-    function showConsole(): void
-}
\ No newline at end of file
diff --git a/developer/src/server/src/win32/console/index.js b/developer/src/server/src/win32/console/index.js
deleted file mode 100644
index 26026657a0..0000000000
--- a/developer/src/server/src/win32/console/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const os = require('os');
-const {showConsole, hideConsole} = require(os.arch() == 'ia32' ? "./node-hide-console-window" : "./node-hide-console-window.x64");
-
-module.exports = {
-    showConsole,
-    hideConsole
-}
\ No newline at end of file
diff --git a/developer/src/server/src/win32/console/index.ts b/developer/src/server/src/win32/console/index.ts
new file mode 100644
index 0000000000..1bee9ada87
--- /dev/null
+++ b/developer/src/server/src/win32/console/index.ts
@@ -0,0 +1,6 @@
+import * as os from 'os';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+const {showConsole, hideConsole} = require(os.arch() == 'ia32' ? "./node-hide-console-window" : "./node-hide-console-window.x64");
+
+export default { showConsole, hideConsole };
diff --git a/developer/src/server/src/win32/trayicon/index.js b/developer/src/server/src/win32/trayicon/index.ts
similarity index 68%
rename from developer/src/server/src/win32/trayicon/index.js
rename to developer/src/server/src/win32/trayicon/index.ts
index 1e50cef3da..6b313af262 100644
--- a/developer/src/server/src/win32/trayicon/index.js
+++ b/developer/src/server/src/win32/trayicon/index.ts
@@ -1,8 +1,17 @@
-const os = require('os');
+import * as os from 'os';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 const { CTrayIconContainer } = require(os.arch() == 'ia32' ? "./addon" : "./addon.x64");
 
 class WindowsTrayicon {
-	constructor(options) {
+	__itemCallbacks: any[];
+	__icon: any;
+	__trayTitle: any;
+	__menuItems: any;
+	__nativeTray: any;
+
+
+	constructor(options: any) {
 		this.__itemCallbacks = [];
 		this.__icon = options.icon;
 		this.__trayTitle = options.title || "";
@@ -12,7 +21,7 @@ class WindowsTrayicon {
 		for (const item of this.__menuItems) {
 			this.__nativeTray.AddMenuItem(item.id, item.caption);
 		}
-		this.__nativeTray.OnMenuItem((id) => {
+		this.__nativeTray.OnMenuItem((id: any) => {
 			for (const cb of this.__itemCallbacks) {
 				cb(id);
 			}
@@ -23,15 +32,15 @@ class WindowsTrayicon {
 		}
 		this.__nativeTray.Start();
 	}
-	item(cb) {
+	item(cb: any) {
 		if ("function" === typeof cb) {
 			this.__itemCallbacks.push(cb);
 		}
 	}
-	balloon(title, text, timeout = 5000) {
+	balloon(title: any, text: any, timeout = 5000) {
 		return new Promise((resolve) => {
 			this.__nativeTray.ShowBalloon(title, text, timeout, () => {
-				resolve();
+				resolve(null);
 			})
 		});
 	}
@@ -40,4 +49,4 @@ class WindowsTrayicon {
 	}
 }
 
-module.exports = WindowsTrayicon;
+export default WindowsTrayicon;
diff --git a/developer/src/server/tsconfig.json b/developer/src/server/tsconfig.json
index 280b535dd9..701a97af6c 100644
--- a/developer/src/server/tsconfig.json
+++ b/developer/src/server/tsconfig.json
@@ -1,13 +1,13 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../../tsconfig.esm-base.json",
 
   "compilerOptions": {
-    "module": "commonjs",
     "target": "es2022",
-    "moduleResolution": "node",
     "sourceMap": true,
-    "outDir": "dist/",
+    "outDir": "build/src/",
     "rootDir": "src/",
+    "baseUrl": ".",
+
     "declaration": true,
     "alwaysStrict": true,
     "noImplicitThis": true,
@@ -16,6 +16,7 @@
     "strictBindCallApply": true,
     "strictFunctionTypes": true,
     "noUnusedLocals": true,
+    "allowJs": true,
     "lib": ["es2022"]
   },
   "include": [

From 81960a649606bc4dd380e86cc9d3fce9a0548b43 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 09:50:05 +0700
Subject: [PATCH 02/22] chore(developer): move server from cjs to esm tsconfig

---
 tsconfig.cjs.json | 2 --
 tsconfig.esm.json | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json
index 3dff61f8b6..2b8030ac76 100644
--- a/tsconfig.cjs.json
+++ b/tsconfig.cjs.json
@@ -9,8 +9,6 @@
     { "path": "./common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json" },
     { "path": "./common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json" },
 
-    { "path": "./developer/src/server/tsconfig.json" },
-
     { "path": "./resources/build/version/tsconfig.json" },
     { "path": "./resources/build/version/tsconfig.production.json" },
     // { "path": "./web/bulk_rendering/tsconfig.json" },
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index e0f72d8f8d..c58550431a 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -26,6 +26,7 @@
     { "path": "./developer/src/kmc-model-info/tsconfig.json" },
     { "path": "./developer/src/kmc-package/test/tsconfig.json" },
     { "path": "./developer/src/kmc-package/tsconfig.json" },
+    { "path": "./developer/src/server/tsconfig.json" },
 
     { "path": "./common/web/keyman-version" },
     { "path": "./common/web/types/" },

From e7ac526c69610b918d9d6bfa09785da9ad24b981 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 11:50:03 +0700
Subject: [PATCH 03/22] chore(developer): fixup Makefile for server

---
 developer/src/server/Makefile | 2 +-
 developer/src/server/build.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/developer/src/server/Makefile b/developer/src/server/Makefile
index 0a580ea3d6..eef7390804 100644
--- a/developer/src/server/Makefile
+++ b/developer/src/server/Makefile
@@ -5,7 +5,7 @@
 !include ..\Defines.mak
 
 build: .virtual
-    $(GIT_BASH_FOR_KEYMAN) build.sh --production --test
+    $(GIT_BASH_FOR_KEYMAN) build.sh configure build test installer
 
 clean: .virtual
 #TODO: move to build.sh `clean` target
diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index e609635b11..44cdbe1ca7 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -24,6 +24,10 @@ builder_describe "Build Keyman Developer Server" \
   ":server     Keyman Developer Server main program" \
   ":addins     Windows addins for GUI integration"
 
+builder_describe_internal_dependency \
+  publish:server       build:server \
+  publish:server       build:addins
+
 builder_describe_outputs \
   configure:server     /node_modules \
   configure:addins     /node_modules \

From f69f28bbd579c1b6b532df764491508dcef97b9b Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 11:04:36 +0700
Subject: [PATCH 04/22] chore(common): convert hextobin to ES Modules

Fixes #9675.
---
 common/tools/hextobin/build.sh      | 26 ++++----------------------
 common/tools/hextobin/hextobin.ts   |  5 +----
 common/tools/hextobin/package.json  | 10 ++--------
 common/tools/hextobin/tsconfig.json | 24 +++++++-----------------
 tsconfig.esm.json                   |  1 +
 5 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh
index 702e6610f0..48c8542510 100755
--- a/common/tools/hextobin/build.sh
+++ b/common/tools/hextobin/build.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
-#
-# Builds hextobin.js
-#
-
-# Exit on command failure and when using unset variables:
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
@@ -23,20 +16,9 @@ builder_describe "Build hextobin" clean configure build
 builder_describe_outputs \
   configure /node_modules \
   build     build/index.js
+
 builder_parse "$@"
 
-if builder_start_action clean; then
-  npm run clean
-  builder_finish_action success clean
-fi
-
-if builder_start_action configure; then
-  verify_npm_setup
-  builder_finish_action success configure
-fi
-
-if builder_start_action build; then
-  npm run build
-  builder_finish_action success build
-fi
-
+builder_run_action clean      rm -rf build/ node_modules/
+builder_run_action configure  verify_npm_setup
+builder_run_action build      tsc --build
diff --git a/common/tools/hextobin/hextobin.ts b/common/tools/hextobin/hextobin.ts
index 503b18d4b1..e53e08ddbc 100644
--- a/common/tools/hextobin/hextobin.ts
+++ b/common/tools/hextobin/hextobin.ts
@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import * as fs from 'fs';
-import * as rd from 'readline';
 import * as program from 'commander';
+import hextobin from './index.js';
 
 let inputFilename: string = "";
 let outputFilename: string = "";
@@ -43,6 +42,4 @@ function exitDueToUsageError(message: string): never  {
   return process.exit(64); // SysExits.EX_USAGE
 }
 
-import hextobin from './index';
-
 hextobin(inputFilename, outputFilename, {silent: false});
diff --git a/common/tools/hextobin/package.json b/common/tools/hextobin/package.json
index 155f829759..2ebb0e9f4e 100644
--- a/common/tools/hextobin/package.json
+++ b/common/tools/hextobin/package.json
@@ -1,6 +1,8 @@
 {
   "name": "@keymanapp/hextobin",
   "description": "hextobin conversion tool",
+  "type": "module",
+  "private": true,
   "keywords": [
     "keyman",
     "hex",
@@ -14,14 +16,6 @@
   "bin": {
     "hextobin": "build/hextobin.js"
   },
-  "scripts": {
-    "clean": "tsc -b --clean",
-    "build": "tsc -b"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
-  },
   "devDependencies": {
     "@types/node": "^18.7.18"
   }
diff --git a/common/tools/hextobin/tsconfig.json b/common/tools/hextobin/tsconfig.json
index e32831fe73..db0a65ae9d 100644
--- a/common/tools/hextobin/tsconfig.json
+++ b/common/tools/hextobin/tsconfig.json
@@ -1,19 +1,9 @@
 {
-    "extends": "../../../tsconfig-base.json",
-    "compilerOptions": {
-        "composite": true,
-        "declaration": true,
-        "target": "ES2020",
-        "module": "CommonJS",
-        "moduleResolution": "node",
-        "rootDir": ".",
-        "outDir": "build/",
-    },
-    "exclude": [
-        "node_modules"
-    ],
-    "files": [
-        "index.ts",
-        "hextobin.ts"
-    ]
+  "extends": "../../../tsconfig.esm-base.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "build/"
+  },
+  "exclude": ["node_modules"],
+  "files": ["index.ts", "hextobin.ts"]
 }
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index c58550431a..47c0ef92e9 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -47,5 +47,6 @@
     // { "path": "./web/tools/sourcemap-root/tsconfig.json" },
     { "path": "./common/web/lm-message-types/" },
     { "path": "./common/web/lm-worker/" },
+    { "path": "./common/tools/hextobin/" }
   ]
 }
\ No newline at end of file

From fbd9a4b5e899923e8e734c8e50ee6518711b7b4b Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 11:46:49 +0700
Subject: [PATCH 05/22] chore(common): convert resources/build/version to ES
 Modules

Fixes #9677.
---
 common/tools/hextobin/build.sh                |   2 +-
 package-lock.json                             | 149 ++++++------------
 resources/build/increment-version.sh          |   4 +-
 resources/build/version/.gitignore            |   1 +
 resources/build/version/build.sh              |  24 +++
 resources/build/version/package.json          |  11 +-
 resources/build/version/src/fixupHistory.ts   |   7 +-
 resources/build/version/src/index.ts          |  15 +-
 resources/build/version/src/reportHistory.ts  |   6 +-
 resources/build/version/tsconfig.json         |   7 +-
 .../build/version/tsconfig.production.json    |  25 ---
 tsconfig.esm.json                             |   4 +-
 12 files changed, 106 insertions(+), 149 deletions(-)
 create mode 100755 resources/build/version/build.sh
 delete mode 100644 resources/build/version/tsconfig.production.json

diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh
index 48c8542510..8df4f9b83a 100755
--- a/common/tools/hextobin/build.sh
+++ b/common/tools/hextobin/build.sh
@@ -15,7 +15,7 @@ cd "$THIS_SCRIPT_PATH"
 builder_describe "Build hextobin" clean configure build
 builder_describe_outputs \
   configure /node_modules \
-  build     build/index.js
+  build     /common/tools/hextobin/build/index.js
 
 builder_parse "$@"
 
diff --git a/package-lock.json b/package-lock.json
index 405d2154cf..dea220c34d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3830,6 +3830,21 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/yargs": {
+      "version": "17.0.26",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.26.tgz",
+      "integrity": "sha512-Y3vDy2X6zw/ZCumcwLpdhM5L7jmyGpmBCTYMHDLqT2IKVMYRRLdv6ZakA+wxhra6Z/3bwhNbNl9bDGXaFU+6rw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz",
+      "integrity": "sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==",
+      "dev": true
+    },
     "node_modules/@types/yauzl": {
       "version": "2.9.2",
       "license": "MIT",
@@ -4753,6 +4768,7 @@
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -5148,6 +5164,7 @@
     },
     "node_modules/decamelize": {
       "version": "1.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -5884,7 +5901,6 @@
     },
     "node_modules/escalade": {
       "version": "3.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -9573,6 +9589,7 @@
     },
     "node_modules/p-try": {
       "version": "2.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -9603,6 +9620,7 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -9930,6 +9948,7 @@
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/requirejs": {
@@ -10170,6 +10189,7 @@
     },
     "node_modules/set-blocking": {
       "version": "2.0.0",
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/set-immediate-shim": {
@@ -11172,6 +11192,7 @@
     },
     "node_modules/which-module": {
       "version": "2.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/which-typed-array": {
@@ -11231,7 +11252,6 @@
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -11247,7 +11267,6 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-regex": {
       "version": "5.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -11255,7 +11274,6 @@
     },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -11263,7 +11281,6 @@
     },
     "node_modules/wrap-ansi/node_modules/string-width": {
       "version": "4.2.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -11276,7 +11293,6 @@
     },
     "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "6.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.0"
@@ -11337,7 +11353,6 @@
     },
     "node_modules/y18n": {
       "version": "5.0.8",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=10"
@@ -11497,16 +11512,14 @@
         "@actions/core": "^1.9.1",
         "@actions/github": "^2.1.0",
         "typescript": "^4.9.5",
-        "yargs": "^15.1.0"
+        "yargs": "^17.7.2"
       },
       "devDependencies": {
         "@types/node": "^13.7.0",
         "@types/semver": "^7.1.0",
+        "@types/yargs": "^17.0.26",
         "semver": "^7.5.2",
         "ts-node": "^10.9.1"
-      },
-      "engines": {
-        "node": ">=16.0"
       }
     },
     "resources/build/version/node_modules/@types/node": {
@@ -11516,74 +11529,37 @@
     },
     "resources/build/version/node_modules/ansi-regex": {
       "version": "5.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "resources/build/version/node_modules/cliui": {
-      "version": "6.0.0",
-      "license": "ISC",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "resources/build/version/node_modules/find-up": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "resources/build/version/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "resources/build/version/node_modules/locate-path": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "resources/build/version/node_modules/p-limit": {
-      "version": "2.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "resources/build/version/node_modules/p-locate": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
         "node": ">=8"
       }
     },
     "resources/build/version/node_modules/string-width": {
       "version": "4.2.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -11595,7 +11571,8 @@
     },
     "resources/build/version/node_modules/strip-ansi": {
       "version": "6.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -11603,51 +11580,29 @@
         "node": ">=8"
       }
     },
-    "resources/build/version/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "resources/build/version/node_modules/y18n": {
-      "version": "4.0.3",
-      "license": "ISC"
-    },
     "resources/build/version/node_modules/yargs": {
-      "version": "15.4.1",
-      "license": "MIT",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "resources/build/version/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "license": "ISC",
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
     "resources/gosh": {
diff --git a/resources/build/increment-version.sh b/resources/build/increment-version.sh
index 445459da16..0f5e2d0608 100755
--- a/resources/build/increment-version.sh
+++ b/resources/build/increment-version.sh
@@ -88,9 +88,7 @@ echo "increment-version.sh: building resources/build/version"
 pushd "$KEYMAN_ROOT"
 npm ci
 
-pushd "$KEYMAN_ROOT/resources/build/version"
-npm run build:ts
-popd
+"$KEYMAN_ROOT/resources/build/version/build.sh"
 
 echo "increment-version.sh: running resources/build/version"
 pushd "$KEYMAN_ROOT"
diff --git a/resources/build/version/.gitignore b/resources/build/version/.gitignore
index 687e3299fe..3e42060cc6 100644
--- a/resources/build/version/.gitignore
+++ b/resources/build/version/.gitignore
@@ -47,3 +47,4 @@ coverage
 # Build output
 dist
 lib
+build
diff --git a/resources/build/version/build.sh b/resources/build/version/build.sh
new file mode 100755
index 0000000000..64892803bc
--- /dev/null
+++ b/resources/build/version/build.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+
+# This script runs from its own folder
+cd "$THIS_SCRIPT_PATH"
+
+################################ Main script ################################
+
+builder_describe "Build version tooling" clean configure build
+builder_describe_outputs \
+  configure /resources/build/version/node_modules \
+  build     /resources/build/version/build/src/index.js
+
+builder_parse "$@"
+
+builder_run_action clean      rm -rf build/ node_modules/ dist/ lib/
+builder_run_action configure  verify_npm_setup
+builder_run_action build      tsc --build
diff --git a/resources/build/version/package.json b/resources/build/version/package.json
index 93911e7970..57264f02e4 100644
--- a/resources/build/version/package.json
+++ b/resources/build/version/package.json
@@ -1,25 +1,24 @@
 {
+  "description": "Automatically updates HISTORY.md based on pull requests",
+  "type": "module",
   "dependencies": {
     "@actions/core": "^1.9.1",
     "@actions/github": "^2.1.0",
     "typescript": "^4.9.5",
-    "yargs": "^15.1.0"
+    "yargs": "^17.7.2"
   },
-  "description": "Automatically updates HISTORY.md based on pull requests",
   "devDependencies": {
     "@types/node": "^13.7.0",
     "@types/semver": "^7.1.0",
+    "@types/yargs": "^17.0.26",
     "semver": "^7.5.2",
     "ts-node": "^10.9.1"
   },
-  "engines": {
-    "node": ">=16.0"
-  },
   "files": [
     "src"
   ],
   "license": "MIT",
-  "main": "lib/index.js",
+  "main": "build/src/index.js",
   "name": "@keymanapp/auto-history-action",
   "private": true,
   "scripts": {
diff --git a/resources/build/version/src/fixupHistory.ts b/resources/build/version/src/fixupHistory.ts
index 2145fa9465..9f48f4851d 100644
--- a/resources/build/version/src/fixupHistory.ts
+++ b/resources/build/version/src/fixupHistory.ts
@@ -5,7 +5,7 @@ import {
 import { GitHub } from '@actions/github';
 import { readFileSync, writeFileSync } from 'fs';
 import { gt } from 'semver';
-import { reportHistory } from './reportHistory';
+import { reportHistory } from './reportHistory.js';
 
 interface PRInformation {
   title: string;
@@ -42,7 +42,8 @@ const splicePullsIntoHistory = async (pulls: PRInformation[]): Promise<{count: n
   const versionMatch = new RegExp(`^## ${version} ${tier}`, 'i');
 
   let historyChunks: { heading: string[]; newer: string[]; current: string[]; older: string[] } = {heading:[], newer:[], current:[], older:[]};
-  let state = "heading";
+  type ChunkType = keyof typeof historyChunks;
+  let state: ChunkType = "heading";
   for(const line of history) {
     if(line.match(versionMatch)) {
       // We are in the correct section of history
@@ -90,7 +91,7 @@ const splicePullsIntoHistory = async (pulls: PRInformation[]): Promise<{count: n
 
     let found = false;
     // Look for the PR in any other chunk -- can be found with merges of master into PR or chained PRs
-    for(const chunk of ['newer','current','older']) {
+    for(const chunk of ['newer','current','older'] as ChunkType[]) {
       for(const line of historyChunks[chunk]) {
         if(line.match(pullNumberRe)) {
           found = true;
diff --git a/resources/build/version/src/index.ts b/resources/build/version/src/index.ts
index 3d5f896650..69776231c6 100644
--- a/resources/build/version/src/index.ts
+++ b/resources/build/version/src/index.ts
@@ -1,13 +1,14 @@
 import { info as logInfo } from '@actions/core';
 import { GitHub } from '@actions/github';
 
-import { sendCommentToPullRequestAndRelatedIssues, fixupHistory } from './fixupHistory';
-import { incrementVersion } from './incrementVersion';
-const yargs = require('yargs');
+import { sendCommentToPullRequestAndRelatedIssues, fixupHistory } from './fixupHistory.js';
+import { incrementVersion } from './incrementVersion.js';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 import { readFileSync } from 'fs';
-import { reportHistory } from './reportHistory';
+import { reportHistory } from './reportHistory.js';
 
-const argv = yargs
+const argv = await yargs(hideBin(process.argv))
   .command(['history'], 'Fixes up HISTORY.md with pull request data')
   .command(['version'], 'Increments the current patch version in VERSION.md')
   .command(['report-history'], 'Print list of outstanding PRs waiting for the next build')
@@ -81,10 +82,10 @@ const main = async (): Promise<void> => {
 
   if(argv._.includes('report-history')) {
     let pulls = await reportHistory(octokit, argv.base, argv.force, argv['github-pr'], argv.from, argv.to);
-    let versions = {};
+    let versions: {[index:string]:any} = {};
     pulls.forEach((item) => {
       if(typeof item.version == 'string') {
-        if(typeof versions[item.version] == 'undefined')  {
+        if(typeof (versions)[item.version] == 'undefined')  {
           versions[item.version] = {data: item.tag_data, pulls: []};
        }
        // We want to invert the order of the pulls as we go to
diff --git a/resources/build/version/src/reportHistory.ts b/resources/build/version/src/reportHistory.ts
index bf72606333..2fae1ab628 100644
--- a/resources/build/version/src/reportHistory.ts
+++ b/resources/build/version/src/reportHistory.ts
@@ -2,8 +2,8 @@ import { warning as logWarning, info as logInfo } from '@actions/core';
 
 import { GitHub } from '@actions/github';
 
-import { findLastHistoryPR, getAssociatedPR} from './graphql/queries';
-import { spawnChild } from './util/spawnAwait';
+import { findLastHistoryPR, getAssociatedPR} from './graphql/queries.js';
+import { spawnChild } from './util/spawnAwait.js';
 
 const getPullRequestInformation = async (
   octokit: GitHub, base: string
@@ -67,7 +67,7 @@ const getAssociatedPRInformation = async (
     }
   }: any = response;
 
-  const node = nodes.find(node => node.state == 'MERGED');
+  const node = nodes.find((node:any) => node.state == 'MERGED');
   return node ? { title: node.title, number: node.number } : undefined;
 };
 
diff --git a/resources/build/version/tsconfig.json b/resources/build/version/tsconfig.json
index 655da5e8af..9f537c799d 100644
--- a/resources/build/version/tsconfig.json
+++ b/resources/build/version/tsconfig.json
@@ -1,7 +1,8 @@
 {
+  "extends": "../../../tsconfig.esm-base.json",
   "compilerOptions": {
-    "rootDir": "."
+    "rootDir": ".",
+    "outDir": "build/",
   },
-  "extends": "./tsconfig.production.json",
-  "include": ["./**/*"]
+  "include": ["./**/*.ts"]
 }
diff --git a/resources/build/version/tsconfig.production.json b/resources/build/version/tsconfig.production.json
deleted file mode 100644
index 2189a3042d..0000000000
--- a/resources/build/version/tsconfig.production.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "alwaysStrict": true,
-    "charset": "utf-8",
-    "declaration": true,
-    "declarationMap": true,
-    "downlevelIteration": true,
-    "forceConsistentCasingInFileNames": true,
-    "lib": ["es2017"],
-    "module": "commonjs",
-    "noImplicitAny": false,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "outDir": "lib",
-    "pretty": true,
-    "rootDir": "src",
-    "sourceMap": true,
-    "strict": true,
-    "strictNullChecks": true,
-    "target": "es2017"
-  },
-  "files": ["./src/index.ts"]
-}
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 47c0ef92e9..0252447c63 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -47,6 +47,8 @@
     // { "path": "./web/tools/sourcemap-root/tsconfig.json" },
     { "path": "./common/web/lm-message-types/" },
     { "path": "./common/web/lm-worker/" },
-    { "path": "./common/tools/hextobin/" }
+    { "path": "./common/tools/hextobin/" },
+
+    { "path": "./resources/build/version/" },
   ]
 }
\ No newline at end of file

From f432cab85193ce5ace9c65ab06d328e0f7263854 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 12:06:46 +0700
Subject: [PATCH 06/22] chore(common): keyman-version now generates only es
 module

---
 common/web/keyman-version/build-bundler.js | 22 ---------
 common/web/keyman-version/build.sh         | 53 ++++------------------
 common/web/keyman-version/package.json     | 13 +-----
 common/web/keyman-version/tsconfig.json    | 10 +---
 package-lock.json                          |  7 ---
 5 files changed, 13 insertions(+), 92 deletions(-)
 delete mode 100644 common/web/keyman-version/build-bundler.js

diff --git a/common/web/keyman-version/build-bundler.js b/common/web/keyman-version/build-bundler.js
deleted file mode 100644
index a5f26a44df..0000000000
--- a/common/web/keyman-version/build-bundler.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Bundles @keymanapp/keyman-version as a single-file CommonJS module for components
- * still in need of it.
- */
-
-import esbuild from 'esbuild';
-
-// Bundles to a compact ESModule
-esbuild.buildSync({
-  entryPoints: ['build/version.inc.js'],
-  bundle: true,
-  sourcemap: true,
-  //minify: true,    // No need to minify a module.
-  //keepNames: true,
-  format: "cjs",
-  // Sets 'common/web' as a root folder for module resolution;
-  // this allows the keyman-version import to resolve.
-  nodePaths: ['..'],
-  outfile: "build/version.inc.cjs",
-  tsconfig: 'tsconfig.json',
-  target: "es5"
-});
\ No newline at end of file
diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index 939709732c..28dd297211 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
-#
-# Builds the include script for the current Keyman version.
-#
-
-# Exit on command failure and when using unset variables:
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
@@ -13,6 +6,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # This script runs from its own folder
 cd "$THIS_SCRIPT_PATH"
@@ -24,9 +18,7 @@ builder_describe "Build the include script for current Keyman version" \
   clean \
   build \
   "pack                      build a local .tgz pack for testing" \
-  "publish                   publish to npm" \
-  test \
-  --dry-run
+  "publish                   publish to npm"
 
 builder_describe_outputs \
   configure "/node_modules" \
@@ -34,21 +26,7 @@ builder_describe_outputs \
 
 builder_parse "$@"
 
-
-if builder_start_action configure; then
-  verify_npm_setup
-  builder_finish_action success configure
-fi
-
-if builder_start_action clean; then
-  npm run clean
-  rm -f ./version.inc.ts
-  rm -f ./keyman-version.mts
-  rm -rf build
-  builder_finish_action success clean
-fi
-
-if builder_start_action build; then
+function do_build() {
   # Generate version.inc.ts
   echo "
 // Generated by common/web/keyman-version/build.sh
@@ -72,22 +50,11 @@ export class KEYMAN_VERSION {
 export default KEYMAN_VERSION;
   " > ./version.inc.ts
 
-  tsc -b $builder_verbose
-  # kmlmc (the lexical model compiler) relies on a Node-based import, but after some of the earlier
-  # ES-modularization work, our main output's an ES module.  Fortunately, esbuild can provide an easy stopgap.
+  tsc --build $builder_verbose
+}
 
-  # Generates a CommonJS variant (in case other modules still need it).
-  node ./build-bundler.js
-
-  builder_finish_action success build
-fi
-
-if builder_start_action publish; then
-  . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-  builder_publish_to_npm
-  builder_finish_action success publish
-elif builder_start_action pack; then
-  . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-  builder_publish_to_pack
-  builder_finish_action success pack
-fi
+builder_run_action clean        rm -rf version.inc.ts keyman-version.mts build/
+builder_run_action configure    verify_npm_setup
+builder_run_action build        do_build
+builder_run_action publish      builder_publish_to_npm
+builder_run_action pack         builder_publish_to_pack
diff --git a/common/web/keyman-version/package.json b/common/web/keyman-version/package.json
index 0ec9c1322b..ded749528c 100644
--- a/common/web/keyman-version/package.json
+++ b/common/web/keyman-version/package.json
@@ -1,26 +1,15 @@
 {
   "name": "@keymanapp/keyman-version",
   "description": "Keyman global version data",
-  "main": "./build/version.inc.cjs",
   "exports": {
-    ".": {
-      "import": "./build/version.inc.js",
-      "require": "./build/version.inc.cjs"
-    },
-    "./build/version.inc.cjs": "./build/version.inc.cjs"
+    ".": "./build/version.inc.js"
   },
   "files": [
     "/build/"
   ],
-  "scripts": {
-    "build": "echo 'Building @keymanapp/keyman-version' && tsc -b",
-    "clean": "tsc -b --clean",
-    "tsc": "tsc"
-  },
   "license": "MIT",
   "type": "module",
   "devDependencies": {
-    "@types/node": "^20.4.1",
     "typescript": "^4.9.5"
   }
 }
diff --git a/common/web/keyman-version/tsconfig.json b/common/web/keyman-version/tsconfig.json
index 8618c6dd92..03478f6021 100644
--- a/common/web/keyman-version/tsconfig.json
+++ b/common/web/keyman-version/tsconfig.json
@@ -1,17 +1,11 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../../tsconfig.esm-base.json",
 
   "compilerOptions": {
-    "allowJs": false,
-    "declaration": true,
-    "module": "es6",
-    "sourceMap": true,
     "outDir": "./build",
-    "lib": ["es6"],
-    "target": "es5",
-    "downlevelIteration": true,
     "rootDir": "."
   },
+
   "include": [
     "version.inc.ts"
   ]
diff --git a/package-lock.json b/package-lock.json
index dea220c34d..10b7dea423 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -271,16 +271,9 @@
       "name": "@keymanapp/keyman-version",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "^20.4.1",
         "typescript": "^4.9.5"
       }
     },
-    "common/web/keyman-version/node_modules/@types/node": {
-      "version": "20.4.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.1.tgz",
-      "integrity": "sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==",
-      "dev": true
-    },
     "common/web/lm-message-types": {
       "name": "@keymanapp/lm-message-types",
       "license": "MIT",

From 253dea0ba66f2bb03bdde4787ea6972689813d20 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 12:21:10 +0700
Subject: [PATCH 07/22] chore(common): fixup Commander call

---
 common/tools/hextobin/hextobin.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/tools/hextobin/hextobin.ts b/common/tools/hextobin/hextobin.ts
index e53e08ddbc..6bf56c7953 100644
--- a/common/tools/hextobin/hextobin.ts
+++ b/common/tools/hextobin/hextobin.ts
@@ -1,10 +1,11 @@
 #!/usr/bin/env node
-import * as program from 'commander';
+import { Command } from 'commander';
 import hextobin from './index.js';
 
 let inputFilename: string = "";
 let outputFilename: string = "";
 
+const program = new Command();
 program
   .description(
 `Will convert the input file which is a hex dump to the output file. Hex dump can contain

From 8c28b96c9f40cc92d05b8b2d8a1b9e6bc41b5d96 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 11:46:49 +0700
Subject: [PATCH 08/22] chore(common): convert resources/build/version to ES
 Modules

Fixes #9677.
---
 common/tools/hextobin/build.sh                |   2 +-
 package-lock.json                             | 149 ++++++------------
 resources/build/increment-version.sh          |   4 +-
 resources/build/version/.gitignore            |   1 +
 resources/build/version/build.sh              |  24 +++
 resources/build/version/package.json          |  11 +-
 resources/build/version/src/fixupHistory.ts   |   7 +-
 resources/build/version/src/index.ts          |  15 +-
 resources/build/version/src/reportHistory.ts  |   6 +-
 resources/build/version/tsconfig.json         |   7 +-
 .../build/version/tsconfig.production.json    |  25 ---
 tsconfig.esm.json                             |   4 +-
 12 files changed, 106 insertions(+), 149 deletions(-)
 create mode 100755 resources/build/version/build.sh
 delete mode 100644 resources/build/version/tsconfig.production.json

diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh
index 48c8542510..8df4f9b83a 100755
--- a/common/tools/hextobin/build.sh
+++ b/common/tools/hextobin/build.sh
@@ -15,7 +15,7 @@ cd "$THIS_SCRIPT_PATH"
 builder_describe "Build hextobin" clean configure build
 builder_describe_outputs \
   configure /node_modules \
-  build     build/index.js
+  build     /common/tools/hextobin/build/index.js
 
 builder_parse "$@"
 
diff --git a/package-lock.json b/package-lock.json
index 405d2154cf..dea220c34d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3830,6 +3830,21 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/yargs": {
+      "version": "17.0.26",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.26.tgz",
+      "integrity": "sha512-Y3vDy2X6zw/ZCumcwLpdhM5L7jmyGpmBCTYMHDLqT2IKVMYRRLdv6ZakA+wxhra6Z/3bwhNbNl9bDGXaFU+6rw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz",
+      "integrity": "sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==",
+      "dev": true
+    },
     "node_modules/@types/yauzl": {
       "version": "2.9.2",
       "license": "MIT",
@@ -4753,6 +4768,7 @@
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -5148,6 +5164,7 @@
     },
     "node_modules/decamelize": {
       "version": "1.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -5884,7 +5901,6 @@
     },
     "node_modules/escalade": {
       "version": "3.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -9573,6 +9589,7 @@
     },
     "node_modules/p-try": {
       "version": "2.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -9603,6 +9620,7 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -9930,6 +9948,7 @@
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/requirejs": {
@@ -10170,6 +10189,7 @@
     },
     "node_modules/set-blocking": {
       "version": "2.0.0",
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/set-immediate-shim": {
@@ -11172,6 +11192,7 @@
     },
     "node_modules/which-module": {
       "version": "2.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/which-typed-array": {
@@ -11231,7 +11252,6 @@
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -11247,7 +11267,6 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-regex": {
       "version": "5.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -11255,7 +11274,6 @@
     },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -11263,7 +11281,6 @@
     },
     "node_modules/wrap-ansi/node_modules/string-width": {
       "version": "4.2.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -11276,7 +11293,6 @@
     },
     "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "6.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.0"
@@ -11337,7 +11353,6 @@
     },
     "node_modules/y18n": {
       "version": "5.0.8",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=10"
@@ -11497,16 +11512,14 @@
         "@actions/core": "^1.9.1",
         "@actions/github": "^2.1.0",
         "typescript": "^4.9.5",
-        "yargs": "^15.1.0"
+        "yargs": "^17.7.2"
       },
       "devDependencies": {
         "@types/node": "^13.7.0",
         "@types/semver": "^7.1.0",
+        "@types/yargs": "^17.0.26",
         "semver": "^7.5.2",
         "ts-node": "^10.9.1"
-      },
-      "engines": {
-        "node": ">=16.0"
       }
     },
     "resources/build/version/node_modules/@types/node": {
@@ -11516,74 +11529,37 @@
     },
     "resources/build/version/node_modules/ansi-regex": {
       "version": "5.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "resources/build/version/node_modules/cliui": {
-      "version": "6.0.0",
-      "license": "ISC",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "resources/build/version/node_modules/find-up": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "resources/build/version/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "resources/build/version/node_modules/locate-path": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "resources/build/version/node_modules/p-limit": {
-      "version": "2.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "resources/build/version/node_modules/p-locate": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
         "node": ">=8"
       }
     },
     "resources/build/version/node_modules/string-width": {
       "version": "4.2.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -11595,7 +11571,8 @@
     },
     "resources/build/version/node_modules/strip-ansi": {
       "version": "6.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -11603,51 +11580,29 @@
         "node": ">=8"
       }
     },
-    "resources/build/version/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "resources/build/version/node_modules/y18n": {
-      "version": "4.0.3",
-      "license": "ISC"
-    },
     "resources/build/version/node_modules/yargs": {
-      "version": "15.4.1",
-      "license": "MIT",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "resources/build/version/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "license": "ISC",
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
     "resources/gosh": {
diff --git a/resources/build/increment-version.sh b/resources/build/increment-version.sh
index 445459da16..0f5e2d0608 100755
--- a/resources/build/increment-version.sh
+++ b/resources/build/increment-version.sh
@@ -88,9 +88,7 @@ echo "increment-version.sh: building resources/build/version"
 pushd "$KEYMAN_ROOT"
 npm ci
 
-pushd "$KEYMAN_ROOT/resources/build/version"
-npm run build:ts
-popd
+"$KEYMAN_ROOT/resources/build/version/build.sh"
 
 echo "increment-version.sh: running resources/build/version"
 pushd "$KEYMAN_ROOT"
diff --git a/resources/build/version/.gitignore b/resources/build/version/.gitignore
index 687e3299fe..3e42060cc6 100644
--- a/resources/build/version/.gitignore
+++ b/resources/build/version/.gitignore
@@ -47,3 +47,4 @@ coverage
 # Build output
 dist
 lib
+build
diff --git a/resources/build/version/build.sh b/resources/build/version/build.sh
new file mode 100755
index 0000000000..64892803bc
--- /dev/null
+++ b/resources/build/version/build.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+
+# This script runs from its own folder
+cd "$THIS_SCRIPT_PATH"
+
+################################ Main script ################################
+
+builder_describe "Build version tooling" clean configure build
+builder_describe_outputs \
+  configure /resources/build/version/node_modules \
+  build     /resources/build/version/build/src/index.js
+
+builder_parse "$@"
+
+builder_run_action clean      rm -rf build/ node_modules/ dist/ lib/
+builder_run_action configure  verify_npm_setup
+builder_run_action build      tsc --build
diff --git a/resources/build/version/package.json b/resources/build/version/package.json
index 93911e7970..57264f02e4 100644
--- a/resources/build/version/package.json
+++ b/resources/build/version/package.json
@@ -1,25 +1,24 @@
 {
+  "description": "Automatically updates HISTORY.md based on pull requests",
+  "type": "module",
   "dependencies": {
     "@actions/core": "^1.9.1",
     "@actions/github": "^2.1.0",
     "typescript": "^4.9.5",
-    "yargs": "^15.1.0"
+    "yargs": "^17.7.2"
   },
-  "description": "Automatically updates HISTORY.md based on pull requests",
   "devDependencies": {
     "@types/node": "^13.7.0",
     "@types/semver": "^7.1.0",
+    "@types/yargs": "^17.0.26",
     "semver": "^7.5.2",
     "ts-node": "^10.9.1"
   },
-  "engines": {
-    "node": ">=16.0"
-  },
   "files": [
     "src"
   ],
   "license": "MIT",
-  "main": "lib/index.js",
+  "main": "build/src/index.js",
   "name": "@keymanapp/auto-history-action",
   "private": true,
   "scripts": {
diff --git a/resources/build/version/src/fixupHistory.ts b/resources/build/version/src/fixupHistory.ts
index 2145fa9465..9f48f4851d 100644
--- a/resources/build/version/src/fixupHistory.ts
+++ b/resources/build/version/src/fixupHistory.ts
@@ -5,7 +5,7 @@ import {
 import { GitHub } from '@actions/github';
 import { readFileSync, writeFileSync } from 'fs';
 import { gt } from 'semver';
-import { reportHistory } from './reportHistory';
+import { reportHistory } from './reportHistory.js';
 
 interface PRInformation {
   title: string;
@@ -42,7 +42,8 @@ const splicePullsIntoHistory = async (pulls: PRInformation[]): Promise<{count: n
   const versionMatch = new RegExp(`^## ${version} ${tier}`, 'i');
 
   let historyChunks: { heading: string[]; newer: string[]; current: string[]; older: string[] } = {heading:[], newer:[], current:[], older:[]};
-  let state = "heading";
+  type ChunkType = keyof typeof historyChunks;
+  let state: ChunkType = "heading";
   for(const line of history) {
     if(line.match(versionMatch)) {
       // We are in the correct section of history
@@ -90,7 +91,7 @@ const splicePullsIntoHistory = async (pulls: PRInformation[]): Promise<{count: n
 
     let found = false;
     // Look for the PR in any other chunk -- can be found with merges of master into PR or chained PRs
-    for(const chunk of ['newer','current','older']) {
+    for(const chunk of ['newer','current','older'] as ChunkType[]) {
       for(const line of historyChunks[chunk]) {
         if(line.match(pullNumberRe)) {
           found = true;
diff --git a/resources/build/version/src/index.ts b/resources/build/version/src/index.ts
index 3d5f896650..69776231c6 100644
--- a/resources/build/version/src/index.ts
+++ b/resources/build/version/src/index.ts
@@ -1,13 +1,14 @@
 import { info as logInfo } from '@actions/core';
 import { GitHub } from '@actions/github';
 
-import { sendCommentToPullRequestAndRelatedIssues, fixupHistory } from './fixupHistory';
-import { incrementVersion } from './incrementVersion';
-const yargs = require('yargs');
+import { sendCommentToPullRequestAndRelatedIssues, fixupHistory } from './fixupHistory.js';
+import { incrementVersion } from './incrementVersion.js';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 import { readFileSync } from 'fs';
-import { reportHistory } from './reportHistory';
+import { reportHistory } from './reportHistory.js';
 
-const argv = yargs
+const argv = await yargs(hideBin(process.argv))
   .command(['history'], 'Fixes up HISTORY.md with pull request data')
   .command(['version'], 'Increments the current patch version in VERSION.md')
   .command(['report-history'], 'Print list of outstanding PRs waiting for the next build')
@@ -81,10 +82,10 @@ const main = async (): Promise<void> => {
 
   if(argv._.includes('report-history')) {
     let pulls = await reportHistory(octokit, argv.base, argv.force, argv['github-pr'], argv.from, argv.to);
-    let versions = {};
+    let versions: {[index:string]:any} = {};
     pulls.forEach((item) => {
       if(typeof item.version == 'string') {
-        if(typeof versions[item.version] == 'undefined')  {
+        if(typeof (versions)[item.version] == 'undefined')  {
           versions[item.version] = {data: item.tag_data, pulls: []};
        }
        // We want to invert the order of the pulls as we go to
diff --git a/resources/build/version/src/reportHistory.ts b/resources/build/version/src/reportHistory.ts
index bf72606333..2fae1ab628 100644
--- a/resources/build/version/src/reportHistory.ts
+++ b/resources/build/version/src/reportHistory.ts
@@ -2,8 +2,8 @@ import { warning as logWarning, info as logInfo } from '@actions/core';
 
 import { GitHub } from '@actions/github';
 
-import { findLastHistoryPR, getAssociatedPR} from './graphql/queries';
-import { spawnChild } from './util/spawnAwait';
+import { findLastHistoryPR, getAssociatedPR} from './graphql/queries.js';
+import { spawnChild } from './util/spawnAwait.js';
 
 const getPullRequestInformation = async (
   octokit: GitHub, base: string
@@ -67,7 +67,7 @@ const getAssociatedPRInformation = async (
     }
   }: any = response;
 
-  const node = nodes.find(node => node.state == 'MERGED');
+  const node = nodes.find((node:any) => node.state == 'MERGED');
   return node ? { title: node.title, number: node.number } : undefined;
 };
 
diff --git a/resources/build/version/tsconfig.json b/resources/build/version/tsconfig.json
index 655da5e8af..9f537c799d 100644
--- a/resources/build/version/tsconfig.json
+++ b/resources/build/version/tsconfig.json
@@ -1,7 +1,8 @@
 {
+  "extends": "../../../tsconfig.esm-base.json",
   "compilerOptions": {
-    "rootDir": "."
+    "rootDir": ".",
+    "outDir": "build/",
   },
-  "extends": "./tsconfig.production.json",
-  "include": ["./**/*"]
+  "include": ["./**/*.ts"]
 }
diff --git a/resources/build/version/tsconfig.production.json b/resources/build/version/tsconfig.production.json
deleted file mode 100644
index 2189a3042d..0000000000
--- a/resources/build/version/tsconfig.production.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "alwaysStrict": true,
-    "charset": "utf-8",
-    "declaration": true,
-    "declarationMap": true,
-    "downlevelIteration": true,
-    "forceConsistentCasingInFileNames": true,
-    "lib": ["es2017"],
-    "module": "commonjs",
-    "noImplicitAny": false,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "outDir": "lib",
-    "pretty": true,
-    "rootDir": "src",
-    "sourceMap": true,
-    "strict": true,
-    "strictNullChecks": true,
-    "target": "es2017"
-  },
-  "files": ["./src/index.ts"]
-}
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 47c0ef92e9..0252447c63 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -47,6 +47,8 @@
     // { "path": "./web/tools/sourcemap-root/tsconfig.json" },
     { "path": "./common/web/lm-message-types/" },
     { "path": "./common/web/lm-worker/" },
-    { "path": "./common/tools/hextobin/" }
+    { "path": "./common/tools/hextobin/" },
+
+    { "path": "./resources/build/version/" },
   ]
 }
\ No newline at end of file

From 11e5cd3a47b90d4bab0c0bddbf77a14bbe4bf174 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 12:07:19 +0700
Subject: [PATCH 09/22] chore: update root tsconfig

---
 tsconfig.cjs.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json
index 2b8030ac76..701d06ce3b 100644
--- a/tsconfig.cjs.json
+++ b/tsconfig.cjs.json
@@ -8,9 +8,5 @@
     { "path": "./common/predictive-text/testing/one-stage-embedded-webworker/tsconfig.json" },
     { "path": "./common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json" },
     { "path": "./common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json" },
-
-    { "path": "./resources/build/version/tsconfig.json" },
-    { "path": "./resources/build/version/tsconfig.production.json" },
-    // { "path": "./web/bulk_rendering/tsconfig.json" },
   ]
 }
\ No newline at end of file

From d4e4992714b5f91d55dc52a88775bf8932309fb5 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 12:55:51 +0700
Subject: [PATCH 10/22] chore(common): cleanup final Typescript non-ESM
 metadata

Fixes #9262.
---
 common/models/templates/package.json          |  4 +-
 common/models/wordbreakers/package.json       |  3 +-
 common/predictive-text/testing/index.html     | 28 --------
 .../one-stage-embedded-webworker/.gitignore   |  2 -
 .../one-stage-embedded-webworker/build.sh     | 54 --------------
 .../one-stage-embedded-webworker/index.html   | 42 -----------
 .../one-stage-embedded-webworker/main.ts      | 52 --------------
 .../tsconfig.json                             | 13 ----
 .../post-blob-webworker/canaryWorker.js       |  5 --
 .../testing/post-blob-webworker/index.html    | 72 -------------------
 .../testing/simple-webworker/canaryWorker.js  |  9 ---
 .../testing/simple-webworker/index.html       | 55 --------------
 .../two-stage-embedded-webworker/.gitignore   |  2 -
 .../two-stage-embedded-webworker/build.sh     | 68 ------------------
 .../two-stage-embedded-webworker/index.html   | 42 -----------
 .../two-stage-embedded-webworker/main.ts      | 30 --------
 .../tsconfig.json                             | 13 ----
 .../worker/canaryWorker.ts                    |  9 ---
 .../worker/tsconfig.json                      | 11 ---
 common/tools/hextobin/tsconfig.json           |  2 +-
 .../sourcemap-path-remapper/tsconfig.json     |  3 +-
 common/web/es-bundling/tsconfig.json          |  2 +-
 common/web/keyman-version/tsconfig.json       |  2 +-
 common/web/lm-message-types/tsconfig.json     |  2 +-
 common/web/sentry-manager/src/tsconfig.json   |  3 +-
 common/web/types/test/tsconfig.json           |  2 +-
 common/web/types/tsconfig.json                |  2 +-
 core/include/ldml/tsconfig.build.json         |  2 +-
 core/include/ldml/tsconfig.json               |  4 +-
 .../src/common/web/test-helpers/tsconfig.json |  2 +-
 developer/src/kmc-analyze/tsconfig.json       |  2 +-
 .../src/kmc-keyboard-info/test/tsconfig.json  |  1 -
 developer/src/kmc-kmn/tsconfig.json           |  2 +-
 developer/src/kmc-ldml/tsconfig.json          |  2 +-
 .../src/kmc-model-info/test/tsconfig.json     |  1 -
 developer/src/kmc-model/test/tsconfig.json    |  1 -
 developer/src/kmc/tsconfig.kmc-base.json      |  2 +-
 developer/src/server/tsconfig.json            |  2 +-
 resources/build/version/tsconfig.json         |  2 +-
 tsconfig-base.json => tsconfig.base.json      | 15 ++++
 tsconfig.cjs.json                             | 12 ----
 tsconfig.esm-base.json                        | 24 -------
 tsconfig.esm.json => tsconfig.json            | 44 +++++-------
 web/tsconfig.base.json                        |  3 +-
 44 files changed, 53 insertions(+), 600 deletions(-)
 delete mode 100644 common/predictive-text/testing/index.html
 delete mode 100644 common/predictive-text/testing/one-stage-embedded-webworker/.gitignore
 delete mode 100755 common/predictive-text/testing/one-stage-embedded-webworker/build.sh
 delete mode 100644 common/predictive-text/testing/one-stage-embedded-webworker/index.html
 delete mode 100644 common/predictive-text/testing/one-stage-embedded-webworker/main.ts
 delete mode 100644 common/predictive-text/testing/one-stage-embedded-webworker/tsconfig.json
 delete mode 100644 common/predictive-text/testing/post-blob-webworker/canaryWorker.js
 delete mode 100644 common/predictive-text/testing/post-blob-webworker/index.html
 delete mode 100644 common/predictive-text/testing/simple-webworker/canaryWorker.js
 delete mode 100644 common/predictive-text/testing/simple-webworker/index.html
 delete mode 100644 common/predictive-text/testing/two-stage-embedded-webworker/.gitignore
 delete mode 100755 common/predictive-text/testing/two-stage-embedded-webworker/build.sh
 delete mode 100644 common/predictive-text/testing/two-stage-embedded-webworker/index.html
 delete mode 100644 common/predictive-text/testing/two-stage-embedded-webworker/main.ts
 delete mode 100644 common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json
 delete mode 100644 common/predictive-text/testing/two-stage-embedded-webworker/worker/canaryWorker.ts
 delete mode 100644 common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json
 rename tsconfig-base.json => tsconfig.base.json (65%)
 delete mode 100644 tsconfig.cjs.json
 delete mode 100644 tsconfig.esm-base.json
 rename tsconfig.esm.json => tsconfig.json (87%)

diff --git a/common/models/templates/package.json b/common/models/templates/package.json
index 0bec0fc88f..33f89cca70 100644
--- a/common/models/templates/package.json
+++ b/common/models/templates/package.json
@@ -21,9 +21,7 @@
   "exports": {
     ".": "./build/obj/index.js",
     "./lib": {
-      "types": "./build/lib/index.d.ts",
-      "import": "./build/lib/index.mjs",
-      "require": "./build/lib/index.cjs"
+      "types": "./build/lib/index.d.ts"
     },
     "./obj/*.js": "./build/obj/*.js"
   },
diff --git a/common/models/wordbreakers/package.json b/common/models/wordbreakers/package.json
index bd8d0157fb..7a03dc9e8f 100644
--- a/common/models/wordbreakers/package.json
+++ b/common/models/wordbreakers/package.json
@@ -19,8 +19,7 @@
   "exports": {
     ".": "./build/obj/index.js",
     "./lib": {
-      "import": "./build/lib/index.mjs",
-      "require": "./build/lib/index.cjs"
+      "types": "./build/lib/index.d.ts"
     },
     "./obj/*.js": "./build/obj/*.js"
   },
diff --git a/common/predictive-text/testing/index.html b/common/predictive-text/testing/index.html
deleted file mode 100644
index 8a00094b70..0000000000
--- a/common/predictive-text/testing/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    
-    <!-- Set the viewport width to match iOS device widths -->                         
-    <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no" /> -->
-    <meta name="viewport" content="width=device-width,user-scalable=no" /> 
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    
-    <!-- Enable IE9 Standards mode -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
-      
-    <title>LMLayer Testing</title>
-    <style type='text/css'>   
-      body {padding-left:20px;margin-left:12px; font-family:Tahoma,Helvetica}
-      h1 {color: #800;margin-left:10px;}
-      h2 {color: #008;margin-left:20px;}
-    </style>
-  </head>
-  <body>
-  <h1>Language-Modeling Layer module testing</h1>
-  <h2><a href="./simple-webworker">A simple basic WebWorker.</a></h2>  Designed as a baseline functionality test we can run against various platforms as a first-stage canary of sorts.
-  <h2><a href="./one-stage-embedded-webworker">An embedded WebWorker prototype.</a></h2>  A prototype for directly embedding a WebWorker's code within a "master" script.
-  <h2><a href="./two-stage-embedded-webworker">A better embedded WebWorker prototype.</a></h2>  A prototype for two-stage compilation of a master/slave main-script/WebWorker pair.
-  <h2><a href="./post-blob-webworker/">Sending code via a Blob URI</a></h2>  A prototype for sending code over to a WebWorker via a Blob URI reference.
-  </body>
-</html>
diff --git a/common/predictive-text/testing/one-stage-embedded-webworker/.gitignore b/common/predictive-text/testing/one-stage-embedded-webworker/.gitignore
deleted file mode 100644
index df6361deda..0000000000
--- a/common/predictive-text/testing/one-stage-embedded-webworker/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-main.js
-main.js.map
\ No newline at end of file
diff --git a/common/predictive-text/testing/one-stage-embedded-webworker/build.sh b/common/predictive-text/testing/one-stage-embedded-webworker/build.sh
deleted file mode 100755
index f1f727b8c0..0000000000
--- a/common/predictive-text/testing/one-stage-embedded-webworker/build.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-#
-# Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications.
-# Designed for optimal compatibility with the Keyman Suite.
-#
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-display_usage ( ) {
-  echo "build.sh [-clean]"
-  echo
-  echo "  -clean              to erase pre-existing build products before a re-build"
-}
-
-SOURCE="testing/one-stage-embedded-webworker"
-
-echo "Node.js + dependencies check"
-npm install --no-optional
-
-if [ $? -ne 0 ]; then
-  builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
-fi
-
-# A nice, extensible method for -clean operations.  Add to this as necessary.
-clean ( ) {
-  rm -rf "./*.js"
-  if [ $? -ne 0 ]; then
-    builder_die "Failed to erase the prior build."
-  fi
-}
-
-# Process command-line arguments
-while [[ $# -gt 0 ]] ; do
-  key="$1"
-  case $key in
-    -clean)
-      clean
-      ;;
-  esac
-  shift # past the processed argument
-done
-
-npm run tsc -- -p $SOURCE/tsconfig.json
-
-if [ $? -ne 0 ]; then
-  builder_die "Compilation failed."
-fi
-
-echo "Typescript compilation successful."
\ No newline at end of file
diff --git a/common/predictive-text/testing/one-stage-embedded-webworker/index.html b/common/predictive-text/testing/one-stage-embedded-webworker/index.html
deleted file mode 100644
index 244f4aa283..0000000000
--- a/common/predictive-text/testing/one-stage-embedded-webworker/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    
-    <!-- Set the viewport width to match phone and tablet device widths -->                         
-    <meta name="viewport" content="width=device-width,user-scalable=no" /> 
-
-    <!-- Allow KeymanWeb to be saved to the iPhone home screen -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    
-    <!-- Enable IE9 Standards mode -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
-      
-    <title>Embedded WebWorker test</title>
-
-    <!-- Your page CSS --> 
-    <style type='text/css'>
-      body {font-family: Tahoma,helvetica;}
-      h3 {font-size: 1em;font-weight:normal;color: darkred; margin-bottom: 4px}
-      .test {font-size: 1.5em; width:80%; min-height:30px; border: 1px solid gray;}
-      #KeymanWebControl {width:50%;min-width:600px;}       
-    </style>
-  
-	<script src="main.js"></script>
-  </head>
-
-<!-- Sample page HTML -->  
-  <body>
-    <h2>LM Layer Testing - One-Stage Embedded WebWorkers</h2>
-	<p>This page serves as a prototype for embedding a WebWorker's code within its "master" script
-    across the TypeScript transpilation boundary.</p>
-  <input type='text' id='txtFeedback' value="No clicks yet." readonly></input> <br>
-  <script>
-    var txtFeedback = document.getElementById("txtFeedback");
-    txtFeedback.value = "No clicks yet.";
-  </script>
-	<input type='button' id='btnInput' onclick='canaryWorker.postMessage("Hello.");' value='Message the WebWorker.' />
-
-   <h3><a href="../index.html">Return to testing home page</a></h3>
-  </body> 
-</html>
diff --git a/common/predictive-text/testing/one-stage-embedded-webworker/main.ts b/common/predictive-text/testing/one-stage-embedded-webworker/main.ts
deleted file mode 100644
index 5d15ae88b5..0000000000
--- a/common/predictive-text/testing/one-stage-embedded-webworker/main.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Useful for passing class constructors
-type Workable<T> = {
-  new (...args: any[]): T;
-  // Requires a static implementation.
-  onmessage(e: any): void;
-};
-
-class A {
-  a(x: number, y: number):number {
-    return x + y;
-  }
-}
-
-var WorkerGlobals = {
-  counter: 0,
-  a: A
-}
-
-class WorkerCore {
-  static WorkerGlobals = WorkerGlobals;
-  //static counter: number;
-  
-  static onmessage(e: any) {
-    WorkerGlobals.counter++;
-  
-    console.log("Message received from main page: ", e.data);
-    
-    // Forces TypeScript to interpret this line as plain JavaScript, as it uses a non-Worker definition.
-    // @ts-ignore
-    postMessage(WorkerGlobals.counter);
-  }
-}
-
-function createWorkerFromClasses(globals: object, fn: Workable<object>): Worker {
-  var sep = ";\n";
-  let glb = "var WorkerGlobals = " + JSON.stringify(globals);
-  let wc = "var onmessage = " + fn.onmessage.toString();
-  var blob = new Blob([glb, sep, wc], { type: 'text/javascript' });
-  let url = URL.createObjectURL(blob);
-
-  return new Worker(url);
-}
-
-var canaryWorker = createWorkerFromClasses(WorkerGlobals, WorkerCore);
-
-canaryWorker.onmessage = function(e) {
-  var counter = e.data; // Number of times the WebWorker has been messaged.
-  console.log("Received message from the WebWorker: " + e.data);
-  
-  var txtFeedback = <HTMLInputElement>document.getElementById("txtFeedback");
-  txtFeedback.value = counter + " click(s)";
-}
diff --git a/common/predictive-text/testing/one-stage-embedded-webworker/tsconfig.json b/common/predictive-text/testing/one-stage-embedded-webworker/tsconfig.json
deleted file mode 100644
index f1e9be8600..0000000000
--- a/common/predictive-text/testing/one-stage-embedded-webworker/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": false,
-    "module": "none",
-    "outDir": "./",
-    "inlineSources": true,
-    "sourceMap": true,
-    "target": "es5"
-  },
-  "files" : [
-    "main.ts"
-  ]
-}
diff --git a/common/predictive-text/testing/post-blob-webworker/canaryWorker.js b/common/predictive-text/testing/post-blob-webworker/canaryWorker.js
deleted file mode 100644
index 5c69deace8..0000000000
--- a/common/predictive-text/testing/post-blob-webworker/canaryWorker.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// receive a message and execute its uri
-onmessage = function (e) {
-  let uri = e.data.uri;
-  importScripts(uri);
-};
diff --git a/common/predictive-text/testing/post-blob-webworker/index.html b/common/predictive-text/testing/post-blob-webworker/index.html
deleted file mode 100644
index a04b6be377..0000000000
--- a/common/predictive-text/testing/post-blob-webworker/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    
-    <!-- Set the viewport width to match phone and tablet device widths -->                         
-    <meta name="viewport" content="width=device-width,user-scalable=no" /> 
-
-    <!-- Allow KeymanWeb to be saved to the iPhone home screen -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    
-    <!-- Enable IE9 Standards mode -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
-      
-    <title>Blob URI test</title>
-
-    <!-- Your page CSS --> 
-    <style type='text/css'>
-      body {font-family: Tahoma,helvetica;}
-      h3 {font-size: 1em;font-weight:normal;color: darkred; margin-bottom: 4px}
-      .test {font-size: 1.5em; width:80%; min-height:30px; border: 1px solid gray;}
-      #KeymanWebControl {width:50%;min-width:600px;}       
-    </style>
-  
-	<script>
-    if (window.Worker) {
-      var canaryWorker = new Worker('canaryWorker.js');
-      
-      canaryWorker.onmessage = function(e) {
-        var message = e.data; // Number of times the WebWorker has been messaged.
-        console.log("Received message from the WebWorker: " + e.data);
-        var txtFeedback = document.getElementById("txtFeedback");
-        txtFeedback.value = message;
-      }
-    } else {
-      console.error("WebWorkers are not supported in this browser!");
-    }
-	</script>
-  </head>
-
-<!-- Sample page HTML -->  
-  <body>
-    <h2>LM Layer Testing - Sending a function to a WebWorker via a Blob URI test</h2>
-	<p>This page sends a function over to the Worker via a Blob URI, and
-    expects the function to reply back.
-    </p>
-  <input type='text' id='txtFeedback' value="Haven't heard back yet" readonly> <br>
-  <script>
-    var txtFeedback = document.getElementById("txtFeedback");
-    txtFeedback.value = "Have not heard back from worker";
-
-    function sendCode () {
-      function payload () {
-        postMessage('Hello, from the blobified code!');
-      }
-
-      // Create an immediately-invoked function expression... to immediately
-      // invoke the code!
-      let iife = ['(', payload.toString(), '())'];
-      let blob = new Blob(iife, { type: 'text/javascript' });
-      let uri = URL.createObjectURL(blob);
-
-      // Go!
-      canaryWorker.postMessage({ uri: uri });
-    }
-
-  </script>
-	<input type='button' id='btnInput' onclick='sendCode()' value='Send the source code!' />
-
-   <h3><a href="../index.html">Return to testing home page</a></h3>
-  </body> 
-</html>
diff --git a/common/predictive-text/testing/simple-webworker/canaryWorker.js b/common/predictive-text/testing/simple-webworker/canaryWorker.js
deleted file mode 100644
index cf8674d330..0000000000
--- a/common/predictive-text/testing/simple-webworker/canaryWorker.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var counter = 0;
-
-onmessage = function(e) {
-  counter++;
-  
-  console.log("Message received from main page: ", e.data);
-  
-  postMessage(counter);
-}
\ No newline at end of file
diff --git a/common/predictive-text/testing/simple-webworker/index.html b/common/predictive-text/testing/simple-webworker/index.html
deleted file mode 100644
index adbcd30d3e..0000000000
--- a/common/predictive-text/testing/simple-webworker/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    
-    <!-- Set the viewport width to match phone and tablet device widths -->                         
-    <meta name="viewport" content="width=device-width,user-scalable=no" /> 
-
-    <!-- Allow KeymanWeb to be saved to the iPhone home screen -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    
-    <!-- Enable IE9 Standards mode -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
-      
-    <title>Basic WebWorker test</title>
-
-    <!-- Your page CSS --> 
-    <style type='text/css'>
-      body {font-family: Tahoma,helvetica;}
-      h3 {font-size: 1em;font-weight:normal;color: darkred; margin-bottom: 4px}
-      .test {font-size: 1.5em; width:80%; min-height:30px; border: 1px solid gray;}
-      #KeymanWebControl {width:50%;min-width:600px;}       
-    </style>
-  
-	<script>
-    if(window.Worker) {
-      var canaryWorker = new Worker('canaryWorker.js');
-      
-      canaryWorker.onmessage = function(e) {
-        var counter = e.data; // Number of times the WebWorker has been messaged.
-        console.log("Received message from the WebWorker: " + e.data);
-        
-        var txtFeedback = document.getElementById("txtFeedback");
-        txtFeedback.value = counter + " click(s)";
-      }
-    } else {
-      console.error("WebWorkers are not supported in this browser!");
-    }
-	</script>
-  </head>
-
-<!-- Sample page HTML -->  
-  <body>
-    <h2>LM Layer Testing - basic WebWorker canary</h2>
-	<p>This page uses a simple WebWorker useful for ensuring functionality on various platforms.</p>
-  <input type='text' id='txtFeedback' value="No clicks yet." readonly></input> <br>
-  <script>
-    var txtFeedback = document.getElementById("txtFeedback");
-    txtFeedback.value = "No clicks yet.";
-  </script>
-	<input type='button' id='btnInput' onclick='canaryWorker.postMessage("Hello.");' value='Message the WebWorker.' />
-
-   <h3><a href="../index.html">Return to testing home page</a></h3>
-  </body> 
-</html>
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/.gitignore b/common/predictive-text/testing/two-stage-embedded-webworker/.gitignore
deleted file mode 100644
index 20efd1ec83..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/*.js
-**/*.js.map
\ No newline at end of file
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/build.sh b/common/predictive-text/testing/two-stage-embedded-webworker/build.sh
deleted file mode 100755
index dd1854ec00..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/build.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-#
-# Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications.
-# Designed for optimal compatibility with the Keyman Suite.
-#
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-display_usage ( ) {
-  echo "build.sh [-clean]"
-  echo
-  echo "  -clean              to erase pre-existing build products before a re-build"
-}
-
-SOURCE="testing/two-stage-embedded-webworker"
-
-COMPILED_WORKER="worker.js"
-EMBEDDED_WORKER="embedded_worker.js"
-
-echo "Node.js + dependencies check"
-npm install --no-optional
-
-if [ $? -ne 0 ]; then
-  builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
-fi
-
-# A nice, extensible method for -clean operations.  Add to this as necessary.
-clean ( ) {
-  rm -rf "./*.js"
-  if [ $? -ne 0 ]; then
-    builder_die "Failed to erase the prior build."
-  fi
-}
-
-# Process command-line arguments
-while [[ $# -gt 0 ]] ; do
-  key="$1"
-  case $key in
-    -clean)
-      clean
-      ;;
-  esac
-  shift # past the processed argument
-done
-
-npm run tsc -- -p $SOURCE/worker/tsconfig.json
-if [ $? -ne 0 ]; then
-  builder_die "Worker compilation failed."
-fi
-
-rm $EMBEDDED_WORKER &> /dev/null
-
-echo "var LMLayerWorker = function() {" >> $EMBEDDED_WORKER
-cat $COMPILED_WORKER >> $EMBEDDED_WORKER
-echo "" >> $EMBEDDED_WORKER
-echo "}" >> $EMBEDDED_WORKER
-
-npm run tsc -- -p $SOURCE/tsconfig.json
-if [ $? -ne 0 ]; then
-  builder_die "Final compilation failed."
-fi
-
-echo "Typescript compilation successful."
\ No newline at end of file
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/index.html b/common/predictive-text/testing/two-stage-embedded-webworker/index.html
deleted file mode 100644
index 244f4aa283..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    
-    <!-- Set the viewport width to match phone and tablet device widths -->                         
-    <meta name="viewport" content="width=device-width,user-scalable=no" /> 
-
-    <!-- Allow KeymanWeb to be saved to the iPhone home screen -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    
-    <!-- Enable IE9 Standards mode -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
-      
-    <title>Embedded WebWorker test</title>
-
-    <!-- Your page CSS --> 
-    <style type='text/css'>
-      body {font-family: Tahoma,helvetica;}
-      h3 {font-size: 1em;font-weight:normal;color: darkred; margin-bottom: 4px}
-      .test {font-size: 1.5em; width:80%; min-height:30px; border: 1px solid gray;}
-      #KeymanWebControl {width:50%;min-width:600px;}       
-    </style>
-  
-	<script src="main.js"></script>
-  </head>
-
-<!-- Sample page HTML -->  
-  <body>
-    <h2>LM Layer Testing - One-Stage Embedded WebWorkers</h2>
-	<p>This page serves as a prototype for embedding a WebWorker's code within its "master" script
-    across the TypeScript transpilation boundary.</p>
-  <input type='text' id='txtFeedback' value="No clicks yet." readonly></input> <br>
-  <script>
-    var txtFeedback = document.getElementById("txtFeedback");
-    txtFeedback.value = "No clicks yet.";
-  </script>
-	<input type='button' id='btnInput' onclick='canaryWorker.postMessage("Hello.");' value='Message the WebWorker.' />
-
-   <h3><a href="../index.html">Return to testing home page</a></h3>
-  </body> 
-</html>
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/main.ts b/common/predictive-text/testing/two-stage-embedded-webworker/main.ts
deleted file mode 100644
index 9eb276d379..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/main.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Provides the final source for our compiled WebWorker within a wrapping function.
-/// <reference path="embedded_worker.js" />
-
-function createWorker(fn: Function): Worker {
-  var str_fn = fn.toString();
-
-  // We now unwrap our WebWorker from its function.
-  var str_lines = str_fn.split("\n");
-  var blob_lines = []
-
-  for(var i=1; i < str_lines.length -1; i++) {
-    blob_lines.push(str_lines[i] + "\n");
-  }
-  // Unwrapping complete.
-
-  var blob = new Blob(blob_lines, { type: 'text/javascript' });
-  let url = URL.createObjectURL(blob);
-
-  return new Worker(url);
-}
-
-var canaryWorker = createWorker(LMLayerWorker);
-
-canaryWorker.onmessage = function(e) {
-  var counter = e.data; // Number of times the WebWorker has been messaged.
-  console.log("Received message from the WebWorker: " + e.data);
-  
-  var txtFeedback = <HTMLInputElement>document.getElementById("txtFeedback");
-  txtFeedback.value = counter + " click(s)";
-}
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json b/common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json
deleted file mode 100644
index a25930a70e..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "module": "none",
-    "outFile": "./main.js",
-    "inlineSources": true,
-    "inlineSourceMap": true,
-    "target": "es5"
-  },
-  "files" : [
-    "main.ts"
-  ]
-}
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/worker/canaryWorker.ts b/common/predictive-text/testing/two-stage-embedded-webworker/worker/canaryWorker.ts
deleted file mode 100644
index cf8674d330..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/worker/canaryWorker.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-var counter = 0;
-
-onmessage = function(e) {
-  counter++;
-  
-  console.log("Message received from main page: ", e.data);
-  
-  postMessage(counter);
-}
\ No newline at end of file
diff --git a/common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json b/common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json
deleted file mode 100644
index ca8006ba44..0000000000
--- a/common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": false,
-    "module": "none",
-    "outFile": "../worker.js",
-    "inlineSources": true,
-    "sourceMap": true,
-    "lib": ["webworker", "es6"],
-    "target": "es5"
-  }
-}
diff --git a/common/tools/hextobin/tsconfig.json b/common/tools/hextobin/tsconfig.json
index db0a65ae9d..55e3f66308 100644
--- a/common/tools/hextobin/tsconfig.json
+++ b/common/tools/hextobin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build/"
diff --git a/common/tools/sourcemap-path-remapper/tsconfig.json b/common/tools/sourcemap-path-remapper/tsconfig.json
index f9b531b311..72809897bd 100644
--- a/common/tools/sourcemap-path-remapper/tsconfig.json
+++ b/common/tools/sourcemap-path-remapper/tsconfig.json
@@ -1,12 +1,11 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "module": "es6",
-    "moduleResolution": "node",
     "inlineSourceMap": true,
     "inlineSources": true,
     "sourceRoot": "/common/tools/sourcemap-path-remapper/src",
diff --git a/common/web/es-bundling/tsconfig.json b/common/web/es-bundling/tsconfig.json
index d2ab738acf..a5149b51c6 100644
--- a/common/web/es-bundling/tsconfig.json
+++ b/common/web/es-bundling/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "./",
     "outDir": "build/",
diff --git a/common/web/keyman-version/tsconfig.json b/common/web/keyman-version/tsconfig.json
index 03478f6021..0712c03f75 100644
--- a/common/web/keyman-version/tsconfig.json
+++ b/common/web/keyman-version/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "outDir": "./build",
diff --git a/common/web/lm-message-types/tsconfig.json b/common/web/lm-message-types/tsconfig.json
index 124def350d..f9d427f0bf 100644
--- a/common/web/lm-message-types/tsconfig.json
+++ b/common/web/lm-message-types/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
     "module": "none",
diff --git a/common/web/sentry-manager/src/tsconfig.json b/common/web/sentry-manager/src/tsconfig.json
index 490c315dc9..f42eaea73b 100644
--- a/common/web/sentry-manager/src/tsconfig.json
+++ b/common/web/sentry-manager/src/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig-base.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
@@ -7,7 +7,6 @@
     "inlineSources": true,
     "lib": ["es6", "dom"],
     "module": "es6",
-    "moduleResolution": "Node16",
     "outDir": "../build/obj",
     "rootDir": "./",
     "sourceMap": true,
diff --git a/common/web/types/test/tsconfig.json b/common/web/types/test/tsconfig.json
index c522129c99..ee468c7fbd 100644
--- a/common/web/types/test/tsconfig.json
+++ b/common/web/types/test/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.esm-base.json",
+  "extends": "../../../../tsconfig.base.json",
 
   "compilerOptions": {
     "rootDir": ".",
diff --git a/common/web/types/tsconfig.json b/common/web/types/tsconfig.json
index 5059030c0f..730244e67c 100644
--- a/common/web/types/tsconfig.json
+++ b/common/web/types/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "outDir": "build/src/",
diff --git a/core/include/ldml/tsconfig.build.json b/core/include/ldml/tsconfig.build.json
index 17c809a857..fd0f003272 100644
--- a/core/include/ldml/tsconfig.build.json
+++ b/core/include/ldml/tsconfig.build.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../../../tsconfig.esm-base.json",
+    "extends": "../../../tsconfig.base.json",
     "compilerOptions": {
         "composite": true,
         "declaration": true,
diff --git a/core/include/ldml/tsconfig.json b/core/include/ldml/tsconfig.json
index b89c96a018..fa4135b021 100644
--- a/core/include/ldml/tsconfig.json
+++ b/core/include/ldml/tsconfig.json
@@ -1,10 +1,8 @@
 {
-    "extends": "../../../tsconfig-base.json",
+    "extends": "../../../tsconfig.base.json",
     "compilerOptions": {
         "composite": true,
         "declaration": true,
-        "module": "es2020",
-        "moduleResolution": "node",
         "rootDir": ".",
         "outDir": "build/",
     },
diff --git a/developer/src/common/web/test-helpers/tsconfig.json b/developer/src/common/web/test-helpers/tsconfig.json
index 47646be3a6..d7089c703f 100644
--- a/developer/src/common/web/test-helpers/tsconfig.json
+++ b/developer/src/common/web/test-helpers/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../../tsconfig.esm-base.json",
+  "extends": "../../../../../tsconfig.base.json",
 
   "compilerOptions": {
       "rootDir": ".",
diff --git a/developer/src/kmc-analyze/tsconfig.json b/developer/src/kmc-analyze/tsconfig.json
index 3a9149e121..987abd3cc3 100644
--- a/developer/src/kmc-analyze/tsconfig.json
+++ b/developer/src/kmc-analyze/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends":  "../../../tsconfig.esm-base.json",
+  "extends":  "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "outDir": "build/src/",
diff --git a/developer/src/kmc-keyboard-info/test/tsconfig.json b/developer/src/kmc-keyboard-info/test/tsconfig.json
index bf96b7b150..6d48ad864d 100644
--- a/developer/src/kmc-keyboard-info/test/tsconfig.json
+++ b/developer/src/kmc-keyboard-info/test/tsconfig.json
@@ -6,7 +6,6 @@
       "rootDirs": ["./", "../src/"],
       "outDir": "../build/test",
       "esModuleInterop": true,
-      "moduleResolution": "node16",
       "allowSyntheticDefaultImports": true,
       "baseUrl": ".",
       "paths": {
diff --git a/developer/src/kmc-kmn/tsconfig.json b/developer/src/kmc-kmn/tsconfig.json
index 04683902ea..4210b750af 100644
--- a/developer/src/kmc-kmn/tsconfig.json
+++ b/developer/src/kmc-kmn/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "outDir": "build/src/",
diff --git a/developer/src/kmc-ldml/tsconfig.json b/developer/src/kmc-ldml/tsconfig.json
index c9ec649b40..fdcf5fd82b 100644
--- a/developer/src/kmc-ldml/tsconfig.json
+++ b/developer/src/kmc-ldml/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "outDir": "build/src/",
diff --git a/developer/src/kmc-model-info/test/tsconfig.json b/developer/src/kmc-model-info/test/tsconfig.json
index bf96b7b150..6d48ad864d 100644
--- a/developer/src/kmc-model-info/test/tsconfig.json
+++ b/developer/src/kmc-model-info/test/tsconfig.json
@@ -6,7 +6,6 @@
       "rootDirs": ["./", "../src/"],
       "outDir": "../build/test",
       "esModuleInterop": true,
-      "moduleResolution": "node16",
       "allowSyntheticDefaultImports": true,
       "baseUrl": ".",
       "paths": {
diff --git a/developer/src/kmc-model/test/tsconfig.json b/developer/src/kmc-model/test/tsconfig.json
index 3902bed57f..0917ea186a 100644
--- a/developer/src/kmc-model/test/tsconfig.json
+++ b/developer/src/kmc-model/test/tsconfig.json
@@ -6,7 +6,6 @@
       "rootDirs": ["./", "../src/"],
       "outDir": "../build/test",
       "esModuleInterop": true,
-      "moduleResolution": "node16",
       "allowSyntheticDefaultImports": true,
       "baseUrl": ".",
       "paths": {
diff --git a/developer/src/kmc/tsconfig.kmc-base.json b/developer/src/kmc/tsconfig.kmc-base.json
index f8cff50b3f..6956b6e05d 100644
--- a/developer/src/kmc/tsconfig.kmc-base.json
+++ b/developer/src/kmc/tsconfig.kmc-base.json
@@ -1,3 +1,3 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
 }
diff --git a/developer/src/server/tsconfig.json b/developer/src/server/tsconfig.json
index 701a97af6c..e5adde9578 100644
--- a/developer/src/server/tsconfig.json
+++ b/developer/src/server/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
 
   "compilerOptions": {
     "target": "es2022",
diff --git a/resources/build/version/tsconfig.json b/resources/build/version/tsconfig.json
index 9f537c799d..2d99762ca9 100644
--- a/resources/build/version/tsconfig.json
+++ b/resources/build/version/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.esm-base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build/",
diff --git a/tsconfig-base.json b/tsconfig.base.json
similarity index 65%
rename from tsconfig-base.json
rename to tsconfig.base.json
index 8e3eafb6cf..2c56fd7079 100644
--- a/tsconfig-base.json
+++ b/tsconfig.base.json
@@ -1,5 +1,18 @@
 {
   "compilerOptions": {
+    "module": "ES2022",
+    "target": "es2022",
+    "moduleResolution": "node16",
+    "forceConsistentCasingInFileNames": true,
+    "sourceMap": true,
+    "alwaysStrict": true,
+    "noImplicitThis": true,
+    "noImplicitReturns": true,
+    "noImplicitAny": true,
+    "strictBindCallApply": true,
+    "strictFunctionTypes": true,
+    "noUnusedLocals": true,
+
     "rootDir": ".",
 
     // TODO: move all compiler options here
@@ -9,7 +22,9 @@
     "declarationMap": true,
 
     "baseUrl": ".",
+
     "paths": {
+      "@keymanapp/common-types": ["./common/web/types/src/main"],
       "@keymanapp/input-processor": ["./common/web/input-processor/src"],
       "@keymanapp/keyboard-processor": ["./common/web/keyboard-processor/src"],
       "@keymanapp/keyman": ["./web" ],
diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json
deleted file mode 100644
index 701d06ce3b..0000000000
--- a/tsconfig.cjs.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  // Lists only CommonJS or 'none' modules; as we move modules from cjs/none to
-  // esm, we should move them from here into tsconfig.esm.json. Eventually, when
-  // we have only ES modules, we'll delete this file.
-  "files": [],
-  "include": [],
-  "references": [
-    { "path": "./common/predictive-text/testing/one-stage-embedded-webworker/tsconfig.json" },
-    { "path": "./common/predictive-text/testing/two-stage-embedded-webworker/tsconfig.json" },
-    { "path": "./common/predictive-text/testing/two-stage-embedded-webworker/worker/tsconfig.json" },
-  ]
-}
\ No newline at end of file
diff --git a/tsconfig.esm-base.json b/tsconfig.esm-base.json
deleted file mode 100644
index d17d505e5c..0000000000
--- a/tsconfig.esm-base.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "extends": "./tsconfig-base.json",
-
-  "compilerOptions": {
-    "module": "ES2022",
-    "target": "es2022",
-    "moduleResolution": "Node16",
-    "forceConsistentCasingInFileNames": true,
-    "sourceMap": true,
-    "alwaysStrict": true,
-    "noImplicitThis": true,
-    "noImplicitReturns": true,
-    "noImplicitAny": true,
-    "strictBindCallApply": true,
-    "strictFunctionTypes": true,
-    "noUnusedLocals": true,
-
-    "paths": {
-      "@keymanapp/keyman-version": ["./common/web/keyman-version/keyman-version.mts"],
-      "@keymanapp/common-types": ["./common/web/types/src/main"],
-      // "@keymanapp/": ["core/include/ldml/ldml-keyboard-constants"],
-    },
-  },
-}
diff --git a/tsconfig.esm.json b/tsconfig.json
similarity index 87%
rename from tsconfig.esm.json
rename to tsconfig.json
index 0252447c63..497bcf7344 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.json
@@ -1,19 +1,28 @@
 {
-  // Lists only ES modules; as we move modules from cjs/none to esm, we should
-  // move them from tsconfig.cjs.json to here. Eventually, when we have only ES
-  // modules, we can rename this to tsconfig.json.
-  "files": [],
-  "include": [],
   "references": [
     { "path": "./core/include/ldml/tsconfig.json" },
 
-    //{ "path": "./developer/src/kmc/test/tsconfig.json" },
+    { "path": "./common/models/templates/tsconfig.json" },
+    { "path": "./common/models/types/tsconfig.json" },
+    { "path": "./common/models/wordbreakers/tsconfig.json" },
+    { "path": "./common/predictive-text/tsconfig.json" },
+    { "path": "./common/tools/hextobin/" },
+    { "path": "./common/web/input-processor/tsconfig.json" },
+    { "path": "./common/web/keyboard-processor/tsconfig.json" },
+    { "path": "./common/web/keyman-version" },
+    { "path": "./common/web/lm-message-types/" },
+    { "path": "./common/web/lm-worker/" },
+    { "path": "./common/web/recorder/tsconfig.json" },
+    { "path": "./common/web/sentry-manager/src/tsconfig.json" },
+    { "path": "./common/web/types/" },
+    { "path": "./common/web/utils/tsconfig.json" },
+
     { "path": "./developer/src/common/web/test-helpers/tsconfig.json" },
 
     { "path": "./developer/src/kmc/tsconfig.json" },
-
-    // { "path": "./developer/src/kmc-analyze/test/tsconfig.json" },
+    { "path": "./developer/src/kmc/test/tsconfig.json" },
     { "path": "./developer/src/kmc-analyze/tsconfig.json" },
+    // { "path": "./developer/src/kmc-analyze/test/tsconfig.json" },
     { "path": "./developer/src/kmc-kmn/test/tsconfig.json" },
     { "path": "./developer/src/kmc-kmn/tsconfig.json" },
     { "path": "./developer/src/kmc-keyboard-info/test/tsconfig.json" },
@@ -28,27 +37,10 @@
     { "path": "./developer/src/kmc-package/tsconfig.json" },
     { "path": "./developer/src/server/tsconfig.json" },
 
-    { "path": "./common/web/keyman-version" },
-    { "path": "./common/web/types/" },
-
-    { "path": "./common/web/input-processor/tsconfig.json" },
-    { "path": "./common/web/keyboard-processor/tsconfig.json" },
-    { "path": "./common/web/recorder/tsconfig.json" },
-    { "path": "./common/web/sentry-manager/src/tsconfig.json" },
-    { "path": "./common/web/utils/tsconfig.json" },
-
-    { "path": "./common/models/templates/tsconfig.json" },
-    { "path": "./common/models/types/tsconfig.json" },
-    { "path": "./common/models/wordbreakers/tsconfig.json" },
-    { "path": "./common/predictive-text/tsconfig.json" },
+    { "path": "./resources/build/version/" },
 
     { "path": "./web/src/tsconfig.all.json" },
     // { "path": "./web/tools/recorder/tsconfig.json" },
     // { "path": "./web/tools/sourcemap-root/tsconfig.json" },
-    { "path": "./common/web/lm-message-types/" },
-    { "path": "./common/web/lm-worker/" },
-    { "path": "./common/tools/hextobin/" },
-
-    { "path": "./resources/build/version/" },
   ]
 }
\ No newline at end of file
diff --git a/web/tsconfig.base.json b/web/tsconfig.base.json
index a2b78b7b15..fa60ca26e6 100644
--- a/web/tsconfig.base.json
+++ b/web/tsconfig.base.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig-base.json",
+  "extends": "../tsconfig.base.json",
 
   "compilerOptions": {
     // Primary settings - the version of ES6 we can target in TS, our downcompile target,
@@ -7,7 +7,6 @@
     "allowSyntheticDefaultImports": true,
     "lib": ["es6"],
     "module": "es6",
-    "moduleResolution": "Node16",
     "target": "es5",
 
     // Other settings - declaration files, sourcemapping, and other miscellaneous bits.

From 75a0977cdbbfd55fcfd3cd6dff4b5f604dc20270 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 14:17:59 +0700
Subject: [PATCH 11/22] chore(developer): fix server tests

---
 developer/src/server/build.sh                    | 10 +++++++++-
 developer/src/server/package.json                |  4 ++--
 developer/src/server/test/tsconfig.json          | 16 ++++++++++++++++
 .../server/{src => test}/version-data.test.ts    |  4 +---
 package-lock.json                                |  9 +++++----
 5 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 developer/src/server/test/tsconfig.json
 rename developer/src/server/{src => test}/version-data.test.ts (97%)

diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 44cdbe1ca7..7e47d4f663 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -125,11 +125,19 @@ function installer_server() {
   cp -R "$PRODBUILDTEMP"/* "$KEYMAN_ROOT/developer/bin/server/"
   rm -rf "$PRODBUILDTEMP"
 }
+
+function test_server() {
+  # eslint .
+  tsc --build test
+  # c8 --reporter=lcov --reporter=text
+  mocha
+}
+
 builder_run_action clean:server        clean_server
 builder_run_action configure:server    configure_server
 builder_run_action build:server        build_server
 builder_run_action build:addins        build_addins
-builder_run_action test:server         mocha
+builder_run_action test:server         test_server
 # builder_run_action test:addins       # no op
 builder_run_action installer:server    installer_server
 
diff --git a/developer/src/server/package.json b/developer/src/server/package.json
index 6d23e11bfb..fbba345439 100644
--- a/developer/src/server/package.json
+++ b/developer/src/server/package.json
@@ -28,7 +28,7 @@
     "@types/express": "^4.17.13",
     "@types/mocha": "^9.1.0",
     "@types/multer": "^1.4.7",
-    "@types/node": "^17.0.0",
+    "@types/node": "^20.4.1",
     "@types/ws": "^8.2.2",
     "chai": "^4.3.4",
     "copyfiles": "^2.4.1",
@@ -39,6 +39,6 @@
   },
   "mocha": {
     "require": "ts-node/register",
-    "spec": "**/*.test.ts"
+    "spec": "build/**/*.test.js"
   }
 }
diff --git a/developer/src/server/test/tsconfig.json b/developer/src/server/test/tsconfig.json
new file mode 100644
index 0000000000..e25eb9fb3f
--- /dev/null
+++ b/developer/src/server/test/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../../../tsconfig.esm-base.json",
+
+  "compilerOptions": {
+      "rootDir": ".",
+      "rootDirs": ["./", "../src/"],
+      "outDir": "../build/test",
+      "baseUrl": ".",
+    },
+  "include": [
+      "**/*.test.ts"
+  ],
+  "references": [
+      { "path": "../" },
+    ]
+}
\ No newline at end of file
diff --git a/developer/src/server/src/version-data.test.ts b/developer/src/server/test/version-data.test.ts
similarity index 97%
rename from developer/src/server/src/version-data.test.ts
rename to developer/src/server/test/version-data.test.ts
index 9f7ebd385f..74762b7d7f 100644
--- a/developer/src/server/src/version-data.test.ts
+++ b/developer/src/server/test/version-data.test.ts
@@ -1,8 +1,6 @@
 import {assert} from 'chai';
 import 'mocha';
-
-import { extractVersionData } from './version-data.js';
-
+import { extractVersionData } from '../src/version-data.js';
 
 describe('extractVersionData', function() {
   it('should parse version strings', function() {
diff --git a/package-lock.json b/package-lock.json
index 405d2154cf..75cab78dd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2654,7 +2654,7 @@
         "@types/express": "^4.17.13",
         "@types/mocha": "^9.1.0",
         "@types/multer": "^1.4.7",
-        "@types/node": "^17.0.0",
+        "@types/node": "^20.4.1",
         "@types/ws": "^8.2.2",
         "chai": "^4.3.4",
         "copyfiles": "^2.4.1",
@@ -2674,9 +2674,10 @@
       "license": "MIT"
     },
     "developer/src/server/node_modules/@types/node": {
-      "version": "17.0.45",
-      "dev": true,
-      "license": "MIT"
+      "version": "20.8.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
+      "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
+      "dev": true
     },
     "developer/src/server/node_modules/busboy": {
       "version": "1.6.0",

From 39699f75d5db883673176d70b89664a600182713 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 14:24:17 +0700
Subject: [PATCH 12/22] chore(common): restore es5 target for keyman-version

---
 common/web/keyman-version/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/web/keyman-version/tsconfig.json b/common/web/keyman-version/tsconfig.json
index 03478f6021..9f4f718745 100644
--- a/common/web/keyman-version/tsconfig.json
+++ b/common/web/keyman-version/tsconfig.json
@@ -3,6 +3,7 @@
 
   "compilerOptions": {
     "outDir": "./build",
+    "target": "es5",
     "rootDir": "."
   },
 

From 27dfef024d11f076c4cb3bce72fe0e227fcac57f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 14:41:31 +0700
Subject: [PATCH 13/22] chore(common): restore (unused) test target for
 keyman-version

---
 common/web/keyman-version/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index 28dd297211..d4a07e4c76 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -18,7 +18,8 @@ builder_describe "Build the include script for current Keyman version" \
   clean \
   build \
   "pack                      build a local .tgz pack for testing" \
-  "publish                   publish to npm"
+  "publish                   publish to npm" \
+  test
 
 builder_describe_outputs \
   configure "/node_modules" \

From 33b6b5abc26444d278d00405b1efb58dc0655ef0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 15:16:34 +0700
Subject: [PATCH 14/22] chore: update tsconfig

---
 developer/src/server/test/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/server/test/tsconfig.json b/developer/src/server/test/tsconfig.json
index e25eb9fb3f..fa377b0fde 100644
--- a/developer/src/server/test/tsconfig.json
+++ b/developer/src/server/test/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.esm-base.json",
+  "extends": "../../../../tsconfig.base.json",
 
   "compilerOptions": {
       "rootDir": ".",

From f832b9ff3d7c5852f0076e30953745950e223b2f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 15:25:01 +0700
Subject: [PATCH 15/22] chore(developer): remove temp non-esm module in
 kmc-model

---
 .../sourcemap-path-remapper/tsconfig.json     |    1 -
 .../kmc-model/test/test-join-word-breaker.ts  |    2 +-
 .../test/test-override-script-defaults.ts     |    2 +-
 .../src/kmc-model/test/wordbreakers/README.md |    3 -
 .../src/kmc-model/test/wordbreakers/data.ts   | 1776 -----------------
 .../wordbreakers/default-wordbreaker-esm.ts   |  383 ----
 6 files changed, 2 insertions(+), 2165 deletions(-)
 delete mode 100644 developer/src/kmc-model/test/wordbreakers/README.md
 delete mode 100644 developer/src/kmc-model/test/wordbreakers/data.ts
 delete mode 100644 developer/src/kmc-model/test/wordbreakers/default-wordbreaker-esm.ts

diff --git a/common/tools/sourcemap-path-remapper/tsconfig.json b/common/tools/sourcemap-path-remapper/tsconfig.json
index 72809897bd..6bf1a23b8d 100644
--- a/common/tools/sourcemap-path-remapper/tsconfig.json
+++ b/common/tools/sourcemap-path-remapper/tsconfig.json
@@ -5,7 +5,6 @@
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
     "declaration": true,
-    "module": "es6",
     "inlineSourceMap": true,
     "inlineSources": true,
     "sourceRoot": "/common/tools/sourcemap-path-remapper/src",
diff --git a/developer/src/kmc-model/test/test-join-word-breaker.ts b/developer/src/kmc-model/test/test-join-word-breaker.ts
index d06bc7a6ef..b08411cb56 100644
--- a/developer/src/kmc-model/test/test-join-word-breaker.ts
+++ b/developer/src/kmc-model/test/test-join-word-breaker.ts
@@ -1,5 +1,5 @@
 import { assert } from "chai";
-import defaultWordBreaker from './wordbreakers/default-wordbreaker-esm.js';
+import defaultWordBreaker from '@keymanapp/models-wordbreakers';
 import {decorateWithJoin} from '../src/join-word-breaker-decorator.js';
 
 describe('The join word breaker decorator', function () {
diff --git a/developer/src/kmc-model/test/test-override-script-defaults.ts b/developer/src/kmc-model/test/test-override-script-defaults.ts
index 909f52c298..a0500320fd 100644
--- a/developer/src/kmc-model/test/test-override-script-defaults.ts
+++ b/developer/src/kmc-model/test/test-override-script-defaults.ts
@@ -1,5 +1,5 @@
 import { assert } from "chai";
-import defaultWordBreaker from './wordbreakers/default-wordbreaker-esm.js';
+import defaultWordBreaker from '@keymanapp/models-wordbreakers';
 import {decorateWithScriptOverrides} from '../src/script-overrides-decorator.js';
 
 const THIN_SPACE = "\u2009";
diff --git a/developer/src/kmc-model/test/wordbreakers/README.md b/developer/src/kmc-model/test/wordbreakers/README.md
deleted file mode 100644
index d204b51c6a..0000000000
--- a/developer/src/kmc-model/test/wordbreakers/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Wordbreakers ES Module format
-
-TODO: once we move common/models/wordbreakers to ESM, eliminate this.
diff --git a/developer/src/kmc-model/test/wordbreakers/data.ts b/developer/src/kmc-model/test/wordbreakers/data.ts
deleted file mode 100644
index 5622bf5c03..0000000000
--- a/developer/src/kmc-model/test/wordbreakers/data.ts
+++ /dev/null
@@ -1,1776 +0,0 @@
-// TEMP: esm version of /common/models/wordbreakers/default/data.ts
-// Hand updated version of automatically generated file.
-/**
- * Valid values for a word break property.
- */
-export enum WordBreakProperty {
-  Other,
-  LF,
-  Newline,
-  CR,
-  WSegSpace,
-  Double_Quote,
-  Single_Quote,
-  MidNum,
-  MidNumLet,
-  Numeric,
-  MidLetter,
-  ALetter,
-  ExtendNumLet,
-  Format,
-  Extend,
-  Hebrew_Letter,
-  ZWJ,
-  Katakana,
-  Regional_Indicator,
-  sot,
-  eot
-};
-
-/**
- * Constants for indexing values in WORD_BREAK_PROPERTY.
- */
-export enum I {
-  Start = 0,
-  Value = 1
-}
-
-export const WORD_BREAK_PROPERTY: [number, WordBreakProperty][] = [
-  [/*start*/ 0x0, WordBreakProperty.Other],
-  [/*start*/ 0xA, WordBreakProperty.LF],
-  [/*start*/ 0xB, WordBreakProperty.Newline],
-  [/*start*/ 0xD, WordBreakProperty.CR],
-  [/*start*/ 0xE, WordBreakProperty.Other],
-  [/*start*/ 0x20, WordBreakProperty.WSegSpace],
-  [/*start*/ 0x21, WordBreakProperty.Other],
-  [/*start*/ 0x22, WordBreakProperty.Double_Quote],
-  [/*start*/ 0x23, WordBreakProperty.Other],
-  [/*start*/ 0x27, WordBreakProperty.Single_Quote],
-  [/*start*/ 0x28, WordBreakProperty.Other],
-  [/*start*/ 0x2C, WordBreakProperty.MidNum],
-  [/*start*/ 0x2D, WordBreakProperty.Other],
-  [/*start*/ 0x2E, WordBreakProperty.MidNumLet],
-  [/*start*/ 0x2F, WordBreakProperty.Other],
-  [/*start*/ 0x30, WordBreakProperty.Numeric],
-  [/*start*/ 0x3A, WordBreakProperty.MidLetter],
-  [/*start*/ 0x3B, WordBreakProperty.MidNum],
-  [/*start*/ 0x3C, WordBreakProperty.Other],
-  [/*start*/ 0x41, WordBreakProperty.ALetter],
-  [/*start*/ 0x5B, WordBreakProperty.Other],
-  [/*start*/ 0x5F, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0x60, WordBreakProperty.Other],
-  [/*start*/ 0x61, WordBreakProperty.ALetter],
-  [/*start*/ 0x7B, WordBreakProperty.Other],
-  [/*start*/ 0x85, WordBreakProperty.Newline],
-  [/*start*/ 0x86, WordBreakProperty.Other],
-  [/*start*/ 0xAA, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB, WordBreakProperty.Other],
-  [/*start*/ 0xAD, WordBreakProperty.Format],
-  [/*start*/ 0xAE, WordBreakProperty.Other],
-  [/*start*/ 0xB5, WordBreakProperty.ALetter],
-  [/*start*/ 0xB6, WordBreakProperty.Other],
-  [/*start*/ 0xB7, WordBreakProperty.MidLetter],
-  [/*start*/ 0xB8, WordBreakProperty.Other],
-  [/*start*/ 0xBA, WordBreakProperty.ALetter],
-  [/*start*/ 0xBB, WordBreakProperty.Other],
-  [/*start*/ 0xC0, WordBreakProperty.ALetter],
-  [/*start*/ 0xD7, WordBreakProperty.Other],
-  [/*start*/ 0xD8, WordBreakProperty.ALetter],
-  [/*start*/ 0xF7, WordBreakProperty.Other],
-  [/*start*/ 0xF8, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D8, WordBreakProperty.Other],
-  [/*start*/ 0x2DE, WordBreakProperty.ALetter],
-  [/*start*/ 0x300, WordBreakProperty.Extend],
-  [/*start*/ 0x370, WordBreakProperty.ALetter],
-  [/*start*/ 0x375, WordBreakProperty.Other],
-  [/*start*/ 0x376, WordBreakProperty.ALetter],
-  [/*start*/ 0x378, WordBreakProperty.Other],
-  [/*start*/ 0x37A, WordBreakProperty.ALetter],
-  [/*start*/ 0x37E, WordBreakProperty.MidNum],
-  [/*start*/ 0x37F, WordBreakProperty.ALetter],
-  [/*start*/ 0x380, WordBreakProperty.Other],
-  [/*start*/ 0x386, WordBreakProperty.ALetter],
-  [/*start*/ 0x387, WordBreakProperty.MidLetter],
-  [/*start*/ 0x388, WordBreakProperty.ALetter],
-  [/*start*/ 0x38B, WordBreakProperty.Other],
-  [/*start*/ 0x38C, WordBreakProperty.ALetter],
-  [/*start*/ 0x38D, WordBreakProperty.Other],
-  [/*start*/ 0x38E, WordBreakProperty.ALetter],
-  [/*start*/ 0x3A2, WordBreakProperty.Other],
-  [/*start*/ 0x3A3, WordBreakProperty.ALetter],
-  [/*start*/ 0x3F6, WordBreakProperty.Other],
-  [/*start*/ 0x3F7, WordBreakProperty.ALetter],
-  [/*start*/ 0x482, WordBreakProperty.Other],
-  [/*start*/ 0x483, WordBreakProperty.Extend],
-  [/*start*/ 0x48A, WordBreakProperty.ALetter],
-  [/*start*/ 0x530, WordBreakProperty.Other],
-  [/*start*/ 0x531, WordBreakProperty.ALetter],
-  [/*start*/ 0x557, WordBreakProperty.Other],
-  [/*start*/ 0x559, WordBreakProperty.ALetter],
-  [/*start*/ 0x55D, WordBreakProperty.Other],
-  [/*start*/ 0x55E, WordBreakProperty.ALetter],
-  [/*start*/ 0x55F, WordBreakProperty.MidLetter],
-  [/*start*/ 0x560, WordBreakProperty.ALetter],
-  [/*start*/ 0x589, WordBreakProperty.MidNum],
-  [/*start*/ 0x58A, WordBreakProperty.ALetter],
-  [/*start*/ 0x58B, WordBreakProperty.Other],
-  [/*start*/ 0x591, WordBreakProperty.Extend],
-  [/*start*/ 0x5BE, WordBreakProperty.Other],
-  [/*start*/ 0x5BF, WordBreakProperty.Extend],
-  [/*start*/ 0x5C0, WordBreakProperty.Other],
-  [/*start*/ 0x5C1, WordBreakProperty.Extend],
-  [/*start*/ 0x5C3, WordBreakProperty.Other],
-  [/*start*/ 0x5C4, WordBreakProperty.Extend],
-  [/*start*/ 0x5C6, WordBreakProperty.Other],
-  [/*start*/ 0x5C7, WordBreakProperty.Extend],
-  [/*start*/ 0x5C8, WordBreakProperty.Other],
-  [/*start*/ 0x5D0, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0x5EB, WordBreakProperty.Other],
-  [/*start*/ 0x5EF, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0x5F3, WordBreakProperty.ALetter],
-  [/*start*/ 0x5F4, WordBreakProperty.MidLetter],
-  [/*start*/ 0x5F5, WordBreakProperty.Other],
-  [/*start*/ 0x600, WordBreakProperty.Format],
-  [/*start*/ 0x606, WordBreakProperty.Other],
-  [/*start*/ 0x60C, WordBreakProperty.MidNum],
-  [/*start*/ 0x60E, WordBreakProperty.Other],
-  [/*start*/ 0x610, WordBreakProperty.Extend],
-  [/*start*/ 0x61B, WordBreakProperty.Other],
-  [/*start*/ 0x61C, WordBreakProperty.Format],
-  [/*start*/ 0x61D, WordBreakProperty.Other],
-  [/*start*/ 0x620, WordBreakProperty.ALetter],
-  [/*start*/ 0x64B, WordBreakProperty.Extend],
-  [/*start*/ 0x660, WordBreakProperty.Numeric],
-  [/*start*/ 0x66A, WordBreakProperty.Other],
-  [/*start*/ 0x66B, WordBreakProperty.Numeric],
-  [/*start*/ 0x66C, WordBreakProperty.MidNum],
-  [/*start*/ 0x66D, WordBreakProperty.Other],
-  [/*start*/ 0x66E, WordBreakProperty.ALetter],
-  [/*start*/ 0x670, WordBreakProperty.Extend],
-  [/*start*/ 0x671, WordBreakProperty.ALetter],
-  [/*start*/ 0x6D4, WordBreakProperty.Other],
-  [/*start*/ 0x6D5, WordBreakProperty.ALetter],
-  [/*start*/ 0x6D6, WordBreakProperty.Extend],
-  [/*start*/ 0x6DD, WordBreakProperty.Format],
-  [/*start*/ 0x6DE, WordBreakProperty.Other],
-  [/*start*/ 0x6DF, WordBreakProperty.Extend],
-  [/*start*/ 0x6E5, WordBreakProperty.ALetter],
-  [/*start*/ 0x6E7, WordBreakProperty.Extend],
-  [/*start*/ 0x6E9, WordBreakProperty.Other],
-  [/*start*/ 0x6EA, WordBreakProperty.Extend],
-  [/*start*/ 0x6EE, WordBreakProperty.ALetter],
-  [/*start*/ 0x6F0, WordBreakProperty.Numeric],
-  [/*start*/ 0x6FA, WordBreakProperty.ALetter],
-  [/*start*/ 0x6FD, WordBreakProperty.Other],
-  [/*start*/ 0x6FF, WordBreakProperty.ALetter],
-  [/*start*/ 0x700, WordBreakProperty.Other],
-  [/*start*/ 0x70F, WordBreakProperty.Format],
-  [/*start*/ 0x710, WordBreakProperty.ALetter],
-  [/*start*/ 0x711, WordBreakProperty.Extend],
-  [/*start*/ 0x712, WordBreakProperty.ALetter],
-  [/*start*/ 0x730, WordBreakProperty.Extend],
-  [/*start*/ 0x74B, WordBreakProperty.Other],
-  [/*start*/ 0x74D, WordBreakProperty.ALetter],
-  [/*start*/ 0x7A6, WordBreakProperty.Extend],
-  [/*start*/ 0x7B1, WordBreakProperty.ALetter],
-  [/*start*/ 0x7B2, WordBreakProperty.Other],
-  [/*start*/ 0x7C0, WordBreakProperty.Numeric],
-  [/*start*/ 0x7CA, WordBreakProperty.ALetter],
-  [/*start*/ 0x7EB, WordBreakProperty.Extend],
-  [/*start*/ 0x7F4, WordBreakProperty.ALetter],
-  [/*start*/ 0x7F6, WordBreakProperty.Other],
-  [/*start*/ 0x7F8, WordBreakProperty.MidNum],
-  [/*start*/ 0x7F9, WordBreakProperty.Other],
-  [/*start*/ 0x7FA, WordBreakProperty.ALetter],
-  [/*start*/ 0x7FB, WordBreakProperty.Other],
-  [/*start*/ 0x7FD, WordBreakProperty.Extend],
-  [/*start*/ 0x7FE, WordBreakProperty.Other],
-  [/*start*/ 0x800, WordBreakProperty.ALetter],
-  [/*start*/ 0x816, WordBreakProperty.Extend],
-  [/*start*/ 0x81A, WordBreakProperty.ALetter],
-  [/*start*/ 0x81B, WordBreakProperty.Extend],
-  [/*start*/ 0x824, WordBreakProperty.ALetter],
-  [/*start*/ 0x825, WordBreakProperty.Extend],
-  [/*start*/ 0x828, WordBreakProperty.ALetter],
-  [/*start*/ 0x829, WordBreakProperty.Extend],
-  [/*start*/ 0x82E, WordBreakProperty.Other],
-  [/*start*/ 0x840, WordBreakProperty.ALetter],
-  [/*start*/ 0x859, WordBreakProperty.Extend],
-  [/*start*/ 0x85C, WordBreakProperty.Other],
-  [/*start*/ 0x860, WordBreakProperty.ALetter],
-  [/*start*/ 0x86B, WordBreakProperty.Other],
-  [/*start*/ 0x8A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x8B5, WordBreakProperty.Other],
-  [/*start*/ 0x8B6, WordBreakProperty.ALetter],
-  [/*start*/ 0x8C8, WordBreakProperty.Other],
-  [/*start*/ 0x8D3, WordBreakProperty.Extend],
-  [/*start*/ 0x8E2, WordBreakProperty.Format],
-  [/*start*/ 0x8E3, WordBreakProperty.Extend],
-  [/*start*/ 0x904, WordBreakProperty.ALetter],
-  [/*start*/ 0x93A, WordBreakProperty.Extend],
-  [/*start*/ 0x93D, WordBreakProperty.ALetter],
-  [/*start*/ 0x93E, WordBreakProperty.Extend],
-  [/*start*/ 0x950, WordBreakProperty.ALetter],
-  [/*start*/ 0x951, WordBreakProperty.Extend],
-  [/*start*/ 0x958, WordBreakProperty.ALetter],
-  [/*start*/ 0x962, WordBreakProperty.Extend],
-  [/*start*/ 0x964, WordBreakProperty.Other],
-  [/*start*/ 0x966, WordBreakProperty.Numeric],
-  [/*start*/ 0x970, WordBreakProperty.Other],
-  [/*start*/ 0x971, WordBreakProperty.ALetter],
-  [/*start*/ 0x981, WordBreakProperty.Extend],
-  [/*start*/ 0x984, WordBreakProperty.Other],
-  [/*start*/ 0x985, WordBreakProperty.ALetter],
-  [/*start*/ 0x98D, WordBreakProperty.Other],
-  [/*start*/ 0x98F, WordBreakProperty.ALetter],
-  [/*start*/ 0x991, WordBreakProperty.Other],
-  [/*start*/ 0x993, WordBreakProperty.ALetter],
-  [/*start*/ 0x9A9, WordBreakProperty.Other],
-  [/*start*/ 0x9AA, WordBreakProperty.ALetter],
-  [/*start*/ 0x9B1, WordBreakProperty.Other],
-  [/*start*/ 0x9B2, WordBreakProperty.ALetter],
-  [/*start*/ 0x9B3, WordBreakProperty.Other],
-  [/*start*/ 0x9B6, WordBreakProperty.ALetter],
-  [/*start*/ 0x9BA, WordBreakProperty.Other],
-  [/*start*/ 0x9BC, WordBreakProperty.Extend],
-  [/*start*/ 0x9BD, WordBreakProperty.ALetter],
-  [/*start*/ 0x9BE, WordBreakProperty.Extend],
-  [/*start*/ 0x9C5, WordBreakProperty.Other],
-  [/*start*/ 0x9C7, WordBreakProperty.Extend],
-  [/*start*/ 0x9C9, WordBreakProperty.Other],
-  [/*start*/ 0x9CB, WordBreakProperty.Extend],
-  [/*start*/ 0x9CE, WordBreakProperty.ALetter],
-  [/*start*/ 0x9CF, WordBreakProperty.Other],
-  [/*start*/ 0x9D7, WordBreakProperty.Extend],
-  [/*start*/ 0x9D8, WordBreakProperty.Other],
-  [/*start*/ 0x9DC, WordBreakProperty.ALetter],
-  [/*start*/ 0x9DE, WordBreakProperty.Other],
-  [/*start*/ 0x9DF, WordBreakProperty.ALetter],
-  [/*start*/ 0x9E2, WordBreakProperty.Extend],
-  [/*start*/ 0x9E4, WordBreakProperty.Other],
-  [/*start*/ 0x9E6, WordBreakProperty.Numeric],
-  [/*start*/ 0x9F0, WordBreakProperty.ALetter],
-  [/*start*/ 0x9F2, WordBreakProperty.Other],
-  [/*start*/ 0x9FC, WordBreakProperty.ALetter],
-  [/*start*/ 0x9FD, WordBreakProperty.Other],
-  [/*start*/ 0x9FE, WordBreakProperty.Extend],
-  [/*start*/ 0x9FF, WordBreakProperty.Other],
-  [/*start*/ 0xA01, WordBreakProperty.Extend],
-  [/*start*/ 0xA04, WordBreakProperty.Other],
-  [/*start*/ 0xA05, WordBreakProperty.ALetter],
-  [/*start*/ 0xA0B, WordBreakProperty.Other],
-  [/*start*/ 0xA0F, WordBreakProperty.ALetter],
-  [/*start*/ 0xA11, WordBreakProperty.Other],
-  [/*start*/ 0xA13, WordBreakProperty.ALetter],
-  [/*start*/ 0xA29, WordBreakProperty.Other],
-  [/*start*/ 0xA2A, WordBreakProperty.ALetter],
-  [/*start*/ 0xA31, WordBreakProperty.Other],
-  [/*start*/ 0xA32, WordBreakProperty.ALetter],
-  [/*start*/ 0xA34, WordBreakProperty.Other],
-  [/*start*/ 0xA35, WordBreakProperty.ALetter],
-  [/*start*/ 0xA37, WordBreakProperty.Other],
-  [/*start*/ 0xA38, WordBreakProperty.ALetter],
-  [/*start*/ 0xA3A, WordBreakProperty.Other],
-  [/*start*/ 0xA3C, WordBreakProperty.Extend],
-  [/*start*/ 0xA3D, WordBreakProperty.Other],
-  [/*start*/ 0xA3E, WordBreakProperty.Extend],
-  [/*start*/ 0xA43, WordBreakProperty.Other],
-  [/*start*/ 0xA47, WordBreakProperty.Extend],
-  [/*start*/ 0xA49, WordBreakProperty.Other],
-  [/*start*/ 0xA4B, WordBreakProperty.Extend],
-  [/*start*/ 0xA4E, WordBreakProperty.Other],
-  [/*start*/ 0xA51, WordBreakProperty.Extend],
-  [/*start*/ 0xA52, WordBreakProperty.Other],
-  [/*start*/ 0xA59, WordBreakProperty.ALetter],
-  [/*start*/ 0xA5D, WordBreakProperty.Other],
-  [/*start*/ 0xA5E, WordBreakProperty.ALetter],
-  [/*start*/ 0xA5F, WordBreakProperty.Other],
-  [/*start*/ 0xA66, WordBreakProperty.Numeric],
-  [/*start*/ 0xA70, WordBreakProperty.Extend],
-  [/*start*/ 0xA72, WordBreakProperty.ALetter],
-  [/*start*/ 0xA75, WordBreakProperty.Extend],
-  [/*start*/ 0xA76, WordBreakProperty.Other],
-  [/*start*/ 0xA81, WordBreakProperty.Extend],
-  [/*start*/ 0xA84, WordBreakProperty.Other],
-  [/*start*/ 0xA85, WordBreakProperty.ALetter],
-  [/*start*/ 0xA8E, WordBreakProperty.Other],
-  [/*start*/ 0xA8F, WordBreakProperty.ALetter],
-  [/*start*/ 0xA92, WordBreakProperty.Other],
-  [/*start*/ 0xA93, WordBreakProperty.ALetter],
-  [/*start*/ 0xAA9, WordBreakProperty.Other],
-  [/*start*/ 0xAAA, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB1, WordBreakProperty.Other],
-  [/*start*/ 0xAB2, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB4, WordBreakProperty.Other],
-  [/*start*/ 0xAB5, WordBreakProperty.ALetter],
-  [/*start*/ 0xABA, WordBreakProperty.Other],
-  [/*start*/ 0xABC, WordBreakProperty.Extend],
-  [/*start*/ 0xABD, WordBreakProperty.ALetter],
-  [/*start*/ 0xABE, WordBreakProperty.Extend],
-  [/*start*/ 0xAC6, WordBreakProperty.Other],
-  [/*start*/ 0xAC7, WordBreakProperty.Extend],
-  [/*start*/ 0xACA, WordBreakProperty.Other],
-  [/*start*/ 0xACB, WordBreakProperty.Extend],
-  [/*start*/ 0xACE, WordBreakProperty.Other],
-  [/*start*/ 0xAD0, WordBreakProperty.ALetter],
-  [/*start*/ 0xAD1, WordBreakProperty.Other],
-  [/*start*/ 0xAE0, WordBreakProperty.ALetter],
-  [/*start*/ 0xAE2, WordBreakProperty.Extend],
-  [/*start*/ 0xAE4, WordBreakProperty.Other],
-  [/*start*/ 0xAE6, WordBreakProperty.Numeric],
-  [/*start*/ 0xAF0, WordBreakProperty.Other],
-  [/*start*/ 0xAF9, WordBreakProperty.ALetter],
-  [/*start*/ 0xAFA, WordBreakProperty.Extend],
-  [/*start*/ 0xB00, WordBreakProperty.Other],
-  [/*start*/ 0xB01, WordBreakProperty.Extend],
-  [/*start*/ 0xB04, WordBreakProperty.Other],
-  [/*start*/ 0xB05, WordBreakProperty.ALetter],
-  [/*start*/ 0xB0D, WordBreakProperty.Other],
-  [/*start*/ 0xB0F, WordBreakProperty.ALetter],
-  [/*start*/ 0xB11, WordBreakProperty.Other],
-  [/*start*/ 0xB13, WordBreakProperty.ALetter],
-  [/*start*/ 0xB29, WordBreakProperty.Other],
-  [/*start*/ 0xB2A, WordBreakProperty.ALetter],
-  [/*start*/ 0xB31, WordBreakProperty.Other],
-  [/*start*/ 0xB32, WordBreakProperty.ALetter],
-  [/*start*/ 0xB34, WordBreakProperty.Other],
-  [/*start*/ 0xB35, WordBreakProperty.ALetter],
-  [/*start*/ 0xB3A, WordBreakProperty.Other],
-  [/*start*/ 0xB3C, WordBreakProperty.Extend],
-  [/*start*/ 0xB3D, WordBreakProperty.ALetter],
-  [/*start*/ 0xB3E, WordBreakProperty.Extend],
-  [/*start*/ 0xB45, WordBreakProperty.Other],
-  [/*start*/ 0xB47, WordBreakProperty.Extend],
-  [/*start*/ 0xB49, WordBreakProperty.Other],
-  [/*start*/ 0xB4B, WordBreakProperty.Extend],
-  [/*start*/ 0xB4E, WordBreakProperty.Other],
-  [/*start*/ 0xB55, WordBreakProperty.Extend],
-  [/*start*/ 0xB58, WordBreakProperty.Other],
-  [/*start*/ 0xB5C, WordBreakProperty.ALetter],
-  [/*start*/ 0xB5E, WordBreakProperty.Other],
-  [/*start*/ 0xB5F, WordBreakProperty.ALetter],
-  [/*start*/ 0xB62, WordBreakProperty.Extend],
-  [/*start*/ 0xB64, WordBreakProperty.Other],
-  [/*start*/ 0xB66, WordBreakProperty.Numeric],
-  [/*start*/ 0xB70, WordBreakProperty.Other],
-  [/*start*/ 0xB71, WordBreakProperty.ALetter],
-  [/*start*/ 0xB72, WordBreakProperty.Other],
-  [/*start*/ 0xB82, WordBreakProperty.Extend],
-  [/*start*/ 0xB83, WordBreakProperty.ALetter],
-  [/*start*/ 0xB84, WordBreakProperty.Other],
-  [/*start*/ 0xB85, WordBreakProperty.ALetter],
-  [/*start*/ 0xB8B, WordBreakProperty.Other],
-  [/*start*/ 0xB8E, WordBreakProperty.ALetter],
-  [/*start*/ 0xB91, WordBreakProperty.Other],
-  [/*start*/ 0xB92, WordBreakProperty.ALetter],
-  [/*start*/ 0xB96, WordBreakProperty.Other],
-  [/*start*/ 0xB99, WordBreakProperty.ALetter],
-  [/*start*/ 0xB9B, WordBreakProperty.Other],
-  [/*start*/ 0xB9C, WordBreakProperty.ALetter],
-  [/*start*/ 0xB9D, WordBreakProperty.Other],
-  [/*start*/ 0xB9E, WordBreakProperty.ALetter],
-  [/*start*/ 0xBA0, WordBreakProperty.Other],
-  [/*start*/ 0xBA3, WordBreakProperty.ALetter],
-  [/*start*/ 0xBA5, WordBreakProperty.Other],
-  [/*start*/ 0xBA8, WordBreakProperty.ALetter],
-  [/*start*/ 0xBAB, WordBreakProperty.Other],
-  [/*start*/ 0xBAE, WordBreakProperty.ALetter],
-  [/*start*/ 0xBBA, WordBreakProperty.Other],
-  [/*start*/ 0xBBE, WordBreakProperty.Extend],
-  [/*start*/ 0xBC3, WordBreakProperty.Other],
-  [/*start*/ 0xBC6, WordBreakProperty.Extend],
-  [/*start*/ 0xBC9, WordBreakProperty.Other],
-  [/*start*/ 0xBCA, WordBreakProperty.Extend],
-  [/*start*/ 0xBCE, WordBreakProperty.Other],
-  [/*start*/ 0xBD0, WordBreakProperty.ALetter],
-  [/*start*/ 0xBD1, WordBreakProperty.Other],
-  [/*start*/ 0xBD7, WordBreakProperty.Extend],
-  [/*start*/ 0xBD8, WordBreakProperty.Other],
-  [/*start*/ 0xBE6, WordBreakProperty.Numeric],
-  [/*start*/ 0xBF0, WordBreakProperty.Other],
-  [/*start*/ 0xC00, WordBreakProperty.Extend],
-  [/*start*/ 0xC05, WordBreakProperty.ALetter],
-  [/*start*/ 0xC0D, WordBreakProperty.Other],
-  [/*start*/ 0xC0E, WordBreakProperty.ALetter],
-  [/*start*/ 0xC11, WordBreakProperty.Other],
-  [/*start*/ 0xC12, WordBreakProperty.ALetter],
-  [/*start*/ 0xC29, WordBreakProperty.Other],
-  [/*start*/ 0xC2A, WordBreakProperty.ALetter],
-  [/*start*/ 0xC3A, WordBreakProperty.Other],
-  [/*start*/ 0xC3D, WordBreakProperty.ALetter],
-  [/*start*/ 0xC3E, WordBreakProperty.Extend],
-  [/*start*/ 0xC45, WordBreakProperty.Other],
-  [/*start*/ 0xC46, WordBreakProperty.Extend],
-  [/*start*/ 0xC49, WordBreakProperty.Other],
-  [/*start*/ 0xC4A, WordBreakProperty.Extend],
-  [/*start*/ 0xC4E, WordBreakProperty.Other],
-  [/*start*/ 0xC55, WordBreakProperty.Extend],
-  [/*start*/ 0xC57, WordBreakProperty.Other],
-  [/*start*/ 0xC58, WordBreakProperty.ALetter],
-  [/*start*/ 0xC5B, WordBreakProperty.Other],
-  [/*start*/ 0xC60, WordBreakProperty.ALetter],
-  [/*start*/ 0xC62, WordBreakProperty.Extend],
-  [/*start*/ 0xC64, WordBreakProperty.Other],
-  [/*start*/ 0xC66, WordBreakProperty.Numeric],
-  [/*start*/ 0xC70, WordBreakProperty.Other],
-  [/*start*/ 0xC80, WordBreakProperty.ALetter],
-  [/*start*/ 0xC81, WordBreakProperty.Extend],
-  [/*start*/ 0xC84, WordBreakProperty.Other],
-  [/*start*/ 0xC85, WordBreakProperty.ALetter],
-  [/*start*/ 0xC8D, WordBreakProperty.Other],
-  [/*start*/ 0xC8E, WordBreakProperty.ALetter],
-  [/*start*/ 0xC91, WordBreakProperty.Other],
-  [/*start*/ 0xC92, WordBreakProperty.ALetter],
-  [/*start*/ 0xCA9, WordBreakProperty.Other],
-  [/*start*/ 0xCAA, WordBreakProperty.ALetter],
-  [/*start*/ 0xCB4, WordBreakProperty.Other],
-  [/*start*/ 0xCB5, WordBreakProperty.ALetter],
-  [/*start*/ 0xCBA, WordBreakProperty.Other],
-  [/*start*/ 0xCBC, WordBreakProperty.Extend],
-  [/*start*/ 0xCBD, WordBreakProperty.ALetter],
-  [/*start*/ 0xCBE, WordBreakProperty.Extend],
-  [/*start*/ 0xCC5, WordBreakProperty.Other],
-  [/*start*/ 0xCC6, WordBreakProperty.Extend],
-  [/*start*/ 0xCC9, WordBreakProperty.Other],
-  [/*start*/ 0xCCA, WordBreakProperty.Extend],
-  [/*start*/ 0xCCE, WordBreakProperty.Other],
-  [/*start*/ 0xCD5, WordBreakProperty.Extend],
-  [/*start*/ 0xCD7, WordBreakProperty.Other],
-  [/*start*/ 0xCDE, WordBreakProperty.ALetter],
-  [/*start*/ 0xCDF, WordBreakProperty.Other],
-  [/*start*/ 0xCE0, WordBreakProperty.ALetter],
-  [/*start*/ 0xCE2, WordBreakProperty.Extend],
-  [/*start*/ 0xCE4, WordBreakProperty.Other],
-  [/*start*/ 0xCE6, WordBreakProperty.Numeric],
-  [/*start*/ 0xCF0, WordBreakProperty.Other],
-  [/*start*/ 0xCF1, WordBreakProperty.ALetter],
-  [/*start*/ 0xCF3, WordBreakProperty.Other],
-  [/*start*/ 0xD00, WordBreakProperty.Extend],
-  [/*start*/ 0xD04, WordBreakProperty.ALetter],
-  [/*start*/ 0xD0D, WordBreakProperty.Other],
-  [/*start*/ 0xD0E, WordBreakProperty.ALetter],
-  [/*start*/ 0xD11, WordBreakProperty.Other],
-  [/*start*/ 0xD12, WordBreakProperty.ALetter],
-  [/*start*/ 0xD3B, WordBreakProperty.Extend],
-  [/*start*/ 0xD3D, WordBreakProperty.ALetter],
-  [/*start*/ 0xD3E, WordBreakProperty.Extend],
-  [/*start*/ 0xD45, WordBreakProperty.Other],
-  [/*start*/ 0xD46, WordBreakProperty.Extend],
-  [/*start*/ 0xD49, WordBreakProperty.Other],
-  [/*start*/ 0xD4A, WordBreakProperty.Extend],
-  [/*start*/ 0xD4E, WordBreakProperty.ALetter],
-  [/*start*/ 0xD4F, WordBreakProperty.Other],
-  [/*start*/ 0xD54, WordBreakProperty.ALetter],
-  [/*start*/ 0xD57, WordBreakProperty.Extend],
-  [/*start*/ 0xD58, WordBreakProperty.Other],
-  [/*start*/ 0xD5F, WordBreakProperty.ALetter],
-  [/*start*/ 0xD62, WordBreakProperty.Extend],
-  [/*start*/ 0xD64, WordBreakProperty.Other],
-  [/*start*/ 0xD66, WordBreakProperty.Numeric],
-  [/*start*/ 0xD70, WordBreakProperty.Other],
-  [/*start*/ 0xD7A, WordBreakProperty.ALetter],
-  [/*start*/ 0xD80, WordBreakProperty.Other],
-  [/*start*/ 0xD81, WordBreakProperty.Extend],
-  [/*start*/ 0xD84, WordBreakProperty.Other],
-  [/*start*/ 0xD85, WordBreakProperty.ALetter],
-  [/*start*/ 0xD97, WordBreakProperty.Other],
-  [/*start*/ 0xD9A, WordBreakProperty.ALetter],
-  [/*start*/ 0xDB2, WordBreakProperty.Other],
-  [/*start*/ 0xDB3, WordBreakProperty.ALetter],
-  [/*start*/ 0xDBC, WordBreakProperty.Other],
-  [/*start*/ 0xDBD, WordBreakProperty.ALetter],
-  [/*start*/ 0xDBE, WordBreakProperty.Other],
-  [/*start*/ 0xDC0, WordBreakProperty.ALetter],
-  [/*start*/ 0xDC7, WordBreakProperty.Other],
-  [/*start*/ 0xDCA, WordBreakProperty.Extend],
-  [/*start*/ 0xDCB, WordBreakProperty.Other],
-  [/*start*/ 0xDCF, WordBreakProperty.Extend],
-  [/*start*/ 0xDD5, WordBreakProperty.Other],
-  [/*start*/ 0xDD6, WordBreakProperty.Extend],
-  [/*start*/ 0xDD7, WordBreakProperty.Other],
-  [/*start*/ 0xDD8, WordBreakProperty.Extend],
-  [/*start*/ 0xDE0, WordBreakProperty.Other],
-  [/*start*/ 0xDE6, WordBreakProperty.Numeric],
-  [/*start*/ 0xDF0, WordBreakProperty.Other],
-  [/*start*/ 0xDF2, WordBreakProperty.Extend],
-  [/*start*/ 0xDF4, WordBreakProperty.Other],
-  [/*start*/ 0xE31, WordBreakProperty.Extend],
-  [/*start*/ 0xE32, WordBreakProperty.Other],
-  [/*start*/ 0xE34, WordBreakProperty.Extend],
-  [/*start*/ 0xE3B, WordBreakProperty.Other],
-  [/*start*/ 0xE47, WordBreakProperty.Extend],
-  [/*start*/ 0xE4F, WordBreakProperty.Other],
-  [/*start*/ 0xE50, WordBreakProperty.Numeric],
-  [/*start*/ 0xE5A, WordBreakProperty.Other],
-  [/*start*/ 0xEB1, WordBreakProperty.Extend],
-  [/*start*/ 0xEB2, WordBreakProperty.Other],
-  [/*start*/ 0xEB4, WordBreakProperty.Extend],
-  [/*start*/ 0xEBD, WordBreakProperty.Other],
-  [/*start*/ 0xEC8, WordBreakProperty.Extend],
-  [/*start*/ 0xECE, WordBreakProperty.Other],
-  [/*start*/ 0xED0, WordBreakProperty.Numeric],
-  [/*start*/ 0xEDA, WordBreakProperty.Other],
-  [/*start*/ 0xF00, WordBreakProperty.ALetter],
-  [/*start*/ 0xF01, WordBreakProperty.Other],
-  [/*start*/ 0xF18, WordBreakProperty.Extend],
-  [/*start*/ 0xF1A, WordBreakProperty.Other],
-  [/*start*/ 0xF20, WordBreakProperty.Numeric],
-  [/*start*/ 0xF2A, WordBreakProperty.Other],
-  [/*start*/ 0xF35, WordBreakProperty.Extend],
-  [/*start*/ 0xF36, WordBreakProperty.Other],
-  [/*start*/ 0xF37, WordBreakProperty.Extend],
-  [/*start*/ 0xF38, WordBreakProperty.Other],
-  [/*start*/ 0xF39, WordBreakProperty.Extend],
-  [/*start*/ 0xF3A, WordBreakProperty.Other],
-  [/*start*/ 0xF3E, WordBreakProperty.Extend],
-  [/*start*/ 0xF40, WordBreakProperty.ALetter],
-  [/*start*/ 0xF48, WordBreakProperty.Other],
-  [/*start*/ 0xF49, WordBreakProperty.ALetter],
-  [/*start*/ 0xF6D, WordBreakProperty.Other],
-  [/*start*/ 0xF71, WordBreakProperty.Extend],
-  [/*start*/ 0xF85, WordBreakProperty.Other],
-  [/*start*/ 0xF86, WordBreakProperty.Extend],
-  [/*start*/ 0xF88, WordBreakProperty.ALetter],
-  [/*start*/ 0xF8D, WordBreakProperty.Extend],
-  [/*start*/ 0xF98, WordBreakProperty.Other],
-  [/*start*/ 0xF99, WordBreakProperty.Extend],
-  [/*start*/ 0xFBD, WordBreakProperty.Other],
-  [/*start*/ 0xFC6, WordBreakProperty.Extend],
-  [/*start*/ 0xFC7, WordBreakProperty.Other],
-  [/*start*/ 0x102B, WordBreakProperty.Extend],
-  [/*start*/ 0x103F, WordBreakProperty.Other],
-  [/*start*/ 0x1040, WordBreakProperty.Numeric],
-  [/*start*/ 0x104A, WordBreakProperty.Other],
-  [/*start*/ 0x1056, WordBreakProperty.Extend],
-  [/*start*/ 0x105A, WordBreakProperty.Other],
-  [/*start*/ 0x105E, WordBreakProperty.Extend],
-  [/*start*/ 0x1061, WordBreakProperty.Other],
-  [/*start*/ 0x1062, WordBreakProperty.Extend],
-  [/*start*/ 0x1065, WordBreakProperty.Other],
-  [/*start*/ 0x1067, WordBreakProperty.Extend],
-  [/*start*/ 0x106E, WordBreakProperty.Other],
-  [/*start*/ 0x1071, WordBreakProperty.Extend],
-  [/*start*/ 0x1075, WordBreakProperty.Other],
-  [/*start*/ 0x1082, WordBreakProperty.Extend],
-  [/*start*/ 0x108E, WordBreakProperty.Other],
-  [/*start*/ 0x108F, WordBreakProperty.Extend],
-  [/*start*/ 0x1090, WordBreakProperty.Numeric],
-  [/*start*/ 0x109A, WordBreakProperty.Extend],
-  [/*start*/ 0x109E, WordBreakProperty.Other],
-  [/*start*/ 0x10A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10C6, WordBreakProperty.Other],
-  [/*start*/ 0x10C7, WordBreakProperty.ALetter],
-  [/*start*/ 0x10C8, WordBreakProperty.Other],
-  [/*start*/ 0x10CD, WordBreakProperty.ALetter],
-  [/*start*/ 0x10CE, WordBreakProperty.Other],
-  [/*start*/ 0x10D0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10FB, WordBreakProperty.Other],
-  [/*start*/ 0x10FC, WordBreakProperty.ALetter],
-  [/*start*/ 0x1249, WordBreakProperty.Other],
-  [/*start*/ 0x124A, WordBreakProperty.ALetter],
-  [/*start*/ 0x124E, WordBreakProperty.Other],
-  [/*start*/ 0x1250, WordBreakProperty.ALetter],
-  [/*start*/ 0x1257, WordBreakProperty.Other],
-  [/*start*/ 0x1258, WordBreakProperty.ALetter],
-  [/*start*/ 0x1259, WordBreakProperty.Other],
-  [/*start*/ 0x125A, WordBreakProperty.ALetter],
-  [/*start*/ 0x125E, WordBreakProperty.Other],
-  [/*start*/ 0x1260, WordBreakProperty.ALetter],
-  [/*start*/ 0x1289, WordBreakProperty.Other],
-  [/*start*/ 0x128A, WordBreakProperty.ALetter],
-  [/*start*/ 0x128E, WordBreakProperty.Other],
-  [/*start*/ 0x1290, WordBreakProperty.ALetter],
-  [/*start*/ 0x12B1, WordBreakProperty.Other],
-  [/*start*/ 0x12B2, WordBreakProperty.ALetter],
-  [/*start*/ 0x12B6, WordBreakProperty.Other],
-  [/*start*/ 0x12B8, WordBreakProperty.ALetter],
-  [/*start*/ 0x12BF, WordBreakProperty.Other],
-  [/*start*/ 0x12C0, WordBreakProperty.ALetter],
-  [/*start*/ 0x12C1, WordBreakProperty.Other],
-  [/*start*/ 0x12C2, WordBreakProperty.ALetter],
-  [/*start*/ 0x12C6, WordBreakProperty.Other],
-  [/*start*/ 0x12C8, WordBreakProperty.ALetter],
-  [/*start*/ 0x12D7, WordBreakProperty.Other],
-  [/*start*/ 0x12D8, WordBreakProperty.ALetter],
-  [/*start*/ 0x1311, WordBreakProperty.Other],
-  [/*start*/ 0x1312, WordBreakProperty.ALetter],
-  [/*start*/ 0x1316, WordBreakProperty.Other],
-  [/*start*/ 0x1318, WordBreakProperty.ALetter],
-  [/*start*/ 0x135B, WordBreakProperty.Other],
-  [/*start*/ 0x135D, WordBreakProperty.Extend],
-  [/*start*/ 0x1360, WordBreakProperty.Other],
-  [/*start*/ 0x1380, WordBreakProperty.ALetter],
-  [/*start*/ 0x1390, WordBreakProperty.Other],
-  [/*start*/ 0x13A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x13F6, WordBreakProperty.Other],
-  [/*start*/ 0x13F8, WordBreakProperty.ALetter],
-  [/*start*/ 0x13FE, WordBreakProperty.Other],
-  [/*start*/ 0x1401, WordBreakProperty.ALetter],
-  [/*start*/ 0x166D, WordBreakProperty.Other],
-  [/*start*/ 0x166F, WordBreakProperty.ALetter],
-  [/*start*/ 0x1680, WordBreakProperty.WSegSpace],
-  [/*start*/ 0x1681, WordBreakProperty.ALetter],
-  [/*start*/ 0x169B, WordBreakProperty.Other],
-  [/*start*/ 0x16A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x16EB, WordBreakProperty.Other],
-  [/*start*/ 0x16EE, WordBreakProperty.ALetter],
-  [/*start*/ 0x16F9, WordBreakProperty.Other],
-  [/*start*/ 0x1700, WordBreakProperty.ALetter],
-  [/*start*/ 0x170D, WordBreakProperty.Other],
-  [/*start*/ 0x170E, WordBreakProperty.ALetter],
-  [/*start*/ 0x1712, WordBreakProperty.Extend],
-  [/*start*/ 0x1715, WordBreakProperty.Other],
-  [/*start*/ 0x1720, WordBreakProperty.ALetter],
-  [/*start*/ 0x1732, WordBreakProperty.Extend],
-  [/*start*/ 0x1735, WordBreakProperty.Other],
-  [/*start*/ 0x1740, WordBreakProperty.ALetter],
-  [/*start*/ 0x1752, WordBreakProperty.Extend],
-  [/*start*/ 0x1754, WordBreakProperty.Other],
-  [/*start*/ 0x1760, WordBreakProperty.ALetter],
-  [/*start*/ 0x176D, WordBreakProperty.Other],
-  [/*start*/ 0x176E, WordBreakProperty.ALetter],
-  [/*start*/ 0x1771, WordBreakProperty.Other],
-  [/*start*/ 0x1772, WordBreakProperty.Extend],
-  [/*start*/ 0x1774, WordBreakProperty.Other],
-  [/*start*/ 0x17B4, WordBreakProperty.Extend],
-  [/*start*/ 0x17D4, WordBreakProperty.Other],
-  [/*start*/ 0x17DD, WordBreakProperty.Extend],
-  [/*start*/ 0x17DE, WordBreakProperty.Other],
-  [/*start*/ 0x17E0, WordBreakProperty.Numeric],
-  [/*start*/ 0x17EA, WordBreakProperty.Other],
-  [/*start*/ 0x180B, WordBreakProperty.Extend],
-  [/*start*/ 0x180E, WordBreakProperty.Format],
-  [/*start*/ 0x180F, WordBreakProperty.Other],
-  [/*start*/ 0x1810, WordBreakProperty.Numeric],
-  [/*start*/ 0x181A, WordBreakProperty.Other],
-  [/*start*/ 0x1820, WordBreakProperty.ALetter],
-  [/*start*/ 0x1879, WordBreakProperty.Other],
-  [/*start*/ 0x1880, WordBreakProperty.ALetter],
-  [/*start*/ 0x1885, WordBreakProperty.Extend],
-  [/*start*/ 0x1887, WordBreakProperty.ALetter],
-  [/*start*/ 0x18A9, WordBreakProperty.Extend],
-  [/*start*/ 0x18AA, WordBreakProperty.ALetter],
-  [/*start*/ 0x18AB, WordBreakProperty.Other],
-  [/*start*/ 0x18B0, WordBreakProperty.ALetter],
-  [/*start*/ 0x18F6, WordBreakProperty.Other],
-  [/*start*/ 0x1900, WordBreakProperty.ALetter],
-  [/*start*/ 0x191F, WordBreakProperty.Other],
-  [/*start*/ 0x1920, WordBreakProperty.Extend],
-  [/*start*/ 0x192C, WordBreakProperty.Other],
-  [/*start*/ 0x1930, WordBreakProperty.Extend],
-  [/*start*/ 0x193C, WordBreakProperty.Other],
-  [/*start*/ 0x1946, WordBreakProperty.Numeric],
-  [/*start*/ 0x1950, WordBreakProperty.Other],
-  [/*start*/ 0x19D0, WordBreakProperty.Numeric],
-  [/*start*/ 0x19DA, WordBreakProperty.Other],
-  [/*start*/ 0x1A00, WordBreakProperty.ALetter],
-  [/*start*/ 0x1A17, WordBreakProperty.Extend],
-  [/*start*/ 0x1A1C, WordBreakProperty.Other],
-  [/*start*/ 0x1A55, WordBreakProperty.Extend],
-  [/*start*/ 0x1A5F, WordBreakProperty.Other],
-  [/*start*/ 0x1A60, WordBreakProperty.Extend],
-  [/*start*/ 0x1A7D, WordBreakProperty.Other],
-  [/*start*/ 0x1A7F, WordBreakProperty.Extend],
-  [/*start*/ 0x1A80, WordBreakProperty.Numeric],
-  [/*start*/ 0x1A8A, WordBreakProperty.Other],
-  [/*start*/ 0x1A90, WordBreakProperty.Numeric],
-  [/*start*/ 0x1A9A, WordBreakProperty.Other],
-  [/*start*/ 0x1AB0, WordBreakProperty.Extend],
-  [/*start*/ 0x1AC1, WordBreakProperty.Other],
-  [/*start*/ 0x1B00, WordBreakProperty.Extend],
-  [/*start*/ 0x1B05, WordBreakProperty.ALetter],
-  [/*start*/ 0x1B34, WordBreakProperty.Extend],
-  [/*start*/ 0x1B45, WordBreakProperty.ALetter],
-  [/*start*/ 0x1B4C, WordBreakProperty.Other],
-  [/*start*/ 0x1B50, WordBreakProperty.Numeric],
-  [/*start*/ 0x1B5A, WordBreakProperty.Other],
-  [/*start*/ 0x1B6B, WordBreakProperty.Extend],
-  [/*start*/ 0x1B74, WordBreakProperty.Other],
-  [/*start*/ 0x1B80, WordBreakProperty.Extend],
-  [/*start*/ 0x1B83, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BA1, WordBreakProperty.Extend],
-  [/*start*/ 0x1BAE, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BB0, WordBreakProperty.Numeric],
-  [/*start*/ 0x1BBA, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BE6, WordBreakProperty.Extend],
-  [/*start*/ 0x1BF4, WordBreakProperty.Other],
-  [/*start*/ 0x1C00, WordBreakProperty.ALetter],
-  [/*start*/ 0x1C24, WordBreakProperty.Extend],
-  [/*start*/ 0x1C38, WordBreakProperty.Other],
-  [/*start*/ 0x1C40, WordBreakProperty.Numeric],
-  [/*start*/ 0x1C4A, WordBreakProperty.Other],
-  [/*start*/ 0x1C4D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1C50, WordBreakProperty.Numeric],
-  [/*start*/ 0x1C5A, WordBreakProperty.ALetter],
-  [/*start*/ 0x1C7E, WordBreakProperty.Other],
-  [/*start*/ 0x1C80, WordBreakProperty.ALetter],
-  [/*start*/ 0x1C89, WordBreakProperty.Other],
-  [/*start*/ 0x1C90, WordBreakProperty.ALetter],
-  [/*start*/ 0x1CBB, WordBreakProperty.Other],
-  [/*start*/ 0x1CBD, WordBreakProperty.ALetter],
-  [/*start*/ 0x1CC0, WordBreakProperty.Other],
-  [/*start*/ 0x1CD0, WordBreakProperty.Extend],
-  [/*start*/ 0x1CD3, WordBreakProperty.Other],
-  [/*start*/ 0x1CD4, WordBreakProperty.Extend],
-  [/*start*/ 0x1CE9, WordBreakProperty.ALetter],
-  [/*start*/ 0x1CED, WordBreakProperty.Extend],
-  [/*start*/ 0x1CEE, WordBreakProperty.ALetter],
-  [/*start*/ 0x1CF4, WordBreakProperty.Extend],
-  [/*start*/ 0x1CF5, WordBreakProperty.ALetter],
-  [/*start*/ 0x1CF7, WordBreakProperty.Extend],
-  [/*start*/ 0x1CFA, WordBreakProperty.ALetter],
-  [/*start*/ 0x1CFB, WordBreakProperty.Other],
-  [/*start*/ 0x1D00, WordBreakProperty.ALetter],
-  [/*start*/ 0x1DC0, WordBreakProperty.Extend],
-  [/*start*/ 0x1DFA, WordBreakProperty.Other],
-  [/*start*/ 0x1DFB, WordBreakProperty.Extend],
-  [/*start*/ 0x1E00, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F16, WordBreakProperty.Other],
-  [/*start*/ 0x1F18, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F1E, WordBreakProperty.Other],
-  [/*start*/ 0x1F20, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F46, WordBreakProperty.Other],
-  [/*start*/ 0x1F48, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F4E, WordBreakProperty.Other],
-  [/*start*/ 0x1F50, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F58, WordBreakProperty.Other],
-  [/*start*/ 0x1F59, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F5A, WordBreakProperty.Other],
-  [/*start*/ 0x1F5B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F5C, WordBreakProperty.Other],
-  [/*start*/ 0x1F5D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F5E, WordBreakProperty.Other],
-  [/*start*/ 0x1F5F, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F7E, WordBreakProperty.Other],
-  [/*start*/ 0x1F80, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FB5, WordBreakProperty.Other],
-  [/*start*/ 0x1FB6, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FBD, WordBreakProperty.Other],
-  [/*start*/ 0x1FBE, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FBF, WordBreakProperty.Other],
-  [/*start*/ 0x1FC2, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FC5, WordBreakProperty.Other],
-  [/*start*/ 0x1FC6, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FCD, WordBreakProperty.Other],
-  [/*start*/ 0x1FD0, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FD4, WordBreakProperty.Other],
-  [/*start*/ 0x1FD6, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FDC, WordBreakProperty.Other],
-  [/*start*/ 0x1FE0, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FED, WordBreakProperty.Other],
-  [/*start*/ 0x1FF2, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FF5, WordBreakProperty.Other],
-  [/*start*/ 0x1FF6, WordBreakProperty.ALetter],
-  [/*start*/ 0x1FFD, WordBreakProperty.Other],
-  [/*start*/ 0x2000, WordBreakProperty.WSegSpace],
-  [/*start*/ 0x2007, WordBreakProperty.Other],
-  [/*start*/ 0x2008, WordBreakProperty.WSegSpace],
-  [/*start*/ 0x200B, WordBreakProperty.Other],
-  [/*start*/ 0x200C, WordBreakProperty.Extend],
-  [/*start*/ 0x200D, WordBreakProperty.ZWJ],
-  [/*start*/ 0x200E, WordBreakProperty.Format],
-  [/*start*/ 0x2010, WordBreakProperty.Other],
-  [/*start*/ 0x2018, WordBreakProperty.MidNumLet],
-  [/*start*/ 0x201A, WordBreakProperty.Other],
-  [/*start*/ 0x2024, WordBreakProperty.MidNumLet],
-  [/*start*/ 0x2025, WordBreakProperty.Other],
-  [/*start*/ 0x2027, WordBreakProperty.MidLetter],
-  [/*start*/ 0x2028, WordBreakProperty.Newline],
-  [/*start*/ 0x202A, WordBreakProperty.Format],
-  [/*start*/ 0x202F, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0x2030, WordBreakProperty.Other],
-  [/*start*/ 0x203F, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0x2041, WordBreakProperty.Other],
-  [/*start*/ 0x2044, WordBreakProperty.MidNum],
-  [/*start*/ 0x2045, WordBreakProperty.Other],
-  [/*start*/ 0x2054, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0x2055, WordBreakProperty.Other],
-  [/*start*/ 0x205F, WordBreakProperty.WSegSpace],
-  [/*start*/ 0x2060, WordBreakProperty.Format],
-  [/*start*/ 0x2065, WordBreakProperty.Other],
-  [/*start*/ 0x2066, WordBreakProperty.Format],
-  [/*start*/ 0x2070, WordBreakProperty.Other],
-  [/*start*/ 0x2071, WordBreakProperty.ALetter],
-  [/*start*/ 0x2072, WordBreakProperty.Other],
-  [/*start*/ 0x207F, WordBreakProperty.ALetter],
-  [/*start*/ 0x2080, WordBreakProperty.Other],
-  [/*start*/ 0x2090, WordBreakProperty.ALetter],
-  [/*start*/ 0x209D, WordBreakProperty.Other],
-  [/*start*/ 0x20D0, WordBreakProperty.Extend],
-  [/*start*/ 0x20F1, WordBreakProperty.Other],
-  [/*start*/ 0x2102, WordBreakProperty.ALetter],
-  [/*start*/ 0x2103, WordBreakProperty.Other],
-  [/*start*/ 0x2107, WordBreakProperty.ALetter],
-  [/*start*/ 0x2108, WordBreakProperty.Other],
-  [/*start*/ 0x210A, WordBreakProperty.ALetter],
-  [/*start*/ 0x2114, WordBreakProperty.Other],
-  [/*start*/ 0x2115, WordBreakProperty.ALetter],
-  [/*start*/ 0x2116, WordBreakProperty.Other],
-  [/*start*/ 0x2119, WordBreakProperty.ALetter],
-  [/*start*/ 0x211E, WordBreakProperty.Other],
-  [/*start*/ 0x2124, WordBreakProperty.ALetter],
-  [/*start*/ 0x2125, WordBreakProperty.Other],
-  [/*start*/ 0x2126, WordBreakProperty.ALetter],
-  [/*start*/ 0x2127, WordBreakProperty.Other],
-  [/*start*/ 0x2128, WordBreakProperty.ALetter],
-  [/*start*/ 0x2129, WordBreakProperty.Other],
-  [/*start*/ 0x212A, WordBreakProperty.ALetter],
-  [/*start*/ 0x212E, WordBreakProperty.Other],
-  [/*start*/ 0x212F, WordBreakProperty.ALetter],
-  [/*start*/ 0x213A, WordBreakProperty.Other],
-  [/*start*/ 0x213C, WordBreakProperty.ALetter],
-  [/*start*/ 0x2140, WordBreakProperty.Other],
-  [/*start*/ 0x2145, WordBreakProperty.ALetter],
-  [/*start*/ 0x214A, WordBreakProperty.Other],
-  [/*start*/ 0x214E, WordBreakProperty.ALetter],
-  [/*start*/ 0x214F, WordBreakProperty.Other],
-  [/*start*/ 0x2160, WordBreakProperty.ALetter],
-  [/*start*/ 0x2189, WordBreakProperty.Other],
-  [/*start*/ 0x24B6, WordBreakProperty.ALetter],
-  [/*start*/ 0x24EA, WordBreakProperty.Other],
-  [/*start*/ 0x2C00, WordBreakProperty.ALetter],
-  [/*start*/ 0x2C2F, WordBreakProperty.Other],
-  [/*start*/ 0x2C30, WordBreakProperty.ALetter],
-  [/*start*/ 0x2C5F, WordBreakProperty.Other],
-  [/*start*/ 0x2C60, WordBreakProperty.ALetter],
-  [/*start*/ 0x2CE5, WordBreakProperty.Other],
-  [/*start*/ 0x2CEB, WordBreakProperty.ALetter],
-  [/*start*/ 0x2CEF, WordBreakProperty.Extend],
-  [/*start*/ 0x2CF2, WordBreakProperty.ALetter],
-  [/*start*/ 0x2CF4, WordBreakProperty.Other],
-  [/*start*/ 0x2D00, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D26, WordBreakProperty.Other],
-  [/*start*/ 0x2D27, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D28, WordBreakProperty.Other],
-  [/*start*/ 0x2D2D, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D2E, WordBreakProperty.Other],
-  [/*start*/ 0x2D30, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D68, WordBreakProperty.Other],
-  [/*start*/ 0x2D6F, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D70, WordBreakProperty.Other],
-  [/*start*/ 0x2D7F, WordBreakProperty.Extend],
-  [/*start*/ 0x2D80, WordBreakProperty.ALetter],
-  [/*start*/ 0x2D97, WordBreakProperty.Other],
-  [/*start*/ 0x2DA0, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DA7, WordBreakProperty.Other],
-  [/*start*/ 0x2DA8, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DAF, WordBreakProperty.Other],
-  [/*start*/ 0x2DB0, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DB7, WordBreakProperty.Other],
-  [/*start*/ 0x2DB8, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DBF, WordBreakProperty.Other],
-  [/*start*/ 0x2DC0, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DC7, WordBreakProperty.Other],
-  [/*start*/ 0x2DC8, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DCF, WordBreakProperty.Other],
-  [/*start*/ 0x2DD0, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DD7, WordBreakProperty.Other],
-  [/*start*/ 0x2DD8, WordBreakProperty.ALetter],
-  [/*start*/ 0x2DDF, WordBreakProperty.Other],
-  [/*start*/ 0x2DE0, WordBreakProperty.Extend],
-  [/*start*/ 0x2E00, WordBreakProperty.Other],
-  [/*start*/ 0x2E2F, WordBreakProperty.ALetter],
-  [/*start*/ 0x2E30, WordBreakProperty.Other],
-  [/*start*/ 0x3000, WordBreakProperty.WSegSpace],
-  [/*start*/ 0x3001, WordBreakProperty.Other],
-  [/*start*/ 0x3005, WordBreakProperty.ALetter],
-  [/*start*/ 0x3006, WordBreakProperty.Other],
-  [/*start*/ 0x302A, WordBreakProperty.Extend],
-  [/*start*/ 0x3030, WordBreakProperty.Other],
-  [/*start*/ 0x3031, WordBreakProperty.Katakana],
-  [/*start*/ 0x3036, WordBreakProperty.Other],
-  [/*start*/ 0x303B, WordBreakProperty.ALetter],
-  [/*start*/ 0x303D, WordBreakProperty.Other],
-  [/*start*/ 0x3099, WordBreakProperty.Extend],
-  [/*start*/ 0x309B, WordBreakProperty.Katakana],
-  [/*start*/ 0x309D, WordBreakProperty.Other],
-  [/*start*/ 0x30A0, WordBreakProperty.Katakana],
-  [/*start*/ 0x30FB, WordBreakProperty.Other],
-  [/*start*/ 0x30FC, WordBreakProperty.Katakana],
-  [/*start*/ 0x3100, WordBreakProperty.Other],
-  [/*start*/ 0x3105, WordBreakProperty.ALetter],
-  [/*start*/ 0x3130, WordBreakProperty.Other],
-  [/*start*/ 0x3131, WordBreakProperty.ALetter],
-  [/*start*/ 0x318F, WordBreakProperty.Other],
-  [/*start*/ 0x31A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x31C0, WordBreakProperty.Other],
-  [/*start*/ 0x31F0, WordBreakProperty.Katakana],
-  [/*start*/ 0x3200, WordBreakProperty.Other],
-  [/*start*/ 0x32D0, WordBreakProperty.Katakana],
-  [/*start*/ 0x32FF, WordBreakProperty.Other],
-  [/*start*/ 0x3300, WordBreakProperty.Katakana],
-  [/*start*/ 0x3358, WordBreakProperty.Other],
-  [/*start*/ 0xA000, WordBreakProperty.ALetter],
-  [/*start*/ 0xA48D, WordBreakProperty.Other],
-  [/*start*/ 0xA4D0, WordBreakProperty.ALetter],
-  [/*start*/ 0xA4FE, WordBreakProperty.Other],
-  [/*start*/ 0xA500, WordBreakProperty.ALetter],
-  [/*start*/ 0xA60D, WordBreakProperty.Other],
-  [/*start*/ 0xA610, WordBreakProperty.ALetter],
-  [/*start*/ 0xA620, WordBreakProperty.Numeric],
-  [/*start*/ 0xA62A, WordBreakProperty.ALetter],
-  [/*start*/ 0xA62C, WordBreakProperty.Other],
-  [/*start*/ 0xA640, WordBreakProperty.ALetter],
-  [/*start*/ 0xA66F, WordBreakProperty.Extend],
-  [/*start*/ 0xA673, WordBreakProperty.Other],
-  [/*start*/ 0xA674, WordBreakProperty.Extend],
-  [/*start*/ 0xA67E, WordBreakProperty.Other],
-  [/*start*/ 0xA67F, WordBreakProperty.ALetter],
-  [/*start*/ 0xA69E, WordBreakProperty.Extend],
-  [/*start*/ 0xA6A0, WordBreakProperty.ALetter],
-  [/*start*/ 0xA6F0, WordBreakProperty.Extend],
-  [/*start*/ 0xA6F2, WordBreakProperty.Other],
-  [/*start*/ 0xA708, WordBreakProperty.ALetter],
-  [/*start*/ 0xA7C0, WordBreakProperty.Other],
-  [/*start*/ 0xA7C2, WordBreakProperty.ALetter],
-  [/*start*/ 0xA7CB, WordBreakProperty.Other],
-  [/*start*/ 0xA7F5, WordBreakProperty.ALetter],
-  [/*start*/ 0xA802, WordBreakProperty.Extend],
-  [/*start*/ 0xA803, WordBreakProperty.ALetter],
-  [/*start*/ 0xA806, WordBreakProperty.Extend],
-  [/*start*/ 0xA807, WordBreakProperty.ALetter],
-  [/*start*/ 0xA80B, WordBreakProperty.Extend],
-  [/*start*/ 0xA80C, WordBreakProperty.ALetter],
-  [/*start*/ 0xA823, WordBreakProperty.Extend],
-  [/*start*/ 0xA828, WordBreakProperty.Other],
-  [/*start*/ 0xA82C, WordBreakProperty.Extend],
-  [/*start*/ 0xA82D, WordBreakProperty.Other],
-  [/*start*/ 0xA840, WordBreakProperty.ALetter],
-  [/*start*/ 0xA874, WordBreakProperty.Other],
-  [/*start*/ 0xA880, WordBreakProperty.Extend],
-  [/*start*/ 0xA882, WordBreakProperty.ALetter],
-  [/*start*/ 0xA8B4, WordBreakProperty.Extend],
-  [/*start*/ 0xA8C6, WordBreakProperty.Other],
-  [/*start*/ 0xA8D0, WordBreakProperty.Numeric],
-  [/*start*/ 0xA8DA, WordBreakProperty.Other],
-  [/*start*/ 0xA8E0, WordBreakProperty.Extend],
-  [/*start*/ 0xA8F2, WordBreakProperty.ALetter],
-  [/*start*/ 0xA8F8, WordBreakProperty.Other],
-  [/*start*/ 0xA8FB, WordBreakProperty.ALetter],
-  [/*start*/ 0xA8FC, WordBreakProperty.Other],
-  [/*start*/ 0xA8FD, WordBreakProperty.ALetter],
-  [/*start*/ 0xA8FF, WordBreakProperty.Extend],
-  [/*start*/ 0xA900, WordBreakProperty.Numeric],
-  [/*start*/ 0xA90A, WordBreakProperty.ALetter],
-  [/*start*/ 0xA926, WordBreakProperty.Extend],
-  [/*start*/ 0xA92E, WordBreakProperty.Other],
-  [/*start*/ 0xA930, WordBreakProperty.ALetter],
-  [/*start*/ 0xA947, WordBreakProperty.Extend],
-  [/*start*/ 0xA954, WordBreakProperty.Other],
-  [/*start*/ 0xA960, WordBreakProperty.ALetter],
-  [/*start*/ 0xA97D, WordBreakProperty.Other],
-  [/*start*/ 0xA980, WordBreakProperty.Extend],
-  [/*start*/ 0xA984, WordBreakProperty.ALetter],
-  [/*start*/ 0xA9B3, WordBreakProperty.Extend],
-  [/*start*/ 0xA9C1, WordBreakProperty.Other],
-  [/*start*/ 0xA9CF, WordBreakProperty.ALetter],
-  [/*start*/ 0xA9D0, WordBreakProperty.Numeric],
-  [/*start*/ 0xA9DA, WordBreakProperty.Other],
-  [/*start*/ 0xA9E5, WordBreakProperty.Extend],
-  [/*start*/ 0xA9E6, WordBreakProperty.Other],
-  [/*start*/ 0xA9F0, WordBreakProperty.Numeric],
-  [/*start*/ 0xA9FA, WordBreakProperty.Other],
-  [/*start*/ 0xAA00, WordBreakProperty.ALetter],
-  [/*start*/ 0xAA29, WordBreakProperty.Extend],
-  [/*start*/ 0xAA37, WordBreakProperty.Other],
-  [/*start*/ 0xAA40, WordBreakProperty.ALetter],
-  [/*start*/ 0xAA43, WordBreakProperty.Extend],
-  [/*start*/ 0xAA44, WordBreakProperty.ALetter],
-  [/*start*/ 0xAA4C, WordBreakProperty.Extend],
-  [/*start*/ 0xAA4E, WordBreakProperty.Other],
-  [/*start*/ 0xAA50, WordBreakProperty.Numeric],
-  [/*start*/ 0xAA5A, WordBreakProperty.Other],
-  [/*start*/ 0xAA7B, WordBreakProperty.Extend],
-  [/*start*/ 0xAA7E, WordBreakProperty.Other],
-  [/*start*/ 0xAAB0, WordBreakProperty.Extend],
-  [/*start*/ 0xAAB1, WordBreakProperty.Other],
-  [/*start*/ 0xAAB2, WordBreakProperty.Extend],
-  [/*start*/ 0xAAB5, WordBreakProperty.Other],
-  [/*start*/ 0xAAB7, WordBreakProperty.Extend],
-  [/*start*/ 0xAAB9, WordBreakProperty.Other],
-  [/*start*/ 0xAABE, WordBreakProperty.Extend],
-  [/*start*/ 0xAAC0, WordBreakProperty.Other],
-  [/*start*/ 0xAAC1, WordBreakProperty.Extend],
-  [/*start*/ 0xAAC2, WordBreakProperty.Other],
-  [/*start*/ 0xAAE0, WordBreakProperty.ALetter],
-  [/*start*/ 0xAAEB, WordBreakProperty.Extend],
-  [/*start*/ 0xAAF0, WordBreakProperty.Other],
-  [/*start*/ 0xAAF2, WordBreakProperty.ALetter],
-  [/*start*/ 0xAAF5, WordBreakProperty.Extend],
-  [/*start*/ 0xAAF7, WordBreakProperty.Other],
-  [/*start*/ 0xAB01, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB07, WordBreakProperty.Other],
-  [/*start*/ 0xAB09, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB0F, WordBreakProperty.Other],
-  [/*start*/ 0xAB11, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB17, WordBreakProperty.Other],
-  [/*start*/ 0xAB20, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB27, WordBreakProperty.Other],
-  [/*start*/ 0xAB28, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB2F, WordBreakProperty.Other],
-  [/*start*/ 0xAB30, WordBreakProperty.ALetter],
-  [/*start*/ 0xAB6A, WordBreakProperty.Other],
-  [/*start*/ 0xAB70, WordBreakProperty.ALetter],
-  [/*start*/ 0xABE3, WordBreakProperty.Extend],
-  [/*start*/ 0xABEB, WordBreakProperty.Other],
-  [/*start*/ 0xABEC, WordBreakProperty.Extend],
-  [/*start*/ 0xABEE, WordBreakProperty.Other],
-  [/*start*/ 0xABF0, WordBreakProperty.Numeric],
-  [/*start*/ 0xABFA, WordBreakProperty.Other],
-  [/*start*/ 0xAC00, WordBreakProperty.ALetter],
-  [/*start*/ 0xD7A4, WordBreakProperty.Other],
-  [/*start*/ 0xD7B0, WordBreakProperty.ALetter],
-  [/*start*/ 0xD7C7, WordBreakProperty.Other],
-  [/*start*/ 0xD7CB, WordBreakProperty.ALetter],
-  [/*start*/ 0xD7FC, WordBreakProperty.Other],
-  [/*start*/ 0xFB00, WordBreakProperty.ALetter],
-  [/*start*/ 0xFB07, WordBreakProperty.Other],
-  [/*start*/ 0xFB13, WordBreakProperty.ALetter],
-  [/*start*/ 0xFB18, WordBreakProperty.Other],
-  [/*start*/ 0xFB1D, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB1E, WordBreakProperty.Extend],
-  [/*start*/ 0xFB1F, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB29, WordBreakProperty.Other],
-  [/*start*/ 0xFB2A, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB37, WordBreakProperty.Other],
-  [/*start*/ 0xFB38, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB3D, WordBreakProperty.Other],
-  [/*start*/ 0xFB3E, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB3F, WordBreakProperty.Other],
-  [/*start*/ 0xFB40, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB42, WordBreakProperty.Other],
-  [/*start*/ 0xFB43, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB45, WordBreakProperty.Other],
-  [/*start*/ 0xFB46, WordBreakProperty.Hebrew_Letter],
-  [/*start*/ 0xFB50, WordBreakProperty.ALetter],
-  [/*start*/ 0xFBB2, WordBreakProperty.Other],
-  [/*start*/ 0xFBD3, WordBreakProperty.ALetter],
-  [/*start*/ 0xFD3E, WordBreakProperty.Other],
-  [/*start*/ 0xFD50, WordBreakProperty.ALetter],
-  [/*start*/ 0xFD90, WordBreakProperty.Other],
-  [/*start*/ 0xFD92, WordBreakProperty.ALetter],
-  [/*start*/ 0xFDC8, WordBreakProperty.Other],
-  [/*start*/ 0xFDF0, WordBreakProperty.ALetter],
-  [/*start*/ 0xFDFC, WordBreakProperty.Other],
-  [/*start*/ 0xFE00, WordBreakProperty.Extend],
-  [/*start*/ 0xFE10, WordBreakProperty.MidNum],
-  [/*start*/ 0xFE11, WordBreakProperty.Other],
-  [/*start*/ 0xFE13, WordBreakProperty.MidLetter],
-  [/*start*/ 0xFE14, WordBreakProperty.MidNum],
-  [/*start*/ 0xFE15, WordBreakProperty.Other],
-  [/*start*/ 0xFE20, WordBreakProperty.Extend],
-  [/*start*/ 0xFE30, WordBreakProperty.Other],
-  [/*start*/ 0xFE33, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0xFE35, WordBreakProperty.Other],
-  [/*start*/ 0xFE4D, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0xFE50, WordBreakProperty.MidNum],
-  [/*start*/ 0xFE51, WordBreakProperty.Other],
-  [/*start*/ 0xFE52, WordBreakProperty.MidNumLet],
-  [/*start*/ 0xFE53, WordBreakProperty.Other],
-  [/*start*/ 0xFE54, WordBreakProperty.MidNum],
-  [/*start*/ 0xFE55, WordBreakProperty.MidLetter],
-  [/*start*/ 0xFE56, WordBreakProperty.Other],
-  [/*start*/ 0xFE70, WordBreakProperty.ALetter],
-  [/*start*/ 0xFE75, WordBreakProperty.Other],
-  [/*start*/ 0xFE76, WordBreakProperty.ALetter],
-  [/*start*/ 0xFEFD, WordBreakProperty.Other],
-  [/*start*/ 0xFEFF, WordBreakProperty.Format],
-  [/*start*/ 0xFF00, WordBreakProperty.Other],
-  [/*start*/ 0xFF07, WordBreakProperty.MidNumLet],
-  [/*start*/ 0xFF08, WordBreakProperty.Other],
-  [/*start*/ 0xFF0C, WordBreakProperty.MidNum],
-  [/*start*/ 0xFF0D, WordBreakProperty.Other],
-  [/*start*/ 0xFF0E, WordBreakProperty.MidNumLet],
-  [/*start*/ 0xFF0F, WordBreakProperty.Other],
-  [/*start*/ 0xFF10, WordBreakProperty.Numeric],
-  [/*start*/ 0xFF1A, WordBreakProperty.MidLetter],
-  [/*start*/ 0xFF1B, WordBreakProperty.MidNum],
-  [/*start*/ 0xFF1C, WordBreakProperty.Other],
-  [/*start*/ 0xFF21, WordBreakProperty.ALetter],
-  [/*start*/ 0xFF3B, WordBreakProperty.Other],
-  [/*start*/ 0xFF3F, WordBreakProperty.ExtendNumLet],
-  [/*start*/ 0xFF40, WordBreakProperty.Other],
-  [/*start*/ 0xFF41, WordBreakProperty.ALetter],
-  [/*start*/ 0xFF5B, WordBreakProperty.Other],
-  [/*start*/ 0xFF66, WordBreakProperty.Katakana],
-  [/*start*/ 0xFF9E, WordBreakProperty.Extend],
-  [/*start*/ 0xFFA0, WordBreakProperty.ALetter],
-  [/*start*/ 0xFFBF, WordBreakProperty.Other],
-  [/*start*/ 0xFFC2, WordBreakProperty.ALetter],
-  [/*start*/ 0xFFC8, WordBreakProperty.Other],
-  [/*start*/ 0xFFCA, WordBreakProperty.ALetter],
-  [/*start*/ 0xFFD0, WordBreakProperty.Other],
-  [/*start*/ 0xFFD2, WordBreakProperty.ALetter],
-  [/*start*/ 0xFFD8, WordBreakProperty.Other],
-  [/*start*/ 0xFFDA, WordBreakProperty.ALetter],
-  [/*start*/ 0xFFDD, WordBreakProperty.Other],
-  [/*start*/ 0xFFF9, WordBreakProperty.Format],
-  [/*start*/ 0xFFFC, WordBreakProperty.Other],
-  [/*start*/ 0x10000, WordBreakProperty.ALetter],
-  [/*start*/ 0x1000C, WordBreakProperty.Other],
-  [/*start*/ 0x1000D, WordBreakProperty.ALetter],
-  [/*start*/ 0x10027, WordBreakProperty.Other],
-  [/*start*/ 0x10028, WordBreakProperty.ALetter],
-  [/*start*/ 0x1003B, WordBreakProperty.Other],
-  [/*start*/ 0x1003C, WordBreakProperty.ALetter],
-  [/*start*/ 0x1003E, WordBreakProperty.Other],
-  [/*start*/ 0x1003F, WordBreakProperty.ALetter],
-  [/*start*/ 0x1004E, WordBreakProperty.Other],
-  [/*start*/ 0x10050, WordBreakProperty.ALetter],
-  [/*start*/ 0x1005E, WordBreakProperty.Other],
-  [/*start*/ 0x10080, WordBreakProperty.ALetter],
-  [/*start*/ 0x100FB, WordBreakProperty.Other],
-  [/*start*/ 0x10140, WordBreakProperty.ALetter],
-  [/*start*/ 0x10175, WordBreakProperty.Other],
-  [/*start*/ 0x101FD, WordBreakProperty.Extend],
-  [/*start*/ 0x101FE, WordBreakProperty.Other],
-  [/*start*/ 0x10280, WordBreakProperty.ALetter],
-  [/*start*/ 0x1029D, WordBreakProperty.Other],
-  [/*start*/ 0x102A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x102D1, WordBreakProperty.Other],
-  [/*start*/ 0x102E0, WordBreakProperty.Extend],
-  [/*start*/ 0x102E1, WordBreakProperty.Other],
-  [/*start*/ 0x10300, WordBreakProperty.ALetter],
-  [/*start*/ 0x10320, WordBreakProperty.Other],
-  [/*start*/ 0x1032D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1034B, WordBreakProperty.Other],
-  [/*start*/ 0x10350, WordBreakProperty.ALetter],
-  [/*start*/ 0x10376, WordBreakProperty.Extend],
-  [/*start*/ 0x1037B, WordBreakProperty.Other],
-  [/*start*/ 0x10380, WordBreakProperty.ALetter],
-  [/*start*/ 0x1039E, WordBreakProperty.Other],
-  [/*start*/ 0x103A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x103C4, WordBreakProperty.Other],
-  [/*start*/ 0x103C8, WordBreakProperty.ALetter],
-  [/*start*/ 0x103D0, WordBreakProperty.Other],
-  [/*start*/ 0x103D1, WordBreakProperty.ALetter],
-  [/*start*/ 0x103D6, WordBreakProperty.Other],
-  [/*start*/ 0x10400, WordBreakProperty.ALetter],
-  [/*start*/ 0x1049E, WordBreakProperty.Other],
-  [/*start*/ 0x104A0, WordBreakProperty.Numeric],
-  [/*start*/ 0x104AA, WordBreakProperty.Other],
-  [/*start*/ 0x104B0, WordBreakProperty.ALetter],
-  [/*start*/ 0x104D4, WordBreakProperty.Other],
-  [/*start*/ 0x104D8, WordBreakProperty.ALetter],
-  [/*start*/ 0x104FC, WordBreakProperty.Other],
-  [/*start*/ 0x10500, WordBreakProperty.ALetter],
-  [/*start*/ 0x10528, WordBreakProperty.Other],
-  [/*start*/ 0x10530, WordBreakProperty.ALetter],
-  [/*start*/ 0x10564, WordBreakProperty.Other],
-  [/*start*/ 0x10600, WordBreakProperty.ALetter],
-  [/*start*/ 0x10737, WordBreakProperty.Other],
-  [/*start*/ 0x10740, WordBreakProperty.ALetter],
-  [/*start*/ 0x10756, WordBreakProperty.Other],
-  [/*start*/ 0x10760, WordBreakProperty.ALetter],
-  [/*start*/ 0x10768, WordBreakProperty.Other],
-  [/*start*/ 0x10800, WordBreakProperty.ALetter],
-  [/*start*/ 0x10806, WordBreakProperty.Other],
-  [/*start*/ 0x10808, WordBreakProperty.ALetter],
-  [/*start*/ 0x10809, WordBreakProperty.Other],
-  [/*start*/ 0x1080A, WordBreakProperty.ALetter],
-  [/*start*/ 0x10836, WordBreakProperty.Other],
-  [/*start*/ 0x10837, WordBreakProperty.ALetter],
-  [/*start*/ 0x10839, WordBreakProperty.Other],
-  [/*start*/ 0x1083C, WordBreakProperty.ALetter],
-  [/*start*/ 0x1083D, WordBreakProperty.Other],
-  [/*start*/ 0x1083F, WordBreakProperty.ALetter],
-  [/*start*/ 0x10856, WordBreakProperty.Other],
-  [/*start*/ 0x10860, WordBreakProperty.ALetter],
-  [/*start*/ 0x10877, WordBreakProperty.Other],
-  [/*start*/ 0x10880, WordBreakProperty.ALetter],
-  [/*start*/ 0x1089F, WordBreakProperty.Other],
-  [/*start*/ 0x108E0, WordBreakProperty.ALetter],
-  [/*start*/ 0x108F3, WordBreakProperty.Other],
-  [/*start*/ 0x108F4, WordBreakProperty.ALetter],
-  [/*start*/ 0x108F6, WordBreakProperty.Other],
-  [/*start*/ 0x10900, WordBreakProperty.ALetter],
-  [/*start*/ 0x10916, WordBreakProperty.Other],
-  [/*start*/ 0x10920, WordBreakProperty.ALetter],
-  [/*start*/ 0x1093A, WordBreakProperty.Other],
-  [/*start*/ 0x10980, WordBreakProperty.ALetter],
-  [/*start*/ 0x109B8, WordBreakProperty.Other],
-  [/*start*/ 0x109BE, WordBreakProperty.ALetter],
-  [/*start*/ 0x109C0, WordBreakProperty.Other],
-  [/*start*/ 0x10A00, WordBreakProperty.ALetter],
-  [/*start*/ 0x10A01, WordBreakProperty.Extend],
-  [/*start*/ 0x10A04, WordBreakProperty.Other],
-  [/*start*/ 0x10A05, WordBreakProperty.Extend],
-  [/*start*/ 0x10A07, WordBreakProperty.Other],
-  [/*start*/ 0x10A0C, WordBreakProperty.Extend],
-  [/*start*/ 0x10A10, WordBreakProperty.ALetter],
-  [/*start*/ 0x10A14, WordBreakProperty.Other],
-  [/*start*/ 0x10A15, WordBreakProperty.ALetter],
-  [/*start*/ 0x10A18, WordBreakProperty.Other],
-  [/*start*/ 0x10A19, WordBreakProperty.ALetter],
-  [/*start*/ 0x10A36, WordBreakProperty.Other],
-  [/*start*/ 0x10A38, WordBreakProperty.Extend],
-  [/*start*/ 0x10A3B, WordBreakProperty.Other],
-  [/*start*/ 0x10A3F, WordBreakProperty.Extend],
-  [/*start*/ 0x10A40, WordBreakProperty.Other],
-  [/*start*/ 0x10A60, WordBreakProperty.ALetter],
-  [/*start*/ 0x10A7D, WordBreakProperty.Other],
-  [/*start*/ 0x10A80, WordBreakProperty.ALetter],
-  [/*start*/ 0x10A9D, WordBreakProperty.Other],
-  [/*start*/ 0x10AC0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10AC8, WordBreakProperty.Other],
-  [/*start*/ 0x10AC9, WordBreakProperty.ALetter],
-  [/*start*/ 0x10AE5, WordBreakProperty.Extend],
-  [/*start*/ 0x10AE7, WordBreakProperty.Other],
-  [/*start*/ 0x10B00, WordBreakProperty.ALetter],
-  [/*start*/ 0x10B36, WordBreakProperty.Other],
-  [/*start*/ 0x10B40, WordBreakProperty.ALetter],
-  [/*start*/ 0x10B56, WordBreakProperty.Other],
-  [/*start*/ 0x10B60, WordBreakProperty.ALetter],
-  [/*start*/ 0x10B73, WordBreakProperty.Other],
-  [/*start*/ 0x10B80, WordBreakProperty.ALetter],
-  [/*start*/ 0x10B92, WordBreakProperty.Other],
-  [/*start*/ 0x10C00, WordBreakProperty.ALetter],
-  [/*start*/ 0x10C49, WordBreakProperty.Other],
-  [/*start*/ 0x10C80, WordBreakProperty.ALetter],
-  [/*start*/ 0x10CB3, WordBreakProperty.Other],
-  [/*start*/ 0x10CC0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10CF3, WordBreakProperty.Other],
-  [/*start*/ 0x10D00, WordBreakProperty.ALetter],
-  [/*start*/ 0x10D24, WordBreakProperty.Extend],
-  [/*start*/ 0x10D28, WordBreakProperty.Other],
-  [/*start*/ 0x10D30, WordBreakProperty.Numeric],
-  [/*start*/ 0x10D3A, WordBreakProperty.Other],
-  [/*start*/ 0x10E80, WordBreakProperty.ALetter],
-  [/*start*/ 0x10EAA, WordBreakProperty.Other],
-  [/*start*/ 0x10EAB, WordBreakProperty.Extend],
-  [/*start*/ 0x10EAD, WordBreakProperty.Other],
-  [/*start*/ 0x10EB0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10EB2, WordBreakProperty.Other],
-  [/*start*/ 0x10F00, WordBreakProperty.ALetter],
-  [/*start*/ 0x10F1D, WordBreakProperty.Other],
-  [/*start*/ 0x10F27, WordBreakProperty.ALetter],
-  [/*start*/ 0x10F28, WordBreakProperty.Other],
-  [/*start*/ 0x10F30, WordBreakProperty.ALetter],
-  [/*start*/ 0x10F46, WordBreakProperty.Extend],
-  [/*start*/ 0x10F51, WordBreakProperty.Other],
-  [/*start*/ 0x10FB0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10FC5, WordBreakProperty.Other],
-  [/*start*/ 0x10FE0, WordBreakProperty.ALetter],
-  [/*start*/ 0x10FF7, WordBreakProperty.Other],
-  [/*start*/ 0x11000, WordBreakProperty.Extend],
-  [/*start*/ 0x11003, WordBreakProperty.ALetter],
-  [/*start*/ 0x11038, WordBreakProperty.Extend],
-  [/*start*/ 0x11047, WordBreakProperty.Other],
-  [/*start*/ 0x11066, WordBreakProperty.Numeric],
-  [/*start*/ 0x11070, WordBreakProperty.Other],
-  [/*start*/ 0x1107F, WordBreakProperty.Extend],
-  [/*start*/ 0x11083, WordBreakProperty.ALetter],
-  [/*start*/ 0x110B0, WordBreakProperty.Extend],
-  [/*start*/ 0x110BB, WordBreakProperty.Other],
-  [/*start*/ 0x110BD, WordBreakProperty.Format],
-  [/*start*/ 0x110BE, WordBreakProperty.Other],
-  [/*start*/ 0x110CD, WordBreakProperty.Format],
-  [/*start*/ 0x110CE, WordBreakProperty.Other],
-  [/*start*/ 0x110D0, WordBreakProperty.ALetter],
-  [/*start*/ 0x110E9, WordBreakProperty.Other],
-  [/*start*/ 0x110F0, WordBreakProperty.Numeric],
-  [/*start*/ 0x110FA, WordBreakProperty.Other],
-  [/*start*/ 0x11100, WordBreakProperty.Extend],
-  [/*start*/ 0x11103, WordBreakProperty.ALetter],
-  [/*start*/ 0x11127, WordBreakProperty.Extend],
-  [/*start*/ 0x11135, WordBreakProperty.Other],
-  [/*start*/ 0x11136, WordBreakProperty.Numeric],
-  [/*start*/ 0x11140, WordBreakProperty.Other],
-  [/*start*/ 0x11144, WordBreakProperty.ALetter],
-  [/*start*/ 0x11145, WordBreakProperty.Extend],
-  [/*start*/ 0x11147, WordBreakProperty.ALetter],
-  [/*start*/ 0x11148, WordBreakProperty.Other],
-  [/*start*/ 0x11150, WordBreakProperty.ALetter],
-  [/*start*/ 0x11173, WordBreakProperty.Extend],
-  [/*start*/ 0x11174, WordBreakProperty.Other],
-  [/*start*/ 0x11176, WordBreakProperty.ALetter],
-  [/*start*/ 0x11177, WordBreakProperty.Other],
-  [/*start*/ 0x11180, WordBreakProperty.Extend],
-  [/*start*/ 0x11183, WordBreakProperty.ALetter],
-  [/*start*/ 0x111B3, WordBreakProperty.Extend],
-  [/*start*/ 0x111C1, WordBreakProperty.ALetter],
-  [/*start*/ 0x111C5, WordBreakProperty.Other],
-  [/*start*/ 0x111C9, WordBreakProperty.Extend],
-  [/*start*/ 0x111CD, WordBreakProperty.Other],
-  [/*start*/ 0x111CE, WordBreakProperty.Extend],
-  [/*start*/ 0x111D0, WordBreakProperty.Numeric],
-  [/*start*/ 0x111DA, WordBreakProperty.ALetter],
-  [/*start*/ 0x111DB, WordBreakProperty.Other],
-  [/*start*/ 0x111DC, WordBreakProperty.ALetter],
-  [/*start*/ 0x111DD, WordBreakProperty.Other],
-  [/*start*/ 0x11200, WordBreakProperty.ALetter],
-  [/*start*/ 0x11212, WordBreakProperty.Other],
-  [/*start*/ 0x11213, WordBreakProperty.ALetter],
-  [/*start*/ 0x1122C, WordBreakProperty.Extend],
-  [/*start*/ 0x11238, WordBreakProperty.Other],
-  [/*start*/ 0x1123E, WordBreakProperty.Extend],
-  [/*start*/ 0x1123F, WordBreakProperty.Other],
-  [/*start*/ 0x11280, WordBreakProperty.ALetter],
-  [/*start*/ 0x11287, WordBreakProperty.Other],
-  [/*start*/ 0x11288, WordBreakProperty.ALetter],
-  [/*start*/ 0x11289, WordBreakProperty.Other],
-  [/*start*/ 0x1128A, WordBreakProperty.ALetter],
-  [/*start*/ 0x1128E, WordBreakProperty.Other],
-  [/*start*/ 0x1128F, WordBreakProperty.ALetter],
-  [/*start*/ 0x1129E, WordBreakProperty.Other],
-  [/*start*/ 0x1129F, WordBreakProperty.ALetter],
-  [/*start*/ 0x112A9, WordBreakProperty.Other],
-  [/*start*/ 0x112B0, WordBreakProperty.ALetter],
-  [/*start*/ 0x112DF, WordBreakProperty.Extend],
-  [/*start*/ 0x112EB, WordBreakProperty.Other],
-  [/*start*/ 0x112F0, WordBreakProperty.Numeric],
-  [/*start*/ 0x112FA, WordBreakProperty.Other],
-  [/*start*/ 0x11300, WordBreakProperty.Extend],
-  [/*start*/ 0x11304, WordBreakProperty.Other],
-  [/*start*/ 0x11305, WordBreakProperty.ALetter],
-  [/*start*/ 0x1130D, WordBreakProperty.Other],
-  [/*start*/ 0x1130F, WordBreakProperty.ALetter],
-  [/*start*/ 0x11311, WordBreakProperty.Other],
-  [/*start*/ 0x11313, WordBreakProperty.ALetter],
-  [/*start*/ 0x11329, WordBreakProperty.Other],
-  [/*start*/ 0x1132A, WordBreakProperty.ALetter],
-  [/*start*/ 0x11331, WordBreakProperty.Other],
-  [/*start*/ 0x11332, WordBreakProperty.ALetter],
-  [/*start*/ 0x11334, WordBreakProperty.Other],
-  [/*start*/ 0x11335, WordBreakProperty.ALetter],
-  [/*start*/ 0x1133A, WordBreakProperty.Other],
-  [/*start*/ 0x1133B, WordBreakProperty.Extend],
-  [/*start*/ 0x1133D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1133E, WordBreakProperty.Extend],
-  [/*start*/ 0x11345, WordBreakProperty.Other],
-  [/*start*/ 0x11347, WordBreakProperty.Extend],
-  [/*start*/ 0x11349, WordBreakProperty.Other],
-  [/*start*/ 0x1134B, WordBreakProperty.Extend],
-  [/*start*/ 0x1134E, WordBreakProperty.Other],
-  [/*start*/ 0x11350, WordBreakProperty.ALetter],
-  [/*start*/ 0x11351, WordBreakProperty.Other],
-  [/*start*/ 0x11357, WordBreakProperty.Extend],
-  [/*start*/ 0x11358, WordBreakProperty.Other],
-  [/*start*/ 0x1135D, WordBreakProperty.ALetter],
-  [/*start*/ 0x11362, WordBreakProperty.Extend],
-  [/*start*/ 0x11364, WordBreakProperty.Other],
-  [/*start*/ 0x11366, WordBreakProperty.Extend],
-  [/*start*/ 0x1136D, WordBreakProperty.Other],
-  [/*start*/ 0x11370, WordBreakProperty.Extend],
-  [/*start*/ 0x11375, WordBreakProperty.Other],
-  [/*start*/ 0x11400, WordBreakProperty.ALetter],
-  [/*start*/ 0x11435, WordBreakProperty.Extend],
-  [/*start*/ 0x11447, WordBreakProperty.ALetter],
-  [/*start*/ 0x1144B, WordBreakProperty.Other],
-  [/*start*/ 0x11450, WordBreakProperty.Numeric],
-  [/*start*/ 0x1145A, WordBreakProperty.Other],
-  [/*start*/ 0x1145E, WordBreakProperty.Extend],
-  [/*start*/ 0x1145F, WordBreakProperty.ALetter],
-  [/*start*/ 0x11462, WordBreakProperty.Other],
-  [/*start*/ 0x11480, WordBreakProperty.ALetter],
-  [/*start*/ 0x114B0, WordBreakProperty.Extend],
-  [/*start*/ 0x114C4, WordBreakProperty.ALetter],
-  [/*start*/ 0x114C6, WordBreakProperty.Other],
-  [/*start*/ 0x114C7, WordBreakProperty.ALetter],
-  [/*start*/ 0x114C8, WordBreakProperty.Other],
-  [/*start*/ 0x114D0, WordBreakProperty.Numeric],
-  [/*start*/ 0x114DA, WordBreakProperty.Other],
-  [/*start*/ 0x11580, WordBreakProperty.ALetter],
-  [/*start*/ 0x115AF, WordBreakProperty.Extend],
-  [/*start*/ 0x115B6, WordBreakProperty.Other],
-  [/*start*/ 0x115B8, WordBreakProperty.Extend],
-  [/*start*/ 0x115C1, WordBreakProperty.Other],
-  [/*start*/ 0x115D8, WordBreakProperty.ALetter],
-  [/*start*/ 0x115DC, WordBreakProperty.Extend],
-  [/*start*/ 0x115DE, WordBreakProperty.Other],
-  [/*start*/ 0x11600, WordBreakProperty.ALetter],
-  [/*start*/ 0x11630, WordBreakProperty.Extend],
-  [/*start*/ 0x11641, WordBreakProperty.Other],
-  [/*start*/ 0x11644, WordBreakProperty.ALetter],
-  [/*start*/ 0x11645, WordBreakProperty.Other],
-  [/*start*/ 0x11650, WordBreakProperty.Numeric],
-  [/*start*/ 0x1165A, WordBreakProperty.Other],
-  [/*start*/ 0x11680, WordBreakProperty.ALetter],
-  [/*start*/ 0x116AB, WordBreakProperty.Extend],
-  [/*start*/ 0x116B8, WordBreakProperty.ALetter],
-  [/*start*/ 0x116B9, WordBreakProperty.Other],
-  [/*start*/ 0x116C0, WordBreakProperty.Numeric],
-  [/*start*/ 0x116CA, WordBreakProperty.Other],
-  [/*start*/ 0x1171D, WordBreakProperty.Extend],
-  [/*start*/ 0x1172C, WordBreakProperty.Other],
-  [/*start*/ 0x11730, WordBreakProperty.Numeric],
-  [/*start*/ 0x1173A, WordBreakProperty.Other],
-  [/*start*/ 0x11800, WordBreakProperty.ALetter],
-  [/*start*/ 0x1182C, WordBreakProperty.Extend],
-  [/*start*/ 0x1183B, WordBreakProperty.Other],
-  [/*start*/ 0x118A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x118E0, WordBreakProperty.Numeric],
-  [/*start*/ 0x118EA, WordBreakProperty.Other],
-  [/*start*/ 0x118FF, WordBreakProperty.ALetter],
-  [/*start*/ 0x11907, WordBreakProperty.Other],
-  [/*start*/ 0x11909, WordBreakProperty.ALetter],
-  [/*start*/ 0x1190A, WordBreakProperty.Other],
-  [/*start*/ 0x1190C, WordBreakProperty.ALetter],
-  [/*start*/ 0x11914, WordBreakProperty.Other],
-  [/*start*/ 0x11915, WordBreakProperty.ALetter],
-  [/*start*/ 0x11917, WordBreakProperty.Other],
-  [/*start*/ 0x11918, WordBreakProperty.ALetter],
-  [/*start*/ 0x11930, WordBreakProperty.Extend],
-  [/*start*/ 0x11936, WordBreakProperty.Other],
-  [/*start*/ 0x11937, WordBreakProperty.Extend],
-  [/*start*/ 0x11939, WordBreakProperty.Other],
-  [/*start*/ 0x1193B, WordBreakProperty.Extend],
-  [/*start*/ 0x1193F, WordBreakProperty.ALetter],
-  [/*start*/ 0x11940, WordBreakProperty.Extend],
-  [/*start*/ 0x11941, WordBreakProperty.ALetter],
-  [/*start*/ 0x11942, WordBreakProperty.Extend],
-  [/*start*/ 0x11944, WordBreakProperty.Other],
-  [/*start*/ 0x11950, WordBreakProperty.Numeric],
-  [/*start*/ 0x1195A, WordBreakProperty.Other],
-  [/*start*/ 0x119A0, WordBreakProperty.ALetter],
-  [/*start*/ 0x119A8, WordBreakProperty.Other],
-  [/*start*/ 0x119AA, WordBreakProperty.ALetter],
-  [/*start*/ 0x119D1, WordBreakProperty.Extend],
-  [/*start*/ 0x119D8, WordBreakProperty.Other],
-  [/*start*/ 0x119DA, WordBreakProperty.Extend],
-  [/*start*/ 0x119E1, WordBreakProperty.ALetter],
-  [/*start*/ 0x119E2, WordBreakProperty.Other],
-  [/*start*/ 0x119E3, WordBreakProperty.ALetter],
-  [/*start*/ 0x119E4, WordBreakProperty.Extend],
-  [/*start*/ 0x119E5, WordBreakProperty.Other],
-  [/*start*/ 0x11A00, WordBreakProperty.ALetter],
-  [/*start*/ 0x11A01, WordBreakProperty.Extend],
-  [/*start*/ 0x11A0B, WordBreakProperty.ALetter],
-  [/*start*/ 0x11A33, WordBreakProperty.Extend],
-  [/*start*/ 0x11A3A, WordBreakProperty.ALetter],
-  [/*start*/ 0x11A3B, WordBreakProperty.Extend],
-  [/*start*/ 0x11A3F, WordBreakProperty.Other],
-  [/*start*/ 0x11A47, WordBreakProperty.Extend],
-  [/*start*/ 0x11A48, WordBreakProperty.Other],
-  [/*start*/ 0x11A50, WordBreakProperty.ALetter],
-  [/*start*/ 0x11A51, WordBreakProperty.Extend],
-  [/*start*/ 0x11A5C, WordBreakProperty.ALetter],
-  [/*start*/ 0x11A8A, WordBreakProperty.Extend],
-  [/*start*/ 0x11A9A, WordBreakProperty.Other],
-  [/*start*/ 0x11A9D, WordBreakProperty.ALetter],
-  [/*start*/ 0x11A9E, WordBreakProperty.Other],
-  [/*start*/ 0x11AC0, WordBreakProperty.ALetter],
-  [/*start*/ 0x11AF9, WordBreakProperty.Other],
-  [/*start*/ 0x11C00, WordBreakProperty.ALetter],
-  [/*start*/ 0x11C09, WordBreakProperty.Other],
-  [/*start*/ 0x11C0A, WordBreakProperty.ALetter],
-  [/*start*/ 0x11C2F, WordBreakProperty.Extend],
-  [/*start*/ 0x11C37, WordBreakProperty.Other],
-  [/*start*/ 0x11C38, WordBreakProperty.Extend],
-  [/*start*/ 0x11C40, WordBreakProperty.ALetter],
-  [/*start*/ 0x11C41, WordBreakProperty.Other],
-  [/*start*/ 0x11C50, WordBreakProperty.Numeric],
-  [/*start*/ 0x11C5A, WordBreakProperty.Other],
-  [/*start*/ 0x11C72, WordBreakProperty.ALetter],
-  [/*start*/ 0x11C90, WordBreakProperty.Other],
-  [/*start*/ 0x11C92, WordBreakProperty.Extend],
-  [/*start*/ 0x11CA8, WordBreakProperty.Other],
-  [/*start*/ 0x11CA9, WordBreakProperty.Extend],
-  [/*start*/ 0x11CB7, WordBreakProperty.Other],
-  [/*start*/ 0x11D00, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D07, WordBreakProperty.Other],
-  [/*start*/ 0x11D08, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D0A, WordBreakProperty.Other],
-  [/*start*/ 0x11D0B, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D31, WordBreakProperty.Extend],
-  [/*start*/ 0x11D37, WordBreakProperty.Other],
-  [/*start*/ 0x11D3A, WordBreakProperty.Extend],
-  [/*start*/ 0x11D3B, WordBreakProperty.Other],
-  [/*start*/ 0x11D3C, WordBreakProperty.Extend],
-  [/*start*/ 0x11D3E, WordBreakProperty.Other],
-  [/*start*/ 0x11D3F, WordBreakProperty.Extend],
-  [/*start*/ 0x11D46, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D47, WordBreakProperty.Extend],
-  [/*start*/ 0x11D48, WordBreakProperty.Other],
-  [/*start*/ 0x11D50, WordBreakProperty.Numeric],
-  [/*start*/ 0x11D5A, WordBreakProperty.Other],
-  [/*start*/ 0x11D60, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D66, WordBreakProperty.Other],
-  [/*start*/ 0x11D67, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D69, WordBreakProperty.Other],
-  [/*start*/ 0x11D6A, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D8A, WordBreakProperty.Extend],
-  [/*start*/ 0x11D8F, WordBreakProperty.Other],
-  [/*start*/ 0x11D90, WordBreakProperty.Extend],
-  [/*start*/ 0x11D92, WordBreakProperty.Other],
-  [/*start*/ 0x11D93, WordBreakProperty.Extend],
-  [/*start*/ 0x11D98, WordBreakProperty.ALetter],
-  [/*start*/ 0x11D99, WordBreakProperty.Other],
-  [/*start*/ 0x11DA0, WordBreakProperty.Numeric],
-  [/*start*/ 0x11DAA, WordBreakProperty.Other],
-  [/*start*/ 0x11EE0, WordBreakProperty.ALetter],
-  [/*start*/ 0x11EF3, WordBreakProperty.Extend],
-  [/*start*/ 0x11EF7, WordBreakProperty.Other],
-  [/*start*/ 0x11FB0, WordBreakProperty.ALetter],
-  [/*start*/ 0x11FB1, WordBreakProperty.Other],
-  [/*start*/ 0x12000, WordBreakProperty.ALetter],
-  [/*start*/ 0x1239A, WordBreakProperty.Other],
-  [/*start*/ 0x12400, WordBreakProperty.ALetter],
-  [/*start*/ 0x1246F, WordBreakProperty.Other],
-  [/*start*/ 0x12480, WordBreakProperty.ALetter],
-  [/*start*/ 0x12544, WordBreakProperty.Other],
-  [/*start*/ 0x13000, WordBreakProperty.ALetter],
-  [/*start*/ 0x1342F, WordBreakProperty.Other],
-  [/*start*/ 0x13430, WordBreakProperty.Format],
-  [/*start*/ 0x13439, WordBreakProperty.Other],
-  [/*start*/ 0x14400, WordBreakProperty.ALetter],
-  [/*start*/ 0x14647, WordBreakProperty.Other],
-  [/*start*/ 0x16800, WordBreakProperty.ALetter],
-  [/*start*/ 0x16A39, WordBreakProperty.Other],
-  [/*start*/ 0x16A40, WordBreakProperty.ALetter],
-  [/*start*/ 0x16A5F, WordBreakProperty.Other],
-  [/*start*/ 0x16A60, WordBreakProperty.Numeric],
-  [/*start*/ 0x16A6A, WordBreakProperty.Other],
-  [/*start*/ 0x16AD0, WordBreakProperty.ALetter],
-  [/*start*/ 0x16AEE, WordBreakProperty.Other],
-  [/*start*/ 0x16AF0, WordBreakProperty.Extend],
-  [/*start*/ 0x16AF5, WordBreakProperty.Other],
-  [/*start*/ 0x16B00, WordBreakProperty.ALetter],
-  [/*start*/ 0x16B30, WordBreakProperty.Extend],
-  [/*start*/ 0x16B37, WordBreakProperty.Other],
-  [/*start*/ 0x16B40, WordBreakProperty.ALetter],
-  [/*start*/ 0x16B44, WordBreakProperty.Other],
-  [/*start*/ 0x16B50, WordBreakProperty.Numeric],
-  [/*start*/ 0x16B5A, WordBreakProperty.Other],
-  [/*start*/ 0x16B63, WordBreakProperty.ALetter],
-  [/*start*/ 0x16B78, WordBreakProperty.Other],
-  [/*start*/ 0x16B7D, WordBreakProperty.ALetter],
-  [/*start*/ 0x16B90, WordBreakProperty.Other],
-  [/*start*/ 0x16E40, WordBreakProperty.ALetter],
-  [/*start*/ 0x16E80, WordBreakProperty.Other],
-  [/*start*/ 0x16F00, WordBreakProperty.ALetter],
-  [/*start*/ 0x16F4B, WordBreakProperty.Other],
-  [/*start*/ 0x16F4F, WordBreakProperty.Extend],
-  [/*start*/ 0x16F50, WordBreakProperty.ALetter],
-  [/*start*/ 0x16F51, WordBreakProperty.Extend],
-  [/*start*/ 0x16F88, WordBreakProperty.Other],
-  [/*start*/ 0x16F8F, WordBreakProperty.Extend],
-  [/*start*/ 0x16F93, WordBreakProperty.ALetter],
-  [/*start*/ 0x16FA0, WordBreakProperty.Other],
-  [/*start*/ 0x16FE0, WordBreakProperty.ALetter],
-  [/*start*/ 0x16FE2, WordBreakProperty.Other],
-  [/*start*/ 0x16FE3, WordBreakProperty.ALetter],
-  [/*start*/ 0x16FE4, WordBreakProperty.Extend],
-  [/*start*/ 0x16FE5, WordBreakProperty.Other],
-  [/*start*/ 0x16FF0, WordBreakProperty.Extend],
-  [/*start*/ 0x16FF2, WordBreakProperty.Other],
-  [/*start*/ 0x1B000, WordBreakProperty.Katakana],
-  [/*start*/ 0x1B001, WordBreakProperty.Other],
-  [/*start*/ 0x1B164, WordBreakProperty.Katakana],
-  [/*start*/ 0x1B168, WordBreakProperty.Other],
-  [/*start*/ 0x1BC00, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BC6B, WordBreakProperty.Other],
-  [/*start*/ 0x1BC70, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BC7D, WordBreakProperty.Other],
-  [/*start*/ 0x1BC80, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BC89, WordBreakProperty.Other],
-  [/*start*/ 0x1BC90, WordBreakProperty.ALetter],
-  [/*start*/ 0x1BC9A, WordBreakProperty.Other],
-  [/*start*/ 0x1BC9D, WordBreakProperty.Extend],
-  [/*start*/ 0x1BC9F, WordBreakProperty.Other],
-  [/*start*/ 0x1BCA0, WordBreakProperty.Format],
-  [/*start*/ 0x1BCA4, WordBreakProperty.Other],
-  [/*start*/ 0x1D165, WordBreakProperty.Extend],
-  [/*start*/ 0x1D16A, WordBreakProperty.Other],
-  [/*start*/ 0x1D16D, WordBreakProperty.Extend],
-  [/*start*/ 0x1D173, WordBreakProperty.Format],
-  [/*start*/ 0x1D17B, WordBreakProperty.Extend],
-  [/*start*/ 0x1D183, WordBreakProperty.Other],
-  [/*start*/ 0x1D185, WordBreakProperty.Extend],
-  [/*start*/ 0x1D18C, WordBreakProperty.Other],
-  [/*start*/ 0x1D1AA, WordBreakProperty.Extend],
-  [/*start*/ 0x1D1AE, WordBreakProperty.Other],
-  [/*start*/ 0x1D242, WordBreakProperty.Extend],
-  [/*start*/ 0x1D245, WordBreakProperty.Other],
-  [/*start*/ 0x1D400, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D455, WordBreakProperty.Other],
-  [/*start*/ 0x1D456, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D49D, WordBreakProperty.Other],
-  [/*start*/ 0x1D49E, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4A0, WordBreakProperty.Other],
-  [/*start*/ 0x1D4A2, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4A3, WordBreakProperty.Other],
-  [/*start*/ 0x1D4A5, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4A7, WordBreakProperty.Other],
-  [/*start*/ 0x1D4A9, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4AD, WordBreakProperty.Other],
-  [/*start*/ 0x1D4AE, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4BA, WordBreakProperty.Other],
-  [/*start*/ 0x1D4BB, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4BC, WordBreakProperty.Other],
-  [/*start*/ 0x1D4BD, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D4C4, WordBreakProperty.Other],
-  [/*start*/ 0x1D4C5, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D506, WordBreakProperty.Other],
-  [/*start*/ 0x1D507, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D50B, WordBreakProperty.Other],
-  [/*start*/ 0x1D50D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D515, WordBreakProperty.Other],
-  [/*start*/ 0x1D516, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D51D, WordBreakProperty.Other],
-  [/*start*/ 0x1D51E, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D53A, WordBreakProperty.Other],
-  [/*start*/ 0x1D53B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D53F, WordBreakProperty.Other],
-  [/*start*/ 0x1D540, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D545, WordBreakProperty.Other],
-  [/*start*/ 0x1D546, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D547, WordBreakProperty.Other],
-  [/*start*/ 0x1D54A, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D551, WordBreakProperty.Other],
-  [/*start*/ 0x1D552, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D6A6, WordBreakProperty.Other],
-  [/*start*/ 0x1D6A8, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D6C1, WordBreakProperty.Other],
-  [/*start*/ 0x1D6C2, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D6DB, WordBreakProperty.Other],
-  [/*start*/ 0x1D6DC, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D6FB, WordBreakProperty.Other],
-  [/*start*/ 0x1D6FC, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D715, WordBreakProperty.Other],
-  [/*start*/ 0x1D716, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D735, WordBreakProperty.Other],
-  [/*start*/ 0x1D736, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D74F, WordBreakProperty.Other],
-  [/*start*/ 0x1D750, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D76F, WordBreakProperty.Other],
-  [/*start*/ 0x1D770, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D789, WordBreakProperty.Other],
-  [/*start*/ 0x1D78A, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D7A9, WordBreakProperty.Other],
-  [/*start*/ 0x1D7AA, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D7C3, WordBreakProperty.Other],
-  [/*start*/ 0x1D7C4, WordBreakProperty.ALetter],
-  [/*start*/ 0x1D7CC, WordBreakProperty.Other],
-  [/*start*/ 0x1D7CE, WordBreakProperty.Numeric],
-  [/*start*/ 0x1D800, WordBreakProperty.Other],
-  [/*start*/ 0x1DA00, WordBreakProperty.Extend],
-  [/*start*/ 0x1DA37, WordBreakProperty.Other],
-  [/*start*/ 0x1DA3B, WordBreakProperty.Extend],
-  [/*start*/ 0x1DA6D, WordBreakProperty.Other],
-  [/*start*/ 0x1DA75, WordBreakProperty.Extend],
-  [/*start*/ 0x1DA76, WordBreakProperty.Other],
-  [/*start*/ 0x1DA84, WordBreakProperty.Extend],
-  [/*start*/ 0x1DA85, WordBreakProperty.Other],
-  [/*start*/ 0x1DA9B, WordBreakProperty.Extend],
-  [/*start*/ 0x1DAA0, WordBreakProperty.Other],
-  [/*start*/ 0x1DAA1, WordBreakProperty.Extend],
-  [/*start*/ 0x1DAB0, WordBreakProperty.Other],
-  [/*start*/ 0x1E000, WordBreakProperty.Extend],
-  [/*start*/ 0x1E007, WordBreakProperty.Other],
-  [/*start*/ 0x1E008, WordBreakProperty.Extend],
-  [/*start*/ 0x1E019, WordBreakProperty.Other],
-  [/*start*/ 0x1E01B, WordBreakProperty.Extend],
-  [/*start*/ 0x1E022, WordBreakProperty.Other],
-  [/*start*/ 0x1E023, WordBreakProperty.Extend],
-  [/*start*/ 0x1E025, WordBreakProperty.Other],
-  [/*start*/ 0x1E026, WordBreakProperty.Extend],
-  [/*start*/ 0x1E02B, WordBreakProperty.Other],
-  [/*start*/ 0x1E100, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E12D, WordBreakProperty.Other],
-  [/*start*/ 0x1E130, WordBreakProperty.Extend],
-  [/*start*/ 0x1E137, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E13E, WordBreakProperty.Other],
-  [/*start*/ 0x1E140, WordBreakProperty.Numeric],
-  [/*start*/ 0x1E14A, WordBreakProperty.Other],
-  [/*start*/ 0x1E14E, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E14F, WordBreakProperty.Other],
-  [/*start*/ 0x1E2C0, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E2EC, WordBreakProperty.Extend],
-  [/*start*/ 0x1E2F0, WordBreakProperty.Numeric],
-  [/*start*/ 0x1E2FA, WordBreakProperty.Other],
-  [/*start*/ 0x1E800, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E8C5, WordBreakProperty.Other],
-  [/*start*/ 0x1E8D0, WordBreakProperty.Extend],
-  [/*start*/ 0x1E8D7, WordBreakProperty.Other],
-  [/*start*/ 0x1E900, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E944, WordBreakProperty.Extend],
-  [/*start*/ 0x1E94B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1E94C, WordBreakProperty.Other],
-  [/*start*/ 0x1E950, WordBreakProperty.Numeric],
-  [/*start*/ 0x1E95A, WordBreakProperty.Other],
-  [/*start*/ 0x1EE00, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE04, WordBreakProperty.Other],
-  [/*start*/ 0x1EE05, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE20, WordBreakProperty.Other],
-  [/*start*/ 0x1EE21, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE23, WordBreakProperty.Other],
-  [/*start*/ 0x1EE24, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE25, WordBreakProperty.Other],
-  [/*start*/ 0x1EE27, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE28, WordBreakProperty.Other],
-  [/*start*/ 0x1EE29, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE33, WordBreakProperty.Other],
-  [/*start*/ 0x1EE34, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE38, WordBreakProperty.Other],
-  [/*start*/ 0x1EE39, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE3A, WordBreakProperty.Other],
-  [/*start*/ 0x1EE3B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE3C, WordBreakProperty.Other],
-  [/*start*/ 0x1EE42, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE43, WordBreakProperty.Other],
-  [/*start*/ 0x1EE47, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE48, WordBreakProperty.Other],
-  [/*start*/ 0x1EE49, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE4A, WordBreakProperty.Other],
-  [/*start*/ 0x1EE4B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE4C, WordBreakProperty.Other],
-  [/*start*/ 0x1EE4D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE50, WordBreakProperty.Other],
-  [/*start*/ 0x1EE51, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE53, WordBreakProperty.Other],
-  [/*start*/ 0x1EE54, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE55, WordBreakProperty.Other],
-  [/*start*/ 0x1EE57, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE58, WordBreakProperty.Other],
-  [/*start*/ 0x1EE59, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE5A, WordBreakProperty.Other],
-  [/*start*/ 0x1EE5B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE5C, WordBreakProperty.Other],
-  [/*start*/ 0x1EE5D, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE5E, WordBreakProperty.Other],
-  [/*start*/ 0x1EE5F, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE60, WordBreakProperty.Other],
-  [/*start*/ 0x1EE61, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE63, WordBreakProperty.Other],
-  [/*start*/ 0x1EE64, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE65, WordBreakProperty.Other],
-  [/*start*/ 0x1EE67, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE6B, WordBreakProperty.Other],
-  [/*start*/ 0x1EE6C, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE73, WordBreakProperty.Other],
-  [/*start*/ 0x1EE74, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE78, WordBreakProperty.Other],
-  [/*start*/ 0x1EE79, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE7D, WordBreakProperty.Other],
-  [/*start*/ 0x1EE7E, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE7F, WordBreakProperty.Other],
-  [/*start*/ 0x1EE80, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE8A, WordBreakProperty.Other],
-  [/*start*/ 0x1EE8B, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EE9C, WordBreakProperty.Other],
-  [/*start*/ 0x1EEA1, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EEA4, WordBreakProperty.Other],
-  [/*start*/ 0x1EEA5, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EEAA, WordBreakProperty.Other],
-  [/*start*/ 0x1EEAB, WordBreakProperty.ALetter],
-  [/*start*/ 0x1EEBC, WordBreakProperty.Other],
-  [/*start*/ 0x1F130, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F14A, WordBreakProperty.Other],
-  [/*start*/ 0x1F150, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F16A, WordBreakProperty.Other],
-  [/*start*/ 0x1F170, WordBreakProperty.ALetter],
-  [/*start*/ 0x1F18A, WordBreakProperty.Other],
-  [/*start*/ 0x1F1E6, WordBreakProperty.Regional_Indicator],
-  [/*start*/ 0x1F200, WordBreakProperty.Other],
-  [/*start*/ 0x1F3FB, WordBreakProperty.Extend],
-  [/*start*/ 0x1F400, WordBreakProperty.Other],
-  [/*start*/ 0x1FBF0, WordBreakProperty.Numeric],
-  [/*start*/ 0x1FBFA, WordBreakProperty.Other],
-  [/*start*/ 0xE0001, WordBreakProperty.Format],
-  [/*start*/ 0xE0002, WordBreakProperty.Other],
-  [/*start*/ 0xE0020, WordBreakProperty.Extend],
-  [/*start*/ 0xE0080, WordBreakProperty.Other],
-  [/*start*/ 0xE0100, WordBreakProperty.Extend],
-  [/*start*/ 0xE01F0, WordBreakProperty.Other],
-];
diff --git a/developer/src/kmc-model/test/wordbreakers/default-wordbreaker-esm.ts b/developer/src/kmc-model/test/wordbreakers/default-wordbreaker-esm.ts
deleted file mode 100644
index 55c0e560da..0000000000
--- a/developer/src/kmc-model/test/wordbreakers/default-wordbreaker-esm.ts
+++ /dev/null
@@ -1,383 +0,0 @@
-// TEMP: esm version of /common/models/wordbreakers/default/index.ts
-
- import { I, WORD_BREAK_PROPERTY, WordBreakProperty } from './data.js';
-
-
-  /**
-   * Word breaker based on Unicode Standard Annex #29, Section 4.1:
-   * Default Word Boundary Specification.
-   *
-   * @see http://unicode.org/reports/tr29/#Word_Boundaries
-   * @see https://github.com/eddieantonio/unicode-default-word-boundary/tree/v12.0.0
-   */
-  export default function default_(text: string): Span[] {
-    let boundaries = findBoundaries(text);
-    if (boundaries.length == 0) {
-      return [];
-    }
-
-    // All non-empty strings have at least TWO boundaries: at the start and at the end of
-    // the string.
-    let spans = [];
-    for (let i = 0; i < boundaries.length - 1; i++) {
-      let start = boundaries[i];
-      let end = boundaries[i + 1];
-      let span = new LazySpan(text, start, end);
-
-      if (isNonSpace(span.text)) {
-        spans.push(span);
-        // Preserve a sequence-final space if it exists.  Needed to signal "end of word".
-      } else if (i == boundaries.length - 2) { // if "we just checked the final boundary"...
-        // We don't want to return the whitespace itself; the correct token is simply ''.
-        span = new LazySpan(text, end, end);
-        spans.push(span);
-      }
-    }
-    return spans;
-  }
-
-  // Utilities //
-  // type WordBreakProperty = data.WordBreakProperty;
-  // const WordBreakProperty = data.WordBreakProperty;
-  // type I = data.I;
-  // const I = data.I;
-  // const WORD_BREAK_PROPERTY = data.WORD_BREAK_PROPERTY;
-
-  /**
-   * A span that does not cut out the substring until it absolutely has to!
-   */
-  class LazySpan implements Span {
-    private _source: string;
-    readonly start: number;
-    readonly end: number;
-    constructor(source: string, start: number, end: number) {
-      this._source = source;
-      this.start = start;
-      this.end = end;
-    }
-
-    get text(): string {
-      return this._source.substring(this.start, this.end);
-    }
-
-    get length(): number {
-      return this.end - this.start;
-    }
-  }
-
-  /**
-   * Returns true when the chunk does not solely consist of whitespace.
-   *
-   * @param chunk a chunk of text. Starts and ends at word boundaries.
-   */
-  function isNonSpace(chunk: string): boolean {
-    return !Array.from(chunk).map(property).every(wb => (
-      wb === WordBreakProperty.CR ||
-      wb === WordBreakProperty.LF ||
-      wb === WordBreakProperty.Newline ||
-      wb === WordBreakProperty.WSegSpace
-    ));
-  }
-
-  /**
-   * Yields a series of string indices where a word break should
-   * occur. That is, there should be a break BEFORE each string
-   * index yielded by this generator.
-   *
-   * @param text Text to find word boundaries in.
-   */
-  function findBoundaries(text: string): number[] {
-    // WB1 and WB2: no boundaries if given an empty string.
-    if (text.length === 0) {
-      // There are no boundaries in an empty string!
-      return [];
-    }
-
-    // This algorithm works by maintaining a sliding window of four SCALAR VALUES.
-    //
-    //  - Scalar values? JavaScript strings are NOT actually a string of
-    //    Unicode code points; some characters are made up of TWO
-    //    JavaScript indices. e.g.,
-    //        "💩".length === 2;
-    //        "💩"[0] === '\uD83D';
-    //        "💩"[1] === '\uDCA9';
-    //
-    //    These characters that are represented by TWO indices are
-    //    called "surrogate pairs". Since we don't want to be in the
-    //    "middle" of a character, make sure we're always advancing
-    //    by scalar values, and NOT indices. That means, we sometimes
-    //    need to advance by TWO indices, not just one.
-    //  - Four values? Some rules look at what's to the left of
-    //    left, and some look at what's to the right of right. So
-    //    keep track of this!
-
-    let boundaries = [];
-
-    let rightPos: number;
-    let lookaheadPos = 0; // lookahead, one scalar value to the right of right.
-    // Before the start of the string is also the start of the string.
-    let lookbehind: WordBreakProperty;
-    let left = WordBreakProperty.sot;
-    let right = WordBreakProperty.sot;
-    let lookahead = wordbreakPropertyAt(0);
-    // Count RIs to make sure we're not splitting emoji flags:
-    let nConsecutiveRegionalIndicators = 0;
-
-    do  {
-      // Shift all positions, one scalar value to the right.
-      rightPos = lookaheadPos;
-      lookaheadPos = positionAfter(lookaheadPos);
-      // Shift all properties, one scalar value to the right.
-      [lookbehind, left, right, lookahead] =
-        [left, right, lookahead, wordbreakPropertyAt(lookaheadPos)];
-
-      // Break at the start and end of text, unless the text is empty.
-      // WB1: Break at start of text...
-      if (left === WordBreakProperty.sot) {
-        boundaries.push(rightPos);
-        continue;
-      }
-      // WB2: Break at the end of text...
-      if (right === WordBreakProperty.eot) {
-        boundaries.push(rightPos);
-        break; // Reached the end of the string. We're done!
-      }
-      // WB3: Do not break within CRLF:
-      if (left === WordBreakProperty.CR && right === WordBreakProperty.LF)
-        continue;
-      // WB3b: Otherwise, break after...
-      if (left === WordBreakProperty.Newline ||
-          left === WordBreakProperty.CR ||
-          left === WordBreakProperty.LF) {
-        boundaries.push(rightPos);
-        continue;
-      }
-      // WB3a: ...and before newlines
-      if (right === WordBreakProperty.Newline ||
-          right === WordBreakProperty.CR ||
-          right === WordBreakProperty.LF) {
-        boundaries.push(rightPos);
-        continue;
-      }
-
-      // TODO: WB3c is not implemented, due to its complex, error-prone
-      // implementation, requiring a ginormous regexp, and the fact that
-      // the only thing it does is prevent big emoji sequences from being
-      // split up, like 🧚🏼‍♂️
-      // https://www.unicode.org/Public/emoji/12.0/emoji-zwj-sequences.txt
-
-      // WB3d: Keep horizontal whitespace together
-      if (left === WordBreakProperty.WSegSpace && right == WordBreakProperty.WSegSpace)
-        continue;
-
-      // WB4: Ignore format and extend characters
-      // This is to keep grapheme clusters together!
-      // See: Section 6.2: https://unicode.org/reports/tr29/#Grapheme_Cluster_and_Format_Rules
-      // N.B.: The rule about "except after sot, CR, LF, and
-      // Newline" already been by WB1, WB2, WB3a, and WB3b above.
-      while (right === WordBreakProperty.Format ||
-            right === WordBreakProperty.Extend ||
-            right === WordBreakProperty.ZWJ) {
-        // Continue advancing in the string, as if these
-        // characters do not exist. DO NOT update left and
-        // lookbehind however!
-        [rightPos, lookaheadPos] = [lookaheadPos, positionAfter(lookaheadPos)];
-        [right, lookahead] = [lookahead, wordbreakPropertyAt(lookaheadPos)];
-      }
-      // In ignoring the characters in the previous loop, we could
-      // have fallen off the end of the string, so end the loop
-      // prematurely if that happens!
-      if (right === WordBreakProperty.eot) {
-        boundaries.push(rightPos);
-        break;
-      }
-      // WB4 (continued): Lookahead must ALSO ignore these format,
-      // extend, ZWJ characters!
-      while (lookahead === WordBreakProperty.Format ||
-            lookahead === WordBreakProperty.Extend ||
-            lookahead === WordBreakProperty.ZWJ) {
-        // Continue advancing in the string, as if these
-        // characters do not exist. DO NOT update left and right,
-        // however!
-        lookaheadPos = positionAfter(lookaheadPos);
-        lookahead = wordbreakPropertyAt(lookaheadPos);
-      }
-
-      // WB5: Do not break between most letters.
-      if (isAHLetter(left) && isAHLetter(right))
-        continue;
-      // Do not break across certain punctuation
-      // WB6: (Don't break before apostrophes in contractions)
-      if (isAHLetter(left) && isAHLetter(lookahead) &&
-        (right === WordBreakProperty.MidLetter || isMidNumLetQ(right)))
-        continue;
-      // WB7: (Don't break after apostrophes in contractions)
-      if (isAHLetter(lookbehind) && isAHLetter(right) &&
-        (left === WordBreakProperty.MidLetter || isMidNumLetQ(left)))
-        continue;
-      // WB7a
-      if (left === WordBreakProperty.Hebrew_Letter && right === WordBreakProperty.Single_Quote)
-        continue;
-      // WB7b
-      if (left === WordBreakProperty.Hebrew_Letter && right === WordBreakProperty.Double_Quote &&
-          lookahead === WordBreakProperty.Hebrew_Letter)
-        continue;
-      // WB7c
-      if (lookbehind === WordBreakProperty.Hebrew_Letter && left === WordBreakProperty.Double_Quote &&
-          right === WordBreakProperty.Hebrew_Letter)
-        continue;
-      // Do not break within sequences of digits, or digits adjacent to letters.
-      // e.g., "3a" or "A3"
-      // WB8
-      if (left === WordBreakProperty.Numeric && right === WordBreakProperty.Numeric)
-        continue;
-      // WB9
-      if (isAHLetter(left) && right === WordBreakProperty.Numeric)
-        continue;
-      // WB10
-      if (left === WordBreakProperty.Numeric && isAHLetter(right))
-        continue;
-      // Do not break within sequences, such as 3.2, 3,456.789
-      // WB11
-      if (lookbehind === WordBreakProperty.Numeric && right === WordBreakProperty.Numeric &&
-        (left === WordBreakProperty.MidNum || isMidNumLetQ(left)))
-        continue;
-      // WB12
-      if (left === WordBreakProperty.Numeric && lookahead === WordBreakProperty.Numeric &&
-          (right === WordBreakProperty.MidNum || isMidNumLetQ(right)))
-        continue;
-      // WB13: Do not break between Katakana
-      if (left === WordBreakProperty.Katakana && right === WordBreakProperty.Katakana)
-        continue;
-      // Do not break from extenders (e.g., U+202F NARROW NO-BREAK SPACE)
-      // WB13a
-      if ((isAHLetter(left) ||
-          left === WordBreakProperty.Numeric ||
-          left === WordBreakProperty.Katakana ||
-          left === WordBreakProperty.ExtendNumLet) &&
-          right === WordBreakProperty.ExtendNumLet)
-        continue;
-      // WB13b
-      if ((isAHLetter(right) ||
-        right === WordBreakProperty.Numeric ||
-        right === WordBreakProperty.Katakana) && left === WordBreakProperty.ExtendNumLet)
-        continue;
-
-      // WB15 & WB16:
-      // Do not break within emoji flag sequences. That is, do not break between
-      // regional indicator (RI) symbols if there is an odd number of RI
-      // characters before the break point.
-      if (right === WordBreakProperty.Regional_Indicator) {
-        // Emoji flags are actually composed of TWO scalar values, each being a
-        // "regional indicator". These indicators correspond to Latin letters. Put
-        // two of them together, and they spell out an ISO 3166-1-alpha-2 country
-        // code. Since these always come in pairs, NEVER split the pairs! So, if
-        // we happen to be inside the middle of an odd numbered of
-        // Regional_Indicators, DON'T SPLIT IT!
-        nConsecutiveRegionalIndicators += 1;
-        if ((nConsecutiveRegionalIndicators % 2) == 1) {
-          continue;
-        }
-      } else {
-        nConsecutiveRegionalIndicators = 0;
-      }
-      // WB999: Otherwise, break EVERYWHERE (including around ideographs)
-      boundaries.push(rightPos);
-    } while (rightPos < text.length);
-
-    return boundaries;
-
-    ///// Internal utility functions /////
-
-    /**
-     * Returns the position of the start of the next scalar value. This jumps
-     * over surrogate pairs.
-     *
-     * If asked for the character AFTER the end of the string, this always
-     * returns the length of the string.
-     */
-    function positionAfter(pos: number): number {
-      if (pos >= text.length) {
-        return text.length;
-      } else if (isStartOfSurrogatePair(text[pos])) {
-        return pos + 2;
-      }
-      return pos + 1;
-    }
-
-    /**
-     * Return the value of the Word_Break property at the given string index.
-     * @param pos position in the text.
-     */
-    function wordbreakPropertyAt(pos: number) {
-      if (pos < 0) {
-        return WordBreakProperty.sot; // Always "start of string" before the string starts!
-      } else if (pos >= text.length) {
-        return WordBreakProperty.eot; // Always "end of string" after the string ends!
-      } else if (isStartOfSurrogatePair(text[pos])) {
-        // Surrogate pairs the next TWO items from the string!
-        return property(text[pos] + text[pos + 1]);
-      }
-      return property(text[pos]);
-    }
-
-    // Word_Break rule macros
-    // See: https://unicode.org/reports/tr29/#WB_Rule_Macros
-    function isAHLetter(prop: WordBreakProperty): boolean {
-      return prop === WordBreakProperty.ALetter ||
-            prop === WordBreakProperty.Hebrew_Letter;
-    }
-
-    function isMidNumLetQ(prop: WordBreakProperty): boolean {
-      return prop === WordBreakProperty.MidNumLet ||
-            prop === WordBreakProperty.Single_Quote;
-    }
-  }
-
-  function isStartOfSurrogatePair(character: string) {
-    let codeUnit = character.charCodeAt(0);
-    return codeUnit >= 0xD800 && codeUnit <= 0xDBFF;
-  }
-
-  /**
-   * Return the Word_Break property value for a character.
-   * Note that
-   * @param character a scalar value
-   */
-  function property(character: string): WordBreakProperty {
-    // This MUST be a scalar value.
-    // TODO: remove dependence on character.codepointAt()?
-    let codepoint = character.codePointAt(0) as number;
-    return searchForProperty(codepoint, 0, WORD_BREAK_PROPERTY.length - 1);
-  }
-
-  /**
-   * Binary search for the word break property of a given CODE POINT.
-   *
-   * The auto-generated data.ts master array defines a **character range**
-   * lookup table.  If a character's codepoint is equal to or greater than
-   * the I.Start value for an entry and exclusively less than the next entry,
-   * it falls in the first entry's range bucket and is classified accordingly
-   * by this method.
-   */
-  function searchForProperty(codePoint: number, left: number, right: number): WordBreakProperty {
-    // All items that are not found in the array are assigned the 'Other' property.
-    if (right < left) {
-      return WordBreakProperty.Other;
-    }
-
-    let midpoint = left + ~~((right - left) / 2);
-    let candidate = WORD_BREAK_PROPERTY[midpoint];
-
-    let nextRange = WORD_BREAK_PROPERTY[midpoint + 1];
-    let startOfNextRange = nextRange ? nextRange[I.Start] : Infinity;
-
-    if (codePoint < candidate[I.Start]) {
-      return searchForProperty(codePoint, left, midpoint - 1);
-    } else if (codePoint >= startOfNextRange) {
-      return searchForProperty(codePoint, midpoint + 1, right);
-    }
-
-    // We found it!
-    return candidate[I.Value];
-  }

From 383678a00241228073074e290be2bc620b51dae0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 4 Oct 2023 17:34:43 +0700
Subject: [PATCH 16/22] chore(developer): cleanup hextobin call

---
 developer/src/kmc-ldml/test/test-compiler-e2e.ts              | 4 +---
 .../src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/developer/src/kmc-ldml/test/test-compiler-e2e.ts b/developer/src/kmc-ldml/test/test-compiler-e2e.ts
index 41acd7c81d..343f6cc7ac 100644
--- a/developer/src/kmc-ldml/test/test-compiler-e2e.ts
+++ b/developer/src/kmc-ldml/test/test-compiler-e2e.ts
@@ -1,12 +1,10 @@
 import 'mocha';
 import {assert} from 'chai';
-import x_hextobin from '@keymanapp/hextobin';
+import hextobin from '@keymanapp/hextobin';
 import { KMXBuilder } from '@keymanapp/common-types';
 import {checkMessages, compileKeyboard, compilerTestCallbacks, compilerTestOptions, makePathToFixture} from './helpers/index.js';
 import { LdmlKeyboardCompiler } from '../src/compiler/compiler.js';
 
-const hextobin = (x_hextobin as any).default;
-
 describe('compiler-tests', function() {
   this.slow(500); // 0.5 sec -- json schema validation takes a while
 
diff --git a/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts b/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts
index 87d4d914c9..133f4286c8 100644
--- a/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts
+++ b/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts
@@ -1,11 +1,9 @@
 import 'mocha';
 import {assert} from 'chai';
-import x_hextobin from '@keymanapp/hextobin';
+import hextobin from '@keymanapp/hextobin';
 import { KvkFileWriter } from '@keymanapp/common-types';
 import {checkMessages,  compilerTestOptions,  compileVisualKeyboard, makePathToFixture} from './helpers/index.js';
 
-const hextobin = (x_hextobin as any).default;
-
 describe('visual-keyboard-compiler', function() {
   this.slow(500); // 0.5 sec -- json schema validation takes a while
 

From a314ba46a6a87d7e6c687a3181d3da04baa22420 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 5 Oct 2023 14:42:33 +0700
Subject: [PATCH 17/22] fix(developer): server node addin paths

---
 developer/src/server/build-addins.inc.sh | 23 +++++++++++++++--------
 developer/src/server/build.sh            |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/developer/src/server/build-addins.inc.sh b/developer/src/server/build-addins.inc.sh
index 3643ebffcd..d48d44d1e7 100644
--- a/developer/src/server/build-addins.inc.sh
+++ b/developer/src/server/build-addins.inc.sh
@@ -29,8 +29,13 @@ do_build_addins() {
   echo "TRAYICON_TARGET=$TRAYICON_TARGET"
   echo "HIDECONSOLE_TARGET=$HIDECONSOLE_TARGET"
 
-  HIDECONSOLE_TARGET="$KEYMAN_ROOT/developer/src/server/src/win32/console/$HIDECONSOLE_TARGET"
-  TRAYICON_TARGET="$KEYMAN_ROOT/developer/src/server/src/win32/trayicon/$TRAYICON_TARGET"
+  local HIDECONSOLE_SRC_TARGET="$KEYMAN_ROOT/developer/src/server/src/win32/console/$HIDECONSOLE_TARGET"
+  local HIDECONSOLE_BIN_TARGET="$KEYMAN_ROOT/developer/src/server/build/src/win32/console/$HIDECONSOLE_TARGET"
+  local TRAYICON_SRC_TARGET="$KEYMAN_ROOT/developer/src/server/src/win32/trayicon/$TRAYICON_TARGET"
+  local TRAYICON_BIN_TARGET="$KEYMAN_ROOT/developer/src/server/build/src/win32/trayicon/$TRAYICON_TARGET"
+
+  mkdir -p "$(dirname "$HIDECONSOLE_BIN_TARGET")"
+  mkdir -p "$(dirname "$TRAYICON_BIN_TARGET")"
 
   #
   # Build node-windows-trayicon
@@ -39,7 +44,8 @@ do_build_addins() {
   pushd "$KEYMAN_ROOT/node_modules/node-windows-trayicon"
   rm -rf build
   npx node-gyp clean configure build --arch=$ARCH --silent
-  cp build/Release/addon.node "$TRAYICON_TARGET"
+  cp build/Release/addon.node "$TRAYICON_SRC_TARGET"
+  cp build/Release/addon.node "$TRAYICON_BIN_TARGET"
   popd
 
   #
@@ -49,7 +55,8 @@ do_build_addins() {
   pushd "$KEYMAN_ROOT/node_modules/hetrodo-node-hide-console-window-napi"
   rm -rf build
   npx node-gyp clean configure build --arch=$ARCH --silent
-  cp build/Release/node-hide-console-window.node "$HIDECONSOLE_TARGET"
+  cp build/Release/node-hide-console-window.node "$HIDECONSOLE_SRC_TARGET"
+  cp build/Release/node-hide-console-window.node "$HIDECONSOLE_BIN_TARGET"
   popd
 
   #
@@ -57,10 +64,10 @@ do_build_addins() {
   #
 
   if (( NODEX64 )); then
-    [[ $(isFileX64 "$TRAYICON_TARGET") == 1 ]] || builder_die "$TRAYICON_TARGET should be 64-bit"
-    [[ $(isFileX64 "$HIDECONSOLE_TARGET") == 1 ]] || builder_die "$HIDECONSOLE_TARGET should be 64-bit"
+    [[ $(isFileX64 "$TRAYICON_BIN_TARGET") == 1 ]] || builder_die "$TRAYICON_TARGET should be 64-bit"
+    [[ $(isFileX64 "$HIDECONSOLE_BIN_TARGET") == 1 ]] || builder_die "$HIDECONSOLE_TARGET should be 64-bit"
   else
-    [[ $(isFileX64 "$TRAYICON_TARGET") == 0 ]] || builder_die "$TRAYICON_TARGET should not be 64-bit"
-    [[ $(isFileX64 "$HIDECONSOLE_TARGET") == 0 ]] || builder_die "$HIDECONSOLE_TARGET should not be 64-bit"
+    [[ $(isFileX64 "$TRAYICON_BIN_TARGET") == 0 ]] || builder_die "$TRAYICON_TARGET should not be 64-bit"
+    [[ $(isFileX64 "$HIDECONSOLE_BIN_TARGET") == 0 ]] || builder_die "$HIDECONSOLE_TARGET should not be 64-bit"
   fi
 }
diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 7e47d4f663..51523c52a3 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -32,7 +32,7 @@ builder_describe_outputs \
   configure:server     /node_modules \
   configure:addins     /node_modules \
   build:server         /developer/src/server/build/src/index.js \
-  build:addins         /developer/src/server/build/src/win32/console/index.js
+  build:addins         /developer/src/server/build/src/win32/trayicon/addon.node
 
 builder_parse "$@"
 

From 3f21f65c43124b779c98ed10bac1eb37593509d5 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 5 Oct 2023 14:46:14 +0700
Subject: [PATCH 18/22] chore(common): fixup sourcemap-path-remapper build
 settings

---
 common/tools/sourcemap-path-remapper/src/convert-source-map.d.ts | 1 +
 common/tools/sourcemap-path-remapper/tsconfig.json               | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 common/tools/sourcemap-path-remapper/src/convert-source-map.d.ts

diff --git a/common/tools/sourcemap-path-remapper/src/convert-source-map.d.ts b/common/tools/sourcemap-path-remapper/src/convert-source-map.d.ts
new file mode 100644
index 0000000000..15a4da3c64
--- /dev/null
+++ b/common/tools/sourcemap-path-remapper/src/convert-source-map.d.ts
@@ -0,0 +1 @@
+declare module 'convert-source-map';
\ No newline at end of file
diff --git a/common/tools/sourcemap-path-remapper/tsconfig.json b/common/tools/sourcemap-path-remapper/tsconfig.json
index 6bf1a23b8d..e207097f61 100644
--- a/common/tools/sourcemap-path-remapper/tsconfig.json
+++ b/common/tools/sourcemap-path-remapper/tsconfig.json
@@ -5,6 +5,7 @@
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
     "declaration": true,
+    "sourceMap": false,
     "inlineSourceMap": true,
     "inlineSources": true,
     "sourceRoot": "/common/tools/sourcemap-path-remapper/src",

From 6cfcf08f3fad0cfdf389fea5da7e8dfdc989427e Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 5 Oct 2023 15:32:43 +0700
Subject: [PATCH 19/22] chore(web): reduce strictness on ts

---
 web/tsconfig.base.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/tsconfig.base.json b/web/tsconfig.base.json
index fa60ca26e6..ccb568c867 100644
--- a/web/tsconfig.base.json
+++ b/web/tsconfig.base.json
@@ -1,14 +1,24 @@
 {
   "extends": "../tsconfig.base.json",
 
+  // TODO: eliminate settings duplicated in ../tsconfig.base.json
   "compilerOptions": {
     // Primary settings - the version of ES6 we can target in TS, our downcompile target,
     // and our module-related settings.
     "allowSyntheticDefaultImports": true,
+
     "lib": ["es6"],
     "module": "es6",
     "target": "es5",
 
+    // TODO: These override ../tsconfig.base.json settings, and so should be removed if possible,
+    //       but existing code in web/ breaks some of these settinsg
+    "noImplicitThis": false,
+    "noImplicitReturns": false,
+    "noImplicitAny": false,
+    "strictFunctionTypes": false,
+    "noUnusedLocals": false,
+
     // Other settings - declaration files, sourcemapping, and other miscellaneous bits.
     "allowJs": false,
     "declaration": true,

From 7e7c81e7ee28c7a0fa7ef80f735877730f3a7607 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 5 Oct 2023 15:48:53 +0700
Subject: [PATCH 20/22] chore(common): reduce strictness on ts for
 sentry-manager

---
 common/web/sentry-manager/src/tsconfig.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/web/sentry-manager/src/tsconfig.json b/common/web/sentry-manager/src/tsconfig.json
index f42eaea73b..1b438c93c4 100644
--- a/common/web/sentry-manager/src/tsconfig.json
+++ b/common/web/sentry-manager/src/tsconfig.json
@@ -1,6 +1,16 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
+
+    // TODO: These override /tsconfig.base.json settings, and so should be removed if possible,
+    //       but existing code in web/ breaks some of these settinsg
+    "noImplicitThis": false,
+    "noImplicitReturns": false,
+    "noImplicitAny": false,
+    "strictFunctionTypes": false,
+    "noUnusedLocals": false,
+
+
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "baseUrl": "./",

From 3dc9ac245f5d713376bd9e893b2baf08cdec9508 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 6 Oct 2023 10:22:02 +0700
Subject: [PATCH 21/22] chore(ios): renew certificate

---
 ios/exportAppStore.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/exportAppStore.plist b/ios/exportAppStore.plist
index 6393f3c4cb..48ef58f532 100644
--- a/ios/exportAppStore.plist
+++ b/ios/exportAppStore.plist
@@ -7,9 +7,9 @@
     <key>teamID</key>
     <string>3YE4W86L3G</string>
     <key>signingCertificate</key>
-    <string>05473BF50CCD4B78B304656FB4D93FDC7EE7ACD0</string>
+    <string>BB842A0081298BBA6D034C85451750B08FC9EE8A</string>
     <key>installerSigningCertificate</key>
-    <string>05473BF50CCD4B78B304656FB4D93FDC7EE7ACD0</string>
+    <string>BB842A0081298BBA6D034C85451750B08FC9EE8A</string>
     <key>provisioningProfiles</key>
     <dict>
         <key>Tavultesoft.Keyman</key>

From 25c20ee812a619391574a9633c8e21e243a65b9d Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 6 Oct 2023 11:58:59 -0500
Subject: [PATCH 22/22] =?UTF-8?q?feat(common):=20fix=20marker=20parsing=20?=
 =?UTF-8?q?=20=F0=9F=99=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- cleaned up regex

For: #9119
---
 .../web/types/src/ldml-keyboard/pattern-parser.ts  | 10 ++++++++--
 .../test/ldml-keyboard/test-pattern-parser.ts      | 14 +++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/common/web/types/src/ldml-keyboard/pattern-parser.ts b/common/web/types/src/ldml-keyboard/pattern-parser.ts
index b02440553e..b0d6fb0796 100644
--- a/common/web/types/src/ldml-keyboard/pattern-parser.ts
+++ b/common/web/types/src/ldml-keyboard/pattern-parser.ts
@@ -64,9 +64,15 @@ export class MarkerParser {
   public static readonly MAX_MARKER_INDEX = constants.marker_max_index;
   /** Max count of markers */
   public static readonly MAX_MARKER_COUNT = constants.marker_max_count;
+
+  private static anyMarkerMatch() : string {
+    const start = (`0000` + (this.MIN_MARKER_INDEX).toString(16)).slice(-4);
+    const end   = (`0000` + (this.MAX_MARKER_INDEX).toString(16)).slice(-4);
+    return `${this.SENTINEL}${this.MARKER_CODE}[\\u${start}-\\u${end}]`;
+  }
+
   /** Expression that matches any marker */
-  public static readonly ANY_MARKER_MATCH =
-    this.SENTINEL + this.MARKER_CODE + `[\\u0001-\\u${this.MAX_MARKER_INDEX.toString(16)}]`;
+  public static readonly ANY_MARKER_MATCH = MarkerParser.anyMarkerMatch();
 
   /**
    * Pattern for matching a marker reference, OR the special marker \m{.}
diff --git a/common/web/types/test/ldml-keyboard/test-pattern-parser.ts b/common/web/types/test/ldml-keyboard/test-pattern-parser.ts
index 1ea96797a7..0274f2a5c2 100644
--- a/common/web/types/test/ldml-keyboard/test-pattern-parser.ts
+++ b/common/web/types/test/ldml-keyboard/test-pattern-parser.ts
@@ -105,16 +105,20 @@ describe('Test of Pattern Parsers', () => {
         )
       );
       // verify the matching behavior of these
-      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`Q\\m{a}`, markers, true), 'u')
+      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`^Q\\m{a}$`, markers, true), 'u')
         .test(MarkerParser.toSentinelString(`Q\\m{a}`, markers, false)), `Q\\m{a} did not match`);
-      assert.isFalse(new RegExp(MarkerParser.toSentinelString(`Q\\m{a}`, markers, true), 'u')
+      assert.isFalse(new RegExp(MarkerParser.toSentinelString(`^Q\\m{a}$`, markers, true), 'u')
         .test(MarkerParser.toSentinelString(`Q\\m{b}`, markers, false)), `Q\\m{a} should not match Q\\m{b}`);
-      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`Q\\m{.}`, markers, true), 'u')
+      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`^Q\\m{.}$`, markers, true), 'u')
         .test(MarkerParser.toSentinelString(`Q\\m{a}`, markers, false)), `Q\\m{.} did not match Q\\m{a}`);
-      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`Q\\m{.}`, markers, true), 'u')
+      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`^Q\\m{.}$`, markers, true), 'u')
         .test(MarkerParser.toSentinelString(`Q\\m{zz}`, markers, false)), `Q\\m{.} did not match Q\\m{zz} (max marker)`);
-      assert.isFalse(new RegExp(MarkerParser.toSentinelString(`Q\\m{.}`, markers, true), 'u')
+      assert.isFalse(new RegExp(MarkerParser.toSentinelString(`^Q\\m{.}$`, markers, true), 'u')
         .test(MarkerParser.toSentinelString(`\\m{a}`, markers, false)), `Q\\m{.} did not match \\m{a}`);
+      assert.isTrue(new RegExp(MarkerParser.toSentinelString(`^\\m{.}$`, markers, true), 'u')
+        .test(MarkerParser.toSentinelString(`\\m{a}`, markers, false)), `\\m{.} did not match \\m{a}`);
+      assert.isFalse(new RegExp(MarkerParser.toSentinelString(`^\\m{.}$`, markers, true), 'u')
+        .test(MarkerParser.toSentinelString(`\\m{a}\\m{b}`, markers, false)), `\\m{.} did not match \\m{a}\\m{b}`);
     });
     it('should match some marker constants', () => {
       assert.equal(constants.uc_sentinel, KMXFile.UC_SENTINEL);